*Renaming the dirs

*Rearranging the Material

TODO

@@ -1,3 +1,4 @@
 *Continue working on the new coding style in shaders
 *Changes in the blending objects problem. The BS will become one stage and the PPS will be divided in two steps. The first will apply the SSAO and the EdgeAA in the IS_FAI and the second will do the rest
 *See this to improve uniform handling http://www.opengl.org/wiki/GLSL_Uniforms
+*The second Physics demo: Create a box that is geting moved by the user. It has to interact with the other boxes

build/debug/Makefile

@@ -4,9 +4,9 @@ CFLAGS = $(COMMONFLAGS) -c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -pi
 PHFLAGS = $(CFLAGS) -x c++-header
 LFLAGS = $(COMMONFLAGS) -rdynamic -L../../../bullet_svn/src/BulletSoftBody -L../../../bullet_svn/src/BulletDynamics -L../../../bullet_svn/src/BulletCollision -L../../../bullet_svn/src/LinearMath -Wl,-Bstatic -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -lGLEW -lSDL_image -lGLU -Wl,-Bdynamic -lSDL -lGL -ljpeg -lpng -ltiff
 EXECUTABLE = AnKi.bin
-INCPATH = -I../../src/math/ -I../../src/tokenizer/ -I../../src/uncategorized/ -I../../src/ -I../../src/renderer/ -I../../src/scene/ -I../../src/ui/ -I../../src/resources/ -I../../src/utility/ -I../../src/controllers/ -I../../../bullet_svn/src/ 
-SOURCES = ../../src/tokenizer//Scanner.cpp ../../src/uncategorized//collision.cpp ../../src/uncategorized//skybox.cpp ../../src/uncategorized//map.cpp ../../src/uncategorized//memory.cpp ../../src/uncategorized//particles.cpp ../../src//main.cpp ../../src/renderer//MsEarlyz.cpp ../../src/renderer//PpsSsao.cpp ../../src/renderer//Dbg.cpp ../../src/renderer//BulletDebuger.cpp ../../src/renderer//PpsHdr.cpp ../../src/renderer//PpsLscatt.cpp ../../src/renderer//Bs2.cpp ../../src/renderer//Ms.cpp ../../src/renderer//Pps.cpp ../../src/renderer//Bs.cpp ../../src/renderer//IsShadows.cpp ../../src/renderer//Is.cpp ../../src/renderer//Renderer.cpp ../../src/scene//SkelNode.cpp ../../src/scene//Light.cpp ../../src/scene//SkelModelNode.cpp ../../src/scene//Scene.cpp ../../src/scene//MeshNode.cpp ../../src/scene//Camera.cpp ../../src/scene//Node.cpp ../../src/ui//Ui.cpp ../../src/resources//LightProps.cpp ../../src/resources//SkelAnim.cpp ../../src/resources//Mesh.cpp ../../src/resources//ShaderProg.cpp ../../src/resources//Material.cpp ../../src/resources//ShaderParser.cpp ../../src/resources//Extension.cpp ../../src/resources//Skeleton.cpp ../../src/resources//Texture.cpp ../../src/resources//Resource.cpp ../../src/utility//Input.cpp ../../src/utility//App.cpp ../../src/utility//Common.cpp ../../src/utility//Util.cpp ../../src/controllers//SkelAnimCtrl.cpp ../../src/controllers//Controller.cpp 
-OBJECTS = Scanner.o collision.o skybox.o map.o memory.o particles.o main.o MsEarlyz.o PpsSsao.o Dbg.o BulletDebuger.o PpsHdr.o PpsLscatt.o Bs2.o Ms.o Pps.o Bs.o IsShadows.o Is.o Renderer.o SkelNode.o Light.o SkelModelNode.o Scene.o MeshNode.o Camera.o Node.o Ui.o LightProps.o SkelAnim.o Mesh.o ShaderProg.o Material.o ShaderParser.o Extension.o Skeleton.o Texture.o Resource.o Input.o App.o Common.o Util.o SkelAnimCtrl.o Controller.o 
+INCPATH = -I../../src/Math/ -I../../src/Tokenizer/ -I../../src/Misc/ -I../../src/ -I../../src/Renderer/ -I../../src/Scene/ -I../../src/Ui/ -I../../src/Resources/ -I../../src/Util/ -I../../src/Controllers/ -I../../../bullet_svn/src/ 
+SOURCES = ../../src/Tokenizer//Scanner.cpp ../../src/Misc//skybox.cpp ../../src/Misc//particles.cpp ../../src/Misc//memory.cpp ../../src/Misc//collision.cpp ../../src/Misc//map.cpp ../../src//Main.cpp ../../src/Renderer//PpsHdr.cpp ../../src/Renderer//Pps.cpp ../../src/Renderer//Bs.cpp ../../src/Renderer//IsShadows.cpp ../../src/Renderer//MsEarlyz.cpp ../../src/Renderer//Renderer.cpp ../../src/Renderer//Is.cpp ../../src/Renderer//PpsLscatt.cpp ../../src/Renderer//Ms.cpp ../../src/Renderer//BulletDebuger.cpp ../../src/Renderer//Bs2.cpp ../../src/Renderer//PpsSsao.cpp ../../src/Renderer//Dbg.cpp ../../src/Scene//MeshNode.cpp ../../src/Scene//SkelNode.cpp ../../src/Scene//Node.cpp ../../src/Scene//SkelModelNode.cpp ../../src/Scene//Light.cpp ../../src/Scene//Camera.cpp ../../src/Scene//Scene.cpp ../../src/Ui//Ui.cpp ../../src/Resources//Material.cpp ../../src/Resources//ShaderProg.cpp ../../src/Resources//Texture.cpp ../../src/Resources//SkelAnim.cpp ../../src/Resources//Extension.cpp ../../src/Resources//Skeleton.cpp ../../src/Resources//Resource.cpp ../../src/Resources//LightProps.cpp ../../src/Resources//Mesh.cpp ../../src/Resources//ShaderPrePreprocessor.cpp ../../src/Util//Input.cpp ../../src/Util//App.cpp ../../src/Util//Common.cpp ../../src/Util//Util.cpp ../../src/Controllers//Controller.cpp ../../src/Controllers//SkelAnimCtrl.cpp 
+OBJECTS = Scanner.o skybox.o particles.o memory.o collision.o map.o Main.o PpsHdr.o Pps.o Bs.o IsShadows.o MsEarlyz.o Renderer.o Is.o PpsLscatt.o Ms.o BulletDebuger.o Bs2.o PpsSsao.o Dbg.o MeshNode.o SkelNode.o Node.o SkelModelNode.o Light.o Camera.o Scene.o Ui.o Material.o ShaderProg.o Texture.o SkelAnim.o Extension.o Skeleton.o Resource.o LightProps.o Mesh.o ShaderPrePreprocessor.o Input.o App.o Common.o Util.o Controller.o SkelAnimCtrl.o 
 PRECOMPILED_HEADERS = 
 
 all: $(PRECOMPILED_HEADERS) $(SOURCES) $(EXECUTABLE)
@@ -16,115 +16,109 @@ $(EXECUTABLE): $(OBJECTS)
 	@$(CXX) $(OBJECTS) $(LFLAGS) -o $(EXECUTABLE)
 	@echo All Done!
 
-Scanner.o: ../../src/tokenizer//Scanner.cpp \
- ../../src/tokenizer//Scanner.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h
-	@echo Compiling ../../src/tokenizer//Scanner.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/tokenizer//Scanner.cpp -o Scanner.o
+Scanner.o: ../../src/Tokenizer//Scanner.cpp \
+ ../../src/Tokenizer//Scanner.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h
+	@echo Compiling ../../src/Tokenizer//Scanner.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Tokenizer//Scanner.cpp -o Scanner.o
 
-collision.o: ../../src/uncategorized//collision.cpp \
- ../../src/uncategorized//collision.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/renderer/Renderer.h \
- ../../src/resources/ShaderProg.h ../../src/resources/Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/scene/Camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/Node.h
-	@echo Compiling ../../src/uncategorized//collision.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//collision.cpp -o collision.o
+skybox.o: ../../src/Misc//skybox.cpp ../../src/Misc//skybox.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h \
+ ../../src/Resources/Texture.h ../../src/Resources/Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/Resource.h \
+ ../../src/Renderer/Renderer.h ../../src/Resources/ShaderProg.h \
+ ../../src/Scene/Camera.h ../../src/Misc/collision.h \
+ ../../src/Scene/Node.h ../../src/Scene/Scene.h ../../src/Misc/skybox.h
+	@echo Compiling ../../src/Misc//skybox.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Misc//skybox.cpp -o skybox.o
 
-skybox.o: ../../src/uncategorized//skybox.cpp \
- ../../src/uncategorized//skybox.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/resources/Texture.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/Resource.h \
- ../../src/renderer/Renderer.h ../../src/resources/ShaderProg.h \
- ../../src/scene/Camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/Node.h ../../src/scene/Scene.h \
- ../../src/uncategorized/skybox.h
-	@echo Compiling ../../src/uncategorized//skybox.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//skybox.cpp -o skybox.o
+particles.o: ../../src/Misc//particles.cpp
+	@echo Compiling ../../src/Misc//particles.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Misc//particles.cpp -o particles.o
 
-map.o: ../../src/uncategorized//map.cpp ../../src/uncategorized//map.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/uncategorized//collision.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/Mesh.h \
- ../../src/renderer/Vbo.h ../../src/resources/Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/uncategorized/collision.h ../../src/tokenizer/Scanner.h \
- ../../src/tokenizer/parser.h ../../src/tokenizer/Scanner.h \
- ../../src/resources/Resource.h ../../src/scene/Camera.h \
- ../../src/scene/Node.h
-	@echo Compiling ../../src/uncategorized//map.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//map.cpp -o map.o
+memory.o: ../../src/Misc//memory.cpp ../../src/Misc//memory.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h
+	@echo Compiling ../../src/Misc//memory.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Misc//memory.cpp -o memory.o
 
-memory.o: ../../src/uncategorized//memory.cpp \
- ../../src/uncategorized//memory.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h
-	@echo Compiling ../../src/uncategorized//memory.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//memory.cpp -o memory.o
+collision.o: ../../src/Misc//collision.cpp ../../src/Misc//collision.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Renderer/Renderer.h \
+ ../../src/Resources/ShaderProg.h ../../src/Resources/Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h
+	@echo Compiling ../../src/Misc//collision.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Misc//collision.cpp -o collision.o
 
-particles.o: ../../src/uncategorized//particles.cpp
-	@echo Compiling ../../src/uncategorized//particles.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//particles.cpp -o particles.o
+map.o: ../../src/Misc//map.cpp ../../src/Misc//map.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h \
+ ../../src/Misc//collision.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/Mesh.h \
+ ../../src/Renderer/Vbo.h ../../src/Resources/Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h ../../src/Misc/collision.h \
+ ../../src/Tokenizer/Scanner.h ../../src/Tokenizer/Parser.h \
+ ../../src/Tokenizer/Scanner.h ../../src/Resources/Resource.h \
+ ../../src/Scene/Camera.h ../../src/Scene/Node.h
+	@echo Compiling ../../src/Misc//map.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Misc//map.cpp -o map.o
 
