- Refactoring

- Compiling with LLVM

build/debug/Makefile

@@ -244,7 +244,7 @@ Main.o: ../../src/Main.cpp ../../src/Input/Input.h \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Scene/VisibilityTester.h ../../src/Util/Scanner/Scanner.h \
@@ -255,14 +255,14 @@ Main.o: ../../src/Main.cpp ../../src/Input/Input.h \
  ../../src/Misc/Parser.h ../../src/Scene/ParticleEmitter.h \
  ../../src/Scene/SceneNode.h ../../src/Scene/GhostNode.h \
  ../../src/Resources/ParticleEmitterProps.h \
- ../../src/Physics/PhysCharacter.h \
+ ../../src/Physics/PhysRigidBody.h ../../src/Physics/PhysCharacter.h \
  ../../src/Physics/PhysMasterContainer.h \
  ../../src/Renderer/RendererInitializer.h \
  ../../src/Renderer/MainRenderer.h ../../src/Renderer/Renderer.h \
- ../../src/Physics/PhysRigidBody.h ../../src/Scripting/ScriptingEngine.h \
- ../../src/Core/StdinListener.h ../../src/Scene/ModelNode.h \
- ../../src/Scene/ModelPatchNode.h ../../src/Scene/PatchNode.h \
- ../../src/Resources/Model/ModelPatch.h ../../src/Scene/RenderableNode.h \
+ ../../src/Scripting/ScriptingEngine.h ../../src/Core/StdinListener.h \
+ ../../src/Scene/ModelNode.h ../../src/Scene/ModelPatchNode.h \
+ ../../src/Scene/PatchNode.h ../../src/Resources/Model/ModelPatch.h \
+ ../../src/Scene/RenderableNode.h \
  ../../src/Scene/MaterialRuntime/MaterialRuntime.h \
  ../../src/Scene/MaterialRuntime/MaterialRuntimeUserDefinedVar.h \
  ../../src/Scene/Controllers/SkelAnimModelNodeCtrl.h \
@@ -507,7 +507,7 @@ skybox.o: ../../src/Misc/skybox.cpp ../../src/Misc/skybox.h \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Scene/VisibilityTester.h ../../src/Core/App.h \
@@ -1327,7 +1327,7 @@ Scene.bpi.o: ../../src/Scripting/Scene/Scene.bpi.cpp \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h ../../src/Math/Math.h \
+ ../../src/Physics/PhysConvertors.h ../../src/Math/Math.h \
  ../../src/Math/Vec2.h ../../src/Math/MathCommon.h \
  ../../src/Util/StdTypes.h ../../src/Util/Accessors.h \
  ../../src/Math/Vec2.inl.h ../../src/Math/MathCommon.inl.h \
@@ -2102,7 +2102,7 @@ Globals.bpi.o: ../../src/Scripting/Core/Globals.bpi.cpp \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Scene/VisibilityTester.h ../../src/Core/App.h \
@@ -2574,17 +2574,17 @@ Dbg.o: ../../src/Renderer/Dbg.cpp ../../src/Renderer/Dbg.h \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Scene/VisibilityTester.h ../../src/Scene/Lights/Light.h \
  ../../src/Resources/LightRsrc.h ../../src/Renderer/RendererInitializer.h \
  ../../src/Scene/ParticleEmitter.h ../../src/Scene/SceneNode.h \
  ../../src/Scene/GhostNode.h ../../src/Resources/ParticleEmitterProps.h \
- ../../src/Scene/RenderableNode.h ../../src/Scene/SkinNode.h \
- ../../src/Scene/SkinPatchNode.h ../../src/Scene/PatchNode.h \
- ../../src/Resources/Mesh/Mesh.h ../../src/Resources/Model/ModelPatch.h \
- ../../src/Scene/RenderableNode.h \
+ ../../src/Physics/PhysRigidBody.h ../../src/Scene/RenderableNode.h \
+ ../../src/Scene/SkinNode.h ../../src/Scene/SkinPatchNode.h \
+ ../../src/Scene/PatchNode.h ../../src/Resources/Mesh/Mesh.h \
+ ../../src/Resources/Model/ModelPatch.h ../../src/Scene/RenderableNode.h \
  ../../src/Scene/MaterialRuntime/MaterialRuntime.h \
  ../../src/Scene/MaterialRuntime/MaterialRuntimeUserDefinedVar.h \
  ../../src/Resources/Material/Material.h \
