Ver código fonte

enable OsWindow

mikymod 12 anos atrás
pai
commit
9ec1982ff4
2 arquivos alterados com 11 adições e 0 exclusões
  1. 9 0
      engine/Device.cpp
  2. 2 0
      engine/Device.h

+ 9 - 0
engine/Device.cpp

@@ -127,6 +127,9 @@ void Device::init()
 	Log::d("Resource manager created.");
 	Log::d("Resource manager created.");
 	Log::d("Resource seed: %d", m_resource_manager->seed());
 	Log::d("Resource seed: %d", m_resource_manager->seed());
 
 
+	// Create window
+	m_window = CE_NEW(m_allocator, OsWindow);
+
 	// Create input devices
 	// Create input devices
 	m_keyboard = CE_NEW(m_allocator, Keyboard);
 	m_keyboard = CE_NEW(m_allocator, Keyboard);
 	m_mouse = CE_NEW(m_allocator, Mouse);
 	m_mouse = CE_NEW(m_allocator, Mouse);
@@ -252,6 +255,12 @@ LuaEnvironment* Device::lua_environment()
 	return m_lua_environment;
 	return m_lua_environment;
 }
 }
 
 
+//-----------------------------------------------------------------------------
+OsWindow* Device::window()
+{
+	return m_window;
+}
+
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 Renderer* Device::renderer()
 Renderer* Device::renderer()
 {
 {

+ 2 - 0
engine/Device.h

@@ -161,6 +161,8 @@ protected:
 	// Public subsystems
 	// Public subsystems
 	Filesystem*				m_filesystem;
 	Filesystem*				m_filesystem;
 
 
+	OsWindow*				m_window;
+
 	Keyboard*				m_keyboard;
 	Keyboard*				m_keyboard;
 	Mouse*					m_mouse;
 	Mouse*					m_mouse;
 	Touch*					m_touch;
 	Touch*					m_touch;