New layout icons

Normand Briere

2019-07-27 1af7d3700724834e40ad8636bc9a56cdc3b19b15

 GenericJoint.java
..
..
@@ -381,7 +381,7 @@
381
381
         try
382
382
         {
383
383
             //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"));
385
385
         } catch (java.io.IOException e)
386
386
         {
387
387
             e.printStackTrace();
..
..
@@ -557,7 +557,8 @@
557
557
                 bRep.startvertices = new int[numObjects];
558
558
             bRep.averagepoints = new float[(bRep.startvertices.length-1) * 3];
559
559
             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)];
561
562
                 buildrep = true;
562
563
                 
563
564
                 initialmatrices = new ObjectArrayList<Transform>();
..
..
@@ -1225,11 +1226,12 @@
1225
1226
                                 }
1226
1227
                                 else
1227
1228
                                 {
1228
-                                    if (bRep.averagepoints == null || bRep.extremepoints == null || bRep.supportsizes == null)
1229
+                                    if (bRep.averagepoints == null || bRep.extremepoints == null || bRep.supportminsize == null || bRep.supportmaxsize == null)
1229
1230
                                     {
1230
1231
                                         bRep.averagepoints = new float[(bRep.startvertices.length-1) * 3];
1231
1232
                                         bRep.extremepoints = new float[(bRep.startvertices.length-1) * 3];
1232
-                                        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)];
1233
1235
                                     }
1234
1236
                                     
1235
1237
                                     float averagex = 0;
..
..
@@ -1299,7 +1301,8 @@
1299
1301
                                         }
1300
1302
                                     }
1301
1303
                                     
1302
-                                    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);
1303
1306
                                 }
1304
1307
 
1305
1308
 //                                if (hull.numTriangles() > 0)