-main.o: ../../src//main.cpp ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/utility/Input.h \
- ../../src/utility/Common.h ../../src/utility/App.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/renderer/Renderer.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/ui/Ui.h ../../src/utility/App.h \
- ../../src/uncategorized/particles.h ../../src/resources/Texture.h \
- ../../src/resources/Mesh.h ../../src/renderer/Vbo.h \
- ../../src/scene/Light.h ../../src/scene/Camera.h \
- ../../src/resources/Material.h ../../src/resources/Resource.h \
- ../../src/scene/Scene.h ../../src/uncategorized/skybox.h \
- ../../src/tokenizer/Scanner.h ../../src/uncategorized/map.h \
- ../../src/uncategorized/collision.h ../../src/scene/MeshNode.h \
- ../../src/scene/SkelModelNode.h ../../src/scene/MeshNode.h \
- ../../src/resources/SkelAnim.h ../../src/controllers/MeshSkelNodeCtrl.h \
- ../../src/controllers/Controller.h ../../src/controllers/SkelAnimCtrl.h \
- ../../src/scene/SkelNode.h ../../src/controllers/Controller.h \
- ../../src/resources/LightProps.h \
+Main.o: ../../src//Main.cpp ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Util/Input.h ../../src/Util/Common.h \
+ ../../src/Util/App.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Renderer/Renderer.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h ../../src/Ui/Ui.h \
+ ../../src/Util/App.h ../../src/Misc/particles.h \
+ ../../src/Resources/Texture.h ../../src/Resources/Mesh.h \
+ ../../src/Renderer/Vbo.h ../../src/Scene/Light.h \
+ ../../src/Scene/Camera.h ../../src/Resources/Material.h \
+ ../../src/Resources/ShaderProg.h ../../src/Resources/Resource.h \
+ ../../src/Scene/Scene.h ../../src/Misc/skybox.h \
+ ../../src/Tokenizer/Scanner.h ../../src/Misc/map.h \
+ ../../src/Misc/collision.h ../../src/Scene/MeshNode.h \
+ ../../src/Scene/SkelModelNode.h ../../src/Scene/MeshNode.h \
+ ../../src/Resources/SkelAnim.h ../../src/Controllers/MeshSkelNodeCtrl.h \
+ ../../src/Controllers/Controller.h ../../src/Controllers/SkelAnimCtrl.h \
+ ../../src/Scene/SkelNode.h ../../src/Controllers/Controller.h \
+ ../../src/Resources/LightProps.h \
  ../../../bullet_svn/src/btBulletCollisionCommon.h \
  ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionWorld.h \
  ../../../bullet_svn/src/LinearMath/btVector3.h \
@@ -252,76 +246,301 @@ main.o: ../../src//main.cpp ../../src/utility/Common.h \
  ../../../bullet_svn/src/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../../bullet_svn/src/BulletDynamics/Dynamics/btActionInterface.h \
  ../../../bullet_svn/src/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/renderer/BulletDebuger.h \
+ ../../src/Renderer/BulletDebuger.h \
  ../../../bullet_svn/src/LinearMath/btIDebugDraw.h \
- ../../src/resources/ShaderParser.h
-	@echo Compiling ../../src//main.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src//main.cpp -o main.o
+ ../../src/Resources/ShaderPrePreprocessor.h
+	@echo Compiling ../../src//Main.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src//Main.cpp -o Main.o
 
-MsEarlyz.o: ../../src/renderer//MsEarlyz.cpp \
- ../../src/renderer//Renderer.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/resources/Resource.h ../../src/resources/Texture.h \
- ../../src/scene/Scene.h ../../src/uncategorized/skybox.h \
- ../../src/renderer//Fbo.h
-	@echo Compiling ../../src/renderer//MsEarlyz.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//MsEarlyz.cpp -o MsEarlyz.o
+PpsHdr.o: ../../src/Renderer//PpsHdr.cpp ../../src/Renderer//Renderer.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Resources/Resource.h ../../src/Resources/Texture.h \
+ ../../src/Scene/Scene.h ../../src/Misc/skybox.h \
+ ../../src/Renderer//Fbo.h
+	@echo Compiling ../../src/Renderer//PpsHdr.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//PpsHdr.cpp -o PpsHdr.o
 
-PpsSsao.o: ../../src/renderer//PpsSsao.cpp ../../src/renderer//Renderer.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/resources/Resource.h ../../src/resources/Texture.h \
- ../../src/scene/Scene.h ../../src/uncategorized/skybox.h \
- ../../src/renderer//Fbo.h
-	@echo Compiling ../../src/renderer//PpsSsao.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//PpsSsao.cpp -o PpsSsao.o
+Pps.o: ../../src/Renderer//Pps.cpp ../../src/Renderer//Renderer.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Resources/Resource.h ../../src/Resources/Texture.h \
+ ../../src/Renderer//Fbo.h
+	@echo Compiling ../../src/Renderer//Pps.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//Pps.cpp -o Pps.o
 
-Dbg.o: ../../src/renderer//Dbg.cpp ../../src/renderer//Renderer.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/renderer//Fbo.h ../../src/scene/Scene.h \
- ../../src/uncategorized/skybox.h ../../src/resources/Texture.h \
- ../../src/scene/Node.h ../../src/scene/SkelNode.h \
- ../../src/controllers/Controller.h \
+Bs.o: ../../src/Renderer//Bs.cpp ../../src/Renderer//Renderer.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Scene/Scene.h ../../src/Misc/skybox.h \
+ ../../src/Resources/Texture.h ../../src/Resources/Mesh.h \
+ ../../src/Renderer/Vbo.h ../../src/Resources/Resource.h \
+ ../../src/Renderer//Fbo.h ../../src/Scene/MeshNode.h \
+ ../../src/Resources/Material.h ../../src/Resources/ShaderProg.h
+	@echo Compiling ../../src/Renderer//Bs.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//Bs.cpp -o Bs.o
+
+IsShadows.o: ../../src/Renderer//IsShadows.cpp \
+ ../../src/Renderer//Renderer.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Resources/Texture.h ../../src/Scene/Scene.h \
+ ../../src/Misc/skybox.h ../../src/Resources/Resource.h \
+ ../../src/Renderer//Fbo.h ../../src/Resources/Material.h \
+ ../../src/Resources/ShaderProg.h ../../src/Scene/MeshNode.h
+	@echo Compiling ../../src/Renderer//IsShadows.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//IsShadows.cpp -o IsShadows.o
+
+MsEarlyz.o: ../../src/Renderer//MsEarlyz.cpp \
+ ../../src/Renderer//Renderer.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Resources/Resource.h ../../src/Resources/Texture.h \
+ ../../src/Scene/Scene.h ../../src/Misc/skybox.h \
+ ../../src/Renderer//Fbo.h
+	@echo Compiling ../../src/Renderer//MsEarlyz.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//MsEarlyz.cpp -o MsEarlyz.o
+
+Renderer.o: ../../src/Renderer//Renderer.cpp \
+ ../../src/Renderer//Renderer.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Resources/Texture.h ../../src/Scene/Scene.h \
+ ../../src/Misc/skybox.h ../../src/Util/App.h
+	@echo Compiling ../../src/Renderer//Renderer.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//Renderer.cpp -o Renderer.o
+
+Is.o: ../../src/Renderer//Is.cpp ../../src/Renderer//Renderer.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Scene/Scene.h ../../src/Misc/skybox.h \
+ ../../src/Resources/Texture.h ../../src/Resources/Mesh.h \
+ ../../src/Renderer/Vbo.h ../../src/Scene/Light.h \
+ ../../src/Scene/Camera.h ../../src/Resources/Resource.h \
+ ../../src/Renderer//Fbo.h ../../src/Resources/LightProps.h
+	@echo Compiling ../../src/Renderer//Is.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//Is.cpp -o Is.o
+
+PpsLscatt.o: ../../src/Renderer//PpsLscatt.cpp \
+ ../../src/Renderer//Renderer.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Resources/Resource.h ../../src/Resources/Texture.h \
+ ../../src/Scene/Scene.h ../../src/Misc/skybox.h \
+ ../../src/Renderer//Fbo.h
+	@echo Compiling ../../src/Renderer//PpsLscatt.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//PpsLscatt.cpp -o PpsLscatt.o
+
+Ms.o: ../../src/Renderer//Ms.cpp ../../src/Renderer//Renderer.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Scene/Scene.h ../../src/Misc/skybox.h \
+ ../../src/Resources/Texture.h ../../src/Resources/Mesh.h \
+ ../../src/Renderer/Vbo.h ../../src/Renderer//Fbo.h \
+ ../../src/Resources/Material.h ../../src/Resources/ShaderProg.h \
+ ../../src/Scene/MeshNode.h
+	@echo Compiling ../../src/Renderer//Ms.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//Ms.cpp -o Ms.o
+
+BulletDebuger.o: ../../src/Renderer//BulletDebuger.cpp \
+ ../../src/Renderer//BulletDebuger.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h \
+ ../../../bullet_svn/src/LinearMath/btIDebugDraw.h \
+ ../../../bullet_svn/src/LinearMath/btVector3.h \
+ ../../../bullet_svn/src/LinearMath/btScalar.h \
+ ../../../bullet_svn/src/LinearMath/btMinMax.h \
+ ../../../bullet_svn/src/LinearMath/btTransform.h \
+ ../../../bullet_svn/src/LinearMath/btMatrix3x3.h \
+ ../../../bullet_svn/src/LinearMath/btQuaternion.h \
+ ../../../bullet_svn/src/LinearMath/btQuadWord.h \
+ ../../src/Renderer//Renderer.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h
+	@echo Compiling ../../src/Renderer//BulletDebuger.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//BulletDebuger.cpp -o BulletDebuger.o
+
+Bs2.o: ../../src/Renderer//Bs2.cpp ../../src/Renderer//Renderer.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Scene/Scene.h ../../src/Misc/skybox.h \
+ ../../src/Resources/Texture.h ../../src/Resources/Mesh.h \
+ ../../src/Renderer/Vbo.h ../../src/Resources/Resource.h \
+ ../../src/Renderer//Fbo.h ../../src/Scene/MeshNode.h \
+ ../../src/Resources/Material.h ../../src/Resources/ShaderProg.h
+	@echo Compiling ../../src/Renderer//Bs2.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//Bs2.cpp -o Bs2.o
+
+PpsSsao.o: ../../src/Renderer//PpsSsao.cpp ../../src/Renderer//Renderer.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Resources/Resource.h ../../src/Resources/Texture.h \
+ ../../src/Scene/Scene.h ../../src/Misc/skybox.h \
+ ../../src/Renderer//Fbo.h
+	@echo Compiling ../../src/Renderer//PpsSsao.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//PpsSsao.cpp -o PpsSsao.o
+
+Dbg.o: ../../src/Renderer//Dbg.cpp ../../src/Renderer//Renderer.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Renderer//Fbo.h ../../src/Scene/Scene.h \
+ ../../src/Misc/skybox.h ../../src/Resources/Texture.h \
+ ../../src/Scene/Node.h ../../src/Scene/SkelNode.h \
+ ../../src/Controllers/Controller.h \
  ../../../bullet_svn/src/btBulletCollisionCommon.h \
  ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionWorld.h \
  ../../../bullet_svn/src/LinearMath/btVector3.h \
