RageModelGeometry::m_pGeometry -> m_pCompiledGeometry, to
differentiate from Model::m_pGeometry
This commit is contained in:
@@ -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 )
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user