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

MD5 parser will now reject files with version!=10.

Browse Source 
3DS Loader -> improved light and camera handling.
DXF -> minor fixes, refactoring.
Updating DLL revision number.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@379 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2009-04-09 21:37:49 +00:00
parent 825118b970
commit bcfbc37301
5 changed files with 93 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
code/DXFLoader.cpp
View File

@@ -112,7 +112,8 @@ bool DXFImporter::GetNextLine()
{
if(!SkipLine(&buffer))
return false;
if(!SkipSpaces(&buffer))return GetNextLine();
if(!SkipSpaces(&buffer))
return GetNextLine();
else if (*buffer == '{') {
// some strange meta data ...
while (true)
@@ -139,11 +140,12 @@ bool DXFImporter::GetNextToken()
SkipSpaces(&buffer);
groupCode = strtol10s(buffer,&buffer);
if(!GetNextLine())return false;
if(!GetNextLine())
return false;
// copy the data line to a separate buffer
char* m = cursor, *end = &cursor[4096];
while (!IsLineEnd ( *buffer ) && m < end)
while (!IsSpaceOrNewLine( *buffer ) && m < end)
*m++ = *buffer++;
*m = '\0';
@@ -163,7 +165,7 @@ void DXFImporter::InternReadFile( const std::string& pFile,
throw new ImportErrorException( "Failed to open DXF file " + pFile + "");
// read the contents of the file in a buffer
unsigned int m = (unsigned int)file->FileSize();
size_t m = file->FileSize();
std::vector<char> buffer2(m+1);
buffer = &buffer2[0];
file->Read( &buffer2[0], m,1);
@@ -182,13 +184,17 @@ void DXFImporter::InternReadFile( const std::string& pFile,
if (2 == groupCode) {
// ENTITIES and BLOCKS sections - skip the whole rest, no need to waste our time with them
if (!::strcmp(cursor,"ENTITIES") || !::strcmp(cursor,"BLOCKS"))
if (!ParseEntities())break; else bRepeat = true;
if (!::strcmp(cursor,"ENTITIES") || !::strcmp(cursor,"BLOCKS")) {
if (!ParseEntities())
break;
else bRepeat = true;
}
// other sections - skip them to make sure there will be no name conflicts
else {
while (GetNextToken()) {
if (!groupCode && !::strcmp(cursor,"ENDSEC"))break;
while ( GetNextToken()) {
if (!::strcmp(cursor,"ENDSEC"))
break;
}
}
}
@@ -202,7 +208,8 @@ void DXFImporter::InternReadFile( const std::string& pFile,
// find out how many valud layers we have
for (std::vector<LayerInfo>::const_iterator it = mLayers.begin(),end = mLayers.end(); it != end;++it) {
if (!(*it).vPositions.empty())++pScene->mNumMeshes;
if (!(*it).vPositions.empty())
++pScene->mNumMeshes;
}
if (!pScene->mNumMeshes)
@@ -476,8 +483,7 @@ bool DXFImporter::ParsePolyLineVertex(aiVector3D& out,aiColor4D& clr, unsigned i
case 0: ret = true;
break;
// todo - handle the correct layer for the vertex
// At the moment it is assumed that all vertices of
// todo - handle the correct layer for the vertex. At the moment it is assumed that all vertices of
// a polyline are placed on the same global layer.
// x position of the first corner
@@ -519,7 +525,9 @@ bool DXFImporter::Parse3DFace()
while (GetNextToken()) {
switch (groupCode) {
case 0: ret = true;break;
case 0:
ret = true;
break;
// 8 specifies the layer
case 8: {
@@ -572,10 +580,12 @@ bool DXFImporter::Parse3DFace()
// color
case 62: clr = g_aclrDxfIndexColors[strtol10(cursor) % AI_DXF_NUM_INDEX_COLORS]; break;
};
if (ret)break;
if (ret)
break;
}
if (!bThird)vip[2] = vip[1];
if (!bThird)
vip[2] = vip[1];
// use a default layer if necessary
if (!out) {