Renaming

.cproject

@@ -65,16 +65,16 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.exe.release.571635259." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1798558317" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1852283584" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
-							<builder buildPath="${workspace_loc:/anki/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.154092247" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+							<builder buildPath="${workspace_loc:/anki/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.154092247" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1469196148" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1634217479" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
-								<option id="gnu.cpp.compiler.exe.release.option.optimization.level.467488783" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1206763877" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.release.option.optimization.level.467488783" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1206763877" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1897753799" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1453949923" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
-								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.204107120" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
-								<option id="gnu.c.compiler.exe.release.option.debugging.level.1402099681" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.204107120" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
+								<option id="gnu.c.compiler.exe.release.option.debugging.level.1402099681" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.813305505" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1557937760" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>

src/CMakeLists.txt

@@ -2,8 +2,8 @@ PROJECT(ANKI_PROJ)
 
 INCLUDE_DIRECTORIES(${ANKI_PROJ_SOURCE_DIR})
 
-SET(ANKI_LIBS script r scene ui event 
-	i phys rsrc core misc gl cln m util)
+SET(ANKI_LIBS script renderer scene ui event 
+	input physics resource core misc gl collision math util)
 
 SUBDIRS(${ANKI_LIBS})
 

src/Main.cpp

@@ -2,39 +2,39 @@
 #include <iostream>
 #include <fstream>
 
-#include "i/Input.h"
+#include "input/Input.h"
 #include "scene/PerspectiveCamera.h"
 #include "scene/OrthographicCamera.h"
-#include "m/Math.h"
-#include "r/Renderer.h"
+#include "math/Math.h"
+#include "renderer/Renderer.h"
 #include "ui/UiPainter.h"
 #include "core/App.h"
-#include "rsrc/Mesh.h"
+#include "resource/Mesh.h"
 #include "scene/Light.h"
 #include "scene/PointLight.h"
 #include "scene/SpotLight.h"
-#include "rsrc/Material.h"
+#include "resource/Material.h"
 #include "scene/Scene.h"
 #include "util/scanner/Scanner.h"
-#include "rsrc/SkelAnim.h"
-#include "rsrc/LightRsrc.h"
+#include "resource/SkelAnim.h"
+#include "resource/LightRsrc.h"
 #include "misc/Parser.h"
 #include "scene/ParticleEmitterNode.h"
-#include "phys/Character.h"
-#include "r/Renderer.h"
-#include "r/RendererInitializer.h"
-#include "r/MainRenderer.h"
-#include "phys/Character.h"
-#include "phys/RigidBody.h"
+#include "physics/Character.h"
+#include "renderer/Renderer.h"
+#include "renderer/RendererInitializer.h"
+#include "renderer/MainRenderer.h"
+#include "physics/Character.h"
+#include "physics/RigidBody.h"
 #include "script/ScriptManager.h"
 #include "core/StdinListener.h"
 #include "scene/ModelNode.h"
-#include "rsrc/Model.h"
+#include "resource/Model.h"
 #include "core/Logger.h"
 #include "util/Util.h"
 #include "util/HighRezTimer.h"
 #include "scene/SkinNode.h"
-#include "rsrc/Skin.h"
+#include "resource/Skin.h"
 #include "scene/MaterialRuntime.h"
 #include "core/Globals.h"
 #include "ui/UiFtFontLoader.h"
@@ -42,10 +42,10 @@
 #include "event/EventManager.h"
 #include "event/SceneColorEvent.h"
 #include "event/MainRendererPpsHdrEvent.h"
-#include "rsrc/ShaderProgramPrePreprocessor.h"
-#include "rsrc/Material.h"
+#include "resource/ShaderProgramPrePreprocessor.h"
+#include "resource/Material.h"
 #include "core/parallel/Manager.h"
-#include "r/PhysDbgDrawer.h"
+#include "renderer/PhysDbgDrawer.h"
 #include <boost/algorithm/string.hpp>
 
 