@@ -449,671 +668,429 @@ Dbg.o: ../../src/renderer//Dbg.cpp ../../src/renderer//Renderer.h \
  ../../../bullet_svn/src/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../../bullet_svn/src/BulletDynamics/Dynamics/btActionInterface.h \
  ../../../bullet_svn/src/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/renderer//BulletDebuger.h \
+ ../../src/Renderer//BulletDebuger.h \
  ../../../bullet_svn/src/LinearMath/btIDebugDraw.h
-	@echo Compiling ../../src/renderer//Dbg.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//Dbg.cpp -o Dbg.o
-
-BulletDebuger.o: ../../src/renderer//BulletDebuger.cpp \
- ../../src/renderer//BulletDebuger.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h \
- ../../../bullet_svn/src/LinearMath/btIDebugDraw.h \
- ../../../bullet_svn/src/LinearMath/btVector3.h \
- ../../../bullet_svn/src/LinearMath/btScalar.h \
- ../../../bullet_svn/src/LinearMath/btMinMax.h \
- ../../../bullet_svn/src/LinearMath/btTransform.h \
- ../../../bullet_svn/src/LinearMath/btMatrix3x3.h \
- ../../../bullet_svn/src/LinearMath/btQuaternion.h \
- ../../../bullet_svn/src/LinearMath/btQuadWord.h \
- ../../src/renderer//Renderer.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h
-	@echo Compiling ../../src/renderer//BulletDebuger.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//BulletDebuger.cpp -o BulletDebuger.o
-
-PpsHdr.o: ../../src/renderer//PpsHdr.cpp ../../src/renderer//Renderer.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/resources/Resource.h ../../src/resources/Texture.h \
- ../../src/scene/Scene.h ../../src/uncategorized/skybox.h \
- ../../src/renderer//Fbo.h
-	@echo Compiling ../../src/renderer//PpsHdr.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//PpsHdr.cpp -o PpsHdr.o
-
-PpsLscatt.o: ../../src/renderer//PpsLscatt.cpp \
- ../../src/renderer//Renderer.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/resources/Resource.h ../../src/resources/Texture.h \
- ../../src/scene/Scene.h ../../src/uncategorized/skybox.h \
- ../../src/renderer//Fbo.h
-	@echo Compiling ../../src/renderer//PpsLscatt.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//PpsLscatt.cpp -o PpsLscatt.o
-
-Bs2.o: ../../src/renderer//Bs2.cpp ../../src/renderer//Renderer.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/scene/Scene.h ../../src/uncategorized/skybox.h \
- ../../src/resources/Texture.h ../../src/resources/Mesh.h \
- ../../src/renderer/Vbo.h ../../src/resources/Resource.h \
- ../../src/renderer//Fbo.h ../../src/scene/MeshNode.h \
- ../../src/resources/Material.h
-	@echo Compiling ../../src/renderer//Bs2.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//Bs2.cpp -o Bs2.o
-
-Ms.o: ../../src/renderer//Ms.cpp ../../src/renderer//Renderer.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/scene/Scene.h ../../src/uncategorized/skybox.h \
- ../../src/resources/Texture.h ../../src/resources/Mesh.h \
- ../../src/renderer/Vbo.h ../../src/renderer//Fbo.h \
- ../../src/resources/Material.h ../../src/scene/MeshNode.h
-	@echo Compiling ../../src/renderer//Ms.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//Ms.cpp -o Ms.o
-
-Pps.o: ../../src/renderer//Pps.cpp ../../src/renderer//Renderer.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/resources/Resource.h ../../src/resources/Texture.h \
- ../../src/renderer//Fbo.h
-	@echo Compiling ../../src/renderer//Pps.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//Pps.cpp -o Pps.o
-
-Bs.o: ../../src/renderer//Bs.cpp ../../src/renderer//Renderer.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/scene/Scene.h ../../src/uncategorized/skybox.h \
- ../../src/resources/Texture.h ../../src/resources/Mesh.h \
- ../../src/renderer/Vbo.h ../../src/resources/Resource.h \
- ../../src/renderer//Fbo.h ../../src/scene/MeshNode.h \
- ../../src/resources/Material.h
-	@echo Compiling ../../src/renderer//Bs.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//Bs.cpp -o Bs.o
-
-IsShadows.o: ../../src/renderer//IsShadows.cpp \
- ../../src/renderer//Renderer.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/resources/Texture.h ../../src/scene/Scene.h \
- ../../src/uncategorized/skybox.h ../../src/resources/Resource.h \
- ../../src/renderer//Fbo.h ../../src/resources/Material.h \
- ../../src/scene/MeshNode.h
-	@echo Compiling ../../src/renderer//IsShadows.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//IsShadows.cpp -o IsShadows.o
-
-Is.o: ../../src/renderer//Is.cpp ../../src/renderer//Renderer.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/scene/Scene.h ../../src/uncategorized/skybox.h \
- ../../src/resources/Texture.h ../../src/resources/Mesh.h \
- ../../src/renderer/Vbo.h ../../src/scene/Light.h \
- ../../src/scene/Camera.h ../../src/resources/Resource.h \
- ../../src/renderer//Fbo.h ../../src/resources/LightProps.h
-	@echo Compiling ../../src/renderer//Is.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//Is.cpp -o Is.o
-
-Renderer.o: ../../src/renderer//Renderer.cpp \
- ../../src/renderer//Renderer.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/resources/Texture.h ../../src/scene/Scene.h \
- ../../src/uncategorized/skybox.h ../../src/utility/App.h
-	@echo Compiling ../../src/renderer//Renderer.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//Renderer.cpp -o Renderer.o
+	@echo Compiling ../../src/Renderer//Dbg.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Renderer//Dbg.cpp -o Dbg.o
 
-SkelNode.o: ../../src/scene//SkelNode.cpp ../../src/scene//SkelNode.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/scene//Node.h ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/controllers/Controller.h \
- ../../src/renderer/Renderer.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/resources/SkelAnim.h ../../src/resources/Skeleton.h \
- ../../src/controllers/SkelAnimCtrl.h ../../src/controllers/Controller.h
-	@echo Compiling ../../src/scene//SkelNode.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//SkelNode.cpp -o SkelNode.o
+MeshNode.o: ../../src/Scene//MeshNode.cpp ../../src/Scene//MeshNode.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Scene//Node.h \
+ ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/Material.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Resources/Mesh.h \
+ ../../src/Renderer/Vbo.h ../../src/Misc/collision.h \
+ ../../src/Renderer/Renderer.h ../../src/Resources/ShaderProg.h \
+ ../../src/Scene/Camera.h ../../src/Scene/Node.h \
+ ../../src/Scene//SkelNode.h ../../src/Controllers/Controller.h \
+ ../../src/Resources/Skeleton.h ../../src/Controllers/MeshSkelNodeCtrl.h \
+ ../../src/Controllers/Controller.h ../../src/Controllers/SkelAnimCtrl.h
+	@echo Compiling ../../src/Scene//MeshNode.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Scene//MeshNode.cpp -o MeshNode.o
 
-Light.o: ../../src/scene//Light.cpp ../../src/scene//Light.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/resources/Texture.h ../../src/resources/Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/scene//Node.h ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/scene//Camera.h \
- ../../src/uncategorized/collision.h ../../src/renderer/Renderer.h \
- ../../src/resources/ShaderProg.h ../../src/scene/Camera.h \
- ../../src/resources/LightProps.h
-	@echo Compiling ../../src/scene//Light.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//Light.cpp -o Light.o
+SkelNode.o: ../../src/Scene//SkelNode.cpp ../../src/Scene//SkelNode.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Scene//Node.h \
+ ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Controllers/Controller.h \
+ ../../src/Renderer/Renderer.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Resources/SkelAnim.h ../../src/Resources/Skeleton.h \
+ ../../src/Controllers/SkelAnimCtrl.h ../../src/Controllers/Controller.h
+	@echo Compiling ../../src/Scene//SkelNode.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Scene//SkelNode.cpp -o SkelNode.o
 
-SkelModelNode.o: ../../src/scene//SkelModelNode.cpp \
- ../../src/scene//SkelModelNode.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/scene//MeshNode.h \
- ../../src/scene//Node.h ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/Material.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/tokenizer/parser.h \
- ../../src/tokenizer/Scanner.h ../../src/scene//SkelNode.h \
- ../../src/controllers/Controller.h \
- ../../src/controllers/MeshSkelNodeCtrl.h \
- ../../src/controllers/Controller.h
-	@echo Compiling ../../src/scene//SkelModelNode.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//SkelModelNode.cpp -o SkelModelNode.o
+Node.o: ../../src/Scene//Node.cpp ../../src/Scene//Node.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Renderer/Renderer.h \
+ ../../src/Resources/ShaderProg.h ../../src/Resources/Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Controllers/Controller.h
+	@echo Compiling ../../src/Scene//Node.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Scene//Node.cpp -o Node.o
 
-Scene.o: ../../src/scene//Scene.cpp ../../src/scene//Scene.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/uncategorized/skybox.h ../../src/resources/Texture.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/scene//SkelNode.h \
- ../../src/scene//Node.h ../../src/controllers/Controller.h \
- ../../src/scene//Camera.h ../../src/uncategorized/collision.h \
- ../../src/scene//MeshNode.h ../../src/resources/Material.h \
- ../../src/scene//Light.h
-	@echo Compiling ../../src/scene//Scene.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//Scene.cpp -o Scene.o
+SkelModelNode.o: ../../src/Scene//SkelModelNode.cpp \
+ ../../src/Scene//SkelModelNode.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Scene//MeshNode.h \
+ ../../src/Scene//Node.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/Material.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Resources/ShaderProg.h \
+ ../../src/Tokenizer/Parser.h ../../src/Tokenizer/Scanner.h \
+ ../../src/Scene//SkelNode.h ../../src/Controllers/Controller.h \
+ ../../src/Controllers/MeshSkelNodeCtrl.h \
+ ../../src/Controllers/Controller.h
+	@echo Compiling ../../src/Scene//SkelModelNode.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Scene//SkelModelNode.cpp -o SkelModelNode.o
 
-MeshNode.o: ../../src/scene//MeshNode.cpp ../../src/scene//MeshNode.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/scene//Node.h ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/Material.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/resources/Resource.h \
- ../../src/resources/Mesh.h ../../src/renderer/Vbo.h \
- ../../src/uncategorized/collision.h ../../src/renderer/Renderer.h \
- ../../src/resources/ShaderProg.h ../../src/scene/Camera.h \
- ../../src/scene/Node.h ../../src/scene//SkelNode.h \
- ../../src/controllers/Controller.h ../../src/resources/Skeleton.h \
- ../../src/controllers/MeshSkelNodeCtrl.h \
- ../../src/controllers/Controller.h ../../src/controllers/SkelAnimCtrl.h
-	@echo Compiling ../../src/scene//MeshNode.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//MeshNode.cpp -o MeshNode.o
+Light.o: ../../src/Scene//Light.cpp ../../src/Scene//Light.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h \
+ ../../src/Resources/Texture.h ../../src/Resources/Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h ../../src/Scene//Node.h \
+ ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Scene//Camera.h \
+ ../../src/Misc/collision.h ../../src/Renderer/Renderer.h \
+ ../../src/Resources/ShaderProg.h ../../src/Scene/Camera.h \
+ ../../src/Resources/LightProps.h
+	@echo Compiling ../../src/Scene//Light.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Scene//Light.cpp -o Light.o
 
