From 8d1aef90d6e7ec5ca138aaa82318a6671750b46d Mon Sep 17 00:00:00 2001 From: hybrid Date: Wed, 14 Nov 2007 09:50:41 +0000 Subject: [PATCH] Warning and project file fixes. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1053 dfc29bdd-3216-0410-991c-e03cc46cb475 --- include/IQ3Shader.h | 6 +++--- source/Irrlicht/CAnimatedMeshSceneNode.cpp | 10 ++++++++-- source/Irrlicht/CBurningShader_Raster_Reference.cpp | 6 ++---- source/Irrlicht/Irrlicht.dsp | 4 ++++ source/Irrlicht/Makefile | 4 ++-- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/include/IQ3Shader.h b/include/IQ3Shader.h index 86a346c1..8008a853 100644 --- a/include/IQ3Shader.h +++ b/include/IQ3Shader.h @@ -138,14 +138,14 @@ namespace quake3 struct SBlendFunc { SBlendFunc () - : type ( video::EMT_SOLID ), param ( 0.f ), modulate ( defaultModulate ), - isTransparent ( 0 ) {} + : type ( video::EMT_SOLID ), modulate ( defaultModulate ), param ( 0.f ), + isTransparent ( false ) {} video::E_MATERIAL_TYPE type; video::E_MODULATE_FUNC modulate; - bool isTransparent; f32 param; + bool isTransparent; }; // parses the content of Variable cull diff --git a/source/Irrlicht/CAnimatedMeshSceneNode.cpp b/source/Irrlicht/CAnimatedMeshSceneNode.cpp index 60fd0049..d1b8ae06 100644 --- a/source/Irrlicht/CAnimatedMeshSceneNode.cpp +++ b/source/Irrlicht/CAnimatedMeshSceneNode.cpp @@ -489,12 +489,14 @@ s32 CAnimatedMeshSceneNode::getStartFrame() const return StartFrame; } + //! Returns the current start frame number. s32 CAnimatedMeshSceneNode::getEndFrame() const { return EndFrame; } + //! sets the frames between the animation is looped. //! the default is 0 - MaximalFrameCount of the mesh. bool CAnimatedMeshSceneNode::setFrameLoop(s32 begin, s32 end) @@ -574,6 +576,8 @@ IShadowVolumeSceneNode* CAnimatedMeshSceneNode::addShadowVolumeSceneNode(s32 id, } +//! Returns a pointer to a child node, which has the same transformation as +//! the corresponding joint, if the mesh in this scene node is a skinned mesh. IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName) { if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED) @@ -602,6 +606,8 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName) } +//! Returns a pointer to a child node, which has the same transformation as +//! the corresponding joint, if the mesh in this scene node is a skinned mesh. IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(u32 jointID) { if (JointChildSceneNodes.size() <= jointID) @@ -626,7 +632,7 @@ u32 CAnimatedMeshSceneNode::getJointCount() const //! Returns a pointer to a child node, which has the same transformation as -//! the corrsesponding joint, if the mesh in this scene node is a ms3d mesh. +//! the corresponding joint, if the mesh in this scene node is a ms3d mesh. ISceneNode* CAnimatedMeshSceneNode::getMS3DJointNode(const c8* jointName) { return getJointNode(jointName); @@ -634,7 +640,7 @@ ISceneNode* CAnimatedMeshSceneNode::getMS3DJointNode(const c8* jointName) //! Returns a pointer to a child node, which has the same transformation as -//! the corrsesponding joint, if the mesh in this scene node is a ms3d mesh. +//! the corresponding joint, if the mesh in this scene node is a .x mesh. ISceneNode* CAnimatedMeshSceneNode::getXJointNode(const c8* jointName) { return getJointNode(jointName); diff --git a/source/Irrlicht/CBurningShader_Raster_Reference.cpp b/source/Irrlicht/CBurningShader_Raster_Reference.cpp index d753d9bc..1df3b9c5 100644 --- a/source/Irrlicht/CBurningShader_Raster_Reference.cpp +++ b/source/Irrlicht/CBurningShader_Raster_Reference.cpp @@ -665,8 +665,6 @@ REALINLINE void CBurningShader_Raster_Reference::depthWrite () */ REALINLINE void CBurningShader_Raster_Reference::scanline2() { - s32 i; - // apply top-left fill-convention, left pShader.xStart = core::ceil32( line.x[0] ); pShader.xEnd = core::ceil32( line.x[1] ) - 1; @@ -683,6 +681,8 @@ REALINLINE void CBurningShader_Raster_Reference::scanline2() line.w[0] += (line.w[1] = (line.w[1] - line.w[0]) * invDeltaX) * subPixel; + u32 i; + for ( i = 0; i != ShaderParam.ColorUnits; ++i ) { line.c[i][1] = (line.c[i][1] - line.c[i][0]) * invDeltaX; @@ -716,9 +716,7 @@ REALINLINE void CBurningShader_Raster_Reference::scanline2() { line.t[i][0] += line.t[i][1]; } - } - } diff --git a/source/Irrlicht/Irrlicht.dsp b/source/Irrlicht/Irrlicht.dsp index d872731b..f51125c0 100644 --- a/source/Irrlicht/Irrlicht.dsp +++ b/source/Irrlicht/Irrlicht.dsp @@ -2338,4 +2338,8 @@ SOURCE=.\changes.txt SOURCE=.\glxext.h # End Source File # End Target + +SOURCE=.\CBurningShader_Raster_Reference.cpp +# End Source File +# End Target # End Project diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile index 49fbab5a..f553d29e 100644 --- a/source/Irrlicht/Makefile +++ b/source/Irrlicht/Makefile @@ -29,10 +29,10 @@ IRROBJ = CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCam 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 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\ +IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CImageLoaderPPM.o CImageLoaderWAL.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 +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 CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o irrXML.o CAttributes.o IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.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 CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o