Integrating Bullet physics. See README of how to build

ToDo.txt

@@ -1 +0,0 @@
-create ui dir, rename hud, put it to ui/

build/README

@@ -1,3 +1,7 @@
+---------------------------------------------------------------------------------------------------------------------------------------
+HOW TO GENERATE MAKEFILES
+---------------------------------------------------------------------------------------------------------------------------------------
+
 There are 4 build targets in this folder. There is also a build system that generates GNU makefiles. If you want to generate the makefile for the debug target (for example) do the following:
 
 cd <path to anki>/build/debug
@@ -9,6 +13,22 @@ make
 
 And the build will will begin. 
 
-Sometimes I forget to to update all the targets. The debug is allways updated though.
+Sometimes I forget to update all the targets. The debug is always updated though.
 
 The gen.cfg.py files contain the build options of every target. Their format is pretty straightforward and minimal.
+
+
+---------------------------------------------------------------------------------------------------------------------------------------
+HOW TO BUILD BULLET PHYSICS
+---------------------------------------------------------------------------------------------------------------------------------------
+
+From now on the AnKi requires the Bullet Physics library. Bullet dev files does not ship with any distribution for now so you have to download it manually and build it. Here is how:
+
+1) Go to the root AnKi path (where src, shaders and blenderscripts are)
+2) cd ..
+3) svn checkout http://bullet.googlecode.com/svn/trunk/ bullet_svn
+4) cd bullet_svn
+5) cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release
+6) make
+
+The above steps build Bullet statically in a certain dir. If you want to change the default dirs prepare to make changes in the gen.cfg.py files

build/debug/Makefile

@@ -2,18 +2,18 @@ CXX = g++
 COMMONFLAGS = 
 CFLAGS = $(COMMONFLAGS) -c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -pipe -O0 -g3 -pg `sdl-config --cflags` -D_DEBUG_ -D_TERMINAL_COLORING__ -D_PLATFORM_LINUX_
 PHFLAGS = $(CFLAGS) -x c++-header
-LFLAGS = $(COMMONFLAGS) -L/usr/lib -L/usr/local/lib -Wl,-rpath,/usr/local/lib,-Bstatic -lSDL -lSDL_image -Wl,-Bdynamic -lGL -lGLU -ljpeg -lGLEW
+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 -lpthread -lGL -ljpeg -lpng -ltiff -lesd -lcaca -laa -ldirectfb -laudio -lpulse-simple
 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//input.cpp ../../src/uncategorized//engine_class.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//renderer.cpp ../../src/renderer//r_is_shadows.cpp ../../src/renderer//r_is.cpp ../../src/renderer//r_ms_earlyz.cpp ../../src/renderer//r_pps.cpp ../../src/renderer//r_bs.cpp ../../src/renderer//r_dbg.cpp ../../src/renderer//r_ms.cpp ../../src/renderer//r_pps_lscatt.cpp ../../src/renderer//r_pps_hdr.cpp ../../src/renderer//r_bs2.cpp ../../src/renderer//r_pps_ssao.cpp ../../src/scene//skel_node.cpp ../../src/scene//skel_model_node.cpp ../../src/scene//camera.cpp ../../src/scene//node.cpp ../../src/scene//mesh_node.cpp ../../src/scene//light.cpp ../../src/scene//scene.cpp ../../src/ui//ui.cpp ../../src/resources//extension.cpp ../../src/resources//shader_prog.cpp ../../src/resources//material.cpp ../../src/resources//mesh.cpp ../../src/resources//skel_anim.cpp ../../src/resources//texture.cpp ../../src/resources//resource.cpp ../../src/resources//skeleton.cpp ../../src/resources//light_props.cpp ../../src/resources//shader_parser.cpp ../../src/utility//app.cpp ../../src/utility//common.cpp ../../src/utility//util.cpp ../../src/controllers//skel_anim_ctrl.cpp ../../src/controllers//controller.cpp 
