ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong texture units

Browse Source
This commit is contained in:
Benau 2016-12-02 19:26:40 +08:00
parent 4fbce474c5
commit bfc006b979
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/stk_mesh_scene_node.cpp
View File

@ -438,7 +438,7 @@ void STKMeshSceneNode::render()
if (!mesh.TextureHandles[2]) if (!mesh.TextureHandles[2])
mesh.TextureHandles[2] = mesh.TextureHandles[2] =
glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[7]), glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[2]),
Shaders::ObjectPass2Shader::getInstance()->m_sampler_ids[0]); Shaders::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
if (!glIsTextureHandleResidentARB(mesh.TextureHandles[2])) if (!glIsTextureHandleResidentARB(mesh.TextureHandles[2]))
glMakeTextureHandleResidentARB(mesh.TextureHandles[2]); glMakeTextureHandleResidentARB(mesh.TextureHandles[2]);
@ -456,7 +456,7 @@ void STKMeshSceneNode::render()
irr_driver->getRenderTargetTexture(RTT_HALF1_R), irr_driver->getRenderTargetTexture(RTT_HALF1_R),
getTextureGLuint(mesh.textures[0]), getTextureGLuint(mesh.textures[0]),
getTextureGLuint(mesh.textures[1]), getTextureGLuint(mesh.textures[1]),
getTextureGLuint(mesh.textures[7])); getTextureGLuint(mesh.textures[2]));
Shaders::ObjectPass2Shader::getInstance()->setUniforms(AbsoluteTransformation, Shaders::ObjectPass2Shader::getInstance()->setUniforms(AbsoluteTransformation,
mesh.texture_trans, mesh.texture_trans,
core::vector2df(0.0f, 0.0f)); core::vector2df(0.0f, 0.0f));