kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simpler edge construction

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2558 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2008-09-13 06:37:33 +00:00
parent 85c97d0454
commit d13a0a5214
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/vertmodel.h
+15 -17
View File
@@ -198,15 +198,19 @@ struct vertmodel : model
const tri &t = tris[i];
loopj(3)
{
uint e1 = shareverts[t.vert[j]], e2 = shareverts[t.vert[(j+1)%3]], shift = 0;
if(e1 > e2) { swap(e1, e2); shift = 16; }
uint &edge = edges.access(e1 | (e2<<16), ~0U);
if(((edge>>shift)&0xFFFF) != 0xFFFF) edge = 0;
else
uint e1 = shareverts[t.vert[j]], e2 = shareverts[t.vert[(j+1)%3]];
uint &edge = edges.access(min(e1, e2) | (max(e1, e2)<<16), ~0U);
if((edge&0xFFFF)==0xFFFF)
{
edge &= 0xFFFF<<(16-shift);
edge |= i<<shift;
edge &= ~0xFFFF;
edge |= i;
}
else if((edge&~0xFFFFU)==~0xFFFFU)
{
edge &= 0xFFFF;
edge |= i<<16;
}
else edge = 0;
}
}
loopi(numtris)
@@ -214,16 +218,10 @@ struct vertmodel : model
tri &t = tris[i];
loopj(3)
{
uint e1 = shareverts[t.vert[j]], e2 = shareverts[t.vert[(j+1)%3]], shift = 0;
if(e1 > e2) { swap(e1, e2); shift = 16; }
uint edge = edges[e1 | (e2<<16)];
if(!edge || int((edge>>shift)&0xFFFF)!=i) t.neighbor[j] = 0xFFFF;
else
{
t.neighbor[j] = (edge>>(16-shift))&0xFFFF;
//ushort n = (edge>>(16-shift))&0xFFFF;
//t.neighbor[j] = n;//n==0xFFFF ? i : n;//(edge>>(16-shift))&0xFFFF;
}
uint e1 = shareverts[t.vert[j]], e2 = shareverts[t.vert[(j+1)%3]];
uint edge = edges[min(e1, e2) | (max(e1, e2)<<16)];
if(!edge) t.neighbor[j] = 0xFFFF;
else t.neighbor[j] = int(edge&0xFFFF)==i ? edge>>16 : edge&0xFFFF;
}
}
}