Compiling for android but have some bugs

This commit is contained in:
Tulioh
2014-12-25 14:22:37 -02:00
parent c28d2c1555
commit 389c7f2a60
20 changed files with 149 additions and 195 deletions

View File

@@ -101,7 +101,7 @@ void Application::init(std::vector<std::string>& args)
registerLuaFunctions();
}
void Application::deinit()
void Application::unloadModules()
{
g_lua.callGlobalField("g_app", "onTerminate");

View File

@@ -34,9 +34,9 @@ public:
virtual ~Application() {}
virtual void init(std::vector<std::string>& args);
virtual void deinit();
virtual void unloadModules();
virtual void terminate();
virtual void run() = 0;
virtual void runAppMainLoop() = 0;
virtual void poll();
virtual void exit();
virtual void close();

View File

@@ -31,7 +31,7 @@
ConsoleApplication g_app;
void ConsoleApplication::run()
void ConsoleApplication::runAppMainLoop()
{
m_running = true;

View File

@@ -29,7 +29,7 @@
class ConsoleApplication : public Application
{
public:
void run();
void runAppMainLoop();
int getFps() { return m_frameCounter.getLastFps(); }

View File

@@ -66,12 +66,12 @@ void GraphicalApplication::init(std::vector<std::string>& args)
#endif
}
void GraphicalApplication::deinit()
void GraphicalApplication::unloadModules()
{
// hide the window because there is no render anymore
g_window.hide();
Application::deinit();
Application::unloadModules();
}
void GraphicalApplication::terminate()
@@ -101,7 +101,7 @@ void GraphicalApplication::terminate()
m_terminated = true;
}
void GraphicalApplication::run()
void GraphicalApplication::runAppMainLoop()
{
m_running = true;

View File

@@ -36,9 +36,9 @@ class GraphicalApplication : public Application
public:
void init(std::vector<std::string>& args);
void deinit();
void unloadModules();
void terminate();
void run();
void runAppMainLoop();
void poll();
void close();