@@ -3093,7 +3093,7 @@ Bs.o: ../../src/Renderer/Bs.cpp ../../src/Renderer/Bs.h \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Scene/VisibilityTester.h ../../src/Resources/Model/Model.h \
@@ -3514,7 +3514,7 @@ Sm.o: ../../src/Renderer/Sm.cpp ../../src/Renderer/Sm.h \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Scene/VisibilityTester.h ../../src/Resources/LightRsrc.h \
@@ -3742,7 +3742,7 @@ Ez.o: ../../src/Renderer/Ez.cpp ../../src/Renderer/Ez.h \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Scene/VisibilityTester.h \
@@ -3970,7 +3970,7 @@ Is.o: ../../src/Renderer/Is.cpp ../../src/Renderer/Is.h \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Scene/VisibilityTester.h
@@ -4518,8 +4518,7 @@ PhyDbgDrawer.o: ../../src/Renderer/Drawers/PhyDbgDrawer.cpp \
  ../../src/Renderer/Drawers/SceneDrawer.h \
  ../../src/Resources/Material/MtlUserDefinedVar.h \
  ../../src/Resources/ShaderProg/SProgUniVar.h \
- ../../src/Renderer/SkinsDeformer.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Renderer/SkinsDeformer.h ../../src/Physics/PhysConvertors.h \
  ../../extern/include/bullet/btBulletCollisionCommon.h \
  ../../extern/include/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h \
  ../../extern/include/bullet/LinearMath/btVector3.h \
@@ -4815,10 +4814,47 @@ SceneDbgDrawer.o: ../../src/Renderer/Drawers/SceneDbgDrawer.cpp \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../extern/include/bullet/LinearMath/btSerializer.h \
  ../../src/Scene/SceneNode.h ../../src/Scene/GhostNode.h \
- ../../src/Resources/ParticleEmitterProps.h ../../src/Scene/SkinNode.h \
- ../../src/Scene/SkinPatchNode.h ../../src/Scene/PatchNode.h \
- ../../src/Resources/Mesh/Mesh.h ../../src/Resources/Model/ModelPatch.h \
- ../../src/Scene/RenderableNode.h \
+ ../../src/Resources/ParticleEmitterProps.h \
+ ../../src/Physics/PhysRigidBody.h \
+ ../../extern/include/bullet/btBulletDynamicsCommon.h \
+ ../../extern/include/bullet/btBulletCollisionCommon.h \
+ ../../extern/include/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h \
+ ../../extern/include/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h \
+ ../../extern/include/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h \
+ ../../extern/include/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h \
+ ../../extern/include/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h \
+ ../../extern/include/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \
+ ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
+ ../../extern/include/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h \
+ ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h \
+ ../../extern/include/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h \
+ ../../extern/include/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h \
+ ../../extern/include/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h \
+ ../../extern/include/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h \
+ ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
+ ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
+ ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
+ ../../src/Scene/SkinNode.h ../../src/Scene/SkinPatchNode.h \
+ ../../src/Scene/PatchNode.h ../../src/Resources/Mesh/Mesh.h \
+ ../../src/Resources/Model/ModelPatch.h ../../src/Scene/RenderableNode.h \
  ../../src/Scene/MaterialRuntime/MaterialRuntime.h \
  ../../src/Scene/MaterialRuntime/MaterialRuntimeUserDefinedVar.h \
  ../../src/Resources/Material/MtlUserDefinedVar.h \