src/cln/CMakeLists.txt → src/collision/CMakeLists.txt

@@ -1,4 +1,4 @@
 FILE(GLOB CLN_SOURCES *.cpp)
 FILE(GLOB CLN_HEADERS *.h)
 
-ADD_LIBRARY(cln ${CLN_SOURCES} ${CLN_HEADERS})
+ADD_LIBRARY(collision ${CLN_SOURCES} ${CLN_HEADERS})

src/cln/CollisionShape.h → src/collision/CollisionShape.h

@@ -24,6 +24,13 @@ class CollisionShape
 			CST_PERSPECTIVE_CAMERA_FRUSTRUM
 		};
 
+		/// Generic visitor
+		class Visitor
+		{
+			public:
+				virtual void visit(class LineSegment&) = 0;
+		};
+
 		CollisionShape(CollisionShapeType cid_)
 		:	cid(cid_)
 		{}

src/cln/LineSegment.h → src/collision/LineSegment.h

@@ -2,7 +2,7 @@
 #define LINE_SEGMENT_H
 
 #include "CollisionShape.h"
-#include "m/Vec3.h"
+#include "math/Vec3.h"
 
 
 /// @addtogroup Collision

src/cln/Obb.h → src/collision/Obb.h

@@ -2,7 +2,7 @@
 #define OBB_H
 
 #include "CollisionShape.h"
-#include "m/Math.h"
+#include "math/Math.h"
 #include <boost/array.hpp>
 
 

src/cln/PerspectiveCameraShape.h → src/collision/PerspectiveCameraShape.h

@@ -1,8 +1,8 @@
-#ifndef PROJECTION_CAMERA_FRUSTUM_H
-#define PROJECTION_CAMERA_FRUSTUM_H
+#ifndef PROJECTION_CAMERA_SHAPE_H
+#define PROJECTION_CAMERA_SHAPE_H
 
 #include "CollisionShape.h"
-#include "m/Math.h"
+#include "math/Math.h"
 
 
 /// @addtogroup Collision

src/cln/Plane.h → src/collision/Plane.h

@@ -2,7 +2,7 @@
 #define PLANE_H
 
 #include "CollisionShape.h"
-#include "m/Math.h"
+#include "math/Math.h"
 
 
 /// @addtogroup Collision

src/cln/Ray.h → src/collision/Ray.h

@@ -2,7 +2,7 @@
 #define RAY_H
 
 #include "CollisionShape.h"
-#include "m/Math.h"
+#include "math/Math.h"
 
 
 class Plane;

src/cln/Sphere.h → src/collision/Sphere.h

@@ -2,7 +2,7 @@
 #define SPHERE_H
 
 #include "CollisionShape.h"
-#include "m/Math.h"
+#include "math/Math.h"
 
 
 class Plane;

src/event/MainRendererPpsHdrEvent.cpp

@@ -1,5 +1,5 @@
 #include "MainRendererPpsHdrEvent.h"
-#include "r/MainRenderer.h"
+#include "renderer/MainRenderer.h"
 #include "core/Globals.h"
 
 

src/event/SceneColorEvent.h

@@ -2,7 +2,7 @@
 #define SCENE_COLOR_EVENT_H
 
 #include "Event.h"
-#include "m/Math.h"
+#include "math/Math.h"
 
 
 /// Change the scene color

src/gl/Vao.cpp

@@ -1,7 +1,7 @@
 #include "Vao.h"
 #include "Vbo.h"
 #include "util/Exception.h"
-#include "rsrc/ShaderProgramAttributeVariable.h"
+#include "resource/ShaderProgramAttributeVariable.h"
 
 
 //==============================================================================

src/i/CMakeLists.txt → src/input/CMakeLists.txt

@@ -1,4 +1,4 @@
 FILE(GLOB I_SOURCES *.cpp)
 FILE(GLOB I_HEADERS *.h)
 
-ADD_LIBRARY(i ${I_SOURCES} ${I_HEADERS})
+ADD_LIBRARY(input ${I_SOURCES} ${I_HEADERS})

