actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cleanup

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_D3D.cpp
+5 -9
View File
@@ -766,16 +766,12 @@ 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
stepmania/src/RageDisplay_OGL.cpp
+10 -14
View File
@@ -924,23 +924,19 @@ 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_vTexture[meshInfo.iVertexStart+j] = Vertices[j].t;
m_vPosition[meshInfo.iVertexStart+j] = Vertices[j].p; m_vNormal[meshInfo.iVertexStart+j] = Vertices[j].n;
m_vTexture[meshInfo.iVertexStart+j] = Vertices[j].t;
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++ ) {
{ int iVertexIndexInVBO = meshInfo.iVertexStart + Triangles[j].nVertexIndices[k];
int iVertexIndexInVBO = meshInfo.iVertexStart + Triangles[j].nVertexIndices[k]; m_vTriangles[meshInfo.iTriangleStart+j].nVertexIndices[k] = (uint16_t) iVertexIndexInVBO;
m_vTriangles[meshInfo.iTriangleStart+j].nVertexIndices[k] = (uint16_t) iVertexIndexInVBO; }
}
}
} }
} }
void Draw( int iMeshIndex ) const void Draw( int iMeshIndex ) const