Normand Briere
2019-06-26 89b25e7cc97f6fe221dfd41c4d463500f8a31bc1
GenericJoint.java
....@@ -381,7 +381,7 @@
381381 try
382382 {
383383 //font = FontRender.createFont("Dialog", 11, false, true);
384
- font = new FontRender.GLFont(gl, GrafreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
384
+ font = new FontRender.GLFont(gl, Grafreed.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
385385 } catch (java.io.IOException e)
386386 {
387387 e.printStackTrace();
....@@ -557,7 +557,8 @@
557557 bRep.startvertices = new int[numObjects];
558558 bRep.averagepoints = new float[(bRep.startvertices.length-1) * 3];
559559 bRep.extremepoints = new float[(bRep.startvertices.length-1) * 3];
560
- bRep.supportsizes = new float[(bRep.startvertices.length-1)];
560
+ bRep.supportminsize = new float[(bRep.startvertices.length-1)];
561
+ bRep.supportmaxsize = new float[(bRep.startvertices.length-1)];
561562 buildrep = true;
562563
563564 initialmatrices = new ObjectArrayList<Transform>();
....@@ -873,6 +874,7 @@
873874
874875 if (shape.getShapeType() == BroadphaseNativeType.COMPOUND_SHAPE_PROXYTYPE)
875876 {
877
+ new Exception().printStackTrace();
876878 System.exit(0);
877879 CompoundShape compoundShape = (CompoundShape) shape;
878880 Transform childTrans = transformsPool.get();
....@@ -903,6 +905,7 @@
903905 {
904906 case BOX_SHAPE_PROXYTYPE:
905907 {
908
+ new Exception().printStackTrace();
906909 System.exit(0);
907910 BoxShape boxShape = (BoxShape) shape;
908911 Vector3f halfExtent = boxShape.getHalfExtentsWithMargin(vectorsPool.get());
....@@ -914,6 +917,7 @@
914917 }
915918 case SPHERE_SHAPE_PROXYTYPE:
916919 {
920
+ new Exception().printStackTrace();
917921 System.exit(0);
918922 SphereShape sphereShape = (SphereShape) shape;
919923 float radius = sphereShape.getMargin(); // radius doesn't include the margin, so draw with margin
....@@ -960,6 +964,7 @@
960964
961965 case STATIC_PLANE_PROXYTYPE:
962966 {
967
+ new Exception().printStackTrace();
963968 System.exit(0);
964969 StaticPlaneShape staticPlaneShape = (StaticPlaneShape) shape;
965970 float planeConst = staticPlaneShape.getPlaneConstant();
....@@ -1006,6 +1011,7 @@
10061011
10071012 case CYLINDER_SHAPE_PROXYTYPE:
10081013 {
1014
+ new Exception().printStackTrace();
10091015 System.exit(0);
10101016 CylinderShape cylinder = (CylinderShape) shape;
10111017 int upAxis = cylinder.getUpAxis();
....@@ -1220,11 +1226,12 @@
12201226 }
12211227 else
12221228 {
1223
- if (bRep.averagepoints == null || bRep.extremepoints == null || bRep.supportsizes == null)
1229
+ if (bRep.averagepoints == null || bRep.extremepoints == null || bRep.supportminsize == null || bRep.supportmaxsize == null)
12241230 {
12251231 bRep.averagepoints = new float[(bRep.startvertices.length-1) * 3];
12261232 bRep.extremepoints = new float[(bRep.startvertices.length-1) * 3];
1227
- bRep.supportsizes = new float[(bRep.startvertices.length-1)];
1233
+ bRep.supportminsize = new float[(bRep.startvertices.length-1)];
1234
+ bRep.supportmaxsize = new float[(bRep.startvertices.length-1)];
12281235 }
12291236
12301237 float averagex = 0;
....@@ -1294,7 +1301,8 @@
12941301 }
12951302 }
12961303
1297
- bRep.supportsizes[currentobject-1] = (float)Math.sqrt(mindist2);
1304
+ bRep.supportminsize[currentobject-1] = (float)Math.sqrt(mindist2);
1305
+ bRep.supportmaxsize[currentobject-1] = (float)Math.sqrt(maxdist2);
12981306 }
12991307
13001308 // if (hull.numTriangles() > 0)
....@@ -1358,6 +1366,7 @@
13581366 // for polyhedral shapes
13591367 if (shape.isPolyhedral())
13601368 {
1369
+ new Exception().printStackTrace();
13611370 System.exit(0);
13621371 PolyhedralConvexShape polyshape = (PolyhedralConvexShape) shape;
13631372
....@@ -1427,6 +1436,7 @@
14271436 if (shape.isConcave())//>getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE||shape->getShapeType() == GIMPACT_SHAPE_PROXYTYPE)
14281437 // if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
14291438 {
1439
+ new Exception().printStackTrace();
14301440 System.exit(0);
14311441 ConcaveShape concaveMesh = (ConcaveShape) shape;
14321442 //btVector3 aabbMax(btScalar(1e30),btScalar(1e30),btScalar(1e30));