restructure modules. make GuiModules depend on WindowModule
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#include "WindowModule.h"
|
||||
|
||||
WindowModule::WindowModule(void* h, Archimedes::App& a) : Module(h, a) {
|
||||
WindowModule::WindowModule(void* h, Archimedes::App* a) : Module(h, a) {
|
||||
name = "Window";
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ void WindowModule::onLoad() {
|
||||
void WindowModule::run() {
|
||||
|
||||
if(window->shouldClose()) {
|
||||
app.end();
|
||||
app->end();
|
||||
}
|
||||
|
||||
window->doFrame();
|
||||
@@ -5,7 +5,7 @@
|
||||
class WindowModule : public Archimedes::Module {
|
||||
|
||||
public:
|
||||
WindowModule(void*, Archimedes::App&);
|
||||
WindowModule(void*, Archimedes::App*);
|
||||
|
||||
~WindowModule();
|
||||
|
||||
@@ -19,8 +19,7 @@ class WindowModule : public Archimedes::Module {
|
||||
};
|
||||
|
||||
|
||||
extern "C" {
|
||||
Archimedes::Module* create(void* handle, Archimedes::App& app) {
|
||||
return new WindowModule(handle, app);
|
||||
}
|
||||
}
|
||||
#ifndef WINDOW_STATIC
|
||||
#define MODULE_TYPE WindowModule
|
||||
#include "endModule.h"
|
||||
#endif
|
||||
Reference in New Issue
Block a user