Cleaning

build/gen-makefile-dbg

@@ -0,0 +1,2 @@
+#!/bin/sh
+cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++ -DBUILD_SHARED_LIBS=ON ..

run-unit-tests.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=extern/lib-x86-64-linux/
-ulimit -c unlimited
-unit-tests/build/anki-unit-tests $1

run.dbg.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=extern/lib-x86-64-linux/
-ulimit -c unlimited
-build/debug/anki

src/Main.cpp

@@ -88,7 +88,7 @@ void initPhysics()
 	init.shape = groundShape;
 	init.startTrf = groundTransform;
 
-	new phys::RigidBody(SceneSingleton::getInstance().getPhysMasterContainer(), init);
+	new phys::RigidBody(SceneSingleton::get().getPhysMasterContainer(), init);
 
 
 	/*{
@@ -131,18 +131,18 @@ void init()
 
 	srand(unsigned(time(NULL)));
 
-	painter = new ui::Painter(Vec2(AppSingleton::getInstance().getWindowWidth(),
-	                               AppSingleton::getInstance().getWindowHeight()));
+	painter = new ui::Painter(Vec2(AppSingleton::get().getWindowWidth(),
+	                               AppSingleton::get().getWindowHeight()));
 	painter->setFont("engine-rsrc/ModernAntiqua.ttf", 25, 25);
 
 	// camera
 	PerspectiveCamera* cam = new PerspectiveCamera(false, NULL);
-	//cam->setAll(toRad(100.0), toRad(100.0) / r::MainRendererSingleton::getInstance().getAspectRatio(), 0.5, 200.0);
-	cam->setAll(r::MainRendererSingleton::getInstance().getAspectRatio()*toRad(60.0), toRad(60.0), 0.5, 200.0);
+	//cam->setAll(toRad(100.0), toRad(100.0) / r::MainRendererSingleton::get().getAspectRatio(), 0.5, 200.0);
+	cam->setAll(r::MainRendererSingleton::get().getAspectRatio()*toRad(60.0), toRad(60.0), 0.5, 200.0);
 	cam->moveLocalY(3.0);
 	cam->moveLocalZ(5.7);
 	cam->moveLocalX(-0.3);
-	AppSingleton::getInstance().setActiveCam(cam);
+	AppSingleton::get().setActiveCam(cam);
 	INFO(cam->getSceneNodeName());
 
 	OrthographicCamera* ocam = new OrthographicCamera(false, NULL);
@@ -241,7 +241,7 @@ void init()
 	/*PhyCharacter::Initializer init;
 	init.sceneNode = imp;
 	init.startTrf = Transform(Vec3(0, 40, 0), Mat3::getIdentity(), 1.0);
-	character = new PhyCharacter(SceneSingleton::getInstance().getPhysics(), init);*/
+	character = new PhyCharacter(SceneSingleton::get().getPhysics(), init);*/
 
 	// crate
 	/*crate = new MeshNode;
@@ -265,63 +265,63 @@ void init()
 //==============================================================================
 void mainLoopExtra()
 {
-	InputSingleton::getInstance().handleEvents();
+	InputSingleton::get().handleEvents();
 
 	float dist = 0.2;
 	float ang = toRad(3.0);
 	float scale = 0.01;
 
 	// move the camera
-	static SceneNode* mover = AppSingleton::getInstance().getActiveCam();
-
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_1)) mover = AppSingleton::getInstance().getActiveCam();
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_2)) mover = point_lights[0];
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_3)) mover = spot_lights[0];
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_4)) mover = point_lights[1];
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_5)) mover = spot_lights[1];
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_6)) mover = imp;
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_7)) mover =
-		SceneSingleton::getInstance().getParticleEmitterNodes()[0];
-	//if(InputSingleton::getInstance().getKey(SDL_SCANCODE_M) == 1) InputSingleton::getInstance().warpMouse = !InputSingleton::getInstance().warpMouse;
-
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_A)) mover->moveLocalX(-dist);
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_D)) mover->moveLocalX(dist);
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_LSHIFT)) mover->moveLocalY(dist);
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_SPACE)) mover->moveLocalY(-dist);
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_W)) mover->moveLocalZ(-dist);
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_S)) mover->moveLocalZ(dist);
-	if(!InputSingleton::getInstance().warpMouse())
+	static SceneNode* mover = AppSingleton::get().getActiveCam();
+
+	if(InputSingleton::get().getKey(SDL_SCANCODE_1)) mover = AppSingleton::get().getActiveCam();
+	if(InputSingleton::get().getKey(SDL_SCANCODE_2)) mover = point_lights[0];
+	if(InputSingleton::get().getKey(SDL_SCANCODE_3)) mover = spot_lights[0];
+	if(InputSingleton::get().getKey(SDL_SCANCODE_4)) mover = point_lights[1];
+	if(InputSingleton::get().getKey(SDL_SCANCODE_5)) mover = spot_lights[1];
+	if(InputSingleton::get().getKey(SDL_SCANCODE_6)) mover = imp;
+	if(InputSingleton::get().getKey(SDL_SCANCODE_7)) mover =
+		SceneSingleton::get().getParticleEmitterNodes()[0];
+	//if(InputSingleton::get().getKey(SDL_SCANCODE_M) == 1) InputSingleton::get().warpMouse = !InputSingleton::get().warpMouse;
+
+	if(InputSingleton::get().getKey(SDL_SCANCODE_A)) mover->moveLocalX(-dist);
+	if(InputSingleton::get().getKey(SDL_SCANCODE_D)) mover->moveLocalX(dist);
+	if(InputSingleton::get().getKey(SDL_SCANCODE_LSHIFT)) mover->moveLocalY(dist);
+	if(InputSingleton::get().getKey(SDL_SCANCODE_SPACE)) mover->moveLocalY(-dist);
+	if(InputSingleton::get().getKey(SDL_SCANCODE_W)) mover->moveLocalZ(-dist);
+	if(InputSingleton::get().getKey(SDL_SCANCODE_S)) mover->moveLocalZ(dist);
+	if(!InputSingleton::get().warpMouse())
 	{
-		if(InputSingleton::getInstance().getKey(SDL_SCANCODE_UP)) mover->rotateLocalX(ang);
-		if(InputSingleton::getInstance().getKey(SDL_SCANCODE_DOWN)) mover->rotateLocalX(-ang);
-		if(InputSingleton::getInstance().getKey(SDL_SCANCODE_LEFT)) mover->rotateLocalY(ang);
-		if(InputSingleton::getInstance().getKey(SDL_SCANCODE_RIGHT)) mover->rotateLocalY(-ang);
+		if(InputSingleton::get().getKey(SDL_SCANCODE_UP)) mover->rotateLocalX(ang);
+		if(InputSingleton::get().getKey(SDL_SCANCODE_DOWN)) mover->rotateLocalX(-ang);
+		if(InputSingleton::get().getKey(SDL_SCANCODE_LEFT)) mover->rotateLocalY(ang);
+		if(InputSingleton::get().getKey(SDL_SCANCODE_RIGHT)) mover->rotateLocalY(-ang);
 	}
 	else
 	{
 		float accel = 44.0;
-		mover->rotateLocalX(ang * InputSingleton::getInstance().mouseVelocity.y() * accel);
-		mover->rotateLocalY(-ang * InputSingleton::getInstance().mouseVelocity.x() * accel);
+		mover->rotateLocalX(ang * InputSingleton::get().mouseVelocity.y() * accel);
+		mover->rotateLocalY(-ang * InputSingleton::get().mouseVelocity.x() * accel);
 	}
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_Q)) mover->rotateLocalZ(ang);
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_E)) mover->rotateLocalZ(-ang);
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_PAGEUP)) mover->getLocalTransform().getScale() += scale ;
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_PAGEDOWN)) mover->getLocalTransform().getScale() -= scale ;
+	if(InputSingleton::get().getKey(SDL_SCANCODE_Q)) mover->rotateLocalZ(ang);
+	if(InputSingleton::get().getKey(SDL_SCANCODE_E)) mover->rotateLocalZ(-ang);
+	if(InputSingleton::get().getKey(SDL_SCANCODE_PAGEUP)) mover->getLocalTransform().getScale() += scale ;
+	if(InputSingleton::get().getKey(SDL_SCANCODE_PAGEDOWN)) mover->getLocalTransform().getScale() -= scale ;
 
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_K))
-		AppSingleton::getInstance().getActiveCam()->lookAtPoint(point_lights[0]->getWorldTransform().getOrigin());
+	if(InputSingleton::get().getKey(SDL_SCANCODE_K))
+		AppSingleton::get().getActiveCam()->lookAtPoint(point_lights[0]->getWorldTransform().getOrigin());
 
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_I))
+	if(InputSingleton::get().getKey(SDL_SCANCODE_I))
 		character->moveForward(0.1);
 
-	/*if(InputSingleton::getInstance().getKey(SDL_SCANCODE_F) == 1)
+	/*if(InputSingleton::get().getKey(SDL_SCANCODE_F) == 1)
 	{
-		Event::ManagerSingleton::getInstance().createEvent(Event::MainRendererPpsHdr(HighRezTimer::getCrntTime() + 5,
-			5, r::MainRendererSingleton::getInstance().getPps().getHdr().getExposure() + 20.0, 3, 1.4));
+		Event::ManagerSingleton::get().createEvent(Event::MainRendererPpsHdr(HighRezTimer::getCrntTime() + 5,
+			5, r::MainRendererSingleton::get().getPps().getHdr().getExposure() + 20.0, 3, 1.4));
 	}*/
 
 
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_O) == 1)
+	if(InputSingleton::get().getKey(SDL_SCANCODE_O) == 1)
 	{
 		btRigidBody* body = static_cast<btRigidBody*>(boxes[0]);
 		//body->getMotionState()->setWorldTransform(toBt(Mat4(Vec3(0.0, 10.0, 0.0), Mat3::getIdentity(), 1.0)));
@@ -330,10 +330,10 @@ void mainLoopExtra()
 		body->forceActivationState(ACTIVE_TAG);
 	}
 
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_Y) == 1)
+	if(InputSingleton::get().getKey(SDL_SCANCODE_Y) == 1)
 	{
 		INFO("Exec script");
-		ScriptingEngineSingleton::getInstance().execScript(util::readFile("test.py").c_str());
+		ScriptingEngineSingleton::get().execScript(util::readFile("test.py").c_str());
 	}
 
 	mover->getLocalTransform().getRotation().reorthogonalize();
