Просмотр исходного кода

Moved drawScreensFirst into ScreenManager, cause that's where it belongs

Ivan Safrin 12 лет назад
Родитель
Сommit
296e890a72

+ 0 - 4
Core/Contents/Include/PolyCoreServices.h

@@ -160,10 +160,6 @@ namespace Polycode {
 						
 			Config *getConfig();
 			
-			/**
-			* If set to true, will draw Screens before Scenes (defaults to false).
-			*/	
-			bool drawScreensFirst;
 					
 			~CoreServices();
 		

+ 6 - 0
Core/Contents/Include/PolyScreenManager.h

@@ -48,6 +48,12 @@ namespace Polycode {
 		
 		void handleEvent(Event *event);
 		
+			
+		/**
+		* If set to true, will draw Screens before Scenes (defaults to false).
+		*/	
+		bool drawScreensFirst;
+					
 		private:
 		
 		std::vector <Screen*> screens;

+ 1 - 2
Core/Contents/Source/PolyCoreServices.cpp

@@ -64,7 +64,6 @@ CoreServices* CoreServices::getInstance() {
 
 //#ifdef _WINDOWS
 		overrideInstance = new CoreServices;
-		overrideInstance->drawScreensFirst = false;
 		Logger::log("Creating new core services instance...\n");
 		return overrideInstance;
 //#else
@@ -223,7 +222,7 @@ void CoreServices::Render() {
 	if(renderer->doClearBuffer)
 		renderer->clearScreen();					
 
-	if(drawScreensFirst) {
+	if(screenManager->drawScreensFirst) {
 		renderer->clearLights();	
 		screenManager->Render();
 		renderer->setPerspectiveMode();

+ 1 - 1
Core/Contents/Source/PolyScreenManager.cpp

@@ -28,7 +28,7 @@
 using namespace Polycode;
 
 ScreenManager::ScreenManager() : EventDispatcher() {
-
+	drawScreensFirst = false;
 }
 
 ScreenManager::~ScreenManager() {