Transform children

Normand Briere

2019-05-13 f924d3e00db476c06f55f3d5aaef307e17575340

 BoundaryRep.java
..
..
@@ -172,16 +172,16 @@
172
172
             bufV = other.bufV;
173
173
             bufF = other.bufF;
174
174
 
175
-            positions = (float[]) GrafreeD.clone(other.positions);
176
-            normals = (float[]) GrafreeD.clone(other.normals);
177
-            colors = (float[]) GrafreeD.clone(other.colors);
178
-            uvmap = (float[]) GrafreeD.clone(other.uvmap);
179
-            triangles = (int[]) GrafreeD.clone(other.triangles);
175
+            positions = (float[]) Grafreed.clone(other.positions);
176
+            normals = (float[]) Grafreed.clone(other.normals);
177
+            colors = (float[]) Grafreed.clone(other.colors);
178
+            uvmap = (float[]) Grafreed.clone(other.uvmap);
179
+            triangles = (int[]) Grafreed.clone(other.triangles);
180
180
             
181
-            indices = (int[]) GrafreeD.clone(other.indices);
181
+            indices = (int[]) Grafreed.clone(other.indices);
182
182
 
183
-            vertices = (Vector<Vertex>) GrafreeD.clone(other.vertices);
184
-            faces = (Vector<Face>) GrafreeD.clone(other.faces);
183
+            vertices = (Vector<Vertex>) Grafreed.clone(other.vertices);
184
+            faces = (Vector<Face>) Grafreed.clone(other.faces);
185
185
         }
186
186
         else
187
187
         {
..
..
@@ -500,7 +500,7 @@
500
500
     static Vertex vertextemp = new Vertex(true);
501
501
     static Vertex vertextemp2 = new Vertex(true);
502
502
     
503
-    static double SEUIL = 0.1f; // 0.1 for rag doll; 0.07;
503
+    static double SEUIL = 0.05f; // 0.1 for rag doll; 0.07;
504
504
         
505
505
     // Compute weight of point w/r to this
506
506
     float ComputeWeight(Vertex v, double[][] toRoot, int k)
..
..
@@ -1518,7 +1518,7 @@
1518
1518
             InitFaceIndices();
1519
1519
         }
1520
1520
         
1521
-        BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
1521
+        BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1522
1522
         //float[] v = new float[100];
1523
1523
         
1524
1524
         for (int loops=1; --loops>=0;)
..
..
@@ -1548,7 +1548,7 @@
1548
1548
             InitFaceIndices();
1549
1549
         }
1550
1550
         
1551
-        BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
1551
+        BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1552
1552
         //float[] v = new float[100];
1553
1553
         
1554
1554
         for (int loops=10; --loops>=0;)
..
..
@@ -2670,7 +2670,7 @@
2670
2670
 
2671
2671
             if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2672
2672
             {
2673
-                GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2673
+                Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2674
2674
 
2675
2675
                 lastsoundtime = Globals.framecount;
2676
2676
             }
..
..
@@ -3403,7 +3403,7 @@
3403
3403
                     k /= x*x + y*y;
3404
3404
                 }
3405
3405
                 else
3406
-                    GrafreeD.Assert(z == 1);
3406
+                    Grafreed.Assert(z == 1);
3407
3407
                 
3408
3408
                 if (k < 0)
3409
3409
                     k = 0;
..
..
@@ -3902,6 +3902,11 @@
3902
3902
                 tsa.getNormals(0, normals);
3903
3903
                 tsa.getTextureCoordinates(0, 0, uvmap);
3904
3904
            //     tsa.getColors(0, colors);
3905
+                
3906
+                for (int i=colors.length; --i>=0;)
3907
+                {
3908
+                        colors[i] = 1;
3909
+                }
3905
3910
 
3906
3911
                 int stripcount = tsa.getNumStrips();
3907
3912
                 triangles = new int[stripcount];
..
..
@@ -6354,6 +6359,7 @@
6354
6359
     
6355
6360
     void InitWeights()
6356
6361
     {
6362
+                new Exception().printStackTrace();
6357
6363
         System.exit(0);
6358
6364
         int n = 0;
6359
6365
         int b = 0;
..
..
@@ -8227,7 +8233,7 @@
8227
8233
         if (!trimmed)
8228
8234
             return;
8229
8235
         
8230
-        GrafreeD.linkUV = false;
8236
+        Grafreed.linkUV = false;
8231
8237
         
8232
8238
         try
8233
8239
         {