@@ -377,52 +377,52 @@ void mainLoop()
 		mainLoopExtra();
 		void execStdinScpripts();
 		execStdinScpripts();
-		SceneSingleton::getInstance().getPhysMasterContainer().update(prevUpdateTime, crntTime);
-		SceneSingleton::getInstance().updateAllWorldStuff(prevUpdateTime, crntTime);
-		SceneSingleton::getInstance().doVisibilityTests(*AppSingleton::getInstance().getActiveCam());
-		SceneSingleton::getInstance().updateAllControllers();
-		event::ManagerSingleton::getInstance().updateAllEvents(prevUpdateTime, crntTime);
-		r::MainRendererSingleton::getInstance().render(*AppSingleton::getInstance().getActiveCam());
+		SceneSingleton::get().getPhysMasterContainer().update(prevUpdateTime, crntTime);
+		SceneSingleton::get().updateAllWorldStuff(prevUpdateTime, crntTime);
+		SceneSingleton::get().doVisibilityTests(*AppSingleton::get().getActiveCam());
+		SceneSingleton::get().updateAllControllers();
+		event::ManagerSingleton::get().updateAllEvents(prevUpdateTime, crntTime);
+		r::MainRendererSingleton::get().render(*AppSingleton::get().getActiveCam());
 
 		painter->setPosition(Vec2(0.0, 0.1));
 		painter->setColor(Vec4(1.0));
 		//painter->drawText("A");
-		const r::MainRenderer& r = r::MainRendererSingleton::getInstance();
+		const r::MainRenderer& r = r::MainRendererSingleton::get();
 		std::stringstream ss;
 		ss << "MS: " << r.getMsTime() * 1000000 << " IS: " <<
 			r.getIsTime() * 1000000 << " BS: " << r.getBsTime() * 1000000 <<
 			" PPS: " << r.getPpsTime() * 1000000 << " DBG: " <<
 			r.getDbgTime() * 1000000;
 
-		ss << "\n" << AppSingleton::getInstance().getActiveCam()->
+		ss << "\n" << AppSingleton::get().getActiveCam()->
 			getVisibleMsRenderableNodes().size();
 		painter->drawText(ss.str());
 
-		if(InputSingleton::getInstance().getKey(SDL_SCANCODE_ESCAPE))
+		if(InputSingleton::get().getKey(SDL_SCANCODE_ESCAPE))
 		{
 			break;
 		}
 
-		if(InputSingleton::getInstance().getKey(SDL_SCANCODE_F11))
+		if(InputSingleton::get().getKey(SDL_SCANCODE_F11))
 		{
-			AppSingleton::getInstance().togleFullScreen();
+			AppSingleton::get().togleFullScreen();
 		}
 
-		if(InputSingleton::getInstance().getKey(SDL_SCANCODE_F12) == 1)
+		if(InputSingleton::get().getKey(SDL_SCANCODE_F12) == 1)
 		{
-			r::MainRendererSingleton::getInstance().takeScreenshot("gfx/screenshot.jpg");
+			r::MainRendererSingleton::get().takeScreenshot("gfx/screenshot.jpg");
 		}
 
-		AppSingleton::getInstance().swapBuffers();
+		AppSingleton::get().swapBuffers();
 
 
 		//
 		// Async resource loading
 		//
