Bug fixing

build/release_llvm/gen.cfg.py

@@ -10,6 +10,6 @@ executableName = "anki"
 compiler = "clang++"
 linker = "llvm-ld"
 
-compilerFlags = "-DPLATFORM_LINUX -DMATH_INTEL_SIMD -DNDEBUG -DBOOST_DISABLE_ASSERTS -DREVISION=\\\"`svnversion ../..`\\\" -c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -Wno-long-long -pipe -msse4 -O3 -mtune=core2 -ffast-math -emit-llvm"
+compilerFlags = "-DPLATFORM_LINUX -DMATH_INTEL_SIMD -DNDEBUG -DBOOST_DISABLE_ASSERTS -DREVISION=\\\"`svnversion ../..`\\\" -c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -Wno-long-long -pipe -msse4 -O3 -mtune=core2 -ffast-math"
 
 linkerFlags = "-L../../extern/lib-x86-64-linux -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -lGLEW -lGLU -lGL -ljpeg -lSDL -lpng -lpython2.6 -lboost_system -lboost_python -lboost_filesystem -lboost_thread -lfreetype"

src/Main.cpp

@@ -372,20 +372,20 @@ void mainLoop()
 		prevUpdateTime = crntTime;
 		crntTime = HighRezTimer::getCrntTime();
 
+		//
+		// Update
+		//
 		mainLoopExtra();
-
 		AppSingleton::getInstance().execStdinScpripts();
 		SceneSingleton::getInstance().getPhysMasterContainer().update(prevUpdateTime, crntTime);
 		SceneSingleton::getInstance().updateAllWorldStuff();
 		SceneSingleton::getInstance().doVisibilityTests(*AppSingleton::getInstance().getActiveCam());
 		SceneSingleton::getInstance().updateAllControllers();
 		Event::ManagerSingleton::getInstance().updateAllEvents(prevUpdateTime, crntTime);
-
 		MainRendererSingleton::getInstance().render(*AppSingleton::getInstance().getActiveCam());
 
 		painter->setPosition(Vec2(0.0, 0.1));
 		painter->setColor(Vec4(1.0));
-
 		//painter->drawText("A");
 		painter->drawText("Once upon a time in a place called Kickapoo.");
 
@@ -406,39 +406,42 @@ void mainLoop()
 
 		AppSingleton::getInstance().swapBuffers();
 
-		HighRezTimer::Scalar a = timer.getElapsedTime();
-		HighRezTimer::Scalar b = AppSingleton::getInstance().getTimerTick();
-		HighRezTimer::Scalar timeToSpendForRsrcPostProcess;
-		if(a < b)
-		{
-			timeToSpendForRsrcPostProcess = b - a;
-		}
-		else
-		{
-			timeToSpendForRsrcPostProcess = 0.001;
-		}
-		ResourceManagerSingleton::getInstance().postProcessFinishedLoadingRequests(timeToSpendForRsrcPostProcess);
 
-		if(1)
+		//
+		// Async resource loading
+		//
+		if(ResourceManagerSingleton::getInstance().getAsyncLoadingRequestsNum() > 0)
 		{
-			//AppSingleton::getInstance().waitForNextFrame();
-
-			timer.stop();
-			if(timer.getElapsedTime() < AppSingleton::getInstance().getTimerTick())
+			HighRezTimer::Scalar a = timer.getElapsedTime();
+			HighRezTimer::Scalar b = AppSingleton::getInstance().getTimerTick();
+			HighRezTimer::Scalar timeToSpendForRsrcPostProcess;
+			if(a < b)
 			{
-				SDL_Delay(AppSingleton::getInstance().getTimerTick() - timer.getElapsedTime());
+				timeToSpendForRsrcPostProcess = b - a;
 			}
-		}
-		else
-		{
-			if(MainRendererSingleton::getInstance().getFramesNum() == 100)
+			else
 			{
-				break;
+				timeToSpendForRsrcPostProcess = 0.001;
 			}
+			ResourceManagerSingleton::getInstance().postProcessFinishedLoadingRequests(timeToSpendForRsrcPostProcess);
+		}
+
+		//
+		// Sleep
+		//
+		timer.stop();
+		if(timer.getElapsedTime() < AppSingleton::getInstance().getTimerTick())
+		{
+			SDL_Delay((AppSingleton::getInstance().getTimerTick() - timer.getElapsedTime()) * 1000.0);
 		}
+
+		/*if(MainRendererSingleton::getInstance().getFramesNum() == 100)
+		{
+			break;
+		}*/
 	}
 
-	INFO("Exiting main loop (" << mainLoopTimer.getElapsedTime() << ")");
+	INFO("Exiting main loop (" << mainLoopTimer.getElapsedTime() << " sec)");
 }
 
 

src/Resources/Core/ResourceManager.h

@@ -42,7 +42,6 @@ class ResourceManager
 		ResourceManager();
 		~ResourceManager();
 
-
 		/// Load a resource
 		/// See if its already loaded, if its not:
 		/// - Create an instance
@@ -57,7 +56,10 @@ class ResourceManager
 		void unload(const typename Types<Type>::Hook& info);
 		
 		/// See RsrcAsyncLoadingReqsHandler::postProcessFinishedRequests
-		void postProcessFinishedLoadingRequests(uint maxTime);
+		void postProcessFinishedLoadingRequests(float maxTime);
+
+		/// Get the number of total pending requests
+		size_t getAsyncLoadingRequestsNum() const {return rsrcAsyncLoadingReqsHandler.getRequestsNum();}
 
 	private:
 		/// @name Containers
@@ -111,7 +113,7 @@ class ResourceManager
 };
 
 
-inline void ResourceManager::postProcessFinishedLoadingRequests(uint maxTime)
+inline void ResourceManager::postProcessFinishedLoadingRequests(float maxTime)
 {
 	rsrcAsyncLoadingReqsHandler.postProcessFinishedRequests(maxTime);
 }

src/Resources/Core/RsrcAsyncLoadingReqsHandler.h

@@ -35,6 +35,9 @@ class RsrcAsyncLoadingReqsHandler
 		/// again.
 		/// In seconds
 		void postProcessFinishedRequests(float maxTime);
+
+		/// Get the number of total pending requests
+		size_t getRequestsNum() const {return requests.size();}
 	
 	private:
 		AsyncLoader al; ///< Asynchronous loader

src/Resources/Core/RsrcLoadingRequests.cpp

@@ -32,6 +32,5 @@ void RsrcTextureLoadingRequest::doPostLoading()
 {
 	Texture* tex = new Texture;
 	tex->load(img);
-	INFO(tex->getGlId());
 	*pTex = tex;
 }

src/Resources/Texture/Texture.cpp

@@ -14,7 +14,7 @@
 //======================================================================================================================
 int Texture::textureUnitsNum = -1;
 bool Texture::mipmappingEnabled = true;
-bool Texture::compressionEnabled = false;
+bool Texture::compressionEnabled = true;
 int Texture::anisotropyLevel = 8;