Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv30073
Modified Files:
ssgOptimiser.cxx
Log Message:
Fixed bug in OptVertex::equal().
Index: ssgOptimiser.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgOptimiser.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ssgOptimiser.cxx 25 Mar 2002 12:56:12 -0000 1.24
+++ ssgOptimiser.cxx 3 Apr 2002 13:55:16 -0000 1.25
@@ -68,15 +68,15 @@
int equal ( sgVec3 v, sgVec2 t, sgVec4 c, int tex_frac )
{
- if ( ! sgCompareVec3 ( vertex , v, DISTANCE_SLOP ) == 0 ||
- ! sgCompareVec4 ( colour , c, COLOUR_SLOP ) == 0 )
+ if ( ! sgCompareVec3 ( vertex , v, DISTANCE_SLOP ) ||
+ ! sgCompareVec4 ( colour , c, COLOUR_SLOP ) )
return FALSE ;
if ( ! tex_frac )
- return sgCompareVec2 ( texcoord, t, TEXCOORD_SLOP ) == 0 ;
+ return sgCompareVec2 ( texcoord, t, TEXCOORD_SLOP ) ;
- return fabs ( frac ( texcoord[0] ) - frac ( t[0] ) ) <= TEXCOORD_SLOP &&
- fabs ( frac ( texcoord[1] ) - frac ( t[1] ) ) <= TEXCOORD_SLOP ;
+ return ( fabs ( frac ( texcoord[0] ) - frac ( t[0] ) ) <= TEXCOORD_SLOP &&
+ fabs ( frac ( texcoord[1] ) - frac ( t[1] ) ) <= TEXCOORD_SLOP ) ;
}
void bump () { counter++ ; }
|
