Some code cleaning.

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

source/Irrlicht/CB3DMeshFileLoader.h

@@ -76,16 +76,16 @@ private:
 	bool load();
 	bool readChunkNODE(CSkinnedMesh::SJoint* InJoint);
 	bool readChunkMESH(CSkinnedMesh::SJoint* InJoint);
-	bool readChunkVRTS(CSkinnedMesh::SJoint* InJoint, scene::SSkinMeshBuffer *MeshBuffer, s32 Vertices_Start);
-	bool readChunkTRIS(CSkinnedMesh::SJoint* InJoint, scene::SSkinMeshBuffer *MeshBuffer, u32 MeshBufferID, s32 Vertices_Start);
+	bool readChunkVRTS(CSkinnedMesh::SJoint* InJoint);
+	bool readChunkTRIS(scene::SSkinMeshBuffer *MeshBuffer, u32 MeshBufferID, s32 Vertices_Start);
 	bool readChunkBONE(CSkinnedMesh::SJoint* InJoint);
 	bool readChunkKEYS(CSkinnedMesh::SJoint* InJoint);
-	bool readChunkANIM(CSkinnedMesh::SJoint* InJoint);
+	bool readChunkANIM();
 	bool readChunkTEXS();
 	bool readChunkBRUS();
 
 	core::stringc readString();
-	core::stringc stripPathFromString(core::stringc string, bool returnPath=false);
+	core::stringc stripPathFromString(core::stringc string, bool returnPath=false) const;
 	void readFloats(f32* vec, u32 count);
 
 	core::array<SB3dChunk> B3dStack;

source/Irrlicht/CMS3DMeshFileLoader.cpp

@@ -372,8 +372,6 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 #endif
 		pPtr += sizeof(MS3DJoint);
 
-
-
 		ISkinnedMesh::SJoint *jnt = AnimatedMesh->createJoint();
 
 		/*
@@ -400,18 +398,16 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 		jnt->LocalMatrix.setTranslation(
 			core::vector3df(pJoint->Translation[0], pJoint->Translation[1], pJoint->Translation[2]) );
 
-
 		ParentNames.push_back( (c8*)pJoint->ParentName );
 
 		/*if (pJoint->NumRotationKeyframes ||
 			pJoint->NumTranslationKeyframes)
-			HasAnimation = true;*/
-
-
-
+			HasAnimation = true;
+		 */
 
 		// get rotation keyframes
-		for (j=0; j < pJoint->NumRotationKeyframes; ++j)
+		const u16 numRotationKeyframes = pJoint->NumRotationKeyframes;
+		for (j=0; j < numRotationKeyframes; ++j)
 		{
 			MS3DKeyframe* kf = (MS3DKeyframe*)pPtr;
 #ifdef __BIG_ENDIAN__
@@ -432,17 +428,11 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 			tmpMatrix=jnt->LocalMatrix*tmpMatrix;
 
 			k->rotation  = core::quaternion(tmpMatrix);
-
-			//fix
-			//k->rotation  = core::vector3df
-			//	(kf->Parameter[0],//+pJoint->Rotation[0]*core::RADTODEG,
-			//	 kf->Parameter[1],//+pJoint->Rotation[1]*core::RADTODEG,
-			//	 kf->Parameter[2]);//+pJoint->Rotation[2]*core::RADTODEG);
-
 		}
 
 		// get translation keyframes
-		for (j=0; j<pJoint->NumTranslationKeyframes; ++j)
+		const u16 numTranslationKeyframes = pJoint->NumTranslationKeyframes;
+		for (j=0; j<numTranslationKeyframes; ++j)
 		{
 			MS3DKeyframe* kf = (MS3DKeyframe*)pPtr;
 #ifdef __BIG_ENDIAN__
@@ -459,8 +449,6 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 				(kf->Parameter[0]+pJoint->Translation[0],
 				 kf->Parameter[1]+pJoint->Translation[1],
 				 kf->Parameter[2]+pJoint->Translation[2]);
-
-
 		}
 	}
 
@@ -517,6 +505,7 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 					break;
 				}
 			}
+
 			if (index == -1)
 			{
 				s32 boneid = vertices[triangles[i].VertexIndices[j]].BoneID;
@@ -584,10 +573,10 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 }
 
 
-core::stringc CMS3DMeshFileLoader::stripPathFromString(core::stringc string, bool returnPath)
+core::stringc CMS3DMeshFileLoader::stripPathFromString(const core::stringc& inString, bool returnPath) const
 {
-	s32 slashIndex=string.findLast('/'); // forward slash
-	s32 backSlash=string.findLast('\\'); // back slash
+	s32 slashIndex=inString.findLast('/'); // forward slash
+	s32 backSlash=inString.findLast('\\'); // back slash
 
 	if (backSlash>slashIndex) slashIndex=backSlash;
 
@@ -595,12 +584,12 @@ core::stringc CMS3DMeshFileLoader::stripPathFromString(core::stringc string, boo
 		if (returnPath)
 			return core::stringc(); //no path to return
 		else
-			return string;
+			return inString;
 
 	if (returnPath)
-		return string.subString(0, slashIndex + 1);
+		return inString.subString(0, slashIndex + 1);
 	else
-		return string.subString(slashIndex+1, string.size() - (slashIndex+1));
+		return inString.subString(slashIndex+1, inString.size() - (slashIndex+1));
 }
 
 

source/Irrlicht/CMS3DMeshFileLoader.h

@@ -34,7 +34,7 @@ public:
 
 private:
 
-	core::stringc stripPathFromString(core::stringc string, bool returnPath);
+	core::stringc stripPathFromString(const core::stringc& inString, bool returnPath) const;
 
 	bool load(io::IReadFile* file);
 	video::IVideoDriver* Driver;