Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 03:33:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a couple copy and paste errors.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-05-23 16:56:10 -07:00
parent 84b78429f2
commit ac2137c3b6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/renderer/Model.cpp
View file

@ -350,7 +350,7 @@ void Model::init() {
Application::resourcesPath() + "shaders/model_shadow_normal_specular_map.frag");
_skinShadowNormalSpecularMapProgram.link();
initSkinProgram(_skinNormalSpecularMapProgram, _skinShadowNormalSpecularMapLocations, 2, 3);
initSkinProgram(_skinShadowNormalSpecularMapProgram, _skinShadowNormalSpecularMapLocations, 2, 3);
_skinShadowProgram.addShaderFromSourceFile(QGLShader::Vertex,
@ -1646,6 +1646,7 @@ void Model::renderMeshes(float alpha, RenderMode mode, bool translucent) {
program = &_shadowNormalMapProgram;
skinProgram = &_skinShadowNormalMapProgram;
skinLocations = &_skinShadowNormalMapLocations;
shadowTextureUnit = GL_TEXTURE2;
} else {
program = &_normalMapProgram;
skinProgram = &_skinNormalMapProgram;
@ -1656,14 +1657,14 @@ void Model::renderMeshes(float alpha, RenderMode mode, bool translucent) {
program = &_shadowSpecularMapProgram;
skinProgram = &_skinShadowSpecularMapProgram;
skinLocations = &_skinShadowSpecularMapLocations;
specularTextureUnit = GL_TEXTURE1;
shadowTextureUnit = GL_TEXTURE2;
} else {
program = &_specularMapProgram;
skinProgram = &_skinSpecularMapProgram;
skinLocations = &_skinSpecularMapLocations;
specularTextureUnit = GL_TEXTURE1;
}
specularTextureUnit = GL_TEXTURE1;
} else if (receiveShadows) {
program = &_shadowMapProgram;
skinProgram = &_skinShadowMapProgram;