Fix compiling on gcc/Linux. Remove a bunch of warnings.

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

include/IAnimatedMesh.h

@@ -61,7 +61,7 @@ namespace scene
 		//! No Animation
 		EAMT_STILL,
 		//! From Start to End, then Stop ( Limited Line )
-		EAMT_WAYPOINT,					 	
+		EAMT_WAYPOINT,
 		//! Linear Cycling Animation	 ( Sawtooth )
 		EAMT_LOOPING,
 		//! Linear bobbing				 ( Triangle )
@@ -103,10 +103,9 @@ namespace scene
 		KeyFrameInterpolation ( const c8 * name = "", s32 start = 0, s32 frames = 0, s32 loopingframes = 0,
 								f32 fps = 0.f, f32 relativefps = 1.f  )
 			: Name ( name ), AnimationType ( loopingframes ? EAMT_LOOPING : EAMT_WAYPOINT),
-			StartFrame ( start ), CurrentFrame ( (f32) start ), NextFrame ( start ), 
-			Frames ( frames ), EndFrame ( start + frames - 1 ),
+			CurrentFrame ( (f32) start ), NextFrame ( start ), StartFrame ( start ),
+			Frames ( frames ), LoopingFrames ( loopingframes ), EndFrame ( start + frames - 1 ),
 			FramesPerSecond ( fps ), RelativeSpeed ( relativefps ),
-			LoopingFrames ( loopingframes ),
 			BeginTime ( 0 ), EndTime ( 0 ), LastTime ( 0 )
 		{
 		}

source/Irrlicht/CImageLoaderDDS.h

@@ -18,7 +18,7 @@ namespace video
 #if defined(_IRR_COMPILE_WITH_DDS_LOADER_) || defined(_IRR_COMPILE_WITH_DDS_WRITER_)
 
 // byte-align structures
-#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__) 
+#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
 #	pragma pack( push, packing )
 #	pragma pack( 1 )
 #	define PACK_STRUCT
@@ -131,7 +131,7 @@ struct ddsBuffer
 	u32		size;
 	u32		flags;
 	u32		height;