-OBJECTS = scanner.o input.o engine_class.o collision.o skybox.o map.o memory.o particles.o main.o renderer.o r_is_shadows.o r_is.o r_ms_earlyz.o r_pps.o r_bs.o r_dbg.o r_ms.o r_pps_lscatt.o r_pps_hdr.o r_bs2.o r_pps_ssao.o skel_node.o skel_model_node.o camera.o node.o mesh_node.o light.o scene.o ui.o extension.o shader_prog.o material.o mesh.o skel_anim.o texture.o resource.o skeleton.o light_props.o shader_parser.o app.o common.o util.o skel_anim_ctrl.o controller.o 
+SOURCES = ../../src/tokenizer//scanner.cpp ../../src/uncategorized//input.cpp ../../src/uncategorized//skybox.cpp ../../src/uncategorized//particles.cpp ../../src/uncategorized//memory.cpp ../../src/uncategorized//engine_class.cpp ../../src/uncategorized//collision.cpp ../../src/uncategorized//map.cpp ../../src//main.cpp ../../src/renderer//r_ms.cpp ../../src/renderer//r_pps_hdr.cpp ../../src/renderer//r_pps.cpp ../../src/renderer//r_is_shadows.cpp ../../src/renderer//r_bs.cpp ../../src/renderer//r_ms_earlyz.cpp ../../src/renderer//renderer.cpp ../../src/renderer//r_pps_ssao.cpp ../../src/renderer//r_is.cpp ../../src/renderer//r_dbg.cpp ../../src/renderer//r_pps_lscatt.cpp ../../src/renderer//r_bs2.cpp ../../src/scene//mesh_node.cpp ../../src/scene//skel_node.cpp ../../src/scene//light.cpp ../../src/scene//skel_model_node.cpp ../../src/scene//node.cpp ../../src/scene//camera.cpp ../../src/scene//scene.cpp ../../src/ui//ui.cpp ../../src/resources//material.cpp ../../src/resources//texture.cpp ../../src/resources//skel_anim.cpp ../../src/resources//extension.cpp ../../src/resources//shader_parser.cpp ../../src/resources//skeleton.cpp ../../src/resources//resource.cpp ../../src/resources//light_props.cpp ../../src/resources//mesh.cpp ../../src/resources//shader_prog.cpp ../../src/utility//app.cpp ../../src/utility//common.cpp ../../src/utility//util.cpp ../../src/controllers//controller.cpp ../../src/controllers//skel_anim_ctrl.cpp 
+OBJECTS = scanner.o input.o skybox.o particles.o memory.o engine_class.o collision.o map.o main.o r_ms.o r_pps_hdr.o r_pps.o r_is_shadows.o r_bs.o r_ms_earlyz.o renderer.o r_pps_ssao.o r_is.o r_dbg.o r_pps_lscatt.o r_bs2.o mesh_node.o skel_node.o light.o skel_model_node.o node.o camera.o scene.o ui.o material.o texture.o skel_anim.o extension.o shader_parser.o skeleton.o resource.o light_props.o mesh.o shader_prog.o app.o common.o util.o controller.o skel_anim_ctrl.o 
 PRECOMPILED_HEADERS = 
 
 all: $(PRECOMPILED_HEADERS) $(SOURCES) $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)
 	@echo Linking...
-	$(CXX) $(OBJECTS) $(LFLAGS) -o $(EXECUTABLE)
+	@$(CXX) $(OBJECTS) $(LFLAGS) -o $(EXECUTABLE)
 	@echo All Done!
 
 scanner.o: ../../src/tokenizer//scanner.cpp \
@@ -43,6 +43,39 @@ input.o: ../../src/uncategorized//input.cpp \
 	@echo Compiling ../../src/uncategorized//input.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//input.cpp -o input.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/uncategorized/engine_class.h \
+ ../../src/utility/util.h ../../src/utility/common.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.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/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/resource.h \
+ ../../src/renderer/renderer.h ../../src/resources/shader_prog.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/uncategorized//particles.cpp
+	@echo Compiling ../../src/uncategorized//particles.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//particles.cpp -o particles.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
+
 engine_class.o: ../../src/uncategorized//engine_class.cpp \
  ../../src/uncategorized//engine_class.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h
@@ -69,29 +102,6 @@ collision.o: ../../src/uncategorized//collision.cpp \
 	@echo Compiling ../../src/uncategorized//collision.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//collision.cpp -o collision.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/uncategorized/engine_class.h \
- ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.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/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/resource.h \
- ../../src/renderer/renderer.h ../../src/resources/shader_prog.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
-
 map.o: ../../src/uncategorized//map.cpp ../../src/uncategorized//map.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/uncategorized//collision.h ../../src/math/gmath.h \
@@ -114,16 +124,6 @@ map.o: ../../src/uncategorized//map.cpp ../../src/uncategorized//map.h \
 	@echo Compiling ../../src/uncategorized//map.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//map.cpp -o map.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
-
-particles.o: ../../src/uncategorized//particles.cpp
-	@echo Compiling ../../src/uncategorized//particles.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//particles.cpp -o particles.o
-
 main.o: ../../src//main.cpp ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/uncategorized/input.h \
  ../../src/utility/app.h ../../src/utility/common.h \
@@ -153,11 +153,159 @@ main.o: ../../src//main.cpp ../../src/utility/common.h \
  ../../src/resources/skel_anim.h ../../src/controllers/mesh_skel_ctrl.h \
  ../../src/controllers/controller.h \
  ../../src/controllers/skel_anim_ctrl.h ../../src/scene/skel_node.h \