@@ -5054,7 +5090,7 @@ SceneDrawer.o: ../../src/Renderer/Drawers/SceneDrawer.cpp \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Scene/VisibilityTester.h \
@@ -5370,7 +5406,7 @@ ParticleEmitter.o: ../../src/Scene/ParticleEmitter.cpp \
  ../../src/Resources/ShaderProg/SProgUniVar.h \
  ../../src/Renderer/SkinsDeformer.h ../../src/Core/App.h \
  ../../src/Scene/Scene.h ../../src/Physics/PhysMasterContainer.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Scene/VisibilityTester.h ../../src/Util/Util.h \
@@ -5686,7 +5722,7 @@ SceneNode.o: ../../src/Scene/SceneNode.cpp ../../src/Scene/SceneNode.h \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Util/Singleton.h ../../src/Scene/VisibilityTester.h \
@@ -5823,7 +5859,7 @@ Scene.o: ../../src/Scene/Scene.cpp ../../src/Util/Exception.h \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h ../../src/Math/Math.h \
+ ../../src/Physics/PhysConvertors.h ../../src/Math/Math.h \
  ../../src/Math/Vec2.h ../../src/Math/MathCommon.h \
  ../../src/Util/StdTypes.h ../../src/Util/Accessors.h \
  ../../src/Math/Vec2.inl.h ../../src/Math/MathCommon.inl.h \
@@ -5904,9 +5940,10 @@ Scene.o: ../../src/Scene/Scene.cpp ../../src/Util/Exception.h \
  ../../src/Resources/ShaderProg/SProgUniVar.h \
  ../../src/Scene/ParticleEmitter.h ../../src/Scene/SceneNode.h \
  ../../src/Scene/GhostNode.h ../../src/Resources/ParticleEmitterProps.h \
- ../../src/Scene/ModelNode.h ../../src/Scene/ModelPatchNode.h \
- ../../src/Scene/PatchNode.h ../../src/GfxApi/BufferObjects/Vao.h \
- ../../src/Misc/GlException.h ../../src/GfxApi/BufferObjects/Vbo.h \
+ ../../src/Physics/PhysRigidBody.h ../../src/Scene/ModelNode.h \
+ ../../src/Scene/ModelPatchNode.h ../../src/Scene/PatchNode.h \
+ ../../src/GfxApi/BufferObjects/Vao.h ../../src/Misc/GlException.h \
+ ../../src/GfxApi/BufferObjects/Vbo.h \
  ../../src/GfxApi/BufferObjects/BufferObject.h \
  ../../src/Resources/Mesh/Mesh.h ../../src/Resources/Model/ModelPatch.h \
  ../../src/Scene/RenderableNode.h \
@@ -6224,7 +6261,7 @@ VisibilityTester.o: ../../src/Scene/VisibilityTester.cpp \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Util/Vec.h ../../src/Util/Assert.h ../../src/Util/Singleton.h \
@@ -6657,7 +6694,7 @@ Controller.o: ../../src/Scene/Controllers/Controller.cpp \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h ../../src/Math/Math.h \
+ ../../src/Physics/PhysConvertors.h ../../src/Math/Math.h \
  ../../src/Math/Vec2.h ../../src/Math/MathCommon.h \
  ../../src/Util/StdTypes.h ../../src/Util/Accessors.h \
  ../../src/Math/Vec2.inl.h ../../src/Math/MathCommon.inl.h \
@@ -7105,7 +7142,7 @@ EventSceneColor.o: ../../src/Events/EventSceneColor.cpp \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Util/Vec.h ../../src/Util/Assert.h ../../src/Util/Singleton.h \
@@ -8537,7 +8574,7 @@ PhysMasterContainer.o: ../../src/Physics/PhysMasterContainer.cpp \
  ../../extern/include/bullet/BulletDynamics/Vehicle/btWheelInfo.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btActionInterface.h \
  ../../extern/include/bullet/BulletDynamics/Dynamics/btRigidBody.h \
- ../../src/Physics/BtAndAnkiConvertors.h ../../src/Math/Math.h \
+ ../../src/Physics/PhysConvertors.h ../../src/Math/Math.h \
  ../../src/Math/Vec2.h ../../src/Math/MathCommon.h \
  ../../src/Util/StdTypes.h ../../src/Util/Accessors.h \
  ../../src/Math/Vec2.inl.h ../../src/Math/MathCommon.inl.h \
