This commit is contained in:
Glenn Maynard
2004-08-19 00:36:11 +00:00
parent 40cecbcf50
commit 39988e2d93
2 changed files with 15 additions and 23 deletions
-4
View File
@@ -766,18 +766,14 @@ public:
const vector<RageModelVertex> &Vertices = mesh.Vertices; const vector<RageModelVertex> &Vertices = mesh.Vertices;
const vector<msTriangle> &Triangles = mesh.Triangles; const vector<msTriangle> &Triangles = mesh.Triangles;
{
for( unsigned j=0; j<Vertices.size(); j++ ) for( unsigned j=0; j<Vertices.size(); j++ )
m_vVertex[meshInfo.iVertexStart+j] = Vertices[j]; m_vVertex[meshInfo.iVertexStart+j] = Vertices[j];
}
{
for( unsigned j=0; j<Triangles.size(); j++ ) for( unsigned j=0; j<Triangles.size(); j++ )
for( unsigned k=0; k<3; k++ ) for( unsigned k=0; k<3; k++ )
m_vTriangles[meshInfo.iTriangleStart+j].nVertexIndices[k] = (uint16_t) meshInfo.iVertexStart + Triangles[j].nVertexIndices[k]; m_vTriangles[meshInfo.iTriangleStart+j].nVertexIndices[k] = (uint16_t) meshInfo.iVertexStart + Triangles[j].nVertexIndices[k];
} }
} }
}
void Draw( int iMeshIndex ) const void Draw( int iMeshIndex ) const
{ {
const MeshInfo& meshInfo = m_vMeshInfo[iMeshIndex]; const MeshInfo& meshInfo = m_vMeshInfo[iMeshIndex];
-4
View File
@@ -924,16 +924,13 @@ public:
const vector<RageModelVertex> &Vertices = mesh.Vertices; const vector<RageModelVertex> &Vertices = mesh.Vertices;
const vector<msTriangle> &Triangles = mesh.Triangles; const vector<msTriangle> &Triangles = mesh.Triangles;
{
for( unsigned j=0; j<Vertices.size(); j++ ) for( unsigned j=0; j<Vertices.size(); j++ )
{ {
m_vPosition[meshInfo.iVertexStart+j] = Vertices[j].p; m_vPosition[meshInfo.iVertexStart+j] = Vertices[j].p;
m_vTexture[meshInfo.iVertexStart+j] = Vertices[j].t; m_vTexture[meshInfo.iVertexStart+j] = Vertices[j].t;
m_vNormal[meshInfo.iVertexStart+j] = Vertices[j].n; m_vNormal[meshInfo.iVertexStart+j] = Vertices[j].n;
} }
}
{
for( unsigned j=0; j<Triangles.size(); j++ ) for( unsigned j=0; j<Triangles.size(); j++ )
for( unsigned k=0; k<3; k++ ) for( unsigned k=0; k<3; k++ )
{ {
@@ -942,7 +939,6 @@ public:
} }
} }
} }
}
void Draw( int iMeshIndex ) const void Draw( int iMeshIndex ) const
{ {
TurnOffHardwareVBO(); TurnOffHardwareVBO();