diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp index 9fa1c4cdb6..22a610c5bb 100644 --- a/stepmania/src/Model.cpp +++ b/stepmania/src/Model.cpp @@ -352,14 +352,14 @@ void Model::DrawPrimitives() { // render the diffuse texture DISPLAY->SetTexture( 0, mat.diffuse.GetCurrentTexture() ); - DISPLAY->SetSphereEnivronmentMapping( mat.diffuse.m_bSphereMapped ); + DISPLAY->SetSphereEnvironmentMapping( mat.diffuse.m_bSphereMapped ); DrawMesh( i ); // render the additive texture if( mat.alpha.GetCurrentTexture() ) { DISPLAY->SetTexture( 0, mat.alpha.GetCurrentTexture() ); - DISPLAY->SetSphereEnivronmentMapping( mat.alpha.m_bSphereMapped ); + DISPLAY->SetSphereEnvironmentMapping( mat.alpha.m_bSphereMapped ); // UGLY: This overrides the Actor's BlendMode DISPLAY->SetBlendMode( BLEND_ADD ); DISPLAY->SetTextureFiltering( true ); @@ -370,13 +370,13 @@ void Model::DrawPrimitives() { // render the diffuse texture with texture unit 1 DISPLAY->SetTexture( 0, mat.diffuse.GetCurrentTexture() ); - DISPLAY->SetSphereEnivronmentMapping( mat.diffuse.m_bSphereMapped ); + DISPLAY->SetSphereEnvironmentMapping( mat.diffuse.m_bSphereMapped ); // render the additive texture with texture unit 2 if( mat.alpha.GetCurrentTexture() ) { DISPLAY->SetTexture( 1, mat.alpha.GetCurrentTexture() ); - DISPLAY->SetSphereEnivronmentMapping( mat.alpha.m_bSphereMapped ); + DISPLAY->SetSphereEnvironmentMapping( mat.alpha.m_bSphereMapped ); DISPLAY->SetTextureModeAdd(); DISPLAY->SetTextureFiltering( true ); } @@ -386,7 +386,7 @@ void Model::DrawPrimitives() // Turn off Environment mapping on tex unit 0. Is there a better way to reset? DISPLAY->SetTexture( 0, NULL ); - DISPLAY->SetSphereEnivronmentMapping( 0 ); + DISPLAY->SetSphereEnvironmentMapping( 0 ); } } else @@ -398,11 +398,11 @@ void Model::DrawPrimitives() static const float shininess = 1; DISPLAY->SetMaterial( emissive, ambient, diffuse, specular, shininess ); DISPLAY->ClearAllTextures(); - DISPLAY->SetSphereEnivronmentMapping( false ); + DISPLAY->SetSphereEnvironmentMapping( false ); DrawMesh( i ); } - DISPLAY->SetSphereEnivronmentMapping( false ); + DISPLAY->SetSphereEnvironmentMapping( false ); DISPLAY->SetBlendMode( BLEND_NORMAL ); DISPLAY->TexturePopMatrix(); } diff --git a/stepmania/src/RageDisplay.h b/stepmania/src/RageDisplay.h index de98156abc..f963a008c0 100644 --- a/stepmania/src/RageDisplay.h +++ b/stepmania/src/RageDisplay.h @@ -226,7 +226,7 @@ public: const RageColor &specular, const RageVector3 &dir ) = 0; - virtual void SetSphereEnivronmentMapping( bool b ) = 0; + virtual void SetSphereEnvironmentMapping( bool b ) = 0; virtual RageCompiledGeometry* CreateCompiledGeometry() = 0; virtual void DeleteCompiledGeometry( RageCompiledGeometry* p ) = 0; diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp index 3b23b9ef5d..418b6a69db 100644 --- a/stepmania/src/RageDisplay_D3D.cpp +++ b/stepmania/src/RageDisplay_D3D.cpp @@ -1329,7 +1329,7 @@ RageMatrix RageDisplay_D3D::GetOrthoMatrix( float l, float r, float b, float t, return m; } -void RageDisplay_D3D::SetSphereEnivronmentMapping( bool b ) +void RageDisplay_D3D::SetSphereEnvironmentMapping( bool b ) { if( g_iCurrentTextureIndex >= (int) g_DeviceCaps.MaxSimultaneousTextures ) // not supported return; diff --git a/stepmania/src/RageDisplay_D3D.h b/stepmania/src/RageDisplay_D3D.h index 87b910016b..5ec776b42d 100644 --- a/stepmania/src/RageDisplay_D3D.h +++ b/stepmania/src/RageDisplay_D3D.h @@ -61,7 +61,7 @@ public: const RageColor &specular, const RageVector3 &dir ); - void SetSphereEnivronmentMapping( bool b ); + void SetSphereEnvironmentMapping( bool b ); RageCompiledGeometry* CreateCompiledGeometry(); void DeleteCompiledGeometry( RageCompiledGeometry* p ); diff --git a/stepmania/src/RageDisplay_Null.h b/stepmania/src/RageDisplay_Null.h index 4d8ce356a6..0fd867d2c4 100644 --- a/stepmania/src/RageDisplay_Null.h +++ b/stepmania/src/RageDisplay_Null.h @@ -59,7 +59,7 @@ public: const RageColor &specular, const RageVector3 &dir ) { } - void SetSphereEnivronmentMapping( bool b ) { } + void SetSphereEnvironmentMapping( bool b ) { } RageCompiledGeometry* CreateCompiledGeometry(); void DeleteCompiledGeometry( RageCompiledGeometry* p ); diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index a851717649..9719539c17 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -1877,7 +1877,7 @@ bool RageDisplay_OGL::SupportsTextureFormat( PixelFormat pixfmt, bool realtime ) } } -void RageDisplay_OGL::SetSphereEnivronmentMapping( bool b ) +void RageDisplay_OGL::SetSphereEnvironmentMapping( bool b ) { if( b ) { diff --git a/stepmania/src/RageDisplay_OGL.h b/stepmania/src/RageDisplay_OGL.h index c5e9c8ed86..9b8df3fef1 100644 --- a/stepmania/src/RageDisplay_OGL.h +++ b/stepmania/src/RageDisplay_OGL.h @@ -62,7 +62,7 @@ public: const RageColor &specular, const RageVector3 &dir ); - void SetSphereEnivronmentMapping( bool b ); + void SetSphereEnvironmentMapping( bool b ); RageCompiledGeometry* CreateCompiledGeometry(); void DeleteCompiledGeometry( RageCompiledGeometry* p );