src/i/Input.h → src/input/Input.h

@@ -1,7 +1,7 @@
 #ifndef INPUT_H
 #define INPUT_H
 
-#include "m/Math.h"
+#include "math/Math.h"
 #include <SDL/SDL_scancode.h>
 #include <boost/array.hpp>
 

src/m/CMakeLists.txt → src/math/CMakeLists.txt

@@ -1,4 +1,4 @@
 FILE(GLOB M_SOURCES *.cpp)
 FILE(GLOB M_HEADERS *.h)
 
-ADD_LIBRARY(m ${M_SOURCES} ${M_HEADERS})
+ADD_LIBRARY(math ${M_SOURCES} ${M_HEADERS})

src/misc/PropertyTree.h

@@ -3,7 +3,7 @@
 
 #include <boost/optional.hpp>
 #include <boost/property_tree/ptree_fwd.hpp>
-#include "m/Math.h"
+#include "math/Math.h"
 
 
 namespace PropertyTree {

src/misc/TestHeader.cpp

@@ -1,4 +1,4 @@
-#include "m/Vec2.h"
+#include "math/Vec2.h"
 
 
 

src/phys/CMakeLists.txt → src/physics/CMakeLists.txt

@@ -1,4 +1,4 @@
 FILE(GLOB PHYS_SOURCES *.cpp)
 FILE(GLOB PHYS_HEADERS *.h)
 
-ADD_LIBRARY(phys ${PHYS_SOURCES} ${PHYS_HEADERS})
+ADD_LIBRARY(physics ${PHYS_SOURCES} ${PHYS_HEADERS})

src/phys/Character.h → src/physics/Character.h

@@ -1,7 +1,7 @@
 #ifndef CHARACTER_H
 #define CHARACTER_H
 
-#include "m/Math.h"
+#include "math/Math.h"
 #include "core/Object.h"
 
 

src/phys/Convertors.h → src/physics/Convertors.h

@@ -3,7 +3,7 @@
 
 #include <btBulletCollisionCommon.h>
 #include <btBulletDynamicsCommon.h>
-#include "m/Math.h"
+#include "math/Math.h"
 
 
 inline Vec3 toAnki(const btVector3& v)

src/phys/RigidBody.h → src/physics/RigidBody.h

@@ -4,7 +4,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <btBulletDynamicsCommon.h>
 #include <btBulletCollisionCommon.h>
-#include "m/Math.h"
+#include "math/Math.h"
 
 
 class SceneNode;

src/r/Bl.cpp → src/renderer/Bl.cpp

@@ -1,7 +1,7 @@
 #include "Bl.h"
 #include "RendererInitializer.h"
 #include "Renderer.h"
-#include "rsrc/ShaderProgram.h"
+#include "resource/ShaderProgram.h"
 
 
 //==============================================================================

src/r/Bl.h → src/renderer/Bl.h

@@ -2,8 +2,8 @@
 #define BL_H
 
 #include "RenderingPass.h"
-#include "rsrc/Texture.h"
-#include "rsrc/RsrcPtr.h"
+#include "resource/Texture.h"
+#include "resource/RsrcPtr.h"
 #include "gl/Fbo.h"
 
 

src/r/Bs.cpp → src/renderer/Bs.cpp

@@ -2,11 +2,11 @@
 #include "Bs.h"
 #include "Renderer.h"
 #include "scene/Scene.h"
-#include "rsrc/ShaderProgram.h"
-#include "rsrc/Model.h"
+#include "resource/ShaderProgram.h"
+#include "resource/Model.h"
 #include "scene/ModelNode.h"
-#include "rsrc/Material.h"
-#include "rsrc/Mesh.h"
+#include "resource/Material.h"
+#include "resource/Mesh.h"
 
 
 //==============================================================================

src/r/Bs.h → src/renderer/Bs.h

@@ -3,8 +3,8 @@
 
 #include "RenderingPass.h"
 #include "gl/Fbo.h"
-#include "rsrc/RsrcPtr.h"
-#include "rsrc/Texture.h"
+#include "resource/RsrcPtr.h"
+#include "resource/Texture.h"
 
 
 class ShaderProgram;

src/r/CMakeLists.txt → src/renderer/CMakeLists.txt

@@ -1,4 +1,4 @@
 FILE(GLOB_RECURSE R_SOURCES *.cpp)
 FILE(GLOB_RECURSE R_HEADERS *.h)
 
-ADD_LIBRARY(r ${R_SOURCES} ${R_HEADERS})
+ADD_LIBRARY(renderer ${R_SOURCES} ${R_HEADERS})

src/r/CollisionDbgDrawer.cpp → src/renderer/CollisionDbgDrawer.cpp

@@ -1,6 +1,6 @@
 #include "CollisionDbgDrawer.h"
 #include "Dbg.h"
-#include "cln/Collision.h"
+#include "collision/Collision.h"
 
 //==============================================================================
 // draw (Sphere)                                                               =

src/r/Dbg.h → src/renderer/Dbg.h

@@ -5,9 +5,9 @@
 #include <map>
 #include "RenderingPass.h"
 #include "gl/Fbo.h"
-#include "rsrc/ShaderProgram.h"
-#include "rsrc/RsrcPtr.h"
-#include "m/Math.h"
+#include "resource/ShaderProgram.h"
+#include "resource/RsrcPtr.h"
+#include "math/Math.h"
 #include "gl/Vbo.h"
 #include "gl/Vao.h"
 #include "SceneDbgDrawer.h"

src/r/Deformer.cpp → src/renderer/Deformer.cpp

@@ -1,6 +1,6 @@
 #include "Deformer.h"
-#include "rsrc/ShaderProgram.h"
-#include "rsrc/Material.h"
+#include "resource/ShaderProgram.h"
+#include "resource/Material.h"
 #include "scene/SkinPatchNode.h"
 #include "scene/SkinNode.h"
 #include "MainRenderer.h"

src/r/Deformer.h → src/renderer/Deformer.h

@@ -1,7 +1,7 @@
 #ifndef DEFORMER_H
 #define DEFORMER_H
 
-#include "rsrc/RsrcPtr.h"
+#include "resource/RsrcPtr.h"
 
 
 class ShaderProgram;

src/r/Hdr.h → src/renderer/Hdr.h

@@ -3,8 +3,8 @@
 
 #include "RenderingPass.h"
 #include "gl/Fbo.h"
-#include "rsrc/Texture.h"
-#include "rsrc/RsrcPtr.h"
+#include "resource/Texture.h"
+#include "resource/RsrcPtr.h"
 
 
 class ShaderProgram;

src/r/Is.cpp → src/renderer/Is.cpp

@@ -4,9 +4,9 @@
 #include "scene/Light.h"
 #include "scene/PointLight.h"
 #include "scene/SpotLight.h"
-#include "rsrc/LightRsrc.h"
+#include "resource/LightRsrc.h"
 #include "core/App.h"
-#include "rsrc/LightRsrc.h"
+#include "resource/LightRsrc.h"
 #include "Sm.h"
 #include "Smo.h"
 #include "scene/Scene.h"

src/r/Is.h → src/renderer/Is.h

@@ -3,10 +3,10 @@
 
 #include "RenderingPass.h"
 #include "gl/Fbo.h"
-#include "rsrc/Texture.h"
-#include "rsrc/RsrcPtr.h"
-#include "rsrc/ShaderProgram.h"
-#include "m/Math.h"
+#include "resource/Texture.h"
+#include "resource/RsrcPtr.h"
+#include "resource/ShaderProgram.h"
+#include "math/Math.h"
 #include "gl/Vbo.h"
 #include "gl/Vao.h"
 #include "Sm.h"

src/r/Ms.h → src/renderer/Ms.h

@@ -2,7 +2,7 @@
 #define MS_H
 
 #include "RenderingPass.h"
-#include "rsrc/Texture.h"
+#include "resource/Texture.h"
 #include "gl/Fbo.h"
 #include "Ez.h"
 

src/r/PhysDbgDrawer.cpp → src/renderer/PhysDbgDrawer.cpp

@@ -1,6 +1,6 @@
 #include "PhysDbgDrawer.h"
 #include "Dbg.h"
-#include "phys/Convertors.h"
+#include "physics/Convertors.h"
 #include "core/Logger.h"
 
 

src/r/Pps.h → src/renderer/Pps.h

@@ -3,8 +3,8 @@
 
 #include "RenderingPass.h"
 #include "gl/Fbo.h"
-#include "rsrc/Texture.h"
-#include "rsrc/RsrcPtr.h"
+#include "resource/Texture.h"
+#include "resource/RsrcPtr.h"
 #include "Hdr.h"
 #include "Ssao.h"
 #include "Bl.h"

src/r/Renderer.h → src/renderer/Renderer.h

@@ -1,13 +1,13 @@
 #ifndef RENDERER_H
 #define RENDERER_H
 
-#include "m/Math.h"
+#include "math/Math.h"
 #include "gl/Fbo.h"
-#include "rsrc/Texture.h"
-#include "rsrc/ShaderProgram.h"
+#include "resource/Texture.h"
+#include "resource/ShaderProgram.h"
 #include "gl/Vbo.h"
 #include "gl/Vao.h"
-#include "rsrc/RsrcPtr.h"
+#include "resource/RsrcPtr.h"
 #include "Ms.h"
 #include "Is.h"
 #include "Pps.h"

src/r/SceneDrawer.cpp → src/renderer/SceneDrawer.cpp

@@ -1,6 +1,6 @@
 #include "SceneDrawer.h"
-#include "m/Math.h"
-#include "rsrc/Material.h"
+#include "math/Math.h"
+#include "resource/Material.h"
 #include "scene/RenderableNode.h"
 #include "scene/Camera.h"
 #include "Renderer.h"

src/r/SceneDrawer.h → src/renderer/SceneDrawer.h

@@ -1,9 +1,9 @@
 #ifndef SCENE_DRAWER_H
 #define SCENE_DRAWER_H
 
-#include "m/Math.h"
-#include "rsrc/MaterialCommon.h"
-#include "rsrc/RsrcPtr.h"
+#include "math/Math.h"
+#include "resource/MaterialCommon.h"
+#include "resource/RsrcPtr.h"
 #include <boost/variant.hpp>
 
 

src/r/Sm.cpp → src/renderer/Sm.cpp

@@ -3,7 +3,7 @@
 #include "Renderer.h"
 #include "core/App.h"
 #include "scene/Scene.h"
-#include "rsrc/LightRsrc.h"
+#include "resource/LightRsrc.h"
 #include "scene/Camera.h"
 #include "scene/Light.h"
 #include "scene/SpotLight.h"

src/r/Sm.h → src/renderer/Sm.h

@@ -3,7 +3,7 @@
 
 #include "RenderingPass.h"
 #include "gl/Fbo.h"
-#include "rsrc/Texture.h"
+#include "resource/Texture.h"
 #include "scene/VisibilityTester.h"
 
 

src/r/Smo.cpp → src/renderer/Smo.cpp

@@ -1,7 +1,7 @@
 #include "Smo.h"
 #include "Renderer.h"
 #include "scene/Light.h"
-#include "rsrc/LightRsrc.h"
+#include "resource/LightRsrc.h"
 #include "scene/PointLight.h"
 #include "scene/SpotLight.h"
 #include "scene/Camera.h"
@@ -9,7 +9,7 @@
 #include "gl/Vbo.h"
 #include "scene/PerspectiveCamera.h"
 #include "scene/OrthographicCamera.h"
-#include "rsrc/Mesh.h"
+#include "resource/Mesh.h"
 
 
 const float THRESHOLD = 0.2;