-Camera.o: ../../src/scene//Camera.cpp ../../src/scene//Camera.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/uncategorized/collision.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/scene//Node.h \
- ../../src/renderer/Renderer.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h
-	@echo Compiling ../../src/scene//Camera.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//Camera.cpp -o Camera.o
+Camera.o: ../../src/Scene//Camera.cpp ../../src/Scene//Camera.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h \
+ ../../src/Misc/collision.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Scene//Node.h \
+ ../../src/Renderer/Renderer.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h
+	@echo Compiling ../../src/Scene//Camera.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Scene//Camera.cpp -o Camera.o
 
-Node.o: ../../src/scene//Node.cpp ../../src/scene//Node.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/renderer/Renderer.h \
- ../../src/resources/ShaderProg.h ../../src/resources/Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/scene/Camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/Node.h ../../src/controllers/Controller.h
-	@echo Compiling ../../src/scene//Node.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//Node.cpp -o Node.o
+Scene.o: ../../src/Scene//Scene.cpp ../../src/Scene//Scene.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Misc/skybox.h \
+ ../../src/Resources/Texture.h ../../src/Resources/Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Scene//SkelNode.h \
+ ../../src/Scene//Node.h ../../src/Controllers/Controller.h \
+ ../../src/Scene//Camera.h ../../src/Misc/collision.h \
+ ../../src/Scene//MeshNode.h ../../src/Resources/Material.h \
+ ../../src/Resources/ShaderProg.h ../../src/Scene//Light.h
+	@echo Compiling ../../src/Scene//Scene.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Scene//Scene.cpp -o Scene.o
 
-Ui.o: ../../src/ui//Ui.cpp ../../src/ui//Ui.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/renderer/Renderer.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h \
- ../../src/resources/Texture.h ../../src/resources/Resource.h
-	@echo Compiling ../../src/ui//Ui.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/ui//Ui.cpp -o Ui.o
+Ui.o: ../../src/Ui//Ui.cpp ../../src/Ui//Ui.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Renderer/Renderer.h \
+ ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h \
+ ../../src/Resources/Texture.h ../../src/Resources/Resource.h
+	@echo Compiling ../../src/Ui//Ui.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Ui//Ui.cpp -o Ui.o
 
-LightProps.o: ../../src/resources//LightProps.cpp \
- ../../src/resources//LightProps.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/resources//Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/tokenizer/parser.h \
- ../../src/tokenizer/Scanner.h ../../src/resources//Texture.h
-	@echo Compiling ../../src/resources//LightProps.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//LightProps.cpp -o LightProps.o
+Material.o: ../../src/Resources//Material.cpp \
+ ../../src/Resources//Material.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources//Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h \
+ ../../src/Resources//ShaderProg.h ../../src/Tokenizer/Scanner.h \
+ ../../src/Tokenizer/Parser.h ../../src/Tokenizer/Scanner.h \
+ ../../src/Resources//Texture.h ../../src/Renderer/Renderer.h \
+ ../../src/Resources/ShaderProg.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h
+	@echo Compiling ../../src/Resources//Material.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Resources//Material.cpp -o Material.o
 
-SkelAnim.o: ../../src/resources//SkelAnim.cpp \
- ../../src/resources//SkelAnim.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/resources//Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/tokenizer/Scanner.h \
- ../../src/tokenizer/parser.h ../../src/tokenizer/Scanner.h
-	@echo Compiling ../../src/resources//SkelAnim.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//SkelAnim.cpp -o SkelAnim.o
+ShaderProg.o: ../../src/Resources//ShaderProg.cpp \
+ ../../src/Resources//ShaderProg.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Resources//Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h \
+ ../../src/Renderer/Renderer.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Scene/Camera.h ../../src/Misc/collision.h \
+ ../../src/Scene/Node.h ../../src/Resources//ShaderPrePreprocessor.h \
+ ../../src/Resources//Texture.h
+	@echo Compiling ../../src/Resources//ShaderProg.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Resources//ShaderProg.cpp -o ShaderProg.o
 
-Mesh.o: ../../src/resources//Mesh.cpp ../../src/resources//Mesh.h \
- ../../src/utility/Common.h ../../src/uncategorized/memory.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/renderer/Vbo.h \
- ../../src/resources//Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/uncategorized/collision.h \
- ../../src/renderer/Renderer.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/scene/Camera.h \
- ../../src/scene/Node.h ../../src/tokenizer/Scanner.h \
- ../../src/tokenizer/parser.h ../../src/tokenizer/Scanner.h
-	@echo Compiling ../../src/resources//Mesh.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//Mesh.cpp -o Mesh.o
+Texture.o: ../../src/Resources//Texture.cpp \
+ ../../src/Resources//Texture.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Resources//Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h \
+ ../../src/Renderer/Renderer.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h
+	@echo Compiling ../../src/Resources//Texture.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Resources//Texture.cpp -o Texture.o
 
-ShaderProg.o: ../../src/resources//ShaderProg.cpp \
- ../../src/resources//ShaderProg.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/resources//Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/renderer/Renderer.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/scene/Camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/Node.h ../../src/resources//ShaderParser.h \
- ../../src/resources//Texture.h
-	@echo Compiling ../../src/resources//ShaderProg.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//ShaderProg.cpp -o ShaderProg.o
+SkelAnim.o: ../../src/Resources//SkelAnim.cpp \
+ ../../src/Resources//SkelAnim.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Resources//Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Tokenizer/Scanner.h \
+ ../../src/Tokenizer/Parser.h ../../src/Tokenizer/Scanner.h
+	@echo Compiling ../../src/Resources//SkelAnim.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Resources//SkelAnim.cpp -o SkelAnim.o
 
-Material.o: ../../src/resources//Material.cpp \
- ../../src/resources//Material.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources//Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/tokenizer/Scanner.h ../../src/tokenizer/parser.h \
- ../../src/tokenizer/Scanner.h ../../src/resources//Texture.h \
- ../../src/resources//ShaderProg.h ../../src/renderer/Renderer.h \
- ../../src/resources/ShaderProg.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h
-	@echo Compiling ../../src/resources//Material.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//Material.cpp -o Material.o
+Extension.o: ../../src/Resources//Extension.cpp \
+ ../../src/Resources//Extension.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Resources//Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h
+	@echo Compiling ../../src/Resources//Extension.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Resources//Extension.cpp -o Extension.o
 
-ShaderParser.o: ../../src/resources//ShaderParser.cpp \
- ../../src/resources//ShaderParser.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/tokenizer/Scanner.h \
- ../../src/tokenizer/parser.h ../../src/tokenizer/Scanner.h \
- ../../src/utility/Util.h ../../src/utility/Common.h
-	@echo Compiling ../../src/resources//ShaderParser.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//ShaderParser.cpp -o ShaderParser.o
+Skeleton.o: ../../src/Resources//Skeleton.cpp \
+ ../../src/Resources//Skeleton.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources//Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h \
+ ../../src/Tokenizer/Scanner.h ../../src/Tokenizer/Parser.h \
+ ../../src/Tokenizer/Scanner.h
+	@echo Compiling ../../src/Resources//Skeleton.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Resources//Skeleton.cpp -o Skeleton.o
 
-Extension.o: ../../src/resources//Extension.cpp \
- ../../src/resources//Extension.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/resources//Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h
-	@echo Compiling ../../src/resources//Extension.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//Extension.cpp -o Extension.o
+Resource.o: ../../src/Resources//Resource.cpp \
+ ../../src/Resources//Resource.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Util/Util.h ../../src/Util/Common.h \
+ ../../src/Resources//Texture.h ../../src/Resources//Material.h \
+ ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources//ShaderProg.h \
+ ../../src/Resources//Mesh.h ../../src/Renderer/Vbo.h \
+ ../../src/Misc/collision.h ../../src/Resources//SkelAnim.h \
+ ../../src/Resources//LightProps.h
+	@echo Compiling ../../src/Resources//Resource.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Resources//Resource.cpp -o Resource.o
 
-Skeleton.o: ../../src/resources//Skeleton.cpp \
- ../../src/resources//Skeleton.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources//Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/tokenizer/Scanner.h ../../src/tokenizer/parser.h \
- ../../src/tokenizer/Scanner.h
-	@echo Compiling ../../src/resources//Skeleton.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//Skeleton.cpp -o Skeleton.o
+LightProps.o: ../../src/Resources//LightProps.cpp \
+ ../../src/Resources//LightProps.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Resources//Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Tokenizer/Parser.h \
+ ../../src/Tokenizer/Scanner.h ../../src/Resources//Texture.h
+	@echo Compiling ../../src/Resources//LightProps.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Resources//LightProps.cpp -o LightProps.o
 
-Texture.o: ../../src/resources//Texture.cpp \
- ../../src/resources//Texture.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/resources//Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/renderer/Renderer.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/ShaderProg.h \
- ../../src/resources/Resource.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/Node.h
-	@echo Compiling ../../src/resources//Texture.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//Texture.cpp -o Texture.o
+Mesh.o: ../../src/Resources//Mesh.cpp ../../src/Resources//Mesh.h \
+ ../../src/Util/Common.h ../../src/Misc/memory.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Renderer/Vbo.h \
+ ../../src/Resources//Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Misc/collision.h \
+ ../../src/Renderer/Renderer.h ../../src/Resources/ShaderProg.h \
+ ../../src/Resources/Resource.h ../../src/Scene/Camera.h \
+ ../../src/Scene/Node.h ../../src/Tokenizer/Scanner.h \
+ ../../src/Tokenizer/Parser.h ../../src/Tokenizer/Scanner.h
+	@echo Compiling ../../src/Resources//Mesh.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Resources//Mesh.cpp -o Mesh.o
 
-Resource.o: ../../src/resources//Resource.cpp \
- ../../src/resources//Resource.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/resources//Texture.h \
- ../../src/resources//Material.h ../../src/math/Math.h \
- ../../src/math/Vec2.h ../../src/math/MathForwardDecls.h \
- ../../src/math/Vec2.inl.h ../../src/math/MathDfltHeader.h \
- ../../src/math/Vec3.h ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources//ShaderProg.h \
- ../../src/resources//Mesh.h ../../src/renderer/Vbo.h \
- ../../src/uncategorized/collision.h ../../src/resources//SkelAnim.h \
- ../../src/resources//LightProps.h
-	@echo Compiling ../../src/resources//Resource.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//Resource.cpp -o Resource.o
+ShaderPrePreprocessor.o: ../../src/Resources//ShaderPrePreprocessor.cpp \
+ ../../src/Resources//ShaderPrePreprocessor.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Tokenizer/Scanner.h \
+ ../../src/Tokenizer/Parser.h ../../src/Tokenizer/Scanner.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h
+	@echo Compiling ../../src/Resources//ShaderPrePreprocessor.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Resources//ShaderPrePreprocessor.cpp -o ShaderPrePreprocessor.o
 
