fix more warnings in BulletCollision, and fix CMakeLists for Linux
This commit is contained in:
@@ -114,7 +114,6 @@ struct btConnectivityProcessor : public btTriangleCallback
|
||||
if(numshared >= 3)
|
||||
return;
|
||||
}
|
||||
|
||||
switch (numshared)
|
||||
{
|
||||
case 0:
|
||||
@@ -203,6 +202,7 @@ struct btConnectivityProcessor : public btTriangleCallback
|
||||
ang4 = 0.f;
|
||||
} else
|
||||
{
|
||||
|
||||
calculatedEdge.normalize();
|
||||
btVector3 calculatedNormalA = calculatedEdge.cross(edgeCrossA);
|
||||
calculatedNormalA.normalize();
|
||||
@@ -213,7 +213,7 @@ struct btConnectivityProcessor : public btTriangleCallback
|
||||
isConvex = (dotA<0.);
|
||||
|
||||
correctedAngle = isConvex ? ang4 : -ang4;
|
||||
btQuaternion orn2 = btQuaternion(btVector3(calculatedEdge.x(), calculatedEdge.y(), calculatedEdge.z()),-correctedAngle);
|
||||
btQuaternion orn2(calculatedEdge,-correctedAngle);
|
||||
calculatedNormalB = btMatrix3x3(orn2)*normalA;
|
||||
|
||||
|
||||
@@ -301,6 +301,11 @@ struct btConnectivityProcessor : public btTriangleCallback
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
// printf("warning: duplicate triangle\n");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user