@@ -8695,7 +8732,7 @@ PhysCharacter.o: ../../src/Physics/PhysCharacter.cpp \
  ../../extern/include/bullet/BulletDynamics/Character/btCharacterControllerInterface.h \
  ../../src/Physics/PhysCharacter.h \
  ../../src/Physics/PhysMasterContainer.h \
- ../../src/Physics/BtAndAnkiConvertors.h ../../src/Math/Math.h \
+ ../../src/Physics/PhysConvertors.h ../../src/Math/Math.h \
  ../../src/Math/Vec2.h ../../src/Math/MathCommon.h \
  ../../src/Util/StdTypes.h ../../src/Util/Accessors.h \
  ../../src/Math/Vec2.inl.h ../../src/Math/MathCommon.inl.h \
@@ -8859,7 +8896,7 @@ PhysRigidBody.o: ../../src/Physics/PhysRigidBody.cpp \
  ../../src/Math/MathFuncs.inl.h ../../src/Math/Transform.h \
  ../../src/Math/Transform.inl.h ../../src/Util/Assert.h \
  ../../src/Physics/PhysMasterContainer.h \
- ../../src/Physics/BtAndAnkiConvertors.h \
+ ../../src/Physics/PhysConvertors.h \
  ../../src/Renderer/Drawers/PhyDbgDrawer.h \
  ../../extern/include/bullet/LinearMath/btIDebugDraw.h \
  ../../src/Util/Vec.h ../../src/Util/Assert.h ../../src/Scene/Scene.h \

build/release/gen.cfg.py

@@ -3,7 +3,7 @@ sourcePaths.extend(list(walkDir("../../src")))
 
 includePaths = ["./"]
 includePaths.extend(list(sourcePaths))
-includePaths.extend(["../../extern/include", "../../extern/include/bullet", "/usr/include/python2.6"])
+includePaths.extend(["../../extern/include", "../../extern/include/bullet", "/usr/include/python2.6", "/usr/include/freetype2"])
 
 executableName = "anki"
 
@@ -11,4 +11,4 @@ compiler = "g++-4.5"
 
 compilerFlags = "-DPLATFORM_LINUX -DMATH_INTEL_SIMD -DNDEBUG -DBOOST_DISABLE_ASSERTS -DREVISION=\\\"`svnversion ../..`\\\" -c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -Wno-long-long -pipe -fsingle-precision-constant -msse4 -O3 -mtune=core2 -ffast-math -flto"
 
-linkerFlags = "-rdynamic -flto -L../../extern/lib-x86-64-linux -Wl,-Bstatic -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -lGLEW -lGLU -Wl,-Bdynamic -lGL -ljpeg -lSDL -lpng -lpython2.6 -lboost_system -lboost_python -lboost_filesystem -lboost_thread"
+linkerFlags = "-rdynamic -flto -L../../extern/lib-x86-64-linux -Wl,-Bstatic -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -lGLEW -lGLU -Wl,-Bdynamic -lGL -ljpeg -lSDL -lpng -lpython2.6 -lboost_system -lboost_python -lboost_filesystem -lboost_thread -lfreetype"

build/release_llvm/gen.cfg.py

