tab index

Normand Briere

2019-09-30 3966454055db8e04700e881a091c2d33dcfda232

 GenericJoint.java
..
..
@@ -177,7 +177,9 @@
177
177
 
178
178
     public void spawnRagdoll(boolean walk) // random)
179
179
     {
180
-        RagDoll ragDoll = new RagDoll(null, new Vector3f(0f, 0f, 0f), 0.45f, walk); // Math.random() > 0.5/*true*/); // true);
180
+        // KIDS4
181
+        RagDoll ragDoll = new RagDoll(null, new Vector3f(0f, 0f, 0f), 0.45f/2, walk, myzoffset = zoffset); // Math.random() > 0.5/*true*/); // true);
182
+        zoffset += 0.1f;
181
183
         ragdolls.add(ragDoll);
182
184
         
183
185
         bRep = null;
..
..
@@ -277,6 +279,8 @@
277
279
 //    
278
280
     ObjectArrayList<Transform> initialmatrices;
279
281
 
282
+    float myzoffset;
283
+    
280
284
     void Reset()
281
285
     {
282
286
 //        int numObjects = dynamicsWorld.getNumCollisionObjects();
..
..
@@ -309,10 +313,12 @@
309
313
             walkdefined = true;
310
314
         }
311
315
         
312
-        ragdolls.get(0).init(/*staticdynamicsWorld,*/ new Vector3f(0f, 0f, 0f), 0.45f, walk);
316
+        ragdolls.get(0).init(/*staticdynamicsWorld,*/ new Vector3f(0f, 0f, 0f), ragdolls.get(0).scale, walk, myzoffset);
313
317
         
314
318
         bRep = null;
315
319
     }
320
+    
321
+    static float zoffset = 0;
316
322
     
317
323
     void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
318
324
     {
..
..
@@ -341,7 +347,7 @@
341
347
         
342
348
 //        assert(bRep != null);
343
349
         
344
-        if (Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
350
+        if (Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // SHADOW
345
351
         {
346
352
 //            float ms = getDeltaTimeMicroseconds();
347
353
 //            float minFPS = 1000000f / 60f;
..
..
@@ -381,7 +387,7 @@
381
387
         try
382
388
         {
383
389
             //font = FontRender.createFont("Dialog", 11, false, true);
384
-            font = new FontRender.GLFont(gl, GrafreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
390
+            font = new FontRender.GLFont(gl, Grafreed.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
385
391
         } catch (java.io.IOException e)
386
392
         {
387
393
             e.printStackTrace();
..
..
@@ -486,7 +492,7 @@
486
492
                 
487
493
                 tc.getFrameOffsetB(trans);
488
494
                         
489
-                if (false) // c == 2) // DEBUG
495
+                if (false) //c == 8) // DEBUG
490
496
                 {
491
497
                 gl.glDisable(gl.GL_LIGHTING);
492
498
                 
..
..
@@ -515,7 +521,7 @@
515
521
 
516
522
                     gl.glPopMatrix();
517
523
 
518
-                    tc.getFrameOffsetB(trans);
524
+                    //tc.getFrameOffsetB(trans);
519
525
 
520
526
                     gl.glColor3f(0, 1, 0);
521
527
 
..
..
@@ -557,7 +563,8 @@
557
563
                 bRep.startvertices = new int[numObjects];
558
564
             bRep.averagepoints = new float[(bRep.startvertices.length-1) * 3];
559
565
             bRep.extremepoints = new float[(bRep.startvertices.length-1) * 3];
560
-            bRep.supportsizes = new float[(bRep.startvertices.length-1)];
566
+            bRep.supportminsize = new float[(bRep.startvertices.length-1)];
567
+            bRep.supportmaxsize = new float[(bRep.startvertices.length-1)];
561
568
                 buildrep = true;
562
569
                 
563
570
                 initialmatrices = new ObjectArrayList<Transform>();
..
..
@@ -1225,11 +1232,12 @@
1225
1232
                                 }
1226
1233
                                 else
1227
1234
                                 {
1228
-                                    if (bRep.averagepoints == null || bRep.extremepoints == null || bRep.supportsizes == null)
1235
+                                    if (bRep.averagepoints == null || bRep.extremepoints == null || bRep.supportminsize == null || bRep.supportmaxsize == null)
1229
1236
                                     {
1230
1237
                                         bRep.averagepoints = new float[(bRep.startvertices.length-1) * 3];
1231
1238
                                         bRep.extremepoints = new float[(bRep.startvertices.length-1) * 3];
1232
-                                        bRep.supportsizes = new float[(bRep.startvertices.length-1)];
1239
+                                        bRep.supportminsize = new float[(bRep.startvertices.length-1)];
1240
+                                        bRep.supportmaxsize = new float[(bRep.startvertices.length-1)];
1233
1241
                                     }
1234
1242
                                     
1235
1243
                                     float averagex = 0;
..
..
@@ -1299,7 +1307,8 @@
1299
1307
                                         }
1300
1308
                                     }
1301
1309
                                     
1302
-                                    bRep.supportsizes[currentobject-1] = (float)Math.sqrt(mindist2);
1310
+                                    bRep.supportminsize[currentobject-1] = (float)Math.sqrt(mindist2);
1311
+                                    bRep.supportmaxsize[currentobject-1] = (float)Math.sqrt(maxdist2);
1303
1312
                                 }
1304
1313
 
1305
1314
 //                                if (hull.numTriangles() > 0)