- ../../src/controllers/controller.h ../../src/resources/light_props.h
+ ../../src/controllers/controller.h ../../src/resources/light_props.h \
+ ../../../bullet_svn/src/btBulletCollisionCommon.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionWorld.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/btVector3.h \
+ ../../../bullet_svn/src/LinearMath/btQuaternion.h \
+ ../../../bullet_svn/src/LinearMath/btQuadWord.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionObject.h \
+ ../../../bullet_svn/src/LinearMath/btMotionState.h \
+ ../../../bullet_svn/src/LinearMath/btTransform.h \
+ ../../../bullet_svn/src/LinearMath/btAlignedAllocator.h \
+ ../../../bullet_svn/src/LinearMath/btAlignedObjectArray.h \
+ ../../../bullet_svn/src/LinearMath/btAlignedAllocator.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btDispatcher.h \
+ ../../../bullet_svn/src/LinearMath/btScalar.h \
+ ../../../bullet_svn/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h \
+ ../../../bullet_svn/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h \
+ ../../../bullet_svn/src/LinearMath/btTransformUtil.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btManifoldResult.h \
+ ../../../bullet_svn/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionObject.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btBoxShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h \
+ ../../../bullet_svn/src/LinearMath/btMatrix3x3.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btConvexInternalShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btConvexShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btCollisionShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btCollisionMargin.h \
+ ../../../bullet_svn/src/LinearMath/btAabbUtil2.h \
+ ../../../bullet_svn/src/LinearMath/btMinMax.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btSphereShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btCapsuleShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btCylinderShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btBoxShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btConeShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btConcaveShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btTriangleCallback.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btConvexHullShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btTriangleMesh.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btOptimizedBvh.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btCompoundShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btTetrahedronShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btEmptyShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btMultiSphereShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionShapes/btUniformScalingShape.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btDbvt.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h \
+ ../../../bullet_svn/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h \
+ ../../../bullet_svn/src/LinearMath/btQuaternion.h \
+ ../../../bullet_svn/src/LinearMath/btTransform.h \
+ ../../../bullet_svn/src/LinearMath/btDefaultMotionState.h \
+ ../../../bullet_svn/src/LinearMath/btMotionState.h \
+ ../../../bullet_svn/src/LinearMath/btQuickprof.h \
+ ../../../bullet_svn/src/LinearMath/btIDebugDraw.h \
+ ../../../bullet_svn/src/LinearMath/btSerializer.h \
+ ../../../bullet_svn/src/LinearMath/btStackAlloc.h \
+ ../../../bullet_svn/src/LinearMath/btHashMap.h \
+ ../../../bullet_svn/src/LinearMath/btAlignedObjectArray.h \
+ ../../../bullet_svn/src/btBulletDynamicsCommon.h \
+ ../../../bullet_svn/src/btBulletCollisionCommon.h \
+ ../../../bullet_svn/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h \
+ ../../../bullet_svn/src/BulletDynamics/Dynamics/btDynamicsWorld.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionWorld.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h \
+ ../../../bullet_svn/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h \
+ ../../../bullet_svn/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h \
+ ../../../bullet_svn/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \
+ ../../../bullet_svn/src/BulletDynamics/Dynamics/btRigidBody.h \
+ ../../../bullet_svn/src/BulletCollision/CollisionDispatch/btCollisionObject.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h \
+ ../../../bullet_svn/src/BulletDynamics/Dynamics/btRigidBody.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btSolverBody.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btContactConstraint.h \
+ ../../../bullet_svn/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h \
+ ../../../bullet_svn/src/BulletDynamics/Vehicle/btRaycastVehicle.h \
+ ../../../bullet_svn/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h \
+ ../../../bullet_svn/src/BulletDynamics/Vehicle/btVehicleRaycaster.h \
+ ../../../bullet_svn/src/BulletDynamics/Vehicle/btWheelInfo.h \
+ ../../../bullet_svn/src/BulletDynamics/Dynamics/btActionInterface.h \
+ ../../../bullet_svn/src/BulletDynamics/Dynamics/btRigidBody.h
 	@echo Compiling ../../src//main.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src//main.cpp -o main.o
 
-renderer.o: ../../src/renderer//renderer.cpp \
+r_ms.o: ../../src/renderer//r_ms.cpp ../../src/renderer//renderer.h \
+ ../../src/utility/common.h ../../src/uncategorized/memory.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.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/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
+ ../../src/resources/resource.h ../../src/uncategorized/engine_class.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//r_private.h ../../src/renderer//fbo.h \
+ ../../src/resources/material.h ../../src/scene/mesh_node.h
+	@echo Compiling ../../src/renderer//r_ms.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_ms.cpp -o r_ms.o
+
+r_pps_hdr.o: ../../src/renderer//r_pps_hdr.cpp \
  ../../src/renderer//renderer.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/math/gmath.h \
  ../../src/math/vec2.h ../../src/math/forward_decls.h \
@@ -173,11 +321,34 @@ renderer.o: ../../src/renderer//renderer.cpp \
  ../../src/resources/resource.h ../../src/uncategorized/engine_class.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/renderer//r_private.h ../../src/utility/app.h
-	@echo Compiling ../../src/renderer//renderer.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//renderer.cpp -o renderer.o
+ ../../src/scene/node.h ../../src/resources/resource.h \
+ ../../src/resources/texture.h ../../src/scene/scene.h \
+ ../../src/uncategorized/skybox.h ../../src/renderer//r_private.h \
+ ../../src/renderer//fbo.h
+	@echo Compiling ../../src/renderer//r_pps_hdr.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps_hdr.cpp -o r_pps_hdr.o
+
+r_pps.o: ../../src/renderer//r_pps.cpp ../../src/renderer//renderer.h \
+ ../../src/utility/common.h ../../src/uncategorized/memory.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.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/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
+ ../../src/resources/resource.h ../../src/uncategorized/engine_class.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//r_private.h \
+ ../../src/renderer//fbo.h
+	@echo Compiling ../../src/renderer//r_pps.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps.cpp -o r_pps.o
 
 r_is_shadows.o: ../../src/renderer//r_is_shadows.cpp \
  ../../src/renderer//renderer.h ../../src/utility/common.h \
