src/Main.cpp

@@ -89,7 +89,7 @@ void initPhysics()
 	init.shape = groundShape;
 	init.startTrf = groundTransform;
 
-	new RigidBody(SceneSingleton::get().getPhysPhysWorld(), init);
+	new RigidBody(SceneSingleton::get().getPhysWorld(), init);
 
 
 	/*{
@@ -382,7 +382,7 @@ void mainLoop()
 		mainLoopExtra();
 		void execStdinScpripts();
 		execStdinScpripts();
-		SceneSingleton::get().getPhysPhysWorld().update(prevUpdateTime, crntTime);
+		SceneSingleton::get().getPhysWorld().update(prevUpdateTime, crntTime);
 		SceneSingleton::get().updateAllWorldStuff(prevUpdateTime, crntTime);
 		SceneSingleton::get().doVisibilityTests(*AppSingleton::get().getActiveCam());
 		SceneSingleton::get().updateAllControllers();
@@ -525,7 +525,7 @@ void initSubsystems(int argc, char* argv[])
 	parallel::ManagerSingleton::get().init(4);
 
 	// Add drawer to physics
-	SceneSingleton::get().getPhysPhysWorld().setDebugDrawer(
+	SceneSingleton::get().getPhysWorld().setDebugDrawer(
 		new PhysDbgDrawer(MainRendererSingleton::get().getDbg()));
 }
 

src/r/Dbg.cpp

@@ -359,8 +359,7 @@ void Dbg::run()
 	///////////////
 
 
-	SceneSingleton::get().getPhysPhysWorld().getWorld().
-		debugDrawWorld();
+	SceneSingleton::get().getPhysWorld().getWorld().debugDrawWorld();
 	// Physics
 	/*glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 	setModelMat(Mat4::getIdentity());

src/scene/ParticleEmitterNode.cpp

@@ -90,7 +90,7 @@ void ParticleEmitterNode::init(const char* filename)
 			PhysWorld::CG_PARTICLE;
 
 		RigidBody* body = new RigidBody(
-			SceneSingleton::get().getPhysPhysWorld(), init);
+			getScene().getPhysWorld(), init);
 
 		body->forceActivationState(DISABLE_SIMULATION);
 

src/scene/Scene.h

@@ -49,40 +49,112 @@ class Scene
 
 		void updateAllWorldStuff(float prevUpdateTime, float crntTime);
 		void updateAllControllers();
-		void doVisibilityTests(Camera& cam) {visibilityTester->test(cam);}
+
+		void doVisibilityTests(Camera& cam)
+		{
+			visibilityTester->test(cam);
+		}
 
 		/// @name Accessors
 		/// @{
-		const Vec3& getAmbientColor() const {return ambientCol;}
-		Vec3& getAmbientColor() {return ambientCol;}
-		void setAmbientColor(const Vec3& x) {ambientCol = x;}
+		const Vec3& getAmbientColor() const
+		{
+			return ambientCol;
+		}
+		Vec3& getAmbientColor()
+		{
+			return ambientCol;
+		}
+		void setAmbientColor(const Vec3& x)
+		{
+			ambientCol = x;
+		}
 
-		PhysWorld& getPhysPhysWorld();
-		const PhysWorld& getPhysPhysWorld() const;
+		PhysWorld& getPhysWorld()
+		{
+			return *physPhysWorld;
+		}
+		const PhysWorld& getPhysWorld() const
+		{
+			return *physPhysWorld;
+		}
 
-		const VisibilityTester& getVisibilityTester() const;
+		const VisibilityTester& getVisibilityTester() const
+		{
+			return *visibilityTester;
+		}
 
-		Types<SceneNode>::ConstRange getAllNodes() const;
-		Types<SceneNode>::MutableRange getAllNodes();
+		Types<SceneNode>::ConstRange getAllNodes() const
+		{
+			return Types<SceneNode>::ConstRange(nodes.begin(), nodes.end());
+		}
+		Types<SceneNode>::MutableRange getAllNodes()
+		{
+			return Types<SceneNode>::MutableRange(nodes.begin(), nodes.end());
+		}
 
-		Types<Light>::ConstRange getLights() const;
-		Types<Light>::MutableRange getLights();
+		Types<Light>::ConstRange getLights() const
+		{
+			return Types<Light>::ConstRange(lights.begin(), lights.end());
+		}
+		Types<Light>::MutableRange getLights()
+		{
+			return Types<Light>::MutableRange(lights.begin(), lights.end());
+		}
 
-		Types<Camera>::ConstRange getCameras() const;
-		Types<Camera>::MutableRange getCameras();
+		Types<Camera>::ConstRange getCameras() const
+		{
+			return Types<Camera>::ConstRange(cams.begin(), cams.end());
+		}
+		Types<Camera>::MutableRange getCameras()
+		{
+			return Types<Camera>::MutableRange(cams.begin(), cams.end());
+		}
 
-		Types<ParticleEmitterNode>::ConstRange getParticleEmitterNodes() const;
-		Types<ParticleEmitterNode>::MutableRange getParticleEmitterNodes();
+		Types<ParticleEmitterNode>::ConstRange getParticleEmitterNodes() const
+		{
+			return Types<ParticleEmitterNode>::ConstRange(
+				particleEmitterNodes.begin(),
+				particleEmitterNodes.end());
+		}
+		Types<ParticleEmitterNode>::MutableRange getParticleEmitterNodes()
+		{
+			return Types<ParticleEmitterNode>::MutableRange(
+				particleEmitterNodes.begin(),
+				particleEmitterNodes.end());
+		}
 
-		Types<ModelNode>::ConstRange getModelNodes() const;
-		Types<ModelNode>::MutableRange getModelNodes();
 
-		Types<SkinNode>::ConstRange getSkinNodes() const;
-		Types<SkinNode>::MutableRange getSkinNodes();
+		Types<ModelNode>::ConstRange getModelNodes() const
+		{
+			return Types<ModelNode>::ConstRange(modelNodes.begin(),
+				modelNodes.end());
+		}
+		Types<ModelNode>::MutableRange getModelNodes()
+		{
+			return Types<ModelNode>::MutableRange(modelNodes.begin(),
+				modelNodes.end());
+		}
+
+		Types<SkinNode>::ConstRange getSkinNodes() const
+		{
+			return Types<SkinNode>::ConstRange(skinNodes.begin(),
+				skinNodes.end());
+		}
+		Types<SkinNode>::MutableRange getSkinNodes()
+		{
+			return Types<SkinNode>::MutableRange(skinNodes.begin(),
+				skinNodes.end());
+		}
 
 		const Types<Controller>::Container& getControllers() const
-			{return controllers;}
-		Types<Controller>::Container& getControllers() {return controllers;}
+		{
+			return controllers;
+		}
+		Types<Controller>::Container& getControllers()
+		{
+			return controllers;
+		}
 		/// @}
 
 	private:

src/scene/Scene.inl.h

@@ -1,3 +1,4 @@
+
 template<typename ContainerType, typename Type>
 inline void Scene::putBackNode(ContainerType& container, Type* x)
 {
@@ -14,99 +15,3 @@ inline void Scene::eraseNode(ContainerType& container, Type* x)
 	ASSERT(it != container.end());
 	container.erase(it);
 }
-
-
-inline PhysWorld& Scene::getPhysPhysWorld()
-{
-	return *physPhysWorld;
-}
-
-
-inline const PhysWorld& Scene::getPhysPhysWorld() const
-{
-	return *physPhysWorld;
-}
-
-
-inline const VisibilityTester& Scene::getVisibilityTester() const
-{
-	return *visibilityTester;
-}
-
-
-inline Scene::Types<SceneNode>::ConstRange Scene::getAllNodes() const
-{
-	return Types<SceneNode>::ConstRange(nodes.begin(), nodes.end());
-}
-
-
-inline Scene::Types<SceneNode>::MutableRange Scene::getAllNodes()
-{
-	return Types<SceneNode>::MutableRange(nodes.begin(), nodes.end());
-}
-
-
-inline Scene::Types<Light>::ConstRange Scene::getLights() const
-{
-	return Types<Light>::ConstRange(lights.begin(), lights.end());
-}
-
-
-inline Scene::Types<Light>::MutableRange Scene::getLights()
-{
-	return Types<Light>::MutableRange(lights.begin(), lights.end());
-}
-
-
-inline Scene::Types<Camera>::ConstRange Scene::getCameras() const
-{
-	return Types<Camera>::ConstRange(cams.begin(), cams.end());
-}
-
-
-inline Scene::Types<Camera>::MutableRange Scene::getCameras()
-{
-	return Types<Camera>::MutableRange(cams.begin(), cams.end());
-}
-
-
-inline Scene::Types<ParticleEmitterNode>::ConstRange
-	Scene::getParticleEmitterNodes() const
-{
-	return Types<ParticleEmitterNode>::ConstRange(
-		particleEmitterNodes.begin(),
-		particleEmitterNodes.end());
-}
-
-
-inline Scene::Types<ParticleEmitterNode>::MutableRange
-	Scene::getParticleEmitterNodes()
-{
-	return Types<ParticleEmitterNode>::MutableRange(
-		particleEmitterNodes.begin(),
-		particleEmitterNodes.end());
-}
-
-
-inline Scene::Types<ModelNode>::ConstRange Scene::getModelNodes() const
-{
-	return Types<ModelNode>::ConstRange(modelNodes.begin(), modelNodes.end());
-}
-
-
-inline Scene::Types<ModelNode>::MutableRange Scene::getModelNodes()
-{
-	return Types<ModelNode>::MutableRange(modelNodes.begin(), modelNodes.end());
-}
-
-
-inline Scene::Types<SkinNode>::ConstRange Scene::getSkinNodes() const
-{
-	return Types<SkinNode>::ConstRange(skinNodes.begin(), skinNodes.end());
-}
-
-
-inline Scene::Types<SkinNode>::MutableRange Scene::getSkinNodes()
-{
-	return Types<SkinNode>::MutableRange(skinNodes.begin(), skinNodes.end());
-}