Fixed some warnings and indentation.

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

include/IMeshWriter.h

@@ -69,3 +69,4 @@ namespace scene
 } // end namespace
 
 #endif
+

include/S3DVertex.h

@@ -197,9 +197,9 @@ inline u32 getVertexPitchFromType(E_VERTEX_TYPE vertexType)
 		return sizeof(video::S3DVertex2TCoords);
 	case video::EVT_TANGENTS:
 		return sizeof(video::S3DVertexTangents);
-	}
-
+	default:
 		return sizeof(video::S3DVertex);
+	}
 }
 
 

source/Irrlicht/CColladaMeshWriter.h

@@ -4,13 +4,13 @@
 #include "IMeshWriter.h"
 #include "S3DVertex.h"
 #include "IVideoDriver.h"
-#include "IFileSystem.h"
 
 namespace irr
 {
 namespace io
 {
 	class IXMLWriter;
+	class IFileSystem;
 }
 namespace scene
 {
@@ -37,27 +37,21 @@ protected:
 
 	struct SComponentGlobalStartPos
 	{
-		SComponentGlobalStartPos()
-		{
-			PosStartIndex = -1;
-			PosLastIndex = -1;
-			NormalStartIndex = -1;
-			NormalLastIndex = -1;
-			TCoord0LastIndex = -1;
-			TCoord0LastIndex = -1;
-			TCoord1LastIndex = -1;
-			TCoord1LastIndex = -1;
-		}
+		SComponentGlobalStartPos() : PosStartIndex(-1), PosLastIndex(-1),
+				NormalStartIndex(-1), NormalLastIndex(-1),
+				TCoord0StartIndex(-1), TCoord0LastIndex(-1),
+				TCoord1StartIndex(-1), TCoord1LastIndex(-1)
+		{ }
 
 		s32 PosStartIndex;
 		s32 PosLastIndex;
 
-		s32 TCoord0StartIndex;
-		s32 TCoord0LastIndex;
-
 		s32 NormalStartIndex;
 		s32 NormalLastIndex;
 
+		s32 TCoord0StartIndex;
+		s32 TCoord0LastIndex;
+
 		s32 TCoord1StartIndex;
 		s32 TCoord1LastIndex;
 	};
@@ -72,3 +66,4 @@ protected:
 } // end namespace
 
 #endif
+

source/Irrlicht/CIrrMeshWriter.cpp

@@ -12,7 +12,7 @@ namespace scene
 
 CIrrMeshWriter::CIrrMeshWriter(irr::video::IVideoDriver* driver,
 				irr::io::IFileSystem* fs)
-: VideoDriver(driver), FileSystem(fs)
+	: FileSystem(fs), VideoDriver(driver), Writer(0)
 {
 	if (VideoDriver)
 		VideoDriver->grab();

source/Irrlicht/CIrrMeshWriter.h

@@ -43,3 +43,4 @@ protected:
 } // end namespace
 
 #endif
+

source/Irrlicht/Makefile

@@ -19,7 +19,7 @@ VERSION = 1.4alpha
 #
 
 #List of object files, separated based on engine architecture
-IRRMESHOBJ = CSkinnedMesh.o CBSPMeshFileLoader.o CMD2MeshFileLoader.o CMD3MeshFileLoader.o CMS3DMeshFileLoader.o CB3DMeshFileLoader.o CBoneSceneNode.o CBSPMeshFileLoader.o C3DSMeshFileLoader.o COgreMeshFileLoader.o COBJMeshFileLoader.o CAnimatedMeshMD2.o CAnimatedMeshMD3.o CMD3MeshFileLoader.o CAnimatedMeshSceneNode.o CColladaFileLoader.o CCSMLoader.o CDMFLoader.o CLMTSMeshFileLoader.o CMeshSceneNode.o CMY3DMeshFileLoader.o COCTLoader.o CQ3LevelMesh.o CXMeshFileLoader.o CQuake3ShaderSceneNode.o
+IRRMESHOBJ = CSkinnedMesh.o CBSPMeshFileLoader.o CMD2MeshFileLoader.o CMD3MeshFileLoader.o CMS3DMeshFileLoader.o CB3DMeshFileLoader.o CBoneSceneNode.o CBSPMeshFileLoader.o C3DSMeshFileLoader.o COgreMeshFileLoader.o COBJMeshFileLoader.o CAnimatedMeshMD2.o CAnimatedMeshMD3.o CMD3MeshFileLoader.o CAnimatedMeshSceneNode.o CColladaFileLoader.o CCSMLoader.o CDMFLoader.o CLMTSMeshFileLoader.o CMeshSceneNode.o CMY3DMeshFileLoader.o COCTLoader.o CQ3LevelMesh.o CXMeshFileLoader.o CQuake3ShaderSceneNode.o CColladaMeshWriter.o CIrrMeshWriter.o
 IRROBJ = CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctTreeSceneNode.o COctTreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CCubeSceneNode.o CSphereSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CMeshCache.o CDefaultSceneNodeAnimatorFactory.o CDefaultSceneNodeFactory.o
 IRRPARTICLEOBJ = CParticleAnimatedMeshSceneNodeEmitter.o CParticleBoxEmitter.o CParticleCylinderEmitter.o CParticleMeshEmitter.o CParticlePointEmitter.o CParticleRingEmitter.o CParticleSphereEmitter.o CParticleAttractionAffector.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticleRotationAffector.o CParticleSystemSceneNode.o
 IRRANIMOBJ = CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o