layers are redundant
This commit is contained in:
@@ -1,9 +1,6 @@
|
||||
#include "WindowModule.h"
|
||||
|
||||
WindowModule::~WindowModule() {
|
||||
if(layers) {
|
||||
delete layers;
|
||||
}
|
||||
if(renderer) {
|
||||
renderer->getCmdList().clear();
|
||||
delete renderer;
|
||||
@@ -23,14 +20,10 @@ void WindowModule::onLoad() {
|
||||
|
||||
//renderer = window->getRenderer();
|
||||
|
||||
layers = new Archimedes::Layerstack();
|
||||
|
||||
if(!renderer->init()) {
|
||||
std::cout << "Renderer init failed!\n";
|
||||
std::abort();
|
||||
}
|
||||
|
||||
renderer->getCmdList().push_back([this](){ layers->renderAll(); });
|
||||
}
|
||||
|
||||
void WindowModule::run() {
|
||||
|
||||
@@ -11,12 +11,11 @@
|
||||
|
||||
#include "utils/Window/Window.h"
|
||||
#include "utils/Renderer/Renderer.h"
|
||||
#include "utils/Layers/Layerstack.h"
|
||||
|
||||
class WindowModule : public Archimedes::Module {
|
||||
|
||||
public:
|
||||
WindowModule(void* h, Archimedes::App* a) : Archimedes::Module(h, a) {
|
||||
WindowModule(Archimedes::App* a, void* h = nullptr) : Archimedes::Module(a, h) {
|
||||
name = "WindowModule";
|
||||
}
|
||||
|
||||
@@ -31,13 +30,11 @@ class WindowModule : public Archimedes::Module {
|
||||
|
||||
Archimedes::Window* getWindow() { return window; }
|
||||
Archimedes::Renderer* getRenderer() { return renderer; }
|
||||
Archimedes::Layerstack* getLayerstack() { return layers; }
|
||||
|
||||
private:
|
||||
|
||||
Archimedes::Window* window;
|
||||
Archimedes::Renderer* renderer;
|
||||
Archimedes::Layerstack* layers;
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user