-Input.o: ../../src/utility//Input.cpp ../../src/utility//Input.h \
- ../../src/utility//Common.h ../../src/uncategorized/memory.h \
- ../../src/utility/Common.h ../../src/utility//App.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/renderer/Renderer.h \
- ../../src/resources/ShaderProg.h ../../src/resources/Resource.h \
- ../../src/utility/Util.h ../../src/utility/Common.h \
- ../../src/scene/Camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/Node.h
-	@echo Compiling ../../src/utility//Input.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/utility//Input.cpp -o Input.o
+Input.o: ../../src/Util//Input.cpp ../../src/Util//Input.h \
+ ../../src/Util//Common.h ../../src/Misc/memory.h ../../src/Util/Common.h \
+ ../../src/Util//App.h ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Renderer/Renderer.h \
+ ../../src/Resources/ShaderProg.h ../../src/Resources/Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h ../../src/Scene/Node.h
+	@echo Compiling ../../src/Util//Input.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Util//Input.cpp -o Input.o
 
-App.o: ../../src/utility//App.cpp ../../src/utility//App.h \
- ../../src/utility//Common.h ../../src/uncategorized/memory.h \
- ../../src/utility/Common.h
-	@echo Compiling ../../src/utility//App.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/utility//App.cpp -o App.o
+App.o: ../../src/Util//App.cpp ../../src/Util//App.h \
+ ../../src/Util//Common.h ../../src/Misc/memory.h ../../src/Util/Common.h
+	@echo Compiling ../../src/Util//App.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Util//App.cpp -o App.o
 
-Common.o: ../../src/utility//Common.cpp
-	@echo Compiling ../../src/utility//Common.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/utility//Common.cpp -o Common.o
+Common.o: ../../src/Util//Common.cpp
+	@echo Compiling ../../src/Util//Common.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Util//Common.cpp -o Common.o
 
-Util.o: ../../src/utility//Util.cpp ../../src/utility//Util.h \
- ../../src/utility//Common.h ../../src/uncategorized/memory.h \
- ../../src/utility/Common.h
-	@echo Compiling ../../src/utility//Util.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/utility//Util.cpp -o Util.o
+Util.o: ../../src/Util//Util.cpp ../../src/Util//Util.h \
+ ../../src/Util//Common.h ../../src/Misc/memory.h ../../src/Util/Common.h
+	@echo Compiling ../../src/Util//Util.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Util//Util.cpp -o Util.o
 
-SkelAnimCtrl.o: ../../src/controllers//SkelAnimCtrl.cpp \
- ../../src/controllers//SkelAnimCtrl.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/controllers//Controller.h \
- ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h ../../src/resources/SkelAnim.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/scene/SkelNode.h \
- ../../src/scene/Node.h ../../src/controllers/Controller.h \
- ../../src/resources/Skeleton.h ../../src/renderer/Renderer.h \
- ../../src/resources/ShaderProg.h ../../src/scene/Camera.h \
- ../../src/uncategorized/collision.h
-	@echo Compiling ../../src/controllers//SkelAnimCtrl.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/controllers//SkelAnimCtrl.cpp -o SkelAnimCtrl.o
+Controller.o: ../../src/Controllers//Controller.cpp \
+ ../../src/Controllers//Controller.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Scene/Scene.h ../../src/Misc/skybox.h \
+ ../../src/Resources/Texture.h ../../src/Resources/Resource.h \
+ ../../src/Util/Util.h ../../src/Util/Common.h ../../src/Math/Math.h \
+ ../../src/Math/Vec2.h ../../src/Math/MathForwardDecls.h \
+ ../../src/Math/Vec2.inl.h ../../src/Math/MathDfltHeader.h \
+ ../../src/Math/Vec3.h ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h
+	@echo Compiling ../../src/Controllers//Controller.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Controllers//Controller.cpp -o Controller.o
 
-Controller.o: ../../src/controllers//Controller.cpp \
- ../../src/controllers//Controller.h ../../src/utility/Common.h \
- ../../src/uncategorized/memory.h ../../src/scene/Scene.h \
- ../../src/uncategorized/skybox.h ../../src/resources/Texture.h \
- ../../src/resources/Resource.h ../../src/utility/Util.h \
- ../../src/utility/Common.h ../../src/math/Math.h ../../src/math/Vec2.h \
- ../../src/math/MathForwardDecls.h ../../src/math/Vec2.inl.h \
- ../../src/math/MathDfltHeader.h ../../src/math/Vec3.h \
- ../../src/math/Vec3.inl.h ../../src/math/Vec4.h \
- ../../src/math/Vec4.inl.h ../../src/math/Quat.h \
- ../../src/math/Quat.inl.h ../../src/math/Axisang.h \
- ../../src/math/Axisang.inl.h ../../src/math/Euler.h \
- ../../src/math/Euler.inl.h ../../src/math/Mat3.h \
- ../../src/math/Mat3.inl.h ../../src/math/Mat4.h \
- ../../src/math/Mat4.inl.h ../../src/math/MathFuncs.h \
- ../../src/math/MathFuncs.inl.h
-	@echo Compiling ../../src/controllers//Controller.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/controllers//Controller.cpp -o Controller.o
+SkelAnimCtrl.o: ../../src/Controllers//SkelAnimCtrl.cpp \
+ ../../src/Controllers//SkelAnimCtrl.h ../../src/Util/Common.h \
+ ../../src/Misc/memory.h ../../src/Controllers//Controller.h \
+ ../../src/Math/Math.h ../../src/Math/Vec2.h \
+ ../../src/Math/MathForwardDecls.h ../../src/Math/Vec2.inl.h \
+ ../../src/Math/MathDfltHeader.h ../../src/Math/Vec3.h \
+ ../../src/Math/Vec3.inl.h ../../src/Math/Vec4.h \
+ ../../src/Math/Vec4.inl.h ../../src/Math/Quat.h \
+ ../../src/Math/Quat.inl.h ../../src/Math/Axisang.h \
+ ../../src/Math/Axisang.inl.h ../../src/Math/Euler.h \
+ ../../src/Math/Euler.inl.h ../../src/Math/Mat3.h \
+ ../../src/Math/Mat3.inl.h ../../src/Math/Mat4.h \
+ ../../src/Math/Mat4.inl.h ../../src/Math/MathFuncs.h \
+ ../../src/Math/MathFuncs.inl.h ../../src/Resources/SkelAnim.h \
+ ../../src/Resources/Resource.h ../../src/Util/Util.h \
+ ../../src/Util/Common.h ../../src/Scene/SkelNode.h \
+ ../../src/Scene/Node.h ../../src/Controllers/Controller.h \
+ ../../src/Resources/Skeleton.h ../../src/Renderer/Renderer.h \
+ ../../src/Resources/ShaderProg.h ../../src/Scene/Camera.h \
+ ../../src/Misc/collision.h
+	@echo Compiling ../../src/Controllers//SkelAnimCtrl.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/Controllers//SkelAnimCtrl.cpp -o SkelAnimCtrl.o
 
 clean:
 	rm -f *.o

build/debug/gen.cfg.py

@@ -1,4 +1,4 @@
-source_paths = [ "../../src/math/", "../../src/tokenizer/", "../../src/uncategorized/", "../../src/", "../../src/renderer/", "../../src/scene/", "../../src/ui/", "../../src/resources/", "../../src/utility/", "../../src/controllers/" ]
+source_paths = [ "../../src/Math/", "../../src/Tokenizer/", "../../src/Misc/", "../../src/", "../../src/Renderer/", "../../src/Scene/", "../../src/Ui/", "../../src/Resources/", "../../src/Util/", "../../src/Controllers/" ]
 
 include_paths = list(source_paths)
 include_paths.extend( [ "../../../bullet_svn/src/" ] ) # the bullet svn path

src/main.cpp → src/Main.cpp

@@ -162,7 +162,7 @@ void initPhysics()
 	dynamicsWorld->setDebugDrawer(&debugDrawer);
 }
 
-#include "ShaderParser.h"
+#include "ShaderPrePreprocessor.h"
 
 
 //=====================================================================================================================================
@@ -224,7 +224,7 @@ void init()
 	imp = new SkelModelNode();
 	imp->init( "models/imp/imp.smdl" );
 	imp->setLocalTransformation( Vec3( 0.0, 2.11, 0.0 ), Mat3( Euler(-M::PI/2, 0.0, 0.0) ), 0.7 );
-	imp->meshNodes[0]->meshSkelCtrl->skelNode->skelAnimCtrl->skelAnim = rsrc::skelAnims.load( "models/imp/walk.imp.anim" );
+	imp->meshNodes[0]->meshSkelCtrl->skelNode->skelAnimCtrl->skelAnim = Rsrc::skelAnims.load( "models/imp/walk.imp.anim" );
 	imp->meshNodes[0]->meshSkelCtrl->skelNode->skelAnimCtrl->step = 0.8;
 
 	// crate
@@ -235,7 +235,7 @@ void init()
 
 	//
 	//floor_ = new floor_t;
-	//floor_->material = rsrc::materials.load( "materials/default.mtl" );
+	//floor_->material = Rsrc::materials.load( "materials/default.mtl" );
 
 	const char* skybox_fnames [] = { "textures/env/hellsky4_forward.tga", "textures/env/hellsky4_back.tga", "textures/env/hellsky4_left.tga",
 																	 "textures/env/hellsky4_right.tga", "textures/env/hellsky4_up.tga", "textures/env/hellsky4_down.tga" };
@@ -246,6 +246,64 @@ void init()
 }
 
 
+Vec3 toAnki( const btVector3& v )
+{
+	return Vec3( v.x(), v.y(), v.z() );
+}
+
+Vec4 toAnki( const btVector4& v )
+{
+	return Vec4( v.x(), v.y(), v.z(), v.w() );
+}
+
+Mat3 toAnki( const btMatrix3x3& m )
+{
+	Mat3 m3;
+	m3.setRows( toAnki(m[0]), toAnki(m[1]), toAnki(m[2]) );
+	return m3;
+}
+
+Quat toAnki( const btQuaternion& q )
+{
+	return Quat( q.x(), q.y(), q.z(), q.w() );
+}
+
+Mat4 toAnki( const btTransform& t )
+{
+	Mat4 m;
+	t.getOpenGLMatrix( &m[0] );
+	m.transpose();
+	return m;
+}
+
+btVector3 toBt( const Vec3& v )
+{
+	return btVector3( v.x,  v.y, v.z );
+}
+
+btVector4 toBt( const Vec4& v )
+{
+	return btVector4( v.x,  v.y, v.z, v.w );
+}
+
+btMatrix3x3 toBt( const Mat3 m )
+{
+	btMatrix3x3 r;
+	r[0] = toBt(m.getRow(0));
+	r[1] = toBt(m.getRow(1));
+	r[2] = toBt(m.getRow(2));
+	return r;
+}
+
+btTransform toBt( const Mat4& m )
+{
+	btTransform r;
+	r.setFromOpenGLMatrix( &(m.getTransposed())[0] );
+	return r;
+}
+
+
+
 //=====================================================================================================================================
 // main                                                                                                                               =
 //=====================================================================================================================================

src/uncategorized/map.cpp → src/Misc/map.cpp

@@ -2,7 +2,7 @@
 #include "map.h"
 #include "Mesh.h"
 #include "Scanner.h"
-#include "parser.h"
+#include "Parser.h"
 #include "Resource.h"
 #include "Camera.h"
 
