From 1af7d3700724834e40ad8636bc9a56cdc3b19b15 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 27 Jul 2019 11:52:38 -0400
Subject: [PATCH] New layout icons
---
GenericJoint.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/GenericJoint.java b/GenericJoint.java
index ab83012..4c7c0e0 100644
--- a/GenericJoint.java
+++ b/GenericJoint.java
@@ -381,7 +381,7 @@
try
{
//font = FontRender.createFont("Dialog", 11, false, true);
- font = new FontRender.GLFont(gl, GrafreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
+ font = new FontRender.GLFont(gl, Grafreed.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
} catch (java.io.IOException e)
{
e.printStackTrace();
@@ -557,7 +557,8 @@
bRep.startvertices = new int[numObjects];
bRep.averagepoints = new float[(bRep.startvertices.length-1) * 3];
bRep.extremepoints = new float[(bRep.startvertices.length-1) * 3];
- bRep.supportsizes = new float[(bRep.startvertices.length-1)];
+ bRep.supportminsize = new float[(bRep.startvertices.length-1)];
+ bRep.supportmaxsize = new float[(bRep.startvertices.length-1)];
buildrep = true;
initialmatrices = new ObjectArrayList<Transform>();
@@ -873,6 +874,7 @@
if (shape.getShapeType() == BroadphaseNativeType.COMPOUND_SHAPE_PROXYTYPE)
{
+ new Exception().printStackTrace();
System.exit(0);
CompoundShape compoundShape = (CompoundShape) shape;
Transform childTrans = transformsPool.get();
@@ -903,6 +905,7 @@
{
case BOX_SHAPE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
BoxShape boxShape = (BoxShape) shape;
Vector3f halfExtent = boxShape.getHalfExtentsWithMargin(vectorsPool.get());
@@ -914,6 +917,7 @@
}
case SPHERE_SHAPE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
SphereShape sphereShape = (SphereShape) shape;
float radius = sphereShape.getMargin(); // radius doesn't include the margin, so draw with margin
@@ -960,6 +964,7 @@
case STATIC_PLANE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
StaticPlaneShape staticPlaneShape = (StaticPlaneShape) shape;
float planeConst = staticPlaneShape.getPlaneConstant();
@@ -1006,6 +1011,7 @@
case CYLINDER_SHAPE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
CylinderShape cylinder = (CylinderShape) shape;
int upAxis = cylinder.getUpAxis();
@@ -1220,11 +1226,12 @@
}
else
{
- if (bRep.averagepoints == null || bRep.extremepoints == null || bRep.supportsizes == null)
+ if (bRep.averagepoints == null || bRep.extremepoints == null || bRep.supportminsize == null || bRep.supportmaxsize == null)
{
bRep.averagepoints = new float[(bRep.startvertices.length-1) * 3];
bRep.extremepoints = new float[(bRep.startvertices.length-1) * 3];
- bRep.supportsizes = new float[(bRep.startvertices.length-1)];
+ bRep.supportminsize = new float[(bRep.startvertices.length-1)];
+ bRep.supportmaxsize = new float[(bRep.startvertices.length-1)];
}
float averagex = 0;
@@ -1294,7 +1301,8 @@
}
}
- bRep.supportsizes[currentobject-1] = (float)Math.sqrt(mindist2);
+ bRep.supportminsize[currentobject-1] = (float)Math.sqrt(mindist2);
+ bRep.supportmaxsize[currentobject-1] = (float)Math.sqrt(maxdist2);
}
// if (hull.numTriangles() > 0)
@@ -1358,6 +1366,7 @@
// for polyhedral shapes
if (shape.isPolyhedral())
{
+ new Exception().printStackTrace();
System.exit(0);
PolyhedralConvexShape polyshape = (PolyhedralConvexShape) shape;
@@ -1427,6 +1436,7 @@
if (shape.isConcave())//>getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE||shape->getShapeType() == GIMPACT_SHAPE_PROXYTYPE)
// if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
{
+ new Exception().printStackTrace();
System.exit(0);
ConcaveShape concaveMesh = (ConcaveShape) shape;
//btVector3 aabbMax(btScalar(1e30),btScalar(1e30),btScalar(1e30));
--
Gitblit v1.6.2