-		if(ResourceManagerSingleton::getInstance().getAsyncLoadingRequestsNum() > 0)
+		if(ResourceManagerSingleton::get().getAsyncLoadingRequestsNum() > 0)
 		{
 			HighRezTimer::Scalar a = timer.getElapsedTime();
-			HighRezTimer::Scalar b = AppSingleton::getInstance().getTimerTick();
+			HighRezTimer::Scalar b = AppSingleton::get().getTimerTick();
 			HighRezTimer::Scalar timeToSpendForRsrcPostProcess;
 			if(a < b)
 			{
@@ -432,19 +432,19 @@ void mainLoop()
 			{
 				timeToSpendForRsrcPostProcess = 0.001;
 			}
-			ResourceManagerSingleton::getInstance().postProcessFinishedLoadingRequests(timeToSpendForRsrcPostProcess);
+			ResourceManagerSingleton::get().postProcessFinishedLoadingRequests(timeToSpendForRsrcPostProcess);
 		}
 
 		//
 		// Sleep
 		//
 		timer.stop();
-		if(timer.getElapsedTime() < AppSingleton::getInstance().getTimerTick())
+		if(timer.getElapsedTime() < AppSingleton::get().getTimerTick())
 		{
-			SDL_Delay((AppSingleton::getInstance().getTimerTick() - timer.getElapsedTime()) * 1000.0);
+			SDL_Delay((AppSingleton::get().getTimerTick() - timer.getElapsedTime()) * 1000.0);
 		}
 
-		/*if(r::MainRendererSingleton::getInstance().getFramesNum() == 100)
+		/*if(r::MainRendererSingleton::get().getFramesNum() == 100)
 		{
 			break;
 		}*/
@@ -460,7 +460,7 @@ void mainLoop()
 void initSubsystems(int argc, char* argv[])
 {
 	// App
-	AppSingleton::getInstance().init(argc, argv);
+	AppSingleton::get().init(argc, argv);
 
 	// Main renderer
 	r::RendererInitializer initializer;
@@ -484,7 +484,7 @@ void initSubsystems(int argc, char* argv[])
 	initializer.pps.bl.sideBlurFactor = 1.0;
 	initializer.mainRendererQuality = 1.0;
 
-	r::MainRendererSingleton::getInstance().init(initializer);
+	r::MainRendererSingleton::get().init(initializer);
 
 	// Scripting engine
 	const char* commonPythonCode =
@@ -497,7 +497,7 @@ void initSubsystems(int argc, char* argv[])
 		"        line = sys._getframe(1).f_lineno\n"
 		"        file = sys._getframe(1).f_code.co_filename\n"
 		"        func = sys._getframe(1).f_code.co_name\n"
-		"        LoggerSingleton.getInstance().write(file, line, "
+		"        LoggerSingleton.get().write(file, line, "
 		"func, str_ + \"\\n\")\n"
 		"\n"
 		"class StderrCatcher:\n"
@@ -505,22 +505,22 @@ void initSubsystems(int argc, char* argv[])
 		"        line = sys._getframe(1).f_lineno\n"
 		"        file = sys._getframe(1).f_code.co_filename\n"
 		"        func = sys._getframe(1).f_code.co_name\n"
-		"        LoggerSingleton.getInstance().write(file, line, func, str_)\n"
+		"        LoggerSingleton.get().write(file, line, func, str_)\n"
 		"\n"
 		"sys.stdout = StdoutCatcher()\n"
 		"sys.stderr = StderrCatcher()\n";
 
-	ScriptingEngineSingleton::getInstance().execScript(commonPythonCode);
+	ScriptingEngineSingleton::get().execScript(commonPythonCode);
 
 	// Stdin listener
-	StdinListenerSingleton::getInstance().start();
+	StdinListenerSingleton::get().start();
 
 	// Parallel jobs
-	parallel::ManagerSingleton::getInstance().init(4);
+	parallel::ManagerSingleton::get().init(4);
 
 	// Add drawer to physics
-	SceneSingleton::getInstance().getPhysMasterContainer().setDebugDrawer(
-		new r::PhysDbgDrawer(r::MainRendererSingleton::getInstance().getDbg()));
+	SceneSingleton::get().getPhysMasterContainer().setDebugDrawer(
+		new r::PhysDbgDrawer(r::MainRendererSingleton::get().getDbg()));
 }
 
 
@@ -533,7 +533,7 @@ void execStdinScpripts()
 {
 	while(1)
 	{
-		std::string cmd = StdinListenerSingleton::getInstance().getLine();
+		std::string cmd = StdinListenerSingleton::get().getLine();
 
 		if(cmd.length() < 1)
 		{
@@ -542,7 +542,7 @@ void execStdinScpripts()
 
 		try
 		{
-			ScriptingEngineSingleton::getInstance().execScript(cmd.c_str(),
+			ScriptingEngineSingleton::get().execScript(cmd.c_str(),
 				"command line input");
 		}
 		catch(Exception& e)
@@ -567,7 +567,7 @@ int main(int argc, char* argv[])
 		mainLoop();
 
 		INFO("Exiting...");
-		AppSingleton::getInstance().quit(EXIT_SUCCESS);
+		AppSingleton::get().quit(EXIT_SUCCESS);
 		exitCode = 0;
 	}
 	catch(std::exception& e)

src/cln/CollisionShape.h

@@ -1,8 +1,6 @@
 #ifndef CLN_COLLISION_SHAPE
 #define CLN_COLLISION_SHAPE
 
-#include "util/Accessors.h"
-
 
 namespace cln {
 

src/cln/LineSegment.h

@@ -3,6 +3,7 @@
 
 #include "CollisionShape.h"
 #include "m/Math.h"
+#include "util/Accessors.h"
 
 
 namespace cln {

src/cln/Obb.h

@@ -3,6 +3,7 @@
 
 #include "CollisionShape.h"
 #include "m/Math.h"
+#include "util/Accessors.h"
 #include <boost/array.hpp>
 
 

src/cln/Sphere.h

@@ -3,6 +3,7 @@
 
 #include "CollisionShape.h"
 #include "m/Math.h"
+#include "util/Accessors.h"
 
 
 namespace cln {
@@ -26,13 +27,8 @@ class Sphere: public CollisionShape
 
 		/// @name Accessors
 		/// @{
-		const Vec3& getCenter() const {return center;}
-		Vec3& getCenter() {return center;}
-		void setCenter(const Vec3& c) {center = c;}
-
-		float getRadius() const {return radius;}
-		float& getRadius() {return radius;}
-		void setRadius(float f) {radius = f;}
+		GETTER_SETTER(Vec3, center, getCenter, setCenter)
+		GETTER_SETTER_BY_VAL(float, radius, getRadius, setRadius)
 		/// @}
 
 		Sphere getTransformed(const Transform& transform) const;

src/core/App.cpp

@@ -59,7 +59,7 @@ void App::init(int argc, char* argv[])
 	fullScreenFlag = false;
 
 	// send output to handleMessageHanlderMsgs
-	LoggerSingleton::getInstance().getSignal().connect(
+	LoggerSingleton::get().getSignal().connect(
 		boost::bind(&App::handleMessageHanlderMsgs, this, _1, _2, _3, _4));
 
 	parseCommandLineArgs(argc, argv);

src/core/Logger.h

@@ -112,10 +112,10 @@ class Logger
 #define LOGGER_MESSAGE(x) \
 	do \
 	{ \
-		LoggerSingleton::getInstance().lock(); \
-		LoggerSingleton::getInstance()  << Logger::setSender(__FILE__, \
+		LoggerSingleton::get().lock(); \
+		LoggerSingleton::get()  << Logger::setSender(__FILE__, \
 			__LINE__, __func__) << x << Logger::endl; \
-		LoggerSingleton::getInstance().unlock(); \
+		LoggerSingleton::get().unlock(); \
 	} while(false);
 
 #define INFO(x) LOGGER_MESSAGE("Info: " << x)

src/event/Event.h

@@ -1,5 +1,5 @@
-#ifndef EVENT_H
-#define EVENT_H
+#ifndef EVENT_EVENT_H
+#define EVENT_EVENT_H
 
 #include "util/StdTypes.h"
 #include "util/Accessors.h"

src/event/MainRendererPpsHdr.cpp

@@ -18,7 +18,7 @@ MainRendererPpsHdr::MainRendererPpsHdr(float startTime, float duration,
 	finalData.blurringDist = blurringDist_;
 
 	const r::Hdr& hdr =
-		r::MainRendererSingleton::getInstance().getPps().getHdr();
+		r::MainRendererSingleton::get().getPps().getHdr();
 	originalData.exposure = hdr.getExposure();
 	originalData.blurringIterationsNum = hdr.getBlurringIterationsNum();
 	originalData.blurringDist = hdr.getBlurringDist();
@@ -55,7 +55,7 @@ void MainRendererPpsHdr::updateSp(float /*prevUpdateTime*/, float crntTime)
 	float d = crntTime - getStartTime(); // delta
 	float dp = d / getDuration(); // delta as percentage
 
-	r::Hdr& hdr = r::MainRendererSingleton::getInstance().getPps().getHdr();
+	r::Hdr& hdr = r::MainRendererSingleton::get().getPps().getHdr();
 
 	hdr.setExposure(interpolate(originalData.exposure, finalData.exposure, dp));
 

src/event/SceneColor.cpp

@@ -15,7 +15,7 @@ SceneColor::SceneColor(float startTime, float duration,
 :	Event(SCENE_COLOR, startTime, duration),
 	finalColor(finalColor_)
 {
-	originalColor = SceneSingleton::getInstance().getAmbientCol();
+	originalColor = SceneSingleton::get().getAmbientCol();
 }
 
 
@@ -49,7 +49,7 @@ void SceneColor::updateSp(float /*prevUpdateTime*/, float crntTime)
 	float d = crntTime - getStartTime(); // delta
 	float dp = d / float(getDuration()); // delta as persentage
 
-	SceneSingleton::getInstance().setAmbientCol(
+	SceneSingleton::get().setAmbientCol(
 		interpolate(originalColor, finalColor, dp));
 }
 

src/i/Input.cpp

@@ -86,9 +86,9 @@ void Input::handleEvents()
 				mousePos.y() = event_.button.y;
 
 				mousePosNdc.x() = (2.0 * mousePos.x()) /
-					(float)AppSingleton::getInstance().getWindowWidth() - 1.0;
+					(float)AppSingleton::get().getWindowWidth() - 1.0;
 				mousePosNdc.y() = 1.0 - (2.0 * mousePos.y()) /
-					(float)AppSingleton::getInstance().getWindowHeight();
+					(float)AppSingleton::get().getWindowHeight();
 
 				if(warpMouseFlag)
 				{
@@ -100,8 +100,8 @@ void Input::handleEvents()
 						break;
 					}
 
-					uint w = AppSingleton::getInstance().getWindowWidth();
-					uint h = AppSingleton::getInstance().getWindowHeight();
+					uint w = AppSingleton::get().getWindowWidth();
+					uint h = AppSingleton::get().getWindowHeight();
 					SDL_WarpMouse(w / 2, h / 2);
 				}
 
@@ -110,7 +110,7 @@ void Input::handleEvents()
 			}
 
 			case SDL_QUIT:
-				AppSingleton::getInstance().quit(1);
+				AppSingleton::get().quit(1);
 				break;
 		}
 	}

src/r/Bl.cpp

@@ -100,7 +100,7 @@ void Bl::runSideBlur()
 
 	sideBlurFbo.bind();
 
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND);
+	GlStateMachineSingleton::get().enable(GL_BLEND);
 	glBlendFunc(GL_ONE, GL_ONE);
 
 	sideBlurSProg->bind();
@@ -116,7 +116,7 @@ void Bl::runSideBlur()
 //==============================================================================
 void Bl::runBlur()
 {
-	GlStateMachineSingleton::getInstance().disable(GL_BLEND);
+	GlStateMachineSingleton::get().disable(GL_BLEND);
 
 	for(uint i = 0; i < blurringIterationsNum; i++)
 	{

src/r/Dbg.cpp

@@ -265,16 +265,16 @@ void Dbg::run()
 	sProg->bind();
 
 	// OGL stuff
-	GlStateMachineSingleton::getInstance().setViewport(0, 0,
+	GlStateMachineSingleton::get().setViewport(0, 0,
 		r.getWidth(), r.getHeight());
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, true);
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, false);
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, true);
+	GlStateMachineSingleton::get().enable(GL_BLEND, false);
 
 	setModelMat(Mat4::getIdentity());
 	renderGrid();
 
 	BOOST_FOREACH(const SceneNode* node,
-		SceneSingleton::getInstance().getAllNodes())
+		SceneSingleton::get().getAllNodes())
 	{
 		/*if(!node->isVisible())
 		{
@@ -321,7 +321,7 @@ void Dbg::run()
 	/*setColor(Vec3(1));
 	Obb obb(Vec3(0.0), Mat3::getIdentity(), Vec3(1.0, 2.0, 1.0));
 	Obb obb2(Vec3(0.0), Mat3::getIdentity(), Vec3(1.0, 1.5, 1.0));
-	obb = obb.getTransformed(SceneSingleton::getInstance().getAllNodes()[1]->
+	obb = obb.getTransformed(SceneSingleton::get().getAllNodes()[1]->
 		getWorldTransform());
 	collisionDbgDrawer.draw(obb.getCompoundShape(obb2));
 	collisionDbgDrawer.draw(obb);
@@ -362,7 +362,7 @@ void Dbg::run()
 	///////////////
 
 
-	SceneSingleton::getInstance().getPhysMasterContainer().getWorld().
+	SceneSingleton::get().getPhysMasterContainer().getWorld().
 		debugDrawWorld();
 	// Physics
 	/*glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);

src/r/Deformer.cpp

@@ -50,7 +50,7 @@ void Deformer::deform(SkinPatchNode& node) const
 
 	SkinNode* skinNode = static_cast<SkinNode*>(node.getParent());
 
-	GlStateMachineSingleton::getInstance().enable(GL_RASTERIZER_DISCARD);
+	GlStateMachineSingleton::get().enable(GL_RASTERIZER_DISCARD);
 
 	// Chose sProg
 	const ShaderProgram* sProg;
@@ -97,7 +97,7 @@ void Deformer::deform(SkinPatchNode& node) const
 	glEndTransformFeedback();
 	//glEndQuery(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN);
 
-	GlStateMachineSingleton::getInstance().disable(GL_RASTERIZER_DISCARD);
+	GlStateMachineSingleton::get().disable(GL_RASTERIZER_DISCARD);
 }
 
 

src/r/Ez.cpp

@@ -58,12 +58,12 @@ void Ez::run()
 
 	fbo.bind();
 
-	GlStateMachineSingleton::getInstance().setViewport(0, 0,
+	GlStateMachineSingleton::get().setViewport(0, 0,
 		r.getWidth(), r.getHeight());
 
 	glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, true);
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, false);
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, true);
+	GlStateMachineSingleton::get().enable(GL_BLEND, false);
 
 	glClear(GL_DEPTH_BUFFER_BIT);
 

src/r/Hdr.cpp

@@ -111,16 +111,17 @@ void Hdr::run()
 
 	int w = renderingQuality * r.getWidth();
 	int h = renderingQuality * r.getHeight();
-	GlStateMachineSingleton::getInstance().setViewport(0, 0, w, h);
+	GlStateMachineSingleton::get().setViewport(0, 0, w, h);
 
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, false);
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, false);
+	GlStateMachineSingleton::get().enable(GL_BLEND, false);
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, false);
 
 	// pass 0
 	toneFbo.bind();
 	toneSProg->bind();
 	toneSProg->getUniformVariableByName("exposure").set(&exposure);
-	toneSProg->getUniformVariableByName("fai").set(r.getPps().getPrePassFai(), 0);
+	toneSProg->getUniformVariableByName("fai").set(
+		r.getPps().getPrePassFai(), 0);
 	r.drawQuad();
 
 	// blurring passes

src/r/Is.cpp

@@ -142,7 +142,7 @@ void Is::init(const RendererInitializer& initializer)
 //==============================================================================
 void Is::ambientPass(const Vec3& color)
 {
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, false);
+	GlStateMachineSingleton::get().enable(GL_BLEND, false);
 
 	// set the shader
 	ambientPassSProg->bind();
@@ -166,7 +166,7 @@ void Is::pointLightPass(const PointLight& light)
 
 	// stencil optimization
 	smo.run(light);
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, false);
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, false);
 
 	// shader prog
 	const ShaderProgram& shader = *pointLightSProg; // ensure the const-ness
@@ -178,7 +178,8 @@ void Is::pointLightPass(const PointLight& light)
 		r.getMs().getDiffuseFai(), 1);
 	shader.getUniformVariableByName("msSpecularFai").set(
 		r.getMs().getSpecularFai(), 2);
-	shader.getUniformVariableByName("msDepthFai").set(r.getMs().getDepthFai(), 3);
+	shader.getUniformVariableByName("msDepthFai").set(
+		r.getMs().getDepthFai(), 3);
 	shader.getUniformVariableByName("planes").set(&r.getPlanes());
 	shader.getUniformVariableByName("limitsOfNearPlane").set(
 		&r.getLimitsOfNearPlane());
@@ -190,8 +191,10 @@ void Is::pointLightPass(const PointLight& light)
 	Vec3 lightPosEyeSpace = origin.getTransformed(cam.getViewMatrix());
 	shader.getUniformVariableByName("lightPos").set(&lightPosEyeSpace);
 	shader.getUniformVariableByName("lightRadius").set(&light.getRadius());
-	shader.getUniformVariableByName("lightDiffuseCol").set(&light.getDiffuseCol());
-	shader.getUniformVariableByName("lightSpecularCol").set(&light.getSpecularCol());
+	shader.getUniformVariableByName("lightDiffuseCol").set(
+		&light.getDiffuseCol());
+	shader.getUniformVariableByName("lightSpecularCol").set(
+		&light.getSpecularCol());
 
 	// render quad
 	r.drawQuad();
@@ -222,16 +225,16 @@ void Is::spotLightPass(const SpotLight& light)
 		fbo.bind();
 
 		// and restore blending and depth test
-		GlStateMachineSingleton::getInstance().enable(GL_BLEND, true);
+		GlStateMachineSingleton::get().enable(GL_BLEND, true);
 		glBlendFunc(GL_ONE, GL_ONE);
-		GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, false);
-		GlStateMachineSingleton::getInstance().setViewport(0, 0,
+		GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, false);
+		GlStateMachineSingleton::get().setViewport(0, 0,
 			r.getWidth(), r.getHeight());
 	}
 
 	// stencil optimization
 	smo.run(light);
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, false);
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, false);
 
 	// set the texture
 	//light.getTexture().setRepeat(false);
@@ -257,7 +260,8 @@ void Is::spotLightPass(const SpotLight& light)
 		r.getMs().getDiffuseFai(), 1);
 	shdr->getUniformVariableByName("msSpecularFai").set(
 		r.getMs().getSpecularFai(), 2);
-	shdr->getUniformVariableByName("msDepthFai").set(r.getMs().getDepthFai(), 3);
+	shdr->getUniformVariableByName("msDepthFai").set(
+		r.getMs().getDepthFai(), 3);
 
 	// the ???
 	shdr->getUniformVariableByName("planes").set(&r.getPlanes());
@@ -274,8 +278,10 @@ void Is::spotLightPass(const SpotLight& light)
 	shdr->getUniformVariableByName("lightPos").set(&lightPosEyeSpace);
 	float tmp = light.getDistance();
 	shdr->getUniformVariableByName("lightRadius").set(&tmp);
-	shdr->getUniformVariableByName("lightDiffuseCol").set(&light.getDiffuseCol());
-	shdr->getUniformVariableByName("lightSpecularCol").set(&light.getSpecularCol());
+	shdr->getUniformVariableByName("lightDiffuseCol").set(
+		&light.getDiffuseCol());
+	shdr->getUniformVariableByName("lightSpecularCol").set(
+		&light.getSpecularCol());
 	shdr->getUniformVariableByName("lightTex").set(light.getTexture(), 4);
 
 	// set texture matrix for texture & shadowmap projection
@@ -319,7 +325,7 @@ void Is::copyDepth()
 void Is::run()
 {
 	// OGL stuff
-	GlStateMachineSingleton::getInstance().setViewport(0, 0,
+	GlStateMachineSingleton::get().setViewport(0, 0,
 		r.getWidth(), r.getHeight());
 
 	// Copy
@@ -332,13 +338,13 @@ void Is::run()
 	fbo.bind();
 
 	// ambient pass
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, false);
-	ambientPass(SceneSingleton::getInstance().getAmbientCol());
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, false);
+	ambientPass(SceneSingleton::get().getAmbientCol());
 
 	// light passes
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, true);
+	GlStateMachineSingleton::get().enable(GL_BLEND, true);
 	glBlendFunc(GL_ONE, GL_ONE);
-	GlStateMachineSingleton::getInstance().enable(GL_STENCIL_TEST);
+	GlStateMachineSingleton::get().enable(GL_STENCIL_TEST);
 
 	// for all lights
 	BOOST_FOREACH(const PointLight* light,
@@ -353,7 +359,7 @@ void Is::run()
 	}
 	
 
-	GlStateMachineSingleton::getInstance().disable(GL_STENCIL_TEST);
+	GlStateMachineSingleton::get().disable(GL_STENCIL_TEST);
 
 	// FBO
 	//fbo.unbind();

src/r/MainRenderer.cpp

@@ -48,9 +48,9 @@ void MainRenderer::init(const RendererInitializer& initializer_)
 	//
 	RendererInitializer initializer = initializer_;
 	renderingQuality = initializer.mainRendererQuality;
-	initializer.width = AppSingleton::getInstance().getWindowWidth() *
+	initializer.width = AppSingleton::get().getWindowWidth() *
 		renderingQuality;
-	initializer.height = AppSingleton::getInstance().getWindowHeight() *
+	initializer.height = AppSingleton::get().getWindowHeight() *
 		renderingQuality;
 	Renderer::init(initializer);
 	dbg.init(initializer);
@@ -88,13 +88,13 @@ void MainRenderer::initGl()
 	glDepthFunc(GL_LEQUAL);
 	// CullFace is always on
 	glCullFace(GL_BACK);
-	GlStateMachineSingleton::getInstance().enable(GL_CULL_FACE);
+	GlStateMachineSingleton::get().enable(GL_CULL_FACE);
 
 	// defaults
 	//glDisable(GL_LIGHTING);
 	//glDisable(GL_TEXTURE_2D);
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, false);
-	GlStateMachineSingleton::getInstance().disable(GL_STENCIL_TEST);
+	GlStateMachineSingleton::get().enable(GL_BLEND, false);
+	GlStateMachineSingleton::get().disable(GL_STENCIL_TEST);
 	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 	glDepthMask(true);
 	glDepthFunc(GL_LESS);
@@ -133,14 +133,15 @@ void MainRenderer::render(Camera& cam_)
 	//
 	glBindFramebuffer(GL_FRAMEBUFFER, 0); // Bind the window framebuffer
 
-	GlStateMachineSingleton::getInstance().setViewport(
-		0, 0, AppSingleton::getInstance().getWindowWidth(),
-		AppSingleton::getInstance().getWindowHeight());
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, false);
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, false);
+	GlStateMachineSingleton::get().setViewport(
+		0, 0, AppSingleton::get().getWindowWidth(),
+		AppSingleton::get().getWindowHeight());
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, false);
+	GlStateMachineSingleton::get().enable(GL_BLEND, false);
 	sProg->bind();
 	//sProg->getUniformVariableByName("rasterImage")->set(ms.getNormalFai(), 0);
-	//sProg->getUniformVariableByName("rasterImage")->set(pps.getSsao().getFai(), 0);
+	//sProg->getUniformVariableByName("rasterImage")->
+	//	set(pps.getSsao().getFai(), 0);
 	sProg->getUniformVariableByName("rasterImage").set(pps.getPostPassFai(), 0);
 	drawQuad();
 }

src/r/Ms.cpp

@@ -99,10 +99,10 @@ void Ms::run()
 		glClear(GL_DEPTH_BUFFER_BIT);
 	}
 
-	GlStateMachineSingleton::getInstance().setViewport(0, 0,
+	GlStateMachineSingleton::get().setViewport(0, 0,
 		r.getWidth(), r.getHeight());
 
-	//GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, true);
+	//GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, true);
 	//app->getScene().skybox.Render(cam.getViewMatrix().getRotationPart());
 	//glDepthFunc(GL_LEQUAL);
 

src/r/Pps.cpp

@@ -120,9 +120,9 @@ void Pps::runPrePass()
 
 	prePassFbo.bind();
 
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, false);
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, false);
-	GlStateMachineSingleton::getInstance().setViewport(0, 0,
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, false);
+	GlStateMachineSingleton::get().enable(GL_BLEND, false);
+	GlStateMachineSingleton::get().setViewport(0, 0,
 		r.getWidth(), r.getHeight());
 
 	prePassSProg->bind();
@@ -130,7 +130,8 @@ void Pps::runPrePass()
 
 	if(ssao.isEnabled())
 	{
-		prePassSProg->getUniformVariableByName("ppsSsaoFai").set(ssao.getFai(), 1);
+		prePassSProg->getUniformVariableByName("ppsSsaoFai").set(
+			ssao.getFai(), 1);
 	}
 
 	r.drawQuad();
@@ -152,16 +153,18 @@ void Pps::runPostPass()
 
 	postPassFbo.bind();
 
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, false);
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, false);
-	GlStateMachineSingleton::getInstance().setViewport(0, 0,
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, false);
+	GlStateMachineSingleton::get().enable(GL_BLEND, false);
+	GlStateMachineSingleton::get().setViewport(0, 0,
 		r.getWidth(), r.getHeight());
 
 	postPassSProg->bind();
-	postPassSProg->getUniformVariableByName("ppsPrePassFai").set(prePassFai, 0);
+	postPassSProg->getUniformVariableByName("ppsPrePassFai").set(
+		prePassFai, 0);
 	if(hdr.isEnabled())
 	{
-		postPassSProg->getUniformVariableByName("ppsHdrFai").set(hdr.getFai(), 1);
+		postPassSProg->getUniformVariableByName("ppsHdrFai").set(
+			hdr.getFai(), 1);
 	}
 
 	r.drawQuad();

src/r/SceneDrawer.cpp

@@ -61,7 +61,7 @@ void SceneDrawer::setupShaderProg(
 {
 	typedef MaterialBuildinVariable Mvb; // Short name
 	uint textureUnit = 0;
-	GlStateMachine& gl = GlStateMachineSingleton::getInstance();
+	GlStateMachine& gl = GlStateMachineSingleton::get();
 	const Material& mtl = mtlr.getMaterial();
 	const ShaderProgram& sprog = mtl.getShaderProgram(pt);
 
@@ -221,7 +221,7 @@ void SceneDrawer::setupShaderProg(
 
 	if(mtl.buildinVariableExits(Mvb::MV_SCENE_AMBIENT_COLOR, pt))
 	{
-		Vec3 col(SceneSingleton::getInstance().getAmbientCol());
+		Vec3 col(SceneSingleton::get().getAmbientCol());
 		mtl.getBuildinVariable(Mvb::MV_SCENE_AMBIENT_COLOR).
 			getShaderProgramUniformVariable(pt).set(&col);
 	}

src/r/Sm.cpp

@@ -129,18 +129,18 @@ void Sm::run(const Light& light, float distance)
 	crntLevel->fbo.bind();
 
 	// set GL
-	GlStateMachineSingleton::getInstance().setViewport(0, 0,
+	GlStateMachineSingleton::get().setViewport(0, 0,
 		crntLevel->resolution, crntLevel->resolution);
 	glClear(GL_DEPTH_BUFFER_BIT);
 
 	// disable color & blend & enable depth test
 	glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, true);
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, false);
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, true);
+	GlStateMachineSingleton::get().enable(GL_BLEND, false);
 
 	// for artifacts
 	glPolygonOffset(2.0, 2.0); // keep the values as low as possible!!!!
-	GlStateMachineSingleton::getInstance().enable(GL_POLYGON_OFFSET_FILL);
+	GlStateMachineSingleton::get().enable(GL_POLYGON_OFFSET_FILL);
 
 	// render all
 	BOOST_FOREACH(const RenderableNode* node,
@@ -162,7 +162,7 @@ void Sm::run(const Light& light, float distance)
 	}
 
 	// restore GL
-	GlStateMachineSingleton::getInstance().disable(GL_POLYGON_OFFSET_FILL);
+	GlStateMachineSingleton::get().disable(GL_POLYGON_OFFSET_FILL);
 	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 
 	// FBO

src/r/Smo.cpp

@@ -98,12 +98,12 @@ void Smo::setUpGl(bool inside)
 	if(inside)
 	{
 		glCullFace(GL_FRONT);
-		GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, false);
+		GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, false);
 	}
 	else
 	{
 		glDepthMask(GL_FALSE);
-		GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, true);
+		GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, true);
 	}
 }
 

src/r/Ssao.cpp

@@ -79,11 +79,13 @@ void Ssao::init(const RendererInitializer& initializer)
 
 	std::string pps = "#define HPASS\n#define COL_R\n";
 	hblurSProg.loadRsrc(
-		ShaderProgram::createSrcCodeToCache(SHADER_FILENAME, pps.c_str()).c_str());
+		ShaderProgram::createSrcCodeToCache(SHADER_FILENAME, 
+		pps.c_str()).c_str());
 
 	pps = "#define VPASS\n#define COL_R\n";
 	vblurSProg.loadRsrc(
-		ShaderProgram::createSrcCodeToCache(SHADER_FILENAME, pps.c_str()).c_str());
+		ShaderProgram::createSrcCodeToCache(SHADER_FILENAME, 
+		pps.c_str()).c_str());
 
 	//
 	// noise map
@@ -108,11 +110,11 @@ void Ssao::run()
 	int height = renderingQuality * r.getHeight();
 	const Camera& cam = r.getCamera();
 
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, false);
-	GlStateMachineSingleton::getInstance().enable(GL_DEPTH_TEST, false);
+	GlStateMachineSingleton::get().enable(GL_BLEND, false);
+	GlStateMachineSingleton::get().enable(GL_DEPTH_TEST, false);
 
 
-	GlStateMachineSingleton::getInstance().setViewport(0, 0, width, height);
+	GlStateMachineSingleton::get().setViewport(0, 0, width, height);
 
 	//
 	// 1st pass
@@ -137,7 +139,8 @@ void Ssao::run()
 	ssaoSProg->getUniformVariableByName("zNear").set(&zNear);
 
 	// msDepthFai
-	ssaoSProg->getUniformVariableByName("msDepthFai").set(r.getMs().getDepthFai(), 0);
+	ssaoSProg->getUniformVariableByName("msDepthFai").set(
+		r.getMs().getDepthFai(), 0);
 
 	// noiseMap
 	ssaoSProg->getUniformVariableByName("noiseMap").set(*noiseMap, 1);

src/rsrc/Material.cpp

@@ -199,7 +199,7 @@ std::string Material::createShaderProgSourceToCache(const std::string& source)
 
 	// Create path
 	boost::filesystem::path newfPathName =
-		AppSingleton::getInstance().getCachePath() / (prefix + ".glsl");
+		AppSingleton::get().getCachePath() / (prefix + ".glsl");
 
 
 	// If file not exists write it

src/rsrc/Material.h

@@ -133,7 +133,8 @@ class Material: public MaterialProperties
 			PassType p) const;
 
 		/// Check if a buildin variable exists in a any pass type
-		bool buildinVariableExits(MaterialBuildinVariable::MatchingVariable e) const
+		bool buildinVariableExits(
+			MaterialBuildinVariable::MatchingVariable e) const
 			{return buildinsArr[e] != NULL;}
 
 	private:

src/rsrc/RsrcPtr.inl.h

@@ -57,7 +57,7 @@ template<typename Type>
 void RsrcPtr<Type>::loadRsrc(const char* filename)
 {
 	ASSERT(hook == NULL);
-	hook = &ResourceManagerSingleton::getInstance().load<Type>(filename);
+	hook = &ResourceManagerSingleton::get().load<Type>(filename);
 }
 
 
@@ -69,7 +69,7 @@ void RsrcPtr<Type>::unload()
 {
 	if(hook != NULL)
 	{
-		ResourceManagerSingleton::getInstance().unload<Type>(*hook);
+		ResourceManagerSingleton::get().unload<Type>(*hook);
 		hook = NULL;
 	}
 }

src/rsrc/ShaderProgram.cpp

@@ -335,7 +335,7 @@ std::string ShaderProgram::createSrcCodeToCache(const char* sProgFPathName,
 
 	//
 	boost::filesystem::path newfPathName =
-		AppSingleton::getInstance().getCachePath() /
+		AppSingleton::get().getCachePath() /
 		(boost::filesystem::path(sProgFPathName).filename() + "." + suffix);
 
 	if(boost::filesystem::exists(newfPathName))

src/rsrc/ShaderProgram.h

@@ -136,7 +136,7 @@ inline GLuint ShaderProgram::getGlId() const
 inline void ShaderProgram::bind() const
 {
 	ASSERT(glId != std::numeric_limits<uint>::max());
-	GlStateMachineSingleton::getInstance().useShaderProg(glId);
+	GlStateMachineSingleton::get().useShaderProg(glId);
 }
 
 

src/rsrc/ShaderProgramUniformVariable.cpp

@@ -10,7 +10,7 @@
 void ShaderProgramUniformVariable::doSanityChecks() const
 {
 	ASSERT(getLoc() != -1);
-	ASSERT(GlStateMachineSingleton::getInstance().getCurrentProgramGlId() ==
+	ASSERT(GlStateMachineSingleton::get().getCurrentProgramGlId() ==
 		getFatherSProg().getGlId());
 	ASSERT(glGetUniformLocation(getFatherSProg().getGlId(),
 		getName().c_str()) == getLoc());

src/scene/Controller.cpp

@@ -11,7 +11,7 @@ Controller::Controller(ControllerType type_, SceneNode& node):
 	controlledNode(node),
 	type(type_)
 {
-	SceneSingleton::getInstance().registerController(this);
+	SceneSingleton::get().registerController(this);
 }
 
 
@@ -20,5 +20,5 @@ Controller::Controller(ControllerType type_, SceneNode& node):
 //==============================================================================
 Controller::~Controller()
 {
-	SceneSingleton::getInstance().unregisterController(this);
+	SceneSingleton::get().unregisterController(this);
 }

src/scene/ParticleEmitterNode.cpp

@@ -90,7 +90,7 @@ void ParticleEmitterNode::init(const char* filename)
 			phys::MasterContainer::CG_PARTICLE;
 
 		phys::RigidBody* body = new phys::RigidBody(
-			SceneSingleton::getInstance().getPhysMasterContainer(), init);
+			SceneSingleton::get().getPhysMasterContainer(), init);
 
 		body->forceActivationState(DISABLE_SIMULATION);
 

src/scene/SceneNode.cpp

@@ -23,7 +23,7 @@ SceneNode::SceneNode(SceneNodeType type_, bool inheritParentTrfFlag_,
 {
 	getWorldTransform().setIdentity();
 	getLocalTransform().setIdentity();
-	SceneSingleton::getInstance().registerNode(this);
+	SceneSingleton::get().registerNode(this);
 
 	name = boost::lexical_cast<std::string>(uid);
 
@@ -39,7 +39,7 @@ SceneNode::SceneNode(SceneNodeType type_, bool inheritParentTrfFlag_,
 //==============================================================================
 SceneNode::~SceneNode()
 {
-	SceneSingleton::getInstance().unregisterNode(this);
+	SceneSingleton::get().unregisterNode(this);
 }
 
 

src/scene/VisibilityTester.cpp

@@ -140,12 +140,12 @@ void VisibilityTester::getRenderableNodes(bool skipShadowless,
 	jobParameters.bsRenderableNodesMtx = &bsRenderableNodesMtx;
 
 	for(uint i = 0;
-		i < parallel::ManagerSingleton::getInstance().getThreadsNum(); i++)
+		i < parallel::ManagerSingleton::get().getThreadsNum(); i++)
 	{
-		parallel::ManagerSingleton::getInstance().assignNewJob(i,
+		parallel::ManagerSingleton::get().assignNewJob(i,
 			getRenderableNodesJobCallback, jobParameters);
 	}
-	parallel::ManagerSingleton::getInstance().waitForAllJobsToFinish();
+	parallel::ManagerSingleton::get().waitForAllJobsToFinish();
 
 	//
 	// Sort the renderables from closest to the camera to the farthest

src/script/Events/MainRendererPpsHdr.bpi.cpp

@@ -6,7 +6,7 @@ WRAP(EventMainRendererPpsHdr)
 {
 	using namespace event;
 
-	class_<MainRendererPpsHdr>("EventMainRendererPpsHdr", no_init)
+	class_<MainRendererPpsHdr>("event_MainRendererPpsHdr", no_init)
 		.def(init<float, float, float, uint, float>())
 		.def(init<const MainRendererPpsHdr&>())
 	;

src/script/Events/Manager.bpi.cpp

@@ -9,7 +9,7 @@ WRAP(EventManager)
 {
 	using namespace event;
 
-	class_<Manager, noncopyable>("EventManager", no_init)
+	class_<Manager, noncopyable>("event_EventManager", no_init)
 		.def("createEvent", &Manager::createEvent<SceneColor>,
 			return_value_policy<reference_existing_object>())
 		.def("createEvent",

src/script/Events/SceneColor.bpi.cpp

@@ -6,7 +6,7 @@ WRAP(EventSceneColor)
 {
 	using namespace event;
 
-	class_<SceneColor>("EventSceneColor", no_init)
+	class_<SceneColor>("event_EventSceneColor", no_init)
 		.def(init<float, float, const Vec3&>())
 		.def(init<const SceneColor&>())
 	;

src/script/ScriptingCommon.h

@@ -17,9 +17,9 @@ using namespace boost::python;
 #define WRAP_SINGLETON(x) \
 	WRAP(x) { \
 		class_<x, noncopyable>(#x, no_init) \
-			.def("getInstance", & x ::getInstance, \
+			.def("get", & x ::get, \
 				return_value_policy<reference_existing_object>()) \
-			.staticmethod("getInstance") \
+			.staticmethod("get") \
 		; \
 	}
 

src/ui/Painter.cpp

@@ -68,10 +68,10 @@ void Painter::init()
 void Painter::drawText(const char* text)
 {
 	// Set GL
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND);
-	//GlStateMachineSingleton::getInstance().disable(GL_BLEND);
+	GlStateMachineSingleton::get().enable(GL_BLEND);
+	//GlStateMachineSingleton::get().disable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	GlStateMachineSingleton::getInstance().disable(GL_DEPTH_TEST);
+	GlStateMachineSingleton::get().disable(GL_DEPTH_TEST);
 
 	// SProg (some)
 	sProg->bind();

src/util/BinaryStream.cpp

@@ -78,7 +78,8 @@ std::string BinaryStream::readString()
 	read(buff, size);
 	if(fail())
 	{
-		throw EXCEPTION("Failed to read " + boost::lexical_cast<std::string>(size) + " bytes");
+		throw EXCEPTION("Failed to read " + 
+			boost::lexical_cast<std::string>(size) + " bytes");
 	}
 	buff[size] = '\0';
 

src/util/BinaryStream.h

@@ -6,8 +6,8 @@
 #include "util/StdTypes.h"
 
 
-/// Read from binary streams. You can read/write data as if it is an iostream but it also contains methods for
-/// reading/writing binary data
+/// Read from binary streams. You can read/write data as if it is an iostream 
+/// but it also contains methods for reading/writing binary data
 class BinaryStream: public std::iostream
 {
 	public:
@@ -21,7 +21,8 @@ class BinaryStream: public std::iostream
 		/// The one and only constructor
 		/// @param sb An std::streambuf for in/out
 		/// @param byteOrder The stream's byte order
-		BinaryStream(std::streambuf* sb, ByteOrder byteOrder = BO_LITTLE_ENDIAN);
+		BinaryStream(std::streambuf* sb, 
+			ByteOrder byteOrder = BO_LITTLE_ENDIAN);
 
 		/// Read unsigned int (32bit)
 		/// @exception Exception
@@ -31,7 +32,8 @@ class BinaryStream: public std::iostream
 		/// @exception Exception
 		float readFloat();
 
-		/// Read a string. It reads the size as an unsigned int and then it reads the characters
+		/// Read a string. It reads the size as an unsigned int and then it 
+		/// reads the characters
 		/// @exception Exception
 		std::string readString();
 

src/util/Exception.cpp

@@ -5,8 +5,9 @@
 //==============================================================================
 // Constructor                                                                 =
 //==============================================================================
-Exception::Exception(const std::string& err_, const char* file_, int line_, const char* func_):
-	err(err_),
+Exception::Exception(const std::string& err_, const char* file_, int line_, 
+	const char* func_)
+:	err(err_),
 	file(file_),
 	line(line_),
 	func(func_)
@@ -29,7 +30,8 @@ Exception::Exception(const Exception& e):
 //==============================================================================
 std::string Exception::getInfoStr() const
 {
-	return std::string("(") + file + ":" + boost::lexical_cast<std::string>(line) + " " + func + ")";
+	return std::string("(") + file + ":" + 
+		boost::lexical_cast<std::string>(line) + " " + func + ")";
 }
 
 

src/util/Exception.h

@@ -5,12 +5,14 @@
 #include <string>
 
 
-/// Custom exception that takes file, line and function that throw it. Throw it using the EXCEPTION macro
+/// Custom exception that takes file, line and function that throw it. Throw 
+/// it using the EXCEPTION macro
 class Exception: public std::exception
 {
 	public:
 		/// Constructor
-		Exception(const std::string& err, const char* file = "unknown", int line = -1, const char* func = "unknown");
+		Exception(const std::string& err, const char* file = "unknown", 
+			int line = -1, const char* func = "unknown");
 
 		/// Copy constructor
 		Exception(const Exception& e);

src/util/HighRezTimer.h

@@ -8,7 +8,8 @@
 class HighRezTimer
 {
 	public:
-		typedef double Scalar; ///< The type that the timer manipulates the results
+		/// The type that the timer manipulates the results
+		typedef double Scalar;
 
 		HighRezTimer();
 
@@ -18,7 +19,8 @@ class HighRezTimer
 		/// Stop the timer
 		void stop();
 
-		/// Get the time elapsed between start and stop (if its stopped) or between start and the current time
+		/// Get the time elapsed between start and stop (if its stopped) or 
+		/// between start and the current time
 		Scalar getElapsedTime() const;
 
 		/// Get the current date's seconds

src/util/LinuxMalinfo.h

@@ -15,7 +15,8 @@
 
 	inline void printMallInfo(const Mallinfo& minfo)
 	{
-		PRINT("used:" << minfo.uordblks << " free:" << minfo.fordblks << " total:" << minfo.arena);
+		PRINT("used:" << minfo.uordblks << " free:" << minfo.fordblks << 
+			" total:" << minfo.arena);
 	}
 
 	inline void printMallInfoDiff(const Mallinfo& prev, const Mallinfo& now)

src/util/Singleton.h

@@ -11,7 +11,8 @@ template<typename Type>
 class Singleton
 {
 	public:
-		static Type& getInstance() {return *(instance ? instance : (instance = new Type));}
+		static Type& get()
+			{return *(instance ? instance : (instance = new Type));}
 
 	protected:
 		Singleton();

src/util/Util.cpp

@@ -46,7 +46,8 @@ std::string readFile(const char* filename)
 		throw EXCEPTION(std::string("Cannot open file \"") + filename + "\"");
 	}
 
-	return std::string((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
+	return std::string((std::istreambuf_iterator<char>(file)),
+		std::istreambuf_iterator<char>());
 }
 
 

src/util/Vec.h

@@ -5,7 +5,8 @@
 #include "util/Assert.h"
 
 
-/// This is a wrapper of std::vector that adds new functionality and assertions in operator[]
+/// This is a wrapper of std::vector that adds new functionality and assertions 
+/// in operator[]
 template<typename Type, typename Allocator = std::allocator<Type> >
 class Vec: public std::vector<Type, Allocator>
 {
@@ -15,10 +16,12 @@ class Vec: public std::vector<Type, Allocator>
 		/// @name Constructors/destructors
 		/// @{
 		Vec(const Allocator& al = Allocator()): Base(al) {}
-		Vec(size_t size, const Type& value = Type(), const Allocator& al = Allocator()): Base(size, value, al) {}
+		Vec(size_t size, const Type& value = Type(), 
+			const Allocator& al = Allocator()): Base(size, value, al) {}
 
 		template <typename InputIterator>
-		Vec(InputIterator first, InputIterator last, const Allocator& al = Allocator()): Base(first, last, al) {}
+		Vec(InputIterator first, InputIterator last, 
+			const Allocator& al = Allocator()): Base(first, last, al) {}
 
 		Vec(const Vec<Type, Allocator>& b): Base(b) {}
 		/// @}

src/util/scanner/Token.h

@@ -25,7 +25,8 @@ enum TokenCode
 	TC_KEYWORD,
 
 	// operators
-	TC_SCOPE_RESOLUTION, TC_L_SQ_BRACKET, TC_R_SQ_BRACKET, TC_L_PAREN, TC_R_PAREN,
+	TC_SCOPE_RESOLUTION, TC_L_SQ_BRACKET, TC_R_SQ_BRACKET, TC_L_PAREN, 
+		TC_R_PAREN,
 	TC_DOT, TC_POINTER_TO_MEMBER, TC_L_BRACKET, TC_R_BRACKET, TC_COMMA,
 	TC_PERIOD, TC_UPDOWNDOT, TC_QUESTIONMARK, TC_SHARP, TC_EQUAL,
 	TC_NOT_EQUAL, TC_LESS, TC_GREATER, TC_LESS_EQUAL, TC_GREATER_EQUAL,

tools/shredder/src/Main.cpp

@@ -130,7 +130,7 @@ void initEngine(int argc, char** argv)
 	glEnable(GL_CULL_FACE);
 	glDisable(GL_LIGHTING);
 	glDisable(GL_TEXTURE_2D);
-	GlStateMachineSingleton::getInstance().enable(GL_BLEND, lse)eton::getInstance().setBlendingEnabled(false);
+	GlStateMachineSingleton::get().enable(GL_BLEND, lse)eton::get().setBlendingEnabled(false);
 	glDisable(GL_STENCIL_TEST);
 	glPolygonMode(GL_FRONT, GL_FILL);
 	glDepthMask(true);

unit-tests/Main.cpp

@@ -7,7 +7,7 @@
 int main(int argc, char** argv)
 {
 	// Init app
-	//AppSingleton::getInstance().init(0, NULL);
+	//AppSingleton::get().init(0, NULL);
 
 	// Tests
 	::testing::InitGoogleTest(&argc, argv);

unit-tests/Scripting/ScriptingEngine.ut.cpp

@@ -8,7 +8,7 @@
 TEST(ScriptingTests, ScriptingEngine)
 {
 	Vec4 v;
-	ScriptingEngineSingleton::getInstance().exposeVar<Vec4>("v", &v);
+	ScriptingEngineSingleton::get().exposeVar<Vec4>("v", &v);
 	
 	const char* src =
 		"from Anki import *\n" 
@@ -18,6 +18,6 @@ TEST(ScriptingTests, ScriptingEngine)
 		"v.w = 4.0\n"
 		"v += Vec4(1.0)\n";
 		
-	EXPECT_NO_THROW(ScriptingEngineSingleton::getInstance().execScript(src));
+	EXPECT_NO_THROW(ScriptingEngineSingleton::get().execScript(src));
 	EXPECT_EQ(v, Vec4(2.0, 3.0, 4.0, 5.0));
 }