@@ -196,7 +196,7 @@ bool map_t::load( const char* filename )
 		// strings is what we want in this case... please let it be G-Strings
 		if( token->code == Scanner::TC_STRING )
 		{
-			Mesh* mesh = rsrc::meshes.load( token->value.string );
+			Mesh* mesh = Rsrc::meshes.load( token->value.string );
 			if( !mesh ) return false;
 
 			meshes.push_back( mesh );

src/uncategorized/skybox.cpp → src/Misc/skybox.cpp

@@ -33,14 +33,14 @@ bool Skybox::load( const char* filenames[6] )
 {
 	for( int i=0; i<6; i++ )
 	{
-		textures[i] = rsrc::textures.load( filenames[i] );
+		textures[i] = Rsrc::textures.load( filenames[i] );
 	}
 
-	noise = rsrc::textures.load( "gfx/noise2.tga" );
+	noise = Rsrc::textures.load( "gfx/noise2.tga" );
 	noise->texParameter( GL_TEXTURE_WRAP_S, GL_REPEAT );
 	noise->texParameter( GL_TEXTURE_WRAP_T, GL_REPEAT );
 
-	shader = rsrc::shaders.load( "shaders/ms_mp_skybox.glsl" );
+	shader = Rsrc::shaders.load( "shaders/ms_mp_skybox.glsl" );
 
 	return true;
 }

src/renderer/Bs2.cpp → src/Renderer/Bs2.cpp

@@ -69,7 +69,7 @@ void init2()
 	// unbind
 	intermid_fbo.unbind();
 
-	shaderProg = rsrc::shaders.load( "shaders/bs_refract.glsl" );
+	shaderProg = Rsrc::shaders.load( "shaders/bs_refract.glsl" );
 }
 
 

src/renderer/Dbg.cpp → src/Renderer/Dbg.cpp

@@ -74,7 +74,13 @@ bool showBvolumes = true;
 static Fbo fbo;
 
 class DbgShaderProg: public ShaderProg
-{};
+{
+	public:
+		struct
+		{
+			int color;
+		}uniLocs;
+};
 
 static DbgShaderProg sProg;
 
@@ -225,8 +231,8 @@ void renderQuad( float w, float h )
 //=====================================================================================================================================
 void renderSphere( float r, int p )
 {
-	const float twopi  = PI*2;
-	const float pidiv2 = PI/2;
+	const float twopi  = M::PI*2;
+	const float pidiv2 = M::PI/2;
 
 	float theta1 = 0.0;
 	float theta2 = 0.0;

src/renderer/MsEarlyz.cpp → src/Renderer/MsEarlyz.cpp

@@ -50,8 +50,8 @@ void init()
 	fbo.unbind();
 
 	// shaders
-	shdr_dp = rsrc::shaders.load( "shaders/dp.glsl" );
-	shdr_dp_grass = rsrc::shaders.load( "shaders/dp_grass.glsl" );
+	shdr_dp = Rsrc::shaders.load( "shaders/dp.glsl" );
+	shdr_dp_grass = Rsrc::shaders.load( "shaders/dp_grass.glsl" );
 }
 
 

src/renderer/PpsSsao.cpp → src/Renderer/PpsSsao.cpp

@@ -128,7 +128,7 @@ void init()
 	bool mipmaping = R::mipmaping;
 	R::textureCompression = false;
 	R::mipmaping = true;
-	noise_map = rsrc::textures.load( "gfx/noise3.tga" );
+	noise_map = Rsrc::textures.load( "gfx/noise3.tga" );
 	noise_map->texParameter( GL_TEXTURE_WRAP_S, GL_REPEAT );
 	noise_map->texParameter( GL_TEXTURE_WRAP_T, GL_REPEAT );
 	//noise_map->texParameter( GL_TEXTURE_MAG_FILTER, GL_NEAREST );

src/renderer/Renderer.cpp → src/Renderer/Renderer.cpp

@@ -174,7 +174,7 @@ void init()
 	R::Dbg::init();
 
 	// misc
-	shdr_final = rsrc::shaders.load( "shaders/final.glsl" );
+	shdr_final = Rsrc::shaders.load( "shaders/final.glsl" );
 
 	PRINT( "Renderer initialization ends" );
 }

src/resources/LightProps.cpp → src/Resources/LightProps.cpp

@@ -1,5 +1,5 @@
 #include "LightProps.h"
-#include "parser.h"
+#include "Parser.h"
 #include "Texture.h"
 
 
@@ -97,7 +97,7 @@ Scanner scanner;
 				return false;
 			}
 				
-			texture = rsrc::textures.load( token->value.string );
+			texture = Rsrc::textures.load( token->value.string );
 			texture->texParameter( GL_TEXTURE_MAX_ANISOTROPY_EXT, 0 );
 		}
 		// end of file
@@ -124,5 +124,5 @@ Scanner scanner;
 void LightProps::unload()
 {
 	if( texture != NULL )
-		rsrc::textures.unload( texture );
+		Rsrc::textures.unload( texture );
 }

src/resources/Material.cpp → src/Resources/Material.cpp

@@ -2,7 +2,7 @@
 #include "Material.h"
 #include "Resource.h"
 #include "Scanner.h"
-#include "parser.h"
+#include "Parser.h"
 #include "Texture.h"
 #include "ShaderProg.h"
 #include "Renderer.h"
@@ -11,18 +11,16 @@
 #define MTL_ERROR( x ) ERROR( "Material (" << getRsrcPath() << getRsrcName() << "): " << x );
 
 
-/*
-=======================================================================================================================================
-Blending dtuff                                                                                                                        =
-=======================================================================================================================================
-*/
-struct blend_param_t
+//=====================================================================================================================================
+// Blending stuff                                                                                                                     =
+//=====================================================================================================================================
+struct BlendParam
 {
 	int gl_enum;
 	const char* str;
 };
 
-static blend_param_t bparams [] =
+static BlendParam bparams [] =
 {
 	{GL_ZERO, "GL_ZERO"},
 	{GL_ONE, "GL_ONE"},
@@ -39,7 +37,7 @@ static blend_param_t bparams [] =
 
 const int BLEND_PARAMS_NUM = 11;
 
-static bool SearchBlendEnum( const char* str, int& gl_enum )
+static bool searchBlendEnum( const char* str, int& gl_enum )
 {
 	for( int i=0; i<BLEND_PARAMS_NUM; i++ )
 	{
@@ -53,11 +51,9 @@ static bool SearchBlendEnum( const char* str, int& gl_enum )
 }
 
 
-/*
-=======================================================================================================================================
-load                                                                                                                                  =
-=======================================================================================================================================
-*/
+//=====================================================================================================================================
+// load                                                                                                                               =
+//=====================================================================================================================================
 bool Material::load( const char* filename )
 {
 	Scanner scanner;
@@ -80,21 +76,8 @@ bool Material::load( const char* filename )
 				PARSE_ERR_EXPECTED( "string" );
 				return false;
 			}
-			shaderProg = rsrc::shaders.load( token->value.string );
+			shaderProg = Rsrc::shaders.load( token->value.string );
 		}
-		/*//** DEPTH_SHADER_PROG **
-		else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "DEPTH_SHADER_PROG" ) )
-		{
-			if( depth.shaderProg ) ERROR( "Depth shader program already loaded" );
-
-			token = &scanner.getNextToken();
-			if( token->code != Scanner::TC_STRING )
-			{
-				PARSE_ERR_EXPECTED( "string" );
-				return false;
-			}
-			depth.shaderProg = rsrc::shaders.load( token->value.string );
-		}*/
 		//** DEPTH_MATERIAL **
 		else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "DEPTH_PASS_MATERIAL" ) )
 		{
@@ -106,7 +89,7 @@ bool Material::load( const char* filename )
 				PARSE_ERR_EXPECTED( "string" );
 				return false;
 			}
-			dpMtl = rsrc::materials.load( token->value.string );
+			dpMtl = Rsrc::materials.load( token->value.string );
 		}
 		//** BLENDS **
 		else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "BLENDS" ) )
@@ -140,7 +123,7 @@ bool Material::load( const char* filename )
 				return false;
 			}
 			int gl_enum;
-			if( !SearchBlendEnum(token->value.string, gl_enum) )
+			if( !searchBlendEnum(token->value.string, gl_enum) )
 			{
 				PARSE_ERR( "Incorrect blending factor \"" << token->value.string << "\"" );
 				return false;
@@ -157,7 +140,7 @@ bool Material::load( const char* filename )
 				return false;
 			}
 			int gl_enum;
-			if( !SearchBlendEnum(token->value.string, gl_enum) )
+			if( !searchBlendEnum(token->value.string, gl_enum) )
 			{
 				PARSE_ERR( "Incorrect blending factor \"" << token->value.string << "\"" );
 				return false;
@@ -175,17 +158,6 @@ bool Material::load( const char* filename )
 			}
 			depthTesting = token->value.int_;
 		}
-		//** GRASS_MAP **
-		else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "GRASS_MAP" ) )
-		{
-			token = &scanner.getNextToken();
-			if( token->code != Scanner::TC_STRING )
-			{
-				PARSE_ERR_EXPECTED( "string" );
-				return false;
-			}
-			grassMap = rsrc::textures.load( token->value.string );
-		}
 		//** WIREFRAME **
 		else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "WIREFRAME" ) )
 		{
@@ -211,6 +183,13 @@ bool Material::load( const char* filename )
 		//** USER_DEFINED_VARS **
 		else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "USER_DEFINED_VARS" ) )
 		{
+			// first check if the shader is defined
+			if( shaderProg == NULL )
+			{
+				PARSE_ERR( "You have to define the shader program before the user defined vars" );
+				return false;
+			}
+
 			// read {
 			token = &scanner.getNextToken();
 			if( token->code != Scanner::TC_LBRACKET )
@@ -221,48 +200,38 @@ bool Material::load( const char* filename )
 			// loop all the vars
 			do
 			{
-				// read var type
-				UserDefinedVar::Type type;
-				token = &scanner.getNextToken();
-				if( token->code == Scanner::TC_RBRACKET )
-					break;
-				else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "TEXTURE" ) )
-					type = UserDefinedVar::VT_TEXTURE;
-				else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "FLOAT" ) )
-					type = UserDefinedVar::VT_FLOAT;
-				else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "VEC3" ) )
-					type = UserDefinedVar::VT_VEC3;
-				else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "VEC4" ) )
-					type = UserDefinedVar::VT_VEC4;
-				else
-				{
-					PARSE_ERR_EXPECTED( "TEXTURE or FLOAT or VEC3 or VEC4 or }" );
-					return false;
-				}
-
 				userDefinedVars.push_back( UserDefinedVar() ); // create new var
 				UserDefinedVar& var = userDefinedVars.back();
-				var.type = type;
 
 				// read the name
+				string varName;
 				token = &scanner.getNextToken();
 				if( token->code == Scanner::TC_IDENTIFIER )
-					var.name = token->value.string;
+					varName = token->value.string;
 				else
 				{
 					PARSE_ERR_EXPECTED( "identifier" );
 					return false;
 				}
 
+				// check if the uniform exists
+				if( !shaderProg->uniVarExists( varName.c_str() ) )
+				{
+					PARSE_ERR( "The variable \"" << varName << "\" is not an active uniform" );
+					return false;
+				}
+
+				var.sProgVar = & shaderProg->getUniVar( varName.c_str() );
+
 				// read the values
