Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes from Andrew Galante for build with gcc4. LWOB materials finished, some research for LWO2. Unit tests are working again. Added makefile and project workspace for xcode3 (from Andrew, too).

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@110 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2008-08-13 23:46:46 +00:00
parent 0148d06678
commit f13edd8acf
24 changed files with 10063 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/STLLoader.cpp
+3 -3
View File
@@ -182,7 +182,7 @@ void STLImporter::LoadASCIIFile()
unsigned int temp;
// setup the name of the node
if (temp = unsigned int(sz-szMe))
if (temp = (unsigned int)(sz-szMe))
{
pScene->mRootNode->mName.length = temp;
::memcpy(pScene->mRootNode->mName.data,szMe,temp);
@@ -213,9 +213,9 @@ void STLImporter::LoadASCIIFile()
if (pMesh->mNumFaces == curFace)
{
// need to resize the arrays, our size estimate was wrong
unsigned int iNeededSize = unsigned int(sz-mBuffer) / pMesh->mNumFaces;
unsigned int iNeededSize = (unsigned int)(sz-mBuffer) / pMesh->mNumFaces;
if (iNeededSize <= 160)iNeededSize >>= 1; // prevent endless looping
unsigned int add = unsigned int((mBuffer+fileSize)-sz) / iNeededSize;
unsigned int add = (unsigned int)((mBuffer+fileSize)-sz) / iNeededSize;
add += add >> 3; // add 12.5% as buffer
iNeededSize = (pMesh->mNumFaces + add)*3;
aiVector3D* pv = new aiVector3D[iNeededSize];