@@ -1,8 +1,14 @@
-include_paths = [ "../../src/math/", "../../src/tokenizer/", "../../src/uncategorized/", "../../src/", "../../src/renderer/", "../../src/scene/", "../../src/resources/", "../../src/utility/", "../../src/ui/" ]
-precompiled_headers = []
-executable_name = "AnKi.bin"
-compiler = "/usr/lib/llvm/llvm/gcc-4.2/bin/llvm-g++"
-common_flags = "-emit-llvm"
-compiler_flags = "-c `sdl-config --cflags` -O3 -D_TERMINAL_COLORING_ -D_PLATFORM_LINUX_"
-precompiled_headers_flags = ""
-linker_flags = "-lGL -lGLU -lGLEW -lSDL_image `sdl-config --static-libs` -ljpeg -lgomp"
+sourcePaths = ["../../src"]
+sourcePaths.extend(list(walkDir("../../src")))
+
+includePaths = ["./"]
+includePaths.extend(list(sourcePaths))
+includePaths.extend(["../../extern/include", "../../extern/include/bullet", "/usr/include/python2.6", "/usr/include/freetype2"])
+
+executableName = "anki"
+
+compiler = "clang++"
+
+compilerFlags = "-DPLATFORM_LINUX -DMATH_INTEL_SIMD -DNDEBUG -DBOOST_DISABLE_ASSERTS -DREVISION=\\\"`svnversion ../..`\\\" -c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -Wno-long-long -pipe -msse4 -O3 -mtune=core2 -ffast-math"
+
+linkerFlags = "-rdynamic -flto -L../../extern/lib-x86-64-linux -Wl,-Bstatic -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -lGLEW -lGLU -Wl,-Bdynamic -lGL -ljpeg -lSDL -lpng -lpython2.6 -lboost_system -lboost_python -lboost_filesystem -lboost_thread -lfreetype"

src/Main.cpp

@@ -374,7 +374,7 @@ void mainLoop()
 		mainLoopExtra();
 
 		AppSingleton::getInstance().execStdinScpripts();
-		SceneSingleton::getInstance().getPhysics().update(timer.getCrntTime());
+		SceneSingleton::getInstance().getPhysMasterContainer().update(prevUpdateTime, crntTime);
 		SceneSingleton::getInstance().updateAllWorldStuff();
 		SceneSingleton::getInstance().doVisibilityTests(*AppSingleton::getInstance().getActiveCam());
 		SceneSingleton::getInstance().updateAllControllers();

src/Physics/PhysCharacter.cpp

@@ -29,15 +29,14 @@ inline Character::Initializer::Initializer():
 //======================================================================================================================
 // Contructor                                                                                                          =
 //======================================================================================================================