-				switch( type )
+				switch( var.sProgVar->getType() )
 				{
 					// texture
-					case UserDefinedVar::VT_TEXTURE:
+					case GL_SAMPLER_2D:
 						token = &scanner.getNextToken();
 						if( token->code == Scanner::TC_STRING )
 						{
-							var.value.texture = rsrc::textures.load( token->value.string );
+							var.value.texture = Rsrc::textures.load( token->value.string );
 						}
 						else if( token->code == Scanner::TC_IDENTIFIER && !strcmp( token->value.string, "IS_FAI" ) )
 						{
@@ -287,7 +256,7 @@ bool Material::load( const char* filename )
 						}
 						break;
 					// float
-					case UserDefinedVar::VT_FLOAT:
+					case GL_FLOAT:
 						token = &scanner.getNextToken();
 						if( token->code == Scanner::TC_NUMBER && token->type == Scanner::DT_FLOAT )
 							var.value.float_ = token->value.float_;
@@ -298,15 +267,15 @@ bool Material::load( const char* filename )
 						}
 						break;
 					// vec2
-					case UserDefinedVar::VT_VEC2:
+					case GL_FLOAT_VEC2:
 						ERROR( "Unimplemented" );
 						break;
 					// vec3
-					case UserDefinedVar::VT_VEC3:
+					case GL_FLOAT_VEC3:
 						if( !ParseArrOfNumbers<float>( scanner, true, true, 3, &var.value.vec3[0] ) ) return false;
 						break;
 					// vec4
-					case UserDefinedVar::VT_VEC4:
+					case GL_FLOAT_VEC4:
 						if( !ParseArrOfNumbers<float>( scanner, true, true, 4, &var.value.vec4[0] ) ) return false;
 						break;
 				};
@@ -344,27 +313,6 @@ bool Material::additionalInit()
 		return false;
 	}
 
-	/*if( !depth.shaderProg )
-	{
-		MTL_ERROR( "Without depth shader is like cake without shadow (missing DEPTH_SHADER_PROG)" );
-		return false;
-	}*/
-
-	// for all user defined vars get their location
-	shaderProg->bind();
-	for( uint i=0; i<userDefinedVars.size(); i++ )
-	{
-		int loc = shaderProg->getUniVar( userDefinedVars[i].name.c_str() ).getLoc();
-		if( loc == -1 )
-		{
-			MTL_ERROR( "Shader \"" << shaderProg->getRsrcName() << "\" and user defined var \"" << userDefinedVars[i].name <<
-			           "\" do not combine. Incorrect location" );
-			return false;
-		}
-		userDefinedVars[i].uniLoc = loc;
-	}
-	shaderProg->unbind();
-
 	// init the attribute locations
 	attribLocs.tanget = shaderProg->attribVarExists( "tangent" ) ?  shaderProg->getAttribVar( "tangent" ).getLoc() : -1;
 	attribLocs.position = shaderProg->attribVarExists( "position" ) ?  shaderProg->getAttribVar( "position" ).getLoc() : -1;
@@ -390,32 +338,25 @@ bool Material::additionalInit()
 }
 
 
-/*
-=======================================================================================================================================
-unload                                                                                                                                =
-=======================================================================================================================================
-*/
+//=====================================================================================================================================
+// unload                                                                                                                             =
+//=====================================================================================================================================
 void Material::unload()
 {
-	rsrc::shaders.unload( shaderProg );
+	Rsrc::shaders.unload( shaderProg );
 
 	// loop all user defined vars and unload the textures
 	for( uint i=0; i<userDefinedVars.size(); i++ )
 	{
-		if( userDefinedVars[i].type == UserDefinedVar::VT_TEXTURE )
-			rsrc::textures.unload( userDefinedVars[i].value.texture );
+		if( userDefinedVars[i].sProgVar->getType() == GL_SAMPLER_2D )
+			Rsrc::textures.unload( userDefinedVars[i].value.texture );
 	}
-
-	// the grass map
-	if( grassMap )
-		rsrc::textures.unload( grassMap );
 }
 
