v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes for build with MinGW 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@19 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
DarkGuru 2008-05-18 08:34:16 +00:00
parent 851ec21ee5
commit a63b257b2b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/assimp_view/MeshRenderer.cpp
View File

@ -93,7 +93,7 @@ int CMeshRenderer::DrawSorted(unsigned int iIndex,const aiMatrix4x4& mWorld)
// well ... this is really funny now. We must compute their distance // well ... this is really funny now. We must compute their distance
// from the camera. We take the average distance of a face and add it // from the camera. We take the average distance of a face and add it
// to a map which sorts it // to a map which sorts it
std::map<float,unsigned int, std::greater_equal<float>> smap; std::map<float,unsigned int, std::greater_equal<float> > smap;
for (unsigned int iFace = 0; iFace < pcMesh->mNumFaces;++iFace) for (unsigned int iFace = 0; iFace < pcMesh->mNumFaces;++iFace)
{ {
@ -120,7 +120,7 @@ int CMeshRenderer::DrawSorted(unsigned int iIndex,const aiMatrix4x4& mWorld)
uint16_t* aiIndices; uint16_t* aiIndices;
pcHelper->piIB->Lock(0,0,(void**)&aiIndices,D3DLOCK_DISCARD); pcHelper->piIB->Lock(0,0,(void**)&aiIndices,D3DLOCK_DISCARD);
for (std::map<float,unsigned int, std::greater_equal<float>>::const_iterator for (std::map<float,unsigned int, std::greater_equal<float> >::const_iterator
i = smap.begin(); i = smap.begin();
i != smap.end();++i) i != smap.end();++i)
{ {
@ -135,7 +135,7 @@ int CMeshRenderer::DrawSorted(unsigned int iIndex,const aiMatrix4x4& mWorld)
uint32_t* aiIndices; uint32_t* aiIndices;
pcHelper->piIB->Lock(0,0,(void**)&aiIndices,D3DLOCK_DISCARD); pcHelper->piIB->Lock(0,0,(void**)&aiIndices,D3DLOCK_DISCARD);
for (std::map<float,unsigned int, std::greater_equal<float>>::const_iterator for (std::map<float,unsigned int, std::greater_equal<float> >::const_iterator
i = smap.begin(); i = smap.begin();
i != smap.end();++i) i != smap.end();++i)
{ {