actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reset tex matrix per-material

Browse Source
This commit is contained in:
Chris Danford
2005-05-01 00:06:53 +00:00
parent 0fd0eb48cc
commit 0c50d0daec
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Model.cpp
+6 -2
View File
@@ -362,7 +362,6 @@ void Model::DrawPrimitives()
{ {
const msMesh *pMesh = &m_pGeometry->m_Meshes[i]; const msMesh *pMesh = &m_pGeometry->m_Meshes[i];
DISPLAY->TexturePushMatrix();
if( pMesh->nMaterialIndex != -1 ) // has a material if( pMesh->nMaterialIndex != -1 ) // has a material
{ {
@@ -381,7 +380,10 @@ void Model::DrawPrimitives()
RageVector2 vTexTranslate = mat.diffuse.GetTextureTranslate(); RageVector2 vTexTranslate = mat.diffuse.GetTextureTranslate();
if( vTexTranslate.x != 0 || vTexTranslate.y != 0 ) if( vTexTranslate.x != 0 || vTexTranslate.y != 0 )
{
DISPLAY->TexturePushMatrix();
DISPLAY->TextureTranslate( vTexTranslate.x, vTexTranslate.y, 0 ); DISPLAY->TextureTranslate( vTexTranslate.x, vTexTranslate.y, 0 );
}
/* There's some common code that could be folded out here, but it seems /* There's some common code that could be folded out here, but it seems
* clearer to keep it separate. */ * clearer to keep it separate. */
@@ -438,6 +440,9 @@ void Model::DrawPrimitives()
DISPLAY->SetTexture( 0, NULL ); DISPLAY->SetTexture( 0, NULL );
DISPLAY->SetSphereEnvironmentMapping( 0 ); DISPLAY->SetSphereEnvironmentMapping( 0 );
} }
if( vTexTranslate.x != 0 || vTexTranslate.y != 0 )
DISPLAY->TexturePopMatrix();
} }
else else
{ {
@@ -454,7 +459,6 @@ void Model::DrawPrimitives()
DISPLAY->SetSphereEnvironmentMapping( false ); DISPLAY->SetSphereEnvironmentMapping( false );
DISPLAY->SetBlendMode( BLEND_NORMAL ); DISPLAY->SetBlendMode( BLEND_NORMAL );
DISPLAY->TexturePopMatrix();
} }
} }