speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Re #691: splitOb() moved object creation to separate function (Boris)

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4865 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 9430918c5162246526cefa8483b7e34666a95da0
Former-commit-id: 0ca31d91d2ed9688061553f676013bdb5124c9b4
This commit is contained in:
kmetykog 2012-08-17 22:10:00 +00:00
parent 1ce22f4bfb
commit 976ebb0aba
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/tools/accc/ac3dload.cpp
View file

@ -152,6 +152,23 @@ verbaction_t verbTab[] =
{ CREASE, doCrease },
{ "END", NULL } };
/** copy the (u,v) coords from srcidxarr to the corresponding position in destarr.
* destarr needs to have 2 * number of vertices entries.
*/
void createTexCoordArray(double * destarr, tcoord_t * srcidxarr, int numidx)
{
tcoord_t * curidxobj = NULL;
int curidx = 0;
for (curidx = 0; curidx < numidx; curidx++)
{
curidxobj = &srcidxarr[curidx];
destarr[curidxobj->indice * 2] = curidxobj->u;
destarr[curidxobj->indice * 2 + 1] = curidxobj->v;
}
}
/** Creates a new object from the given data. This function is used during object splitting.
*
* @param splitid the id of this split object
@ -169,11 +186,10 @@ ob_t * createObjectSplitCopy(int splitid, ob_t * srcobj,
int numidx, tcoord_t * idxarray)
{
int numtri = numidx / 3;
int curidx = 0;
tcoord_t * curidxobj = NULL;
int size_pts = sizeof(point_t) * numvert;
int size_idx = sizeof(tcoord_t) * numidx;
int size_texcoord = sizeof(double) * numvert * 2;
/* allocate space */
ob_t * tob = (ob_t*) malloc(sizeof(ob_t));
@ -186,8 +202,8 @@ ob_t * createObjectSplitCopy(int splitid, ob_t * srcobj,
memset(tob->snorm, 0, size_pts);
tob->vertexarray = (tcoord_t *) malloc(size_idx);
memset(tob->vertexarray, 0, size_idx);
tob->textarray = (double *) malloc(sizeof(tcoord_t) * numtri * 2);
memset(tob->textarray, 0, sizeof(tcoord_t) * numtri * 2);
tob->textarray = (double *) malloc(size_texcoord);
memset(tob->textarray, 0, size_texcoord);
tob->name = (char *) malloc(strlen(srcobj->name) + 10);
@ -203,13 +219,7 @@ ob_t * createObjectSplitCopy(int splitid, ob_t * srcobj,
memcpy(tob->snorm, normarray, size_pts);
memcpy(tob->norm, normarray, size_pts);
for (curidx = 0; curidx < numidx; curidx++)
{
curidxobj = &idxarray[curidx];
tob->textarray[curidxobj->indice * 2] = curidxobj->u;
tob->textarray[curidxobj->indice * 2 + 1] = curidxobj->v;
}
createTexCoordArray(tob->textarray, idxarray, numidx);
tob->texture = strdup(srcobj->texture);