Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Animated faces with bumpmapping now behave as expected.

Browse Source
This commit is contained in:
Shyotl
2011-10-21 15:03:46 -05:00
parent fb32a0be5a
commit 53f5957b92
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/shaders/class1/objects/bumpV.glsl
View File

@@ -11,6 +11,6 @@ void main()
//transform vertex //transform vertex
gl_Position = gl_ModelViewProjectionMatrix*gl_Vertex; gl_Position = gl_ModelViewProjectionMatrix*gl_Vertex;
gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
gl_TexCoord[1] = gl_TextureMatrix[1] * gl_MultiTexCoord1; gl_TexCoord[1] = gl_TextureMatrix[0] * gl_MultiTexCoord1;
gl_FrontColor = gl_Color; gl_FrontColor = gl_Color;
} }

18
indra/newview/lldrawpoolbump.cpp
View File

@@ -1374,11 +1374,16 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL
} }
else else
{ {
gGL.getTexUnit(1)->activate(); if (!gPipeline.canUseVertexShaders())
{
gGL.getTexUnit(1)->activate();
glMatrixMode(GL_TEXTURE);
glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
}
gGL.getTexUnit(0)->activate();
glMatrixMode(GL_TEXTURE); glMatrixMode(GL_TEXTURE);
glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix); glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
gPipeline.mTextureMatrixOps++; gPipeline.mTextureMatrixOps++;
gGL.getTexUnit(0)->activate();
} }
glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix); glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
@@ -1415,9 +1420,14 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL
} }
else else
{ {
gGL.getTexUnit(1)->activate(); if (!gPipeline.canUseVertexShaders())
glLoadIdentity(); {
gGL.getTexUnit(1)->activate();
glMatrixMode(GL_TEXTURE);
glLoadIdentity();
}
gGL.getTexUnit(0)->activate(); gGL.getTexUnit(0)->activate();
glMatrixMode(GL_TEXTURE);
} }
glLoadIdentity(); glLoadIdentity();
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);