@@ -203,7 +374,7 @@ r_is_shadows.o: ../../src/renderer//r_is_shadows.cpp \
 	@echo Compiling ../../src/renderer//r_is_shadows.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_is_shadows.cpp -o r_is_shadows.o
 
-r_is.o: ../../src/renderer//r_is.cpp ../../src/renderer//renderer.h \
+r_bs.o: ../../src/renderer//r_bs.cpp ../../src/renderer//renderer.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
  ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
@@ -222,11 +393,11 @@ r_is.o: ../../src/renderer//r_is.cpp ../../src/renderer//renderer.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//r_private.h \
- ../../src/renderer//fbo.h ../../src/resources/light_props.h
-	@echo Compiling ../../src/renderer//r_is.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_is.cpp -o r_is.o
+ ../../src/renderer//r_private.h ../../src/resources/resource.h \
+ ../../src/renderer//fbo.h ../../src/scene/mesh_node.h \
+ ../../src/resources/material.h
+	@echo Compiling ../../src/renderer//r_bs.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_bs.cpp -o r_bs.o
 
 r_ms_earlyz.o: ../../src/renderer//r_ms_earlyz.cpp \
  ../../src/renderer//renderer.h ../../src/utility/common.h \
@@ -251,12 +422,12 @@ r_ms_earlyz.o: ../../src/renderer//r_ms_earlyz.cpp \
 	@echo Compiling ../../src/renderer//r_ms_earlyz.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_ms_earlyz.cpp -o r_ms_earlyz.o
 
-r_pps.o: ../../src/renderer//r_pps.cpp ../../src/renderer//renderer.h \
- ../../src/utility/common.h ../../src/uncategorized/memory.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+renderer.o: ../../src/renderer//renderer.cpp \
+ ../../src/renderer//renderer.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/math/gmath.h \
+ ../../src/math/vec2.h ../../src/math/forward_decls.h \
+ ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.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 \
@@ -267,18 +438,18 @@ r_pps.o: ../../src/renderer//r_pps.cpp ../../src/renderer//renderer.h \
  ../../src/resources/resource.h ../../src/uncategorized/engine_class.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//r_private.h \
- ../../src/renderer//fbo.h
-	@echo Compiling ../../src/renderer//r_pps.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps.cpp -o r_pps.o
+ ../../src/scene/node.h ../../src/resources/texture.h \
+ ../../src/scene/scene.h ../../src/uncategorized/skybox.h \
+ ../../src/renderer//r_private.h ../../src/utility/app.h
+	@echo Compiling ../../src/renderer//renderer.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//renderer.cpp -o renderer.o
 
-r_bs.o: ../../src/renderer//r_bs.cpp ../../src/renderer//renderer.h \
- ../../src/utility/common.h ../../src/uncategorized/memory.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+r_pps_ssao.o: ../../src/renderer//r_pps_ssao.cpp \
+ ../../src/renderer//renderer.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/math/gmath.h \
+ ../../src/math/vec2.h ../../src/math/forward_decls.h \
+ ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.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 \
@@ -289,16 +460,14 @@ r_bs.o: ../../src/renderer//r_bs.cpp ../../src/renderer//renderer.h \
  ../../src/resources/resource.h ../../src/uncategorized/engine_class.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//r_private.h ../../src/resources/resource.h \
- ../../src/renderer//fbo.h ../../src/scene/mesh_node.h \
- ../../src/resources/material.h
-	@echo Compiling ../../src/renderer//r_bs.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_bs.cpp -o r_bs.o
+ ../../src/scene/node.h ../../src/resources/resource.h \
+ ../../src/resources/texture.h ../../src/scene/scene.h \
+ ../../src/uncategorized/skybox.h ../../src/renderer//r_private.h \
+ ../../src/renderer//fbo.h
+	@echo Compiling ../../src/renderer//r_pps_ssao.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps_ssao.cpp -o r_pps_ssao.o
 
-r_dbg.o: ../../src/renderer//r_dbg.cpp ../../src/renderer//renderer.h \
+r_is.o: ../../src/renderer//r_is.cpp ../../src/renderer//renderer.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
  ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
@@ -314,15 +483,16 @@ r_dbg.o: ../../src/renderer//r_dbg.cpp ../../src/renderer//renderer.h \
  ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
  ../../src/utility/util.h ../../src/utility/common.h \
  ../../src/scene/camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/node.h ../../src/renderer//r_private.h \
- ../../src/renderer//fbo.h ../../src/scene/scene.h \
+ ../../src/scene/node.h ../../src/scene/scene.h \
  ../../src/uncategorized/skybox.h ../../src/resources/texture.h \
- ../../src/scene/node.h ../../src/scene/skel_node.h \
- ../../src/controllers/controller.h
-	@echo Compiling ../../src/renderer//r_dbg.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_dbg.cpp -o r_dbg.o
+ ../../src/resources/mesh.h ../../src/renderer/vbo.h \
+ ../../src/scene/light.h ../../src/scene/camera.h \
+ ../../src/resources/resource.h ../../src/renderer//r_private.h \
+ ../../src/renderer//fbo.h ../../src/resources/light_props.h
+	@echo Compiling ../../src/renderer//r_is.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_is.cpp -o r_is.o
 
