Constification for line3df paramater and reindentation.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2308 dfc29bdd-3216-0410-991c-e03cc46cb475

include/ISceneCollisionManager.h

@@ -43,8 +43,7 @@ namespace scene
 		\return True if a collision was detected and false if not. */
 		virtual bool getCollisionPoint(const core::line3d<f32>& ray,
 				ITriangleSelector* selector, core::vector3df& outCollisionPoint,
-			core::triangle3df& outTriangle,
-			const ISceneNode*& outNode) = 0;
+				core::triangle3df& outTriangle, const ISceneNode*& outNode) =0;
 
 		//! Collides a moving ellipsoid with a 3d world with gravity and returns the resulting new position of the ellipsoid.
 		/** This can be used for moving a character in a 3d world: The
@@ -132,8 +131,8 @@ namespace scene
 		\return Returns the scene node nearest to ray.start, which collides with the
 		ray and matches the idBitMask, if the mask is not null. If no scene
 		node is found, 0 is returned. */
-		virtual ISceneNode* getSceneNodeFromRayBB(const core::line3d<f32> ray,	
-										s32 idBitMask=0, bool bNoDebugObjects = false) = 0;
+		virtual ISceneNode* getSceneNodeFromRayBB(const core::line3d<f32>& ray,	
+							s32 idBitMask=0, bool bNoDebugObjects = false) =0;
 
 		//! Get the scene node, which the given camera is looking at and whose id matches the bitmask.
 		/** A ray is simply casted from the position of the camera to

source/Irrlicht/CSceneCollisionManager.cpp

@@ -30,7 +30,6 @@ CSceneCollisionManager::CSceneCollisionManager(ISceneManager* smanager, video::I
 }
 
 
-
 //! destructor
 CSceneCollisionManager::~CSceneCollisionManager()
 {
@@ -39,13 +38,12 @@ CSceneCollisionManager::~CSceneCollisionManager()
 }
 
 
-
 //! Returns the scene node, which is currently visible under the overgiven
 //! screencoordinates, viewed from the currently active camera.
 ISceneNode* CSceneCollisionManager::getSceneNodeFromScreenCoordinatesBB(
 	const core::position2d<s32> & pos, s32 idBitMask, bool bNoDebugObjects)
 {
-	core::line3d<f32> ln = getRayFromScreenCoordinates(pos, 0);
+	const core::line3d<f32> ln = getRayFromScreenCoordinates(pos, 0);
 
 	if ( ln.start == ln.end )
 		return 0;
@@ -54,12 +52,10 @@ ISceneNode* CSceneCollisionManager::getSceneNodeFromScreenCoordinatesBB(
 }
 
 
-
 //! Returns the nearest scene node which collides with a 3d ray and
 //! which id matches a bitmask.
-ISceneNode* CSceneCollisionManager::getSceneNodeFromRayBB(const core::line3d<f32> ray,	
-															s32 idBitMask,
-															bool bNoDebugObjects)
+ISceneNode* CSceneCollisionManager::getSceneNodeFromRayBB(const core::line3d<f32>& ray,
+						s32 idBitMask, bool bNoDebugObjects)
 {
 	ISceneNode* best = 0;
 	f32 dist = FLT_MAX;
@@ -74,12 +70,9 @@ ISceneNode* CSceneCollisionManager::getSceneNodeFromRayBB(const core::line3d<f32
 
 
 //! recursive method for going through all scene nodes
-void CSceneCollisionManager::getPickedNodeBB(ISceneNode* root,
-               core::line3df& ray,
-               s32 bits,
-               bool bNoDebugObjects,
-               f32& outbestdistance,
-               ISceneNode*& outbestnode)
+void CSceneCollisionManager::getPickedNodeBB(ISceneNode* root, core::line3df& ray,
+			s32 bits, bool bNoDebugObjects,
+			f32& outbestdistance, ISceneNode*& outbestnode)
 {
 	const core::list<ISceneNode*>& children = root->getChildren();
 	const core::vector3df rayVector = ray.getVector().normalize();
@@ -202,7 +195,7 @@ void CSceneCollisionManager::getPickedNodeBB(ISceneNode* root,
 					}
 
 					// If we got a hit, we can now truncate the ray to stop us hitting further nodes.
-				if(gotHit)
+					if (gotHit)
 						ray.end = ray.start + (rayVector * sqrtf(outbestdistance));
 				}
 			}
@@ -251,19 +244,13 @@ ISceneNode* CSceneCollisionManager::getSceneNodeAndCollisionPointFromRay(
 	// node in order to find the nearest collision point, so sorting them by
 	// bounding box would be pointless.
 
-	getPickedNodeFromBBAndSelector(collisionRootNode,
-									ray,
-									idBitMask,
-									noDebugObjects,
-									bestDistanceSquared,
-									bestNode,
-									outCollisionPoint,
-									outTriangle);
+	getPickedNodeFromBBAndSelector(collisionRootNode, ray, idBitMask,
+					noDebugObjects, bestDistanceSquared, bestNode,
+					outCollisionPoint, outTriangle);
 	return bestNode;
 }
 
 
-
 void CSceneCollisionManager::getPickedNodeFromBBAndSelector(
 				ISceneNode * root,
 				const core::line3df & ray,
@@ -303,8 +290,7 @@ void CSceneCollisionManager::getPickedNodeFromBBAndSelector(
 
 			// do intersection test in object space
 			const ISceneNode * hitNode = 0;
-		if (box.intersectsWithLine(line)
-			&&
+			if (box.intersectsWithLine(line) &&
 				getCollisionPoint(ray, selector, candidateCollisionPoint, candidateTriangle, hitNode))
 			{
 				const f32 distanceSquared = (candidateCollisionPoint - ray.start).getLengthSQ();
@@ -319,14 +305,9 @@ void CSceneCollisionManager::getPickedNodeFromBBAndSelector(
 			}
 		}
 
-	  getPickedNodeFromBBAndSelector(current, 
-									ray, 
-									bits, 
-									noDebugObjects, 
-									outBestDistanceSquared, 
-									outBestNode, 
-									outBestCollisionPoint, 
-									outBestTriangle);
+		getPickedNodeFromBBAndSelector(current, ray, bits, noDebugObjects,
+						outBestDistanceSquared, outBestNode,
+						outBestCollisionPoint, outBestTriangle);
 	}
 }
 
@@ -339,17 +320,15 @@ ISceneNode* CSceneCollisionManager::getSceneNodeFromCameraBB(
 	if (!camera)
 		return 0;
 
-	core::vector3df start = camera->getAbsolutePosition();
+	const core::vector3df start = camera->getAbsolutePosition();
 	core::vector3df end = camera->getTarget();
 
 	end = start + ((end - start).normalize() * camera->getFarValue());
-	core::line3d<f32> line(start, end);
 
-	return getSceneNodeFromRayBB(line, idBitMask, bNoDebugObjects);
+	return getSceneNodeFromRayBB(core::line3d<f32>(start, end), idBitMask, bNoDebugObjects);
 }
 
 
-
 //! Finds the collision point of a line and lots of triangles, if there is one.
 bool CSceneCollisionManager::getCollisionPoint(const core::line3d<f32>& ray,
 		ITriangleSelector* selector, core::vector3df& outIntersection,
@@ -419,7 +398,6 @@ bool CSceneCollisionManager::getCollisionPoint(const core::line3d<f32>& ray,
 }
 
 
-
 //! Collides a moving ellipsoid with a 3d world with gravity and returns
 //! the resulting new position of the ellipsoid.
 core::vector3df CSceneCollisionManager::getCollisionResultPosition(
@@ -687,7 +665,6 @@ bool CSceneCollisionManager::testTriangleIntersection(SCollisionData* colData,
 }
 
 
-
 //! Collides a moving ellipsoid with a 3d world with gravity and returns
 //! the resulting new position of the ellipsoid.
 core::vector3df CSceneCollisionManager::collideEllipsoidWithWorld(
@@ -756,6 +733,7 @@ core::vector3df CSceneCollisionManager::collideEllipsoidWithWorld(
 	return finalPos;
 }
 
+
 core::vector3df CSceneCollisionManager::collideWithWorld(s32 recursionDepth,
 	SCollisionData &colData, core::vector3df pos, core::vector3df vel)
 {
@@ -786,8 +764,7 @@ core::vector3df CSceneCollisionManager::collideWithWorld(s32 recursionDepth,
 	scaleMatrix.setScale(
 			core::vector3df(1.0f / colData.eRadius.X,
 					1.0f / colData.eRadius.Y,
-						1.0f / colData.eRadius.Z)
-					);
+					1.0f / colData.eRadius.Z));
 
 	s32 triangleCnt = 0;
 	colData.selector->getTriangles(Triangles.pointer(), totalTriangleCnt, triangleCnt, box, &scaleMatrix);
@@ -959,4 +936,3 @@ inline bool CSceneCollisionManager::getLowestRoot(f32 a, f32 b, f32 c, f32 maxR,
 } // end namespace scene
 } // end namespace irr
 
-

source/Irrlicht/CSceneCollisionManager.h

-#ifndef __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
-#define __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
-
 // Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
+#ifndef __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
+#define __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
+
 #include "ISceneCollisionManager.h"
 #include "ISceneManager.h"
 #include "IVideoDriver.h"
@@ -25,20 +25,20 @@ namespace scene
 		//! destructor
 		virtual ~CSceneCollisionManager();
 
-		//! Returns the scene node, which is currently visible under the overgiven 
-		//! screencoordinates, viewed from the currently active camera. 
-		virtual ISceneNode* getSceneNodeFromScreenCoordinatesBB(const core::position2d<s32> & pos,
+		//! Returns the scene node, which is currently visible at the given
+		//! screen coordinates, viewed from the currently active camera.
+		virtual ISceneNode* getSceneNodeFromScreenCoordinatesBB(const core::position2d<s32>& pos,
 						s32 idBitMask=0, bool bNoDebugObjects = false);
 
 		//! Returns the nearest scene node which collides with a 3d ray and
 		//! which id matches a bitmask.
-		virtual ISceneNode* getSceneNodeFromRayBB(const core::line3d<f32> ray,	
+		virtual ISceneNode* getSceneNodeFromRayBB(const core::line3d<f32>& ray,
 						s32 idBitMask=0, bool bNoDebugObjects = false);
 
 		//! Returns the scene node, at which the overgiven camera is looking at and
 		//! which id matches the bitmask.
-		virtual ISceneNode* getSceneNodeFromCameraBB(ICameraSceneNode* camera, s32 idBitMask=0,
-													 bool bNoDebugObjects = false);
+		virtual ISceneNode* getSceneNodeFromCameraBB(ICameraSceneNode* camera,
+				s32 idBitMask=0, bool bNoDebugObjects = false);
 
 		//! Finds the collision point of a line and lots of triangles, if there is one.
 		virtual bool getCollisionPoint(const core::line3d<f32>& ray,
@@ -82,12 +82,9 @@ namespace scene
 	private:
 
 		//! recursive method for going through all scene nodes
-		void getPickedNodeBB(ISceneNode* root,
-					   core::line3df& ray,
-					   s32 bits,
+		void getPickedNodeBB(ISceneNode* root, core::line3df& ray, s32 bits,
 					bool bNoDebugObjects,
-					   f32& outbestdistance,
-					   ISceneNode*& outbestnode);
+					f32& outbestdistance, ISceneNode*& outbestnode);
 
 		//! recursive method for going through all scene nodes
 		void getPickedNodeFromBBAndSelector(ISceneNode * root,

source/Irrlicht/CSceneManager.cpp

@@ -1161,7 +1161,7 @@ u32 CSceneManager::registerNodeForRendering(ISceneNode* node, E_SCENE_NODE_RENDE
 
 	switch(time)
 	{
-		// take camera if it doesn't exists
+		// take camera if it is not already registered
 	case ESNRP_CAMERA:
 		{
 			taken = 1;
@@ -1177,11 +1177,12 @@ u32 CSceneManager::registerNodeForRendering(ISceneNode* node, E_SCENE_NODE_RENDE
 			{
 				CameraList.push_back(node);
 			}
-		}break;
+		}
+		break;
 
 	case ESNRP_LIGHT:
 		// TODO: Point Light culling..
-		// Lighting modell in irrlicht has to be redone..
+		// Lighting model in irrlicht has to be redone..
 		//if (!isCulled(node))
 		{
 			LightList.push_back(static_cast<ILightSceneNode*>(node));
@@ -1268,6 +1269,7 @@ u32 CSceneManager::registerNodeForRendering(ISceneNode* node, E_SCENE_NODE_RENDE
 	return taken;
 }
 
+
 //! This method is called just before the rendering process of the whole scene.
 //! draws all scene nodes
 void CSceneManager::drawAll()