RageModelGeometry::m_pGeometry -> m_pCompiledGeometry, to

differentiate from Model::m_pGeometry
This commit is contained in:
Glenn Maynard
2004-08-19 06:24:41 +00:00
parent 65c6155f29
commit 4f12abec26
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -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 )
+3 -3
View File
@@ -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();
}
+1 -1
View File
@@ -25,7 +25,7 @@ public:
int m_iRefCount;
vector<msMesh> 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;
};