Use c++ casts instead of plain C ones.

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

source/Irrlicht/COpenGLDriver.h

@@ -239,11 +239,11 @@ namespace video
 
 		//! sets the current Texture
 		//! Returns whether setting was a success or not.
-		bool setTexture(s32 stage, video::ITexture* texture);
+		bool setTexture(u32 stage, video::ITexture* texture);
 
 		//! disables all textures beginning with the optional fromStage parameter. Otherwise all texture stages are disabled.
 		//! Returns whether disabling was successful or not.
-		bool disableTextures(s32 fromStage=0);
+		bool disableTextures(u32 fromStage=0);
 
 		//! Adds a new material renderer to the VideoDriver, using extGLGetObjectParameterivARB(shaderHandle, GL_OBJECT_COMPILE_STATUS_ARB, &status) pixel and/or
 		//! vertex shaders to render geometry.

source/Irrlicht/COpenGLExtensionHandler.cpp

@@ -59,7 +59,7 @@ void COpenGLExtensionHandler::dump() const
 
 void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 {
-	const f32 ver = core::fast_atof((c8*)glGetString(GL_VERSION));
+	const f32 ver = core::fast_atof(reinterpret_cast<const c8*>(glGetString(GL_VERSION)));
 	Version = core::floor32(ver)*100+core::ceil32((ver-floor(ver))*10.0);
 	if ( Version >= 102)
 		os::Printer::log("OpenGL driver version is 1.2 or better.", ELL_INFORMATION);
@@ -67,25 +67,25 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 		os::Printer::log("OpenGL driver version is not 1.2 or better.", ELL_WARNING);
 
 	const GLubyte* t = glGetString(GL_EXTENSIONS);
-//	os::Printer::log((const c8*)t, ELL_INFORMATION);
+//	os::Printer::log(reinterpret_cast<const c8*>(t), ELL_INFORMATION);
 	#ifdef GLU_VERSION_1_3
 	const GLubyte* gluVersion = gluGetString(GLU_VERSION);
 
 	if (gluVersion[0]>1 || gluVersion[3]>2)
 	{
 		for (u32 i=0; i<IRR_OpenGL_Feature_Count; ++i)
-			FeatureAvailable[i] = gluCheckExtension((const GLubyte*)OpenGLFeatureStrings[i], t);
+			FeatureAvailable[i] = gluCheckExtension(reinterpret_cast<const GLubyte*>(OpenGLFeatureStrings[i]), t);
 	}
 	else
 	#endif
 	{
-		s32 len = (s32)strlen((const char*)t);
+		size_t len = strlen(reinterpret_cast<const char*>(t));
 		c8 *str = new c8[len+1];
 		c8* p = str;
 
-		for (s32 i=0; i<len; ++i)
+		for (size_t i=0; i<len; ++i)
 		{
-			str[i] = (char)t[i];
+			str[i] = static_cast<char>(t[i]);
 
 			if (str[i] == ' ')
 			{
@@ -170,7 +170,7 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
         pGlFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) wglGetProcAddress("glFramebufferRenderbufferEXT");
 
 	// vsync extension
-	wglSwapIntervalEXT = (PFNWGLSWAPINTERVALFARPROC)wglGetProcAddress( "wglSwapIntervalEXT" );
+	wglSwapIntervalEXT = (PFNWGLSWAPINTERVALFARPROC) wglGetProcAddress("wglSwapIntervalEXT");
 
 #elif defined(_IRR_USE_LINUX_DEVICE_) || defined (_IRR_USE_SDL_DEVICE_)
 	#ifdef _IRR_OPENGL_USE_EXTPOINTER_
@@ -351,7 +351,11 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 	// set some properties
 #if defined(GL_ARB_multitexture) || defined(GL_VERSION_1_3)
 	if (Version>102 || FeatureAvailable[IRR_ARB_multitexture])
-		glGetIntegerv(GL_MAX_TEXTURE_UNITS, &MaxTextureUnits);
+	{
+		GLint num;
+		glGetIntegerv(GL_MAX_TEXTURE_UNITS, &num);
+		MaxTextureUnits=num;
+	}
 #endif
 	glGetIntegerv(GL_MAX_LIGHTS, &MaxLights);
 #ifdef GL_EXT_texture_filter_anisotropic
@@ -371,7 +375,7 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 			ShaderLanguageVersion = 100;
 		else
 		{
-			const f32 ver = core::fast_atof((c8*)shaderVersion);
+			const f32 ver = core::fast_atof(reinterpret_cast<const c8*>(shaderVersion));
 			ShaderLanguageVersion = core::floor32(ver)*100+core::ceil32((ver-floor(ver))*10.0);
 		}
 	}
@@ -390,7 +394,7 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 		MultiTextureExtension = false;
 		os::Printer::log("Warning: OpenGL device only has one texture unit. Disabling multitexturing.", ELL_WARNING);
 	}
-	MaxTextureUnits = core::min_((u32)MaxTextureUnits,MATERIAL_MAX_TEXTURES);
+	MaxTextureUnits = core::min_(MaxTextureUnits,MATERIAL_MAX_TEXTURES);
 
 }
 

source/Irrlicht/COpenGLExtensionHandler.h

@@ -670,7 +670,7 @@ class COpenGLExtensionHandler
 
 	// Some non-boolean properties
 	//! Maxmimum texture layers supported by the fixed pipeline
