erwin.coumans
2009-02-06 06:09:57 +00:00
parent 5593a23417
commit 24d1fea8b2
16 changed files with 44 additions and 44 deletions

View File

@@ -1045,12 +1045,12 @@ public:
}
//! call when reading child shapes
virtual void lockChildShapes()
virtual void lockChildShapes() const
{
btAssert(0);
}
virtual void unlockChildShapes()
virtual void unlockChildShapes() const
{
btAssert(0);
}

View File

@@ -110,8 +110,7 @@ GUINT GIM_BOX_TREE::_sort_and_calc_splitting_index(
splitIndex = startIndex+ (numIndices>>1);
}
bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
btAssert(!unbal);
btAssert(!(splitIndex==startIndex) || (splitIndex == (endIndex)));
return splitIndex;
}
@@ -180,3 +179,4 @@ void GIM_BOX_TREE::build_tree(
_build_sub_tree(primitive_boxes, 0, primitive_boxes.size());
}

View File

@@ -107,7 +107,7 @@ enum GIM_SCALAR_TYPES
///returns a clamped number
#define GIM_CLAMP(number,minval,maxval) (number<minval?minval:(number>maxval?maxval:number))
#define GIM_GREATER(x, y) fabsf(x) > (y)
#define GIM_GREATER(x, y) btFabs(x) > (y)
///Swap numbers
#define GIM_SWAP_NUMBERS(a,b){ \

View File

@@ -275,7 +275,7 @@ if 0.0<= u+v <=1.0 then they are inside of triangle
}
else
{
float sumuv;
btScalar sumuv;
sumuv = u+v;
if(sumuv<-G_EPSILON)
{