Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove duplicate points removal in PIE loader. Closes ticket:1582 Reviewed by Safety0ff 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9793 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2010-02-13 18:50:15 +00:00 committed by Git SVN Gateway
parent 7b7aca3ce0
commit d254e6a339
1 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/ivis_common/imdload.c
View File

@ -36,11 +36,6 @@
#include "ivispatch.h" #include "ivispatch.h"
#include "tex.h" // texture page loading #include "tex.h" // texture page loading
// Static variables
static VERTEXID vertexTable[iV_IMD_MAX_POINTS];
static BOOL AtEndOfFile(const char *CurPos, const char *EndOfFile) static BOOL AtEndOfFile(const char *CurPos, const char *EndOfFile)
{ {
while ( *CurPos == 0x00 || *CurPos == 0x09 || *CurPos == 0x0a || *CurPos == 0x0d || *CurPos == 0x20 ) while ( *CurPos == 0x00 || *CurPos == 0x09 || *CurPos == 0x0a || *CurPos == 0x0d || *CurPos == 0x20 )
@ -118,7 +113,7 @@ static BOOL _imd_load_polys( const char **ppFileData, iIMDShape *s )
return false; return false;
} }
pFileData += cnt; pFileData += cnt;
poly->pindex[j] = vertexTable[newID]; poly->pindex[j] = newID;
} }
assert(poly->npnts > 2); assert(poly->npnts > 2);
@ -211,54 +206,17 @@ static BOOL ReadPoints( const char **ppFileData, iIMDShape *s )
{ {
const char *pFileData = *ppFileData; const char *pFileData = *ppFileData;
unsigned int i; unsigned int i;
int cnt, j, lastPoint = 0, match = -1; int cnt;
Vector3f newVector = {0.0f, 0.0f, 0.0f};
for (i = 0; i < s->npoints; i++) for (i = 0; i < s->npoints; i++)
{ {
if (sscanf(pFileData, "%f %f %f%n", &newVector.x, &newVector.y, &newVector.z, &cnt) != 3) if (sscanf(pFileData, "%f %f %f%n", &s->points[i].x, &s->points[i].y, &s->points[i].z, &cnt) != 3)
{ {
debug(LOG_ERROR, "(_load_points) file corrupt -K"); debug(LOG_ERROR, "(_load_points) file corrupt -K");
return false; return false;
} }
pFileData += cnt; pFileData += cnt;
//check for duplicate points
match = -1;
// scan through list upto the number of points added (lastPoint) ... not up to the number of points scanned in (i) (which will include duplicates)
for (j = 0; j < lastPoint; j++)
{
if (Vector3f_Compare(newVector, s->points[j]))
{
match = j;
break;
} }
}
//check for duplicate points
if (match == -1)
{
// new point
s->points[lastPoint].x = newVector.x;
s->points[lastPoint].y = newVector.y;
s->points[lastPoint].z = newVector.z;
vertexTable[i] = lastPoint;
lastPoint++;
}
else
{
vertexTable[i] = match;
}
}
//clear remaining table
for (i = s->npoints; i < iV_IMD_MAX_POINTS; i++)
{
vertexTable[i] = -1;
}
s->npoints = lastPoint;
*ppFileData = pFileData; *ppFileData = pFileData;