-/*
-=======================================================================================================================================
-setToDefault                                                                                                                          =
-=======================================================================================================================================
-*/
+
+//=====================================================================================================================================
+// setToDefault                                                                                                                       =
+//=====================================================================================================================================
 void Material::setToDefault()
 {
 	shaderProg = NULL;
@@ -424,7 +365,6 @@ void Material::setToDefault()
 	blendingDfactor = GL_ZERO;
 	depthTesting = true;
 	wireframe = false;
-	grassMap = NULL;
 	castsShadow = true;
 	refracts = false;
 	dpMtl = NULL;
@@ -451,7 +391,7 @@ void Material::setup()
 
 
 	if( depthTesting )  glEnable( GL_DEPTH_TEST );
-	else                 glDisable( GL_DEPTH_TEST );
+	else                glDisable( GL_DEPTH_TEST );
 
 	if( wireframe )  glPolygonMode( GL_FRONT, GL_LINE );
 	else             glPolygonMode( GL_FRONT, GL_FILL );
@@ -462,27 +402,27 @@ void Material::setup()
 	Vec<UserDefinedVar>::iterator udv;
 	for( udv=userDefinedVars.begin(); udv!=userDefinedVars.end(); udv++ )
 	{
-		switch( udv->type )
+		switch( udv->sProgVar->getType() )
 		{
 			// texture
-			case UserDefinedVar::VT_TEXTURE:
-				shaderProg->locTexUnit( udv->uniLoc, *udv->value.texture, texture_unit++ );
+			case GL_SAMPLER_2D:
+				shaderProg->locTexUnit( udv->sProgVar->getLoc(), *udv->value.texture, texture_unit++ );
 				break;
 			// float
-			case UserDefinedVar::VT_FLOAT:
-				glUniform1f( udv->uniLoc, udv->value.float_ );
+			case GL_FLOAT:
+				glUniform1f( udv->sProgVar->getLoc(), udv->value.float_ );
 				break;
 			// vec2
-			case UserDefinedVar::VT_VEC2:
-				glUniform2fv( udv->uniLoc, 1, &udv->value.vec2[0] );
+			case GL_FLOAT_VEC2:
+				glUniform2fv( udv->sProgVar->getLoc(), 1, &udv->value.vec2[0] );
 				break;
 			// vec3
-			case UserDefinedVar::VT_VEC3:
-				glUniform3fv( udv->uniLoc, 1, &udv->value.vec3[0] );
+			case GL_FLOAT_VEC3:
+				glUniform3fv( udv->sProgVar->getLoc(), 1, &udv->value.vec3[0] );
 				break;
 			// vec4
-			case UserDefinedVar::VT_VEC4:
-				glUniform4fv( udv->uniLoc, 1, &udv->value.vec4[0] );
+			case GL_FLOAT_VEC4:
+				glUniform4fv( udv->sProgVar->getLoc(), 1, &udv->value.vec4[0] );
 				break;
 		}
 	}

src/resources/Material.h → src/Resources/Material.h

@@ -4,6 +4,8 @@
 #include "Common.h"
 #include "Math.h"
 #include "Resource.h"
+#include "ShaderProg.h"
+
 
 /// Mesh material resource
 class Material: public Resource
@@ -16,29 +18,18 @@ class Material: public Resource
 		class UserDefinedVar
 		{
 			public:
-				enum Type
-				{
-					VT_TEXTURE,
-					VT_FLOAT,
-					VT_VEC2, // not used yet
-					VT_VEC3,
-					VT_VEC4
-				};
-
 				struct Value       // unfortunately we cannot use union because of Vec3 and Vec4
 				{
 					Texture* texture;
 					float    float_;
-					Vec2   vec2;
-					Vec3   vec3;
-					Vec4   vec4;
+					Vec2     vec2;
+					Vec3     vec3;
+					Vec4     vec4;
 					Value(): texture(NULL) {}
 				};
 
-				Type   type;
 				Value  value;
-				int    uniLoc;
-				string name;
+				const ShaderProg::Var* sProgVar;
 		}; // end class UserDefinedVar
 
 		Vec<UserDefinedVar> userDefinedVars;
@@ -48,7 +39,7 @@ class Material: public Resource
 	// data                                                                                                                             =
 	//===================================================================================================================================
 	public:
-		ShaderProg* shaderProg; ///< The most imortant asspect of materials
+		ShaderProg* shaderProg; ///< The most important aspect of materials
 
 		bool blends; ///< The entities with blending are being rendered in blending stage and those without in material stage
 		bool refracts;
@@ -57,7 +48,6 @@ class Material: public Resource
 		bool depthTesting;
 		bool wireframe;
 		bool castsShadow; ///< Used in shadowmapping passes but not in EarlyZ
-		Texture* grassMap; // ToDo remove this
 
 		// vertex attributes
 		struct

src/resources/Mesh.cpp → src/Resources/Mesh.cpp

@@ -2,7 +2,7 @@
 #include "Renderer.h"
 #include "Resource.h"
 #include "Scanner.h"
-#include "parser.h"
+#include "Parser.h"
 
 
 //=====================================================================================================================================

src/resources/Resource.cpp → src/Resources/Resource.cpp

@@ -7,7 +7,7 @@
 #include "LightProps.h"
 
 
-namespace rsrc {
+namespace Rsrc {
 
 
 /*

src/resources/Resource.h → src/Resources/Resource.h

@@ -14,15 +14,14 @@ class Skeleton;
 class SkelAnim;
 class LightProps;
 
-namespace rsrc {
+namespace Rsrc {
 template< typename Type > class Container;
 }
 
 
 /**
- * Every class that it is considered resource should be derivative of this one. This step is not
- * necessary because of the Container template but ensures that loading will be made by the
- * resource manager and not the class itself
+ * Every class that it is considered a resource should be derived by this one. This step is not necessary because of the Container
+ * template but ensures that loading will be made by the resource manager and not the class itself
  */
 class Resource
 {
@@ -31,13 +30,13 @@ class Resource
 	PROPERTY_R( uint, usersNum, getRsrcUsersNum );
 
 	// friends
-	friend class rsrc::Container<Texture>;
-	friend class rsrc::Container<Material>;
-	friend class rsrc::Container<ShaderProg>;
-	friend class rsrc::Container<Skeleton>;
-	friend class rsrc::Container<Mesh>;
-	friend class rsrc::Container<SkelAnim>;
-	friend class rsrc::Container<LightProps>;
+	friend class Rsrc::Container<Texture>;
+	friend class Rsrc::Container<Material>;
+	friend class Rsrc::Container<ShaderProg>;
+	friend class Rsrc::Container<Skeleton>;
+	friend class Rsrc::Container<Mesh>;
+	friend class Rsrc::Container<SkelAnim>;
+	friend class Rsrc::Container<LightProps>;
 	friend class ShaderProg;
 
 	public:
@@ -50,7 +49,7 @@ class Resource
 
 
 /// resource namespace
-namespace rsrc {
+namespace Rsrc {
 
 
 extern Container<Texture>    textures;

src/resources/ShaderParser.cpp → src/Resources/ShaderPrePreprocessor.cpp

@@ -1,14 +1,14 @@
 #include <iomanip>
-#include "ShaderParser.h"
+#include "ShaderPrePreprocessor.h"
 #include "Scanner.h"
-#include "parser.h"
+#include "Parser.h"
 #include "Util.h"
 
 
 //=====================================================================================================================================
 // printSourceLines                                                                                                                   =
 //=====================================================================================================================================
-void ShaderParser::printSourceLines() const
+void ShaderPrePreprocessor::printSourceLines() const
 {
 	for( uint i=0; i<sourceLines.size(); ++i )
 	{
@@ -20,7 +20,7 @@ void ShaderParser::printSourceLines() const
 //=====================================================================================================================================
 // printShaderVars                                                                                                                    =
 //=====================================================================================================================================
-void ShaderParser::printShaderVars() const
+void ShaderPrePreprocessor::printShaderVars() const
 {
 	PRINT( "TYPE" << setw(20) << "NAME" << setw(4) << "LOC" );
 	for( uint i=0; i<output.attributes.size(); ++i )
@@ -33,7 +33,7 @@ void ShaderParser::printShaderVars() const
 //=====================================================================================================================================
 // findShaderVar                                                                                                                      =
 //=====================================================================================================================================
-Vec<ShaderParser::ShaderVarPragma>::iterator ShaderParser::findShaderVar( Vec<ShaderVarPragma>& vec, const string& name ) const
+Vec<ShaderPrePreprocessor::ShaderVarPragma>::iterator ShaderPrePreprocessor::findShaderVar( Vec<ShaderVarPragma>& vec, const string& name ) const
 {
 	Vec<ShaderVarPragma>::iterator it = vec.begin();
 	while( it != vec.end() && it->name != name )
@@ -47,7 +47,7 @@ Vec<ShaderParser::ShaderVarPragma>::iterator ShaderParser::findShaderVar( Vec<Sh
 //=====================================================================================================================================
 // parseFileForPragmas                                                                                                                =
 //=====================================================================================================================================
-bool ShaderParser::parseFileForPragmas( const string& filename, int depth )
+bool ShaderPrePreprocessor::parseFileForPragmas( const string& filename, int depth )
 {
 	// first check the depth
 	if( depth > 99 )
@@ -264,7 +264,7 @@ bool ShaderParser::parseFileForPragmas( const string& filename, int depth )
 //=====================================================================================================================================
 // parseFile                                                                                                                          =
 //=====================================================================================================================================
-bool ShaderParser::parseFile( const char* filename )
+bool ShaderPrePreprocessor::parseFile( const char* filename )
 {
 	// parse master file
 	if( !parseFileForPragmas( filename ) ) return false;

src/resources/ShaderParser.h → src/Resources/ShaderPrePreprocessor.h

@@ -7,12 +7,12 @@
 
 /**
  * The class fills some of the GLSL spec deficiencies. It adds the include preprocessor directive and the support to have all the
- * shaders in the same file. The file that includes all the shaders is called ShaderParser-compatible. The preprocessor pragmas are
+ * shaders in the same file. The file that includes all the shaders is called ShaderPrePreprocessor-compatible. The preprocessor pragmas are
  * four: include, vertShaderBegins, fragShaderBegins and attribute. The *ShaderBegins indicate where the shader code begins and must be
  * in certain order, first the vert shader and then the frag. The include is self-explanatory. The attribute is used to bind custom
  * locations to attributes.
  */
-class ShaderParser
+class ShaderPrePreprocessor
 {
 	protected:
 		/**
@@ -45,7 +45,7 @@ class ShaderParser
 	
 		struct CodeBeginningPragma: Pragma
 		{
-			int globalLine; ///< The line number in the ShaderParser-compatible file
+			int globalLine; ///< The line number in the ShaderPrePreprocessor-compatible file
 
 			CodeBeginningPragma(): globalLine(-1) {}
 		};
@@ -78,7 +78,7 @@ class ShaderParser
 		 */
 		struct Output
 		{
-			friend class ShaderParser;
+			friend class ShaderPrePreprocessor;
 
 			private:
 				Vec<ShaderVarPragma> attributes;  ///< It holds the name and the custom location
@@ -94,18 +94,18 @@ class ShaderParser
 		Output output; ///< The output of the parser. parseFile fills it
 
 	public:
-		ShaderParser() {}
-		~ShaderParser() {}
+		ShaderPrePreprocessor() {}
+		~ShaderPrePreprocessor() {}
 
 		/**
-		 * Parse a ShaderParser formated GLSL file. Use getOutput to get the output
+		 * Parse a ShaderPrePreprocessor formated GLSL file. Use getOutput to get the output
 		 * @param fname The file to parse
 		 * @return True on success
 		 */
 		bool parseFile( const char* fname );
 
 		/**
-		 * Wrapper func to get the output. Use it after calling parseFile
+		 * Accessor func to get the output. Use it after calling parseFile
 		 * @return The output
 		 */
 		const Output& getOutput() const { return output; }

src/resources/ShaderProg.cpp → src/Resources/ShaderProg.cpp

@@ -1,6 +1,6 @@
 #include "ShaderProg.h"
 #include "Renderer.h"
-#include "ShaderParser.h"
+#include "ShaderPrePreprocessor.h"
 #include "Texture.h"
 
 
@@ -153,7 +153,7 @@ void ShaderProg::getUniAndAttribVars()
 //=====================================================================================================================================
 // bindCustomAttribLocs                                                                                                               =
 //=====================================================================================================================================
-bool ShaderProg::bindCustomAttribLocs( const ShaderParser& pars ) const
+bool ShaderProg::bindCustomAttribLocs( const ShaderPrePreprocessor& pars ) const
 {
 	for( uint i=0; i<pars.getOutput().getAttribLocs().size(); ++i )
 	{
@@ -194,7 +194,7 @@ bool ShaderProg::customLoad( const char* filename, const char* extraSource )
 		path = Util::getPath( filename );
 	}
 
-	ShaderParser pars;
+	ShaderPrePreprocessor pars;
 
 	if( !pars.parseFile( filename ) ) return false;
 

src/resources/ShaderProg.h → src/Resources/ShaderProg.h

@@ -6,7 +6,7 @@
 #include "Common.h"
 #include "Resource.h"
 
-class ShaderParser;
+class ShaderPrePreprocessor;
 class Texture;
 
 /**
@@ -18,6 +18,8 @@ class ShaderProg: public Resource
 {
 	PROPERTY_R( uint, glId, getGlId )
 	
+	friend class Material;
+
 	private:
 		/**
 		 * Attribute of uniform variable
@@ -49,7 +51,7 @@ class ShaderProg: public Resource
 		typedef map<string,Var*>::const_iterator NameToVarIterator; ///< Variable name to variable iterator
 
 		void getUniAndAttribVars(); ///< After the linking of the shader prog is done gather all the vars in custom containers
-		bool bindCustomAttribLocs( const ShaderParser& pars ) const; ///< Uses glBindAttribLocation for every parser attrib location
+		bool bindCustomAttribLocs( const ShaderPrePreprocessor& pars ) const; ///< Uses glBindAttribLocation for every parser attrib location
 		uint createAndCompileShader( const char* sourceCode, const char* preproc, int type ) const; ///< @return Returns zero on failure
 		bool link(); ///< Link the shader prog
 		

src/resources/SkelAnim.cpp → src/Resources/SkelAnim.cpp

@@ -1,6 +1,6 @@
 #include "SkelAnim.h"
 #include "Scanner.h"
-#include "parser.h"
+#include "Parser.h"
 
 
 //=====================================================================================================================================

src/resources/Skeleton.cpp → src/Resources/Skeleton.cpp

@@ -1,6 +1,6 @@
 #include "Skeleton.h"
 #include "Scanner.h"
-#include "parser.h"
+#include "Parser.h"
 
 
 //=====================================================================================================================================

src/scene/Light.cpp → src/Scene/Light.cpp

@@ -9,7 +9,7 @@
 //=====================================================================================================================================
 void PointLight::init( const char* filename )
 {
-	lightProps = rsrc::lightProps.load( filename );
+	lightProps = Rsrc::lightProps.load( filename );
 	radius = lightProps->getRadius();
 }
 
@@ -19,7 +19,7 @@ void PointLight::init( const char* filename )
 //=====================================================================================================================================
 void SpotLight::init( const char* filename )
 {
-	lightProps = rsrc::lightProps.load( filename );
+	lightProps = Rsrc::lightProps.load( filename );
 	camera.setAll( lightProps->getFovX(), lightProps->getFovY(), 0.2, lightProps->getDistance() );
 	castsShadow = lightProps->castsShadow();
 	if( lightProps->getTexture() == NULL )
@@ -35,7 +35,7 @@ void SpotLight::init( const char* filename )
 //=====================================================================================================================================
 void Light::deinit()
 {
-	rsrc::lightProps.unload( lightProps );
+	Rsrc::lightProps.unload( lightProps );
 }
 
 

src/scene/MeshNode.cpp → src/Scene/MeshNode.cpp

@@ -14,8 +14,8 @@
 //=====================================================================================================================================
 void MeshNode::init( const char* filename )
 {
-	mesh = rsrc::meshes.load( filename );
-	material = rsrc::materials.load( mesh->materialName.c_str() );
+	mesh = Rsrc::meshes.load( filename );
+	material = Rsrc::materials.load( mesh->materialName.c_str() );
 
 	// sanity checks
 	if( material->attribLocs.texCoords != -1 && mesh->vbos.texCoords.getGlId() == 0 )
@@ -30,8 +30,8 @@ void MeshNode::init( const char* filename )
 //=====================================================================================================================================
 void MeshNode::deinit()
 {
-	rsrc::meshes.unload( mesh );
-	rsrc::materials.unload( material );
+	Rsrc::meshes.unload( mesh );
+	Rsrc::materials.unload( material );
 }
 
 

src/scene/SkelModelNode.cpp → src/Scene/SkelModelNode.cpp

@@ -1,5 +1,5 @@
 #include "SkelModelNode.h"
-#include "parser.h"
+#include "Parser.h"
 #include "SkelNode.h"
 #include "MeshSkelNodeCtrl.h"
 

src/scene/SkelNode.cpp → src/Scene/SkelNode.cpp

@@ -20,7 +20,7 @@ SkelNode::SkelNode():
 //=====================================================================================================================================
 void SkelNode::init( const char* filename )
 {
-	skeleton = rsrc::skeletons.load( filename );
+	skeleton = Rsrc::skeletons.load( filename );
 	skelAnimCtrl = new SkelAnimCtrl( this );
 }
 
@@ -30,7 +30,7 @@ void SkelNode::init( const char* filename )
 //=====================================================================================================================================
 void SkelNode::deinit()
 {
-	rsrc::skeletons.unload( skeleton );
+	Rsrc::skeletons.unload( skeleton );
 }
 
 

src/ui/Ui.cpp → src/Ui/Ui.cpp

@@ -159,10 +159,10 @@ non static funcs
 // exec after init SDL
 void init()
 {
-	fontMap = rsrc::textures.load( "gfx/fontmapa.tga" );
+	fontMap = Rsrc::textures.load( "gfx/fontmapa.tga" );
 	fontMap->texParameter( GL_TEXTURE_MIN_FILTER, GL_LINEAR );
 	//font_map->texParameter( GL_TEXTURE_MAG_FILTER, GL_NEAREST );
-	shader = rsrc::shaders.load( "shaders/txt.glsl" );
+	shader = Rsrc::shaders.load( "shaders/txt.glsl" );
 	setPos( 0.0f, 0.0f );
 	setFontWidth( 0.05f );
 	setColor( Vec4(1.0f, 1.0f, 1.0f, 1.0f) );