-r_ms.o: ../../src/renderer//r_ms.cpp ../../src/renderer//renderer.h \
+r_dbg.o: ../../src/renderer//r_dbg.cpp ../../src/renderer//renderer.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
  ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
@@ -338,13 +508,13 @@ r_ms.o: ../../src/renderer//r_ms.cpp ../../src/renderer//renderer.h \
  ../../src/resources/resource.h ../../src/uncategorized/engine_class.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/scene/node.h ../../src/renderer//r_private.h \
+ ../../src/renderer//fbo.h ../../src/scene/scene.h \
  ../../src/uncategorized/skybox.h ../../src/resources/texture.h \
- ../../src/resources/mesh.h ../../src/renderer/vbo.h \
- ../../src/renderer//r_private.h ../../src/renderer//fbo.h \
- ../../src/resources/material.h ../../src/scene/mesh_node.h
-	@echo Compiling ../../src/renderer//r_ms.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_ms.cpp -o r_ms.o
+ ../../src/scene/node.h ../../src/scene/skel_node.h \
+ ../../src/controllers/controller.h
+	@echo Compiling ../../src/renderer//r_dbg.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_dbg.cpp -o r_dbg.o
 
 r_pps_lscatt.o: ../../src/renderer//r_pps_lscatt.cpp \
  ../../src/renderer//renderer.h ../../src/utility/common.h \
@@ -369,29 +539,6 @@ r_pps_lscatt.o: ../../src/renderer//r_pps_lscatt.cpp \
 	@echo Compiling ../../src/renderer//r_pps_lscatt.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps_lscatt.cpp -o r_pps_lscatt.o
 
-r_pps_hdr.o: ../../src/renderer//r_pps_hdr.cpp \
- ../../src/renderer//renderer.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/math/gmath.h \
- ../../src/math/vec2.h ../../src/math/forward_decls.h \
- ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.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/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
- ../../src/resources/resource.h ../../src/uncategorized/engine_class.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//r_private.h \
- ../../src/renderer//fbo.h
-	@echo Compiling ../../src/renderer//r_pps_hdr.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps_hdr.cpp -o r_pps_hdr.o
-
 r_bs2.o: ../../src/renderer//r_bs2.cpp ../../src/renderer//renderer.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
@@ -417,28 +564,31 @@ r_bs2.o: ../../src/renderer//r_bs2.cpp ../../src/renderer//renderer.h \
 	@echo Compiling ../../src/renderer//r_bs2.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_bs2.cpp -o r_bs2.o
 
-r_pps_ssao.o: ../../src/renderer//r_pps_ssao.cpp \
- ../../src/renderer//renderer.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/math/gmath.h \
- ../../src/math/vec2.h ../../src/math/forward_decls.h \
- ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.h \
- ../../src/math/vec3.h ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+mesh_node.o: ../../src/scene//mesh_node.cpp ../../src/scene//mesh_node.h \
+ ../../src/utility/common.h ../../src/uncategorized/memory.h \
+ ../../src/scene//node.h ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.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/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/material.h \
  ../../src/resources/resource.h ../../src/uncategorized/engine_class.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//r_private.h \
- ../../src/renderer//fbo.h
-	@echo Compiling ../../src/renderer//r_pps_ssao.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps_ssao.cpp -o r_pps_ssao.o
+ ../../src/resources/resource.h ../../src/resources/mesh.h \
+ ../../src/renderer/vbo.h ../../src/uncategorized/collision.h \
+ ../../src/renderer/renderer.h ../../src/resources/shader_prog.h \
+ ../../src/scene/camera.h ../../src/scene/node.h \
+ ../../src/scene//skel_node.h ../../src/controllers/controller.h \
+ ../../src/resources/skeleton.h ../../src/controllers/mesh_skel_ctrl.h \
+ ../../src/controllers/controller.h \
+ ../../src/controllers/skel_anim_ctrl.h
+	@echo Compiling ../../src/scene//mesh_node.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//mesh_node.cpp -o mesh_node.o
 
 skel_node.o: ../../src/scene//skel_node.cpp ../../src/scene//skel_node.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
@@ -463,6 +613,28 @@ skel_node.o: ../../src/scene//skel_node.cpp ../../src/scene//skel_node.h \
 	@echo Compiling ../../src/scene//skel_node.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//skel_node.cpp -o skel_node.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/uncategorized/engine_class.h ../../src/utility/util.h \
+ ../../src/utility/common.h ../../src/scene//node.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.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/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/scene//camera.h \
+ ../../src/uncategorized/collision.h ../../src/renderer/renderer.h \
+ ../../src/resources/shader_prog.h ../../src/scene/camera.h \
+ ../../src/resources/light_props.h
+	@echo Compiling ../../src/scene//light.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//light.cpp -o light.o
+
 skel_model_node.o: ../../src/scene//skel_model_node.cpp \
  ../../src/scene//skel_model_node.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/scene//mesh_node.h \
@@ -486,26 +658,6 @@ skel_model_node.o: ../../src/scene//skel_model_node.cpp \
 	@echo Compiling ../../src/scene//skel_model_node.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//skel_model_node.cpp -o skel_model_node.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/gmath.h \
