- Fixed some minor issues with Cg material renderer.

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

source/Irrlicht/CCgMaterialRenderer.cpp

@@ -22,6 +22,10 @@ CCgUniform::CCgUniform(const CGparameter& parameter, bool global) : Parameter(pa
 		Space = CG_PROGRAM;
 }
 
+CCgUniform::~CCgUniform()
+{
+}
+
 const core::stringc& CCgUniform::getName() const
 {
 	return Name;

source/Irrlicht/CCgMaterialRenderer.h

@@ -31,6 +31,7 @@ class CCgUniform
 {
 public:
 	CCgUniform(const CGparameter& parameter, bool global);
+	virtual ~CCgUniform();
 
 	const core::stringc& getName() const;
 	const CGparameter& getParameter() const;

source/Irrlicht/COpenGLCgMaterialRenderer.cpp

@@ -152,7 +152,7 @@ void COpenGLCgMaterialRenderer::init(s32& materialType,
 	const c8* geometryProgram, const c8* geometryEntry, E_GEOMETRY_SHADER_TYPE geometryProfile,
 	scene::E_PRIMITIVE_TYPE inType, scene::E_PRIMITIVE_TYPE outType, u32 vertices)
 {
-	bool Status = true;
+	bool shaderStatus = true;
 	CGerror Error = CG_NO_ERROR;
 	materialType = -1;
 
@@ -171,7 +171,7 @@ void COpenGLCgMaterialRenderer::init(s32& materialType,
 			os::Printer::log("Cg vertex program failed to compile:", ELL_ERROR);
 			os::Printer::log(cgGetLastListing(Driver->getCgContext()), ELL_ERROR);
 
-			Status = false;
+			shaderStatus = false;
 		}
 		else
 			cgGLLoadProgram(VertexProgram);
@@ -190,7 +190,7 @@ void COpenGLCgMaterialRenderer::init(s32& materialType,
 			os::Printer::log("Cg fragment program failed to compile:", ELL_ERROR);
 			os::Printer::log(cgGetLastListing(Driver->getCgContext()), ELL_ERROR);
 
-			Status = false;
+			shaderStatus = false;
 		}
 		else
 			cgGLLoadProgram(FragmentProgram);
@@ -209,7 +209,7 @@ void COpenGLCgMaterialRenderer::init(s32& materialType,
 			os::Printer::log("Cg geometry program failed to compile:", ELL_ERROR);
 			os::Printer::log(cgGetLastListing(Driver->getCgContext()), ELL_ERROR);
 
-			Status = false;
+			shaderStatus = false;
 		}
 		else
 			cgGLLoadProgram(GeometryProgram);
@@ -233,7 +233,7 @@ void COpenGLCgMaterialRenderer::init(s32& materialType,
 		}
 	}
 
-	if (Status)
+	if (shaderStatus)
 		materialType = Driver->addMaterialRenderer(this);
 }
 

source/Irrlicht/Makefile

@@ -38,7 +38,7 @@ IRRMESHOBJ = $(IRRMESHLOADER) $(IRRMESHWRITER) \
 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 CSceneLoaderIrr.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
+IRRDRVROBJ = CNullDriver.o CCgMaterialRenderer.o COpenGLCgMaterialRenderer.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 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)