-Character::Character(MasterContainer& masterContainer_, const Initializer& init, Object* parent):
-	Object(parent),
+Character::Character(MasterContainer& masterContainer_, const Initializer& init):
 	masterContainer(masterContainer_)
 {
 	ghostObject = new btPairCachingGhostObject();
 
 	motionState = new MotionState(init.startTrf, init.sceneNode);
 
-	btAxisSweep3* sweepBp = dynamic_cast<btAxisSweep3*>(physics.broadphase);
+	btAxisSweep3* sweepBp = dynamic_cast<btAxisSweep3*>(masterContainer.broadphase);
 	ASSERT(sweepBp != NULL);
 
 	ghostPairCallback = new btGhostPairCallback();
@@ -55,12 +54,12 @@ Character::Character(MasterContainer& masterContainer_, const Initializer& init,
 	character->setMaxJumpHeight(init.maxJumpHeight);
 
 	// register
-	physics.dynamicsWorld->addCollisionObject(ghostObject, btBroadphaseProxy::CharacterFilter,
-																						btBroadphaseProxy::StaticFilter|btBroadphaseProxy::DefaultFilter);
+	masterContainer.dynamicsWorld->addCollisionObject(ghostObject, btBroadphaseProxy::CharacterFilter,
+		btBroadphaseProxy::StaticFilter|btBroadphaseProxy::DefaultFilter);
 
-	physics.dynamicsWorld->addAction(character);
+	masterContainer.dynamicsWorld->addAction(character);
 
-	physics.characters.push_back(this);
+	masterContainer.characters.push_back(this);
 }
 
 
@@ -69,9 +68,10 @@ Character::Character(MasterContainer& masterContainer_, const Initializer& init,
 //======================================================================================================================
 Character::~Character()
 {
-	physics.characters.erase(std::find(physics.characters.begin(), physics.characters.end(), this));
-	physics.dynamicsWorld->removeAction(character);
-	physics.dynamicsWorld->removeCollisionObject(ghostObject);
+	masterContainer.characters.erase(std::find(masterContainer.characters.begin(),
+		masterContainer.characters.end(), this));
+	masterContainer.dynamicsWorld->removeAction(character);
+	masterContainer.dynamicsWorld->removeCollisionObject(ghostObject);
 
 	delete character;
 	delete convexShape;

src/Physics/BtAndAnkiConvertors.h → src/Physics/PhysConvertors.h

@@ -1,5 +1,5 @@
-#ifndef PHYCONVERTORS_H
-#define PHYCONVERTORS_H
+#ifndef PHYS_CONVERTORS_H
+#define PHYS_CONVERTORS_H
 
 #include <btBulletCollisionCommon.h>
 #include <btBulletDynamicsCommon.h>

src/Physics/PhysMasterContainer.cpp

@@ -14,7 +14,7 @@ MasterContainer::MasterContainer():
 	defaultContactProcessingThreshold(BT_LARGE_FLOAT)
 {
 	collisionConfiguration = new btDefaultCollisionConfiguration();
-	dispatcher = new	btCollisionDispatcher(collisionConfiguration);
+	dispatcher = new btCollisionDispatcher(collisionConfiguration);
 	broadphase = new btAxisSweep3(btVector3(-1000, -1000, -1000), btVector3(1000, 1000, 1000));
 	sol = new btSequentialImpulseConstraintSolver;
 	dynamicsWorld = new btDiscreteDynamicsWorld(dispatcher, broadphase, sol, collisionConfiguration);

src/Physics/PhysMasterContainer.h

@@ -3,13 +3,13 @@
 
 #include <btBulletCollisionCommon.h>
 #include <btBulletDynamicsCommon.h>
-#include "BtAndAnkiConvertors.h"
+#include "PhysConvertors.h"
 #include "PhyDbgDrawer.h" ///< @todo Remove this crap from here. Its Renderer's stuff
 #include "Vec.h"
 
 
 namespace Phys {
-class PhyCharacter;
+class Character;
 class RigidBody;
 }
 
@@ -20,7 +20,7 @@ namespace Phys {
 /// The master container for all physics related stuff.
 class MasterContainer
 {
-	friend class PhyCharacter; ///< For registering and unregistering
+	friend class Character; ///< For registering and unregistering
 	friend class RigidBody;  ///< For registering and unregistering
 
 	public:
@@ -45,14 +45,14 @@ class MasterContainer
 		void update(uint prevUpdateTime, uint crntTime);
 
 	private:
-		btDiscreteDynamicsWorld* dynamicsWorld;
+		btDiscreteDynamicsWorld* dynamicsWorld; ///< Container for rigid bodied and constraints
 		btDefaultCollisionConfiguration* collisionConfiguration;
-		btCollisionDispatcher* dispatcher;
+		btCollisionDispatcher* dispatcher; ///< Contains the algorithms of collision
 		btBroadphaseInterface* broadphase;
 		btSequentialImpulseConstraintSolver* sol;
 		PhyDbgDrawer* debugDrawer; ///< @todo Remove this crap from here. Its Renderer's stuff
 		float defaultContactProcessingThreshold;
-		Vec<PhyCharacter*> characters;
+		Vec<Character*> characters;
 };
 
 

src/Physics/PhysRigidBody.cpp

@@ -47,7 +47,7 @@ RigidBody::RigidBody(MasterContainer& masterContainer_, const Initializer& init)
 
 	setupRigidBody(cInfo);
 
-	setContactProcessingThreshold(physics.defaultContactProcessingThreshold);
+	setContactProcessingThreshold(masterContainer.defaultContactProcessingThreshold);
 
 	forceActivationState(ISLAND_SLEEPING);
 
@@ -68,7 +68,7 @@ RigidBody::RigidBody(MasterContainer& masterContainer_, const Initializer& init)
 //======================================================================================================================
 RigidBody::~RigidBody()
 {
-	physics.dynamicsWorld->removeRigidBody(this);
+	masterContainer.dynamicsWorld->removeRigidBody(this);
 }
 
 

src/Renderer/Drawers/PhyDbgDrawer.cpp

@@ -1,6 +1,6 @@
 #include "PhyDbgDrawer.h"
 #include "MainRenderer.h"
-#include "BtAndAnkiConvertors.h"
+#include "PhysConvertors.h"
 #include "Logger.h"
 #include "Globals.h"
 

src/Renderer/Drawers/SceneDrawer.cpp

@@ -25,35 +25,26 @@ SceneDrawer::UsrDefVarVisitor::UsrDefVarVisitor(const MaterialRuntimeUserDefined
 // Visitor functors                                                                                                    =
 //======================================================================================================================
 
-void SceneDrawer::UsrDefVarVisitor::operator()(float x) const
-{
-	udvr.getUniVar().set(&x);
-}
 
-void SceneDrawer::UsrDefVarVisitor::operator()(const Vec2& x) const
+template<typename Type>
+void SceneDrawer::UsrDefVarVisitor::operator()(const Type& x) const
 {
 	udvr.getUniVar().set(&x);
 }
 
-void SceneDrawer::UsrDefVarVisitor::operator()(const Vec3& x) const
-{
-	udvr.getUniVar().set(&x);
-}
 
-void SceneDrawer::UsrDefVarVisitor::operator()(const Vec4& x) const
-{
-	udvr.getUniVar().set(&x);
-}
+typedef const Texture* ConstTex;
 
-void SceneDrawer::UsrDefVarVisitor::operator()(const RsrcPtr<Texture>* x) const
+template<>
+void SceneDrawer::UsrDefVarVisitor::operator()(const ConstTex& x) const
 {
-	const RsrcPtr<Texture>& texPtr = *x;
-	//texPtr->setRepeat(true);
-	udvr.getUniVar().set(*texPtr, texUnit);
+	udvr.getUniVar().set(*x, texUnit);
 	++texUnit;
 }
 
-void SceneDrawer::UsrDefVarVisitor::operator()(MtlUserDefinedVar::Fai x) const
+
+template<>
+void SceneDrawer::UsrDefVarVisitor::operator()(const MtlUserDefinedVar::Fai& x) const
 {
 	switch(x)
 	{

src/Renderer/Drawers/SceneDrawer.h

@@ -31,21 +31,17 @@ class SceneDrawer
 
 	private:
 		/// Set the uniform using this visitor
-		class UsrDefVarVisitor: public boost::static_visitor<void>
+		class UsrDefVarVisitor: public boost::static_visitor<>
 		{
 			public:
 				const MaterialRuntimeUserDefinedVar& udvr;
 				const Renderer& r;
-				mutable uint& texUnit;
+				uint& texUnit;
 
 				UsrDefVarVisitor(const MaterialRuntimeUserDefinedVar& udvr, const Renderer& r, uint& texUnit);
 
-				void operator()(float x) const;
-				void operator()(const Vec2& x) const;
-				void operator()(const Vec3& x) const;
-				void operator()(const Vec4& x) const;
-				void operator()(const RsrcPtr<Texture>* x) const;
-				void operator()(MtlUserDefinedVar::Fai x) const;
+				template<typename Type>
+				void operator()(const Type& x) const;
 		};
 
 		const Renderer& r; ///< Keep it here cause the class wants a few stuff from it

src/Renderer/Ms.h

@@ -8,9 +8,6 @@
 #include "Ez.h"
 
 
-class RendererInitializer;
-
-
 /// Material stage
 class Ms: public RenderingPass
 {

src/Renderer/Renderer.h

@@ -20,7 +20,7 @@
 
 
 class Camera;
-class RendererInitializer;
+struct RendererInitializer;
 class ModelNode;
 
 

src/Renderer/RenderingPass.h

@@ -3,7 +3,7 @@
 
 
 class Renderer;
-class RendererInitializer;
+struct RendererInitializer;
 
 
 /// Rendering pass

src/Resources/Texture/Image.cpp

@@ -464,6 +464,7 @@ void Image::load(const char* filename)
 // DDS                                                                                                                 =
 //======================================================================================================================
 
+/*
 //  little-endian, of course
 #define DDS_MAGIC 0x20534444
 
@@ -611,11 +612,11 @@ DdsLoadInfo loadInfoBGRA8 = {false, false, false, 1, 4};
 DdsLoadInfo loadInfoBGR8 = {false, false, false, 1, 3};
 DdsLoadInfo loadInfoBGR5A1 = {false, true, false, 1, 2};
 DdsLoadInfo loadInfoBGR565 = {false, true, false, 1, 2};
-DdsLoadInfo loadInfoIndex8 = {false, false, true, 1, 1};
+DdsLoadInfo loadInfoIndex8 = {false, false, true, 1, 1};*/
 
 void Image::loadDds(const char* filename)
 {
-	std::fstream in;
+	/*std::fstream in;
 	in.open(filename, std::ios::in | std::ios::binary);
 
 	if(!in.is_open())
@@ -675,8 +676,8 @@ void Image::loadDds(const char* filename)
 	if(li->compressed)
 	{
 		size_t size = std::max(li->divSize, x) / li->divSize * std::max(li->divSize, y) / li->divSize * li->blockBytes;
-		/*assert( size == hdr.dwPitchOrLinearSize );
-		assert( hdr.dwFlags & DDSD_LINEARSIZE );*/
+		//assert( size == hdr.dwPitchOrLinearSize );
+		//assert( hdr.dwFlags & DDSD_LINEARSIZE );
 		data.resize(size);
 		in.read((char*)(&data[0]), size);
 	}
@@ -685,5 +686,5 @@ void Image::loadDds(const char* filename)
 	width = hdr.data.dwWidth;
 	height = hdr.data.dwHeight;
 
-	in.close();
+	in.close();*/
 }

src/Scene/MaterialRuntime/MaterialRuntimeUserDefinedVar.cpp

@@ -7,7 +7,7 @@
 template <>
 void MaterialRuntimeUserDefinedVar::ConstructVisitor::operator()<RsrcPtr<Texture> >(const RsrcPtr<Texture>& x) const
 {
-	udvr.data = &x;
+	udvr.data = x.get();
 }
 
 

src/Scene/MaterialRuntime/MaterialRuntimeUserDefinedVar.h

@@ -11,7 +11,7 @@ class MaterialRuntimeUserDefinedVar
 
 	public:
 		/// The data union. The Texture resource is read-only at runtime
-		typedef boost::variant<float, Vec2, Vec3, Vec4, const RsrcPtr<Texture>*, MtlUserDefinedVar::Fai> DataVariant;
+		typedef boost::variant<float, Vec2, Vec3, Vec4, const Texture*, MtlUserDefinedVar::Fai> DataVariant;
 
 		/// The one and only constructor
 		MaterialRuntimeUserDefinedVar(const MtlUserDefinedVar& rsrc);

src/Scene/ParticleEmitter.cpp

@@ -51,14 +51,14 @@ void ParticleEmitter::init(const char* filename)
 
 		float mass = particleMass + Util::randFloat(particleMassMargin) * 2.0 - particleMassMargin;
 
-		RigidBody::Initializer init;
+		Phys::RigidBody::Initializer init;
 		init.mass = mass;
 		init.startTrf = toAnki(startingTrf);
 		init.shape = collShape.get();
 		init.sceneNode = particle;
-		init.group = Physics::CG_PARTICLE;
-		init.mask = Physics::CG_ALL ^ Physics::CG_PARTICLE;
-		Phys::RigidBody* body = new Phys::RigidBody(SceneSingleton::getInstance().getPhysics(), init);
+		init.group = Phys::MasterContainer::CG_PARTICLE;
+		init.mask = Phys::MasterContainer::CG_ALL ^ Phys::MasterContainer::CG_PARTICLE;
+		Phys::RigidBody* body = new Phys::RigidBody(SceneSingleton::getInstance().getPhysMasterContainer(), init);
 
 		body->forceActivationState(DISABLE_SIMULATION);
 

src/Util/Scanner/ScannerToken.h

@@ -76,7 +76,7 @@ class TokenDataVal
 
 
 /// The Token class
-struct Token
+class Token
 {
 	friend class Scanner;