- ../../src/math/vec2.h ../../src/math/forward_decls.h \
- ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.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/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/scene//node.h \
- ../../src/renderer/renderer.h ../../src/resources/shader_prog.h \
- ../../src/resources/resource.h ../../src/uncategorized/engine_class.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
-
 node.o: ../../src/scene//node.cpp ../../src/scene//node.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
@@ -527,53 +679,25 @@ node.o: ../../src/scene//node.cpp ../../src/scene//node.h \
 	@echo Compiling ../../src/scene//node.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//node.cpp -o node.o
 
-mesh_node.o: ../../src/scene//mesh_node.cpp ../../src/scene//mesh_node.h \
+camera.o: ../../src/scene//camera.cpp ../../src/scene//camera.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
- ../../src/scene//node.h ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/uncategorized/collision.h ../../src/math/gmath.h \
+ ../../src/math/vec2.h ../../src/math/forward_decls.h \
+ ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.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/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/material.h \
+ ../../src/math/m_misc.inl.h ../../src/scene//node.h \
+ ../../src/renderer/renderer.h ../../src/resources/shader_prog.h \
  ../../src/resources/resource.h ../../src/uncategorized/engine_class.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/shader_prog.h \
- ../../src/scene/camera.h ../../src/scene/node.h \
- ../../src/scene//skel_node.h ../../src/controllers/controller.h \
- ../../src/resources/skeleton.h ../../src/controllers/mesh_skel_ctrl.h \
- ../../src/controllers/controller.h \
- ../../src/controllers/skel_anim_ctrl.h
-	@echo Compiling ../../src/scene//mesh_node.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//mesh_node.cpp -o mesh_node.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/uncategorized/engine_class.h ../../src/utility/util.h \
- ../../src/utility/common.h ../../src/scene//node.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.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/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/scene//camera.h \
- ../../src/uncategorized/collision.h ../../src/renderer/renderer.h \
- ../../src/resources/shader_prog.h ../../src/scene/camera.h \
- ../../src/resources/light_props.h
-	@echo Compiling ../../src/scene//light.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//light.cpp -o light.o
+ ../../src/scene/camera.h
+	@echo Compiling ../../src/scene//camera.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//camera.cpp -o camera.o
 
 scene.o: ../../src/scene//scene.cpp ../../src/scene//scene.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
@@ -619,36 +743,6 @@ ui.o: ../../src/ui//ui.cpp ../../src/ui//ui.h ../../src/utility/common.h \
 	@echo Compiling ../../src/ui//ui.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/ui//ui.cpp -o ui.o
 
-extension.o: ../../src/resources//extension.cpp \
- ../../src/resources//extension.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/resources//resource.h \
- ../../src/uncategorized/engine_class.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
-
-shader_prog.o: ../../src/resources//shader_prog.cpp \
- ../../src/resources//shader_prog.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/resources//resource.h \
- ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
- ../../src/utility/common.h ../../src/renderer/renderer.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.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/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
- ../../src/scene/camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/node.h ../../src/resources//shader_parser.h \
- ../../src/resources//texture.h
-	@echo Compiling ../../src/resources//shader_prog.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//shader_prog.cpp -o shader_prog.o
-
 material.o: ../../src/resources//material.cpp \
  ../../src/resources//material.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/math/gmath.h \
@@ -672,8 +766,11 @@ material.o: ../../src/resources//material.cpp \
 	@echo Compiling ../../src/resources//material.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//material.cpp -o material.o
 
-mesh.o: ../../src/resources//mesh.cpp ../../src/resources//mesh.h \
- ../../src/utility/common.h ../../src/uncategorized/memory.h \
+texture.o: ../../src/resources//texture.cpp \
+ ../../src/resources//texture.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/resources//resource.h \
+ ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
+ ../../src/utility/common.h ../../src/renderer/renderer.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
  ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
  ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
@@ -684,16 +781,11 @@ mesh.o: ../../src/resources//mesh.cpp ../../src/resources//mesh.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/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/renderer/vbo.h \
- ../../src/resources//resource.h ../../src/uncategorized/engine_class.h \
- ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/uncategorized/collision.h ../../src/renderer/renderer.h \
- ../../src/resources/shader_prog.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
+ ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.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
 
 skel_anim.o: ../../src/resources//skel_anim.cpp \
  ../../src/resources//skel_anim.h ../../src/utility/common.h \
@@ -714,26 +806,40 @@ skel_anim.o: ../../src/resources//skel_anim.cpp \
 	@echo Compiling ../../src/resources//skel_anim.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//skel_anim.cpp -o skel_anim.o
 
-texture.o: ../../src/resources//texture.cpp \
- ../../src/resources//texture.h ../../src/utility/common.h \
+extension.o: ../../src/resources//extension.cpp \
+ ../../src/resources//extension.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/resources//resource.h \
  ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
- ../../src/utility/common.h ../../src/renderer/renderer.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/utility/common.h
+	@echo Compiling ../../src/resources//extension.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//extension.cpp -o extension.o
+
+shader_parser.o: ../../src/resources//shader_parser.cpp \
+ ../../src/resources//shader_parser.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//shader_parser.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//shader_parser.cpp -o shader_parser.o
+
+skeleton.o: ../../src/resources//skeleton.cpp \
+ ../../src/resources//skeleton.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/math/gmath.h \
+ ../../src/math/vec2.h ../../src/math/forward_decls.h \
+ ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.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/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.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
+ ../../src/math/m_misc.inl.h ../../src/resources//resource.h \
+ ../../src/uncategorized/engine_class.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
 
 resource.o: ../../src/resources//resource.cpp \
  ../../src/resources//resource.h ../../src/utility/common.h \
