Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-12-21 07:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'revgraphics'

Browse Source 
Conflicts:
	src/framework/CMakeLists.txt
	src/framework/application.cpp
	src/framework/graphics/graphics.cpp
This commit is contained in:
Eduardo Bart
2011-12-09 12:23:32 -02:00
parent e6449a94f4 04ee85dc92
commit 2030a4da29
81 changed files with 1988 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/framework/application.cpp
View File

@@ -32,6 +32,7 @@
#include <framework/ui/uiwidget.h>
#include <framework/graphics/graphics.h>
#include <framework/graphics/particlesmanager.h>
#include <framework/graphics/painter.h>
#include <framework/luascript/luainterface.h>
Application *g_app = nullptr;
@@ -135,7 +136,6 @@ void Application::terminate()
// terminate graphics
if(m_appFlags & Fw::AppEnableGraphics) {
g_ui.terminate();
g_graphics.terminate();
g_window.terminate();
}
@@ -222,8 +222,8 @@ void Application::render()
void Application::resize(const Size& size)
{
g_graphics.resize(size);
g_ui.resize(size);
g_graphics.resize(size);
}
void Application::inputEvent(const InputEvent& event)