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

@@ -14,7 +14,7 @@ namespace scene
 	class IMesh;
 
 	//! An enumeration for all supported types of built-in mesh writers
-	/** A scene mesh writers is represented by a four character code 
+	/** A scene mesh writers is represented by a four character code
 	such as 'irrm' or 'coll' instead of simple numbers, to avoid
 	name clashes with external mesh writers.*/
 	enum EMESH_WRITER_TYPE
@@ -51,21 +51,22 @@ namespace scene
 		enumeration to return your own unique mesh type id.*/
 		virtual EMESH_WRITER_TYPE getType() const = 0;
 
-		//! writes a static mesh 
+		//! writes a static mesh
 		/** \return Returns true if sucessful */
-		virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, 
-							   s32 flags=EMWF_NONE) = 0;
+		virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh,
+							s32 flags=EMWF_NONE) = 0;
 
 		// writes an animated mesh
 		// for future use, no writer is able to write animated meshes currently
 		/* \return Returns true if sucessful */
-		//virtual bool writeAnimatedMesh(io::IWriteFile* file, 
-		// scene::IAnimatedMesh* mesh, 
+		//virtual bool writeAnimatedMesh(io::IWriteFile* file,
+		// scene::IAnimatedMesh* mesh,
 		// s32 flags=EMWF_NONE) = 0;
 	};
 
 
-} // end namespace 
 } // end namespace
+} // end namespace
+
+#endif
 
-#endif
\ No newline at end of file

include/S3DVertex.h

@@ -46,7 +46,7 @@ struct S3DVertex
 
 	//! Position
 	core::vector3df Pos;
-	
+
 	//! Normal vector
 	core::vector3df Normal;
 
@@ -189,17 +189,17 @@ struct S3DVertexTangents : S3DVertex
 
 
 
-inline u32 getVertexPitchFromType(E_VERTEX_TYPE vertexType) 
-{
-	switch (vertexType)
-	{
-	case video::EVT_2TCOORDS: 	
-		return sizeof(video::S3DVertex2TCoords);
-	case video::EVT_TANGENTS: 	
-		return sizeof(video::S3DVertexTangents);
+inline u32 getVertexPitchFromType(E_VERTEX_TYPE vertexType)
+{
+	switch (vertexType)
+	{
+	case video::EVT_2TCOORDS:
+		return sizeof(video::S3DVertex2TCoords);
+	case video::EVT_TANGENTS:
+		return sizeof(video::S3DVertexTangents);
+	default:
+		return sizeof(video::S3DVertex);
 	}
-
-	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
 {
@@ -28,7 +28,7 @@ public:
 	//! Returns the type of the mesh writer
 	virtual EMESH_WRITER_TYPE getType() const;
 
-	//! writes a mesh 
+	//! writes a mesh
 	virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE);
 
 protected:
@@ -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;
 	};
@@ -68,7 +62,8 @@ protected:
 };
 
 
-} // end namespace 
 } // end namespace
+} // end namespace
+
+#endif
 
-#endif
\ No newline at end of file

source/Irrlicht/CIrrMeshWriter.cpp

@@ -10,13 +10,13 @@ namespace scene
 {
 
 
-CIrrMeshWriter::CIrrMeshWriter(irr::video::IVideoDriver* driver, 
-									   irr::io::IFileSystem* fs)
-: VideoDriver(driver), FileSystem(fs)
+CIrrMeshWriter::CIrrMeshWriter(irr::video::IVideoDriver* driver,
+				irr::io::IFileSystem* fs)
+	: FileSystem(fs), VideoDriver(driver), Writer(0)
 {
 	if (VideoDriver)
 		VideoDriver->grab();
-    
+
 	if (FileSystem)
 		FileSystem->grab();
 }
@@ -26,7 +26,7 @@ CIrrMeshWriter::~CIrrMeshWriter()
 {
 	if (VideoDriver)
 		VideoDriver->drop();
-    
+
 	if (FileSystem)
 		FileSystem->drop();
 }
@@ -39,7 +39,7 @@ EMESH_WRITER_TYPE CIrrMeshWriter::getType() const
 }
 
 
-//! writes a mesh 
+//! writes a mesh
 bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags)
 {
 	if (!file)
@@ -57,7 +57,7 @@ bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
 
 	// write IRR MESH header
 
-    Writer->writeXMLHeader();
+	Writer->writeXMLHeader();
 
 	Writer->writeElement(L"irrmesh", false,
 		L"xmlns", L"http://irrlicht.sourceforge.net/IRRMESH_08_2007",
@@ -74,5 +74,5 @@ bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
 
 
 
-} // end namespace 
+} // end namespace
 } // end namespace

source/Irrlicht/CIrrMeshWriter.h

@@ -28,7 +28,7 @@ public:
 	//! Returns the type of the mesh writer
 	virtual EMESH_WRITER_TYPE getType() const;
 
-	//! writes a mesh 
+	//! writes a mesh
 	virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE);
 
 protected:
@@ -39,7 +39,8 @@ protected:
 };
 
 
-} // end namespace 
 } // end namespace
+} // end namespace
+
+#endif
 
-#endif
\ No newline at end of file

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