@@ -757,25 +863,6 @@ resource.o: ../../src/resources//resource.cpp \
 	@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/gmath.h \
- ../../src/math/vec2.h ../../src/math/forward_decls.h \
- ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.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/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources//resource.h \
- ../../src/uncategorized/engine_class.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
-
 light_props.o: ../../src/resources//light_props.cpp \
  ../../src/resources//light_props.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/resources//resource.h \
@@ -795,13 +882,50 @@ light_props.o: ../../src/resources//light_props.cpp \
 	@echo Compiling ../../src/resources//light_props.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//light_props.cpp -o light_props.o
 
-shader_parser.o: ../../src/resources//shader_parser.cpp \
- ../../src/resources//shader_parser.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//shader_parser.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//shader_parser.cpp -o shader_parser.o
+mesh.o: ../../src/resources//mesh.cpp ../../src/resources//mesh.h \
+ ../../src/utility/common.h ../../src/uncategorized/memory.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.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/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/renderer/vbo.h \
+ ../../src/resources//resource.h ../../src/uncategorized/engine_class.h \
+ ../../src/utility/util.h ../../src/utility/common.h \
+ ../../src/uncategorized/collision.h ../../src/renderer/renderer.h \
+ ../../src/resources/shader_prog.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
+
+shader_prog.o: ../../src/resources//shader_prog.cpp \
+ ../../src/resources//shader_prog.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/resources//resource.h \
+ ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
+ ../../src/utility/common.h ../../src/renderer/renderer.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.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/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
+ ../../src/scene/camera.h ../../src/uncategorized/collision.h \
+ ../../src/scene/node.h ../../src/resources//shader_parser.h \
+ ../../src/resources//texture.h
+	@echo Compiling ../../src/resources//shader_prog.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//shader_prog.cpp -o shader_prog.o
 
 app.o: ../../src/utility//app.cpp ../../src/utility//app.h \
  ../../src/utility//common.h ../../src/uncategorized/memory.h \
@@ -820,6 +944,26 @@ util.o: ../../src/utility//util.cpp ../../src/utility//util.h \
 	@echo Compiling ../../src/utility//util.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/utility//util.cpp -o util.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/uncategorized/engine_class.h \
+ ../../src/utility/util.h ../../src/utility/common.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.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/m_misc.h \
+ ../../src/math/m_misc.inl.h
+	@echo Compiling ../../src/controllers//controller.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/controllers//controller.cpp -o controller.o
+
 skel_anim_ctrl.o: ../../src/controllers//skel_anim_ctrl.cpp \
  ../../src/controllers//skel_anim_ctrl.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/controllers//controller.h \
@@ -843,26 +987,6 @@ skel_anim_ctrl.o: ../../src/controllers//skel_anim_ctrl.cpp \
 	@echo Compiling ../../src/controllers//skel_anim_ctrl.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/controllers//skel_anim_ctrl.cpp -o skel_anim_ctrl.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/uncategorized/engine_class.h \
- ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.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/m_misc.h \
- ../../src/math/m_misc.inl.h
-	@echo Compiling ../../src/controllers//controller.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/controllers//controller.cpp -o controller.o
-
 clean:
 	rm -f *.o
 	rm -f *.gch

build/debug/gen.cfg.py

@@ -1,8 +1,7 @@
 source_paths = [ "../../src/math/", "../../src/tokenizer/", "../../src/uncategorized/", "../../src/", "../../src/renderer/", "../../src/scene/", "../../src/ui/", "../../src/resources/", "../../src/utility/", "../../src/controllers/" ]
 
 include_paths = list(source_paths)
-#include_paths.extend( ["../../../bullet_svn/src/BulletDynamics", "../../../bullet_svn/src/BulletDynamics/ibmsdk", "../../../bullet_svn/src/BulletDynamics/Character", "../../../bullet_svn/src/BulletDynamics/Vehicle", "../../../bullet_svn/src/BulletDynamics/Dynamics", "../../../bullet_svn/src/BulletDynamics/ConstraintSolver", "../../../bullet_svn/src/ibmsdk", "../../../bullet_svn/src/BulletCollision", "../../../bullet_svn/src/BulletCollision/ibmsdk", "../../../bullet_svn/src/BulletCollision/NarrowPhaseCollision", "../../../bullet_svn/src/BulletCollision/Gimpact", "../../../bullet_svn/src/BulletCollision/BroadphaseCollision", "../../../bullet_svn/src/BulletCollision/CollisionShapes", "../../../bullet_svn/src/BulletCollision/CollisionDispatch", "../../../bullet_svn/src/BulletMultiThreaded", "../../../bullet_svn/src/BulletMultiThreaded/SpuSampleTask", "../../../bullet_svn/src/BulletMultiThreaded/MiniCLTask", "../../../bullet_svn/src/BulletMultiThreaded/out", "../../../bullet_svn/src/BulletMultiThreaded/vectormath", "../../../bullet_svn/src/BulletMultiThreaded/vectormath/scalar", "../../../bullet_svn/src/BulletMultiThreaded/vectormath/scalar/cpp", "../../../bullet_svn/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask", "../../../bullet_svn/src/LinearMath", "../../../bullet_svn/src/LinearMath/ibmsdk", "../../../bullet_svn/src/BulletSoftBody", "../../../bullet_svn/src/MiniCL"] )
-include_paths.extend( [ "../../../bullet_svn/src/" ] )
+include_paths.extend( [ "../../../bullet_svn/src/" ] ) # the bullet svn path
 
 precompiled_headers = []
 executable_name = "AnKi.bin"
