zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Restored the ability to set a textures by a float interface, but this solution was marked as deprecated. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4132 dfc29bdd-3216-0410-991c-e03cc46cb475
master
nadro 2012-04-11 16:37:56 +00:00
parent 5d3bb13d00
commit 353c6170ee
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/Irrlicht/COpenGLSLMaterialRenderer.cpp
View File

@ -529,6 +529,9 @@ bool COpenGLSLMaterialRenderer::setPixelShaderConstant(const c8* name, const f32
switch (UniformInfo[i].type)
{
case GL_FLOAT:
Driver->extGlUniform1fv(Location, count, floats);
break;
case GL_FLOAT_VEC2_ARB:
Driver->extGlUniform2fv(Location, count/2, floats);
break;
@ -547,9 +550,10 @@ bool COpenGLSLMaterialRenderer::setPixelShaderConstant(const c8* name, const f32
case GL_FLOAT_MAT4_ARB:
Driver->extGlUniformMatrix4fv(Location, count/16, false, floats);
break;
// case GL_FLOAT:
default:
Driver->extGlUniform1fv(Location, count, floats);
default: // deprecated.
os::Printer::log("You used deprecated solution, please use an int interface instead of a float to set a variable", name, ELL_WARNING);
s32 ID = *floats;
Driver->extGlUniform1iv(Location, 1, &ID);
break;
}
return true;