From 4f12abec26b6e71a67f8896f766e8261ecc265bb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 19 Aug 2004 06:24:41 +0000 Subject: [PATCH] RageModelGeometry::m_pGeometry -> m_pCompiledGeometry, to differentiate from Model::m_pGeometry --- stepmania/src/Model.cpp | 2 +- stepmania/src/RageModelGeometry.cpp | 6 +++--- stepmania/src/RageModelGeometry.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp index c78198bec1..db0c05aaa2 100644 --- a/stepmania/src/Model.cpp +++ b/stepmania/src/Model.cpp @@ -546,7 +546,7 @@ void Model::DrawMesh( int i ) const } // Draw it - const RageCompiledGeometry* TempGeometry = m_pTempGeometry ? m_pTempGeometry : m_pGeometry->m_pGeometry; + const RageCompiledGeometry* TempGeometry = m_pTempGeometry ? m_pTempGeometry : m_pGeometry->m_pCompiledGeometry; DISPLAY->DrawCompiledGeometry( TempGeometry, i, m_pGeometry->m_Meshes ); if( pMesh->nBoneIndex != -1 ) diff --git a/stepmania/src/RageModelGeometry.cpp b/stepmania/src/RageModelGeometry.cpp index 992e365865..3496283957 100644 --- a/stepmania/src/RageModelGeometry.cpp +++ b/stepmania/src/RageModelGeometry.cpp @@ -9,12 +9,12 @@ RageModelGeometry::RageModelGeometry () { m_iRefCount = 1; - m_pGeometry = DISPLAY->CreateCompiledGeometry(); + m_pCompiledGeometry = DISPLAY->CreateCompiledGeometry(); } RageModelGeometry::~RageModelGeometry () { - DISPLAY->DeleteCompiledGeometry( m_pGeometry ); + DISPLAY->DeleteCompiledGeometry( m_pCompiledGeometry ); } void RageModelGeometry::OptimizeBones() @@ -243,7 +243,7 @@ void RageModelGeometry::LoadMilkshapeAscii( CString sPath ) OptimizeBones(); // send the finalized vertices to the graphics card - m_pGeometry->Set( m_Meshes ); + m_pCompiledGeometry->Set( m_Meshes ); f.Close(); } diff --git a/stepmania/src/RageModelGeometry.h b/stepmania/src/RageModelGeometry.h index 762b7902a9..365fac01a5 100644 --- a/stepmania/src/RageModelGeometry.h +++ b/stepmania/src/RageModelGeometry.h @@ -25,7 +25,7 @@ public: int m_iRefCount; vector m_Meshes; - RageCompiledGeometry* m_pGeometry; // video memory copy of geometry shared by all meshes + RageCompiledGeometry* m_pCompiledGeometry; // video memory copy of geometry shared by all meshes RageVector3 m_vMins, m_vMaxs; };