@@ -10,6 +9,4 @@ compiler = "g++"
 common_flags = ""
 compiler_flags = "-c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -pipe -O0 -g3 -pg `sdl-config --cflags` -D_DEBUG_ -D_TERMINAL_COLORING__ -D_PLATFORM_LINUX_"
 precompiled_headers_flags = "-x c++-header"
-#linker_flags = "-L../../../bullet_svn/src/BulletSoftBody -L../../../bullet_svn/src/BulletDynamics -L../../../bullet_svn/src/BulletCollision -L../../../bullet_svn/src/LinearMath -L/usr/lib -L/usr/local/lib -Wl,-rpath,/usr/local/lib,-Bstatic -lSDL -lSDL_image -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -Wl,-Bdynamic -lGL -lGLU -ljpeg -lGLEW"
-linker_flags = "-L/usr/lib -L/usr/local/lib -Wl,-rpath,/usr/local/lib,-Bstatic -lSDL -lSDL_image -Wl,-Bdynamic -lGL -lGLU -ljpeg -lGLEW"
-#linker_flags = "-rdynamic -static-libgcc -static-stdc++ -Bdynamic -lGL -lGLU -ljpeg -lGLEW -Bstatic `sdl-config --static-libs` -lSDL_image"
+linker_flags = "-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 -lpthread -lGL -ljpeg -lpng -ltiff -lesd -lcaca -laa -ldirectfb -laudio -lpulse-simple" # a few libs are now static

build/genmakefile.py

@@ -176,7 +176,7 @@ master_str += "all: $(PRECOMPILED_HEADERS) $(SOURCES) $(EXECUTABLE)\n\n"
 
 master_str += "$(EXECUTABLE): $(OBJECTS)\n"
 master_str += "\t@echo Linking...\n"
-master_str += "\t$(CXX) $(OBJECTS) $(LFLAGS) -o $(EXECUTABLE)\n"
+master_str += "\t@$(CXX) $(OBJECTS) $(LFLAGS) -o $(EXECUTABLE)\n"
 master_str += "\t@echo All Done!\n\n"
 
 

src/main.cpp

@@ -29,8 +29,8 @@
 #include "skel_anim_ctrl.h"
 #include "skel_node.h"
 #include "light_props.h"
-//#include "btBulletCollisionCommon.h"
-//#include "btBulletDynamicsCommon.h"
+#include "btBulletCollisionCommon.h"
+#include "btBulletDynamicsCommon.h"
 
 
 // map (hard coded)
@@ -56,13 +56,12 @@ class floor_t: public camera_t
 
 
 // Physics
-//btDefaultCollisionConfiguration* collisionConfiguration;
-
+btDefaultCollisionConfiguration* collisionConfiguration;
 
 
 void initPhysics()
 {
-	//collisionConfiguration = new btDefaultCollisionConfiguration();
+	collisionConfiguration = new btDefaultCollisionConfiguration();
 }
 
 

src/renderer/r_ms.cpp

@@ -39,14 +39,17 @@ void Init()
 	// inform in what buffers we draw
 	fbo.SetNumOfColorAttachements(3);
 
-	// create buffers
+	// create the FAIs
 	const int internal_format = GL_RGBA16F_ARB;
-	normal_fai.CreateEmpty2D( r::w, r::h, internal_format, GL_RGBA );
-	diffuse_fai.CreateEmpty2D( r::w, r::h, internal_format, GL_RGBA );
-	specular_fai.CreateEmpty2D( r::w, r::h, internal_format, GL_RGBA );
+	if( !normal_fai.CreateEmpty2D( r::w, r::h, internal_format, GL_RGBA ) ||
+	    !diffuse_fai.CreateEmpty2D( r::w, r::h, internal_format, GL_RGBA ) ||
+	    !specular_fai.CreateEmpty2D( r::w, r::h, internal_format, GL_RGBA ) ||
+	    !depth_fai.CreateEmpty2D( r::w, r::h, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT ) )
+	{
+		FATAL( "See prev error" );
+	}
 
-	//depth_fai.CreateEmpty2D( r::w * r::rendering_quality, r::h * r::rendering_quality, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT );
-	depth_fai.CreateEmpty2D( r::w, r::h, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT );
+	
 	// you could use the above for SSAO but the difference is very little.
 	//depth_fai.TexParameter( GL_TEXTURE_MAG_FILTER, GL_LINEAR );
 	//depth_fai.TexParameter( GL_TEXTURE_MIN_FILTER, GL_LINEAR );