-	u32		width; 
+	u32		width;
 	union
 	{
 		s32				pitch;
@@ -149,18 +149,18 @@ struct ddsBuffer
 	void				*surface;
 	union
 	{
-		ddsColorKey	ckDestOverlay;   
+		ddsColorKey	ckDestOverlay;
 		u32	emptyFaceColor;
 	};
 	ddsColorKey		ckDestBlt;
-	ddsColorKey		ckSrcOverlay;    
-	ddsColorKey		ckSrcBlt;     
+	ddsColorKey		ckSrcOverlay;
+	ddsColorKey		ckSrcBlt;
 	union
 	{
 		ddsPixelFormat	pixelFormat;
 		u32	fvf;
 	};
-	ddsCaps			ddsCaps;
+	ddsCaps			caps;
 	u32		textureStage;
 
 	/* data (Varying size) */
@@ -284,7 +284,7 @@ floatSwapUnion;
 
 
 // Default alignment
-#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__) 
+#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
 #	pragma pack( pop, packing )
 #endif
 

source/Irrlicht/CSoftwareDriver2.cpp

@@ -40,7 +40,7 @@ struct mat4{
    float m[4][4];
 
    vec4 operator* ( const vec4 &in ) const
-   { 
+   {
 	   vec4 out;
 	   return out;
    }
@@ -51,7 +51,7 @@ struct mat3{
    float m[3][3];
 
    vec3 operator* ( const vec3 &in ) const
-   { 
+   {
 	   vec3 out;
 	   return out;
    }
@@ -164,7 +164,7 @@ struct gl_MaterialParameters
 uniform gl_MaterialParameters gl_FrontMaterial;
 uniform gl_MaterialParameters gl_BackMaterial;
 
-// GLSL has some built-in attributes in a vertex shader: 
+// GLSL has some built-in attributes in a vertex shader:
 attribute vec4 gl_Vertex;			// 4D vector representing the vertex position
 attribute vec3 gl_Normal;			// 3D vector representing the vertex normal
 attribute vec4 gl_Color;			// 4D vector representing the vertex color
@@ -197,7 +197,7 @@ vec4 ftransform(void)
 
 vec3 fnormal(void)
 {
-    //Compute the normal 
+    //Compute the normal
     vec3 normal = gl_NormalMatrix * gl_Normal;
     normal = normalize(normal);
     return normal;
@@ -256,7 +256,7 @@ struct program1
 
 	vec3 fnormal(void)
 	{
-		//Compute the normal 
+		//Compute the normal
 		vec3 normal = gl_NormalMatrix * gl_Normal;
 		normal = normalize(normal);
 		return normal;
@@ -312,13 +312,13 @@ struct program1
 		ftexgen(transformedNormal, ecPosition);
 	}
 
-	void fragmentshader_main (void) 
+	void fragmentshader_main (void)
 	{
 		vec4 color;
 
 		color = gl_Color;
 
-		color *= texture2D(texUnit0, gl_TexCoord[0].xy);
+		color *= texture2D(texUnit0, vec2(gl_TexCoord[0].x, gl_TexCoord[0].y) );
 
 		color += gl_SecondaryColor;
 		color = clamp(color, 0.0, 1.0);
@@ -2633,7 +2633,7 @@ void CBurningVideoDriver::drawStencilShadowVolume(const core::vector3df* triangl
 		//glDrawArrays(GL_TRIANGLES,0,count);
 	}
 
-	
+
 }
 
 //! Fills the stencil shadow with color. After the shadow volume has been drawn

source/Irrlicht/Irrlicht-gcc.cbp

@@ -562,6 +562,8 @@
 		<Unit filename="BuiltInFont.h" />
 		<Unit filename="C3DSMeshFileLoader.cpp" />
 		<Unit filename="C3DSMeshFileLoader.h" />
+		<Unit filename="CAnimatedMeshHalfLife.cpp" />
+		<Unit filename="CAnimatedMeshHalfLife.h" />
 		<Unit filename="CAnimatedMeshMD2.cpp" />
 		<Unit filename="CAnimatedMeshMD2.h" />
 		<Unit filename="CAnimatedMeshMD3.cpp" />
@@ -696,6 +698,8 @@
 		<Unit filename="CImage.h" />
 		<Unit filename="CImageLoaderBMP.cpp" />
 		<Unit filename="CImageLoaderBMP.h" />
+		<Unit filename="CImageLoaderDDS.cpp" />
+		<Unit filename="CImageLoaderDDS.h" />
 		<Unit filename="CImageLoaderJPG.cpp" />
 		<Unit filename="CImageLoaderJPG.h" />
 		<Unit filename="CImageLoaderPCX.cpp" />
@@ -889,6 +893,8 @@
 		<Unit filename="CTRGouraudAlpha2.cpp" />
 		<Unit filename="CTRGouraudAlphaNoZ2.cpp" />
 		<Unit filename="CTRGouraudWire.cpp" />
+		<Unit filename="CTRNormalMap.cpp" />
+		<Unit filename="CTRStencilShadow.cpp" />
 		<Unit filename="CTRTextureBlend.cpp" />
 		<Unit filename="CTRTextureDetailMap2.cpp" />
 		<Unit filename="CTRTextureFlat.cpp" />
@@ -928,6 +934,8 @@
 		<Unit filename="CVideoModeList.h" />
 		<Unit filename="CVolumeLightSceneNode.cpp" />
 		<Unit filename="CVolumeLightSceneNode.h" />
+		<Unit filename="CWADReader.cpp" />
+		<Unit filename="CWADReader.h" />
 		<Unit filename="CWaterSurfaceSceneNode.cpp" />
 		<Unit filename="CWaterSurfaceSceneNode.h" />
 		<Unit filename="CWriteFile.cpp" />

source/Irrlicht/Makefile

@@ -27,16 +27,16 @@ IRRMESHWRITER = CColladaMeshWriter.o CIrrMeshWriter.o CSTLMeshWriter.o COBJMeshW
 IRRMESHOBJ = $(IRRMESHLOADER) $(IRRMESHWRITER) \
 	CSkinnedMesh.o CBoneSceneNode.o CMeshSceneNode.o \
 	CAnimatedMeshSceneNode.o CAnimatedMeshMD2.o CAnimatedMeshMD3.o \
-	CQ3LevelMesh.o CQuake3ShaderSceneNode.o
+	CQ3LevelMesh.o CQuake3ShaderSceneNode.o CAnimatedMeshHalfLife.o
 IRROBJ = CBillboardSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctreeSceneNode.o COctreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CVolumeLightSceneNode.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 CParticleScaleAffector.o
 IRRANIMOBJ = CSceneNodeAnimatorCameraFPS.o CSceneNodeAnimatorCameraMaya.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o
 IRRDRVROBJ = CNullDriver.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o
-IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CImageLoaderPPM.o CImageLoaderWAL.o CImageLoaderRGB.o \
+IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderDDS.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CImageLoaderPPM.o CImageLoaderWAL.o CImageLoaderRGB.o \
 	CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o
 IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)
-IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o CBurningShader_Raster_Reference.o
-IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
+IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRNormalMap.o CTRStencilShadow.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o CBurningShader_Raster_Reference.o
+IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
 IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
 IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o
 ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o

source/Irrlicht/S4DVertex.h

@@ -112,10 +112,10 @@ struct sVec4
 	{
 		struct { f32 x, y, z, w; };
 		struct { f32 a, r, g, b; };
-		struct { sVec2 xy, zw; };
+//		struct { sVec2 xy, zw; };	// sorry, this does not compile with gcc
 	};
 
-	
+
 
 	sVec4 () {}
 
@@ -640,7 +640,7 @@ struct sPixelShaderData
 /*
 	load a color value
 */
-inline void getTexel_plain2 (	tFixPoint &r, tFixPoint &g, tFixPoint &b, 
+inline void getTexel_plain2 (	tFixPoint &r, tFixPoint &g, tFixPoint &b,
 							const sVec4 &v
 							)
 {
@@ -652,7 +652,7 @@ inline void getTexel_plain2 (	tFixPoint &r, tFixPoint &g, tFixPoint &b,
 /*
 	load a color value
 */
-inline void getSample_color (	tFixPoint &a, tFixPoint &r, tFixPoint &g, tFixPoint &b, 
+inline void getSample_color (	tFixPoint &a, tFixPoint &r, tFixPoint &g, tFixPoint &b,
 							const sVec4 &v
 							)
 {
@@ -689,5 +689,5 @@ inline void getSample_color (	tFixPoint &r, tFixPoint &g, tFixPoint &b,
 
 }
 
-#endif 
+#endif