-	GLint MaxTextureUnits;
+	u32 MaxTextureUnits;
 	//! Maximum hardware lights supported
 	GLint MaxLights;
 	//! Optimal number of indices per meshbuffer

source/Irrlicht/COpenGLMaterialRenderer.h

@@ -22,8 +22,7 @@ class COpenGLMaterialRenderer : public IMaterialRenderer
 public:
 
 	//! Constructor
-	COpenGLMaterialRenderer(video::COpenGLDriver* driver)
-		: Driver(driver)
+	COpenGLMaterialRenderer(video::COpenGLDriver* driver) : Driver(driver)
 	{
 	}
 

source/Irrlicht/COpenGLNormalMapRenderer.cpp

@@ -201,7 +201,7 @@ COpenGLNormalMapRenderer::COpenGLNormalMapRenderer(video::COpenGLDriver* driver,
 	if (renderer)
 	{
 		// use the already compiled shaders 
-		video::COpenGLNormalMapRenderer* nmr = (video::COpenGLNormalMapRenderer*)renderer;
+		video::COpenGLNormalMapRenderer* nmr = reinterpret_cast<video::COpenGLNormalMapRenderer*>(renderer);
 		CompiledShaders = false;
 
 		VertexShader = nmr->VertexShader;

source/Irrlicht/COpenGLParallaxMapRenderer.cpp

@@ -235,7 +235,7 @@ COpenGLParallaxMapRenderer::COpenGLParallaxMapRenderer(video::COpenGLDriver* dri
 	if (renderer)
 	{
 		// use the already compiled shaders
-		video::COpenGLParallaxMapRenderer* nmr = (video::COpenGLParallaxMapRenderer*)renderer;
+		video::COpenGLParallaxMapRenderer* nmr = reinterpret_cast<video::COpenGLParallaxMapRenderer*>(renderer);
 		CompiledShaders = false;
 
 		VertexShader = nmr->VertexShader;

source/Irrlicht/COpenGLSLMaterialRenderer.cpp

@@ -192,7 +192,7 @@ bool COpenGLSLMaterialRenderer::createShader(GLenum shaderType, const char* shad
 #endif
 		GLcharARB *pInfoLog = new GLcharARB[maxLength];
 		Driver->extGlGetInfoLog(shaderHandle, maxLength, &length, pInfoLog);
-		os::Printer::log((const c8*)pInfoLog);
+		os::Printer::log(reinterpret_cast<const c8*>(pInfoLog));
 		delete [] pInfoLog;
 
 		return false;
@@ -225,7 +225,7 @@ bool COpenGLSLMaterialRenderer::linkProgram()
 #endif
 		GLcharARB *pInfoLog = new GLcharARB[maxLength];
 		Driver->extGlGetInfoLog(Program, maxLength, &length, pInfoLog);
-		os::Printer::log((const c8*)pInfoLog);
+		os::Printer::log(reinterpret_cast<const c8*>(pInfoLog));
 		delete [] pInfoLog;
 
 		return false;
@@ -266,7 +266,7 @@ bool COpenGLSLMaterialRenderer::linkProgram()
 		memset(buf, 0, maxlen);
 
 		GLint size;
-		Driver->extGlGetActiveUniform(Program, i, maxlen, 0, &size, &ui.type, (GLcharARB*)buf);
+		Driver->extGlGetActiveUniform(Program, i, maxlen, 0, &size, &ui.type, reinterpret_cast<GLcharARB*>(buf));
 		ui.name = buf;
 
 		UniformInfo.push_back(ui);
@@ -301,9 +301,9 @@ void COpenGLSLMaterialRenderer::setVertexShaderConstant(const f32* data, s32 sta
 
 bool COpenGLSLMaterialRenderer::setPixelShaderConstant(const c8* name, const f32* floats, int count)
 {
-	int i = 0, num = (int)UniformInfo.size();
+	int i, num = static_cast<int>(UniformInfo.size());
 
-	for (; i < num; i++)
+	for (i=0; i < num; ++i)
 	{
 		if (UniformInfo[i].name == name)
 			break;
@@ -337,7 +337,7 @@ bool COpenGLSLMaterialRenderer::setPixelShaderConstant(const c8* name, const f32
 			Driver->extGlUniformMatrix4fv(i, count/16, false, floats);
 			break;
 		default:
-			Driver->extGlUniform1iv(i, count, (GLint*)floats);
+			Driver->extGlUniform1iv(i, count, reinterpret_cast<const GLint*>(floats));
 			break;
 	}
 #endif

source/Irrlicht/COpenGLShaderMaterialRenderer.cpp

@@ -160,7 +160,8 @@ bool COpenGLShaderMaterialRenderer::createPixelShader(const c8* pxsh)
 	Driver->extGlBindProgram(GL_FRAGMENT_PROGRAM_ARB, PixelShader);
 
 	// clear error buffer
-	while(glGetError() != GL_NO_ERROR)	{}
+	while(glGetError() != GL_NO_ERROR)
+		{}
 
 	// compile
 	Driver->extGlProgramString(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
@@ -199,7 +200,8 @@ bool COpenGLShaderMaterialRenderer::createVertexShader(const char* vtxsh)
 	Driver->extGlBindProgram(GL_VERTEX_PROGRAM_ARB, VertexShader);
 
 	// clear error buffer
-	while(glGetError() != GL_NO_ERROR)	{}
+	while(glGetError() != GL_NO_ERROR)
+		{}
 
 	// compile
 	Driver->extGlProgramString(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,