Transform children

Normand Briere

2019-05-13 f924d3e00db476c06f55f3d5aaef307e17575340

 CameraPane.java
..
..
@@ -1628,7 +1628,7 @@
1628
1628
             
1629
1629
         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630
1630
 
1631
-        float[] colorV = GrafreeD.colorV;
1631
+        float[] colorV = Grafreed.colorV;
1632
1632
 
1633
1633
         /**/
1634
1634
         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..
..
@@ -2140,7 +2140,7 @@
2140
2140
         System.err.println("LIVE = " + Globals.isLIVE());
2141
2141
         
2142
2142
         if (!Globals.isLIVE()) // save sound
2143
-            GrafreeD.savesound = true; // wav.save();
2143
+            Grafreed.savesound = true; // wav.save();
2144
2144
      //   else
2145
2145
             repaint(); // start loop // may 2013
2146
2146
     }
..
..
@@ -9542,7 +9542,7 @@
9542
9542
             
9543
9543
             if (!BOXMODE)
9544
9544
             {
9545
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9545
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9546
9546
             }
9547
9547
     
9548
9548
             if (!BOXMODE)
..
..
@@ -9580,7 +9580,7 @@
9580
9580
             ABORTED = false;
9581
9581
         }
9582
9582
         else
9583
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9583
+            Grafreed.wav.cursor += 735 * ACSIZE;
9584
9584
         
9585
9585
         if (false)
9586
9586
         {
..
..
@@ -10243,11 +10243,11 @@
10243
10243
 
10244
10244
     public void display(GLAutoDrawable drawable)
10245
10245
     {
10246
-        if (GrafreeD.savesound && GrafreeD.hassound)
10246
+        if (Grafreed.savesound && Grafreed.hassound)
10247
10247
         {
10248
-            GrafreeD.wav.save();
10249
-            GrafreeD.savesound = false;
10250
-            GrafreeD.hassound = false;
10248
+            Grafreed.wav.save();
10249
+            Grafreed.savesound = false;
10250
+            Grafreed.hassound = false;
10251
10251
         }
10252
10252
 //        if (DEBUG_SELECTION)
10253
10253
 //        {
..
..
@@ -10377,7 +10377,7 @@
10377
10377
             Object3D theobject = object;
10378
10378
             Object3D theparent = object.parent;
10379
10379
             object.parent = null;
10380
-            object = (Object3D)GrafreeD.clone(object);
10380
+            object = (Object3D)Grafreed.clone(object);
10381
10381
             object.Stripify();
10382
10382
             if (theobject.selection == null || theobject.selection.Size() == 0)
10383
10383
                 theobject.PreprocessOcclusion(this);
..
..
@@ -11283,8 +11283,8 @@
11283
11283
             e.printStackTrace();
11284
11284
         }
11285
11285
         
11286
-        if (GrafreeD.RENDERME > 0)
11287
-            GrafreeD.RENDERME--; // mechante magouille
11286
+        if (Grafreed.RENDERME > 0)
11287
+            Grafreed.RENDERME--; // mechante magouille
11288
11288
         
11289
11289
         Globals.ONESTEP = false;
11290
11290
     }
..
..
@@ -13656,6 +13656,10 @@
13656
13656
 //            wasliveok = true;
13657
13657
 //            waslive = false;
13658
13658
             
13659
+            // May 2019 Forget it:
13660
+            if (true)
13661
+                    return;
13662
+            
13659
13663
             // source == timer
13660
13664
             if (mouseDown)
13661
13665
             {
..
..
@@ -14359,7 +14363,7 @@
14359
14363
         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14360
14364
         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14361
14365
         
14362
-        if (control || command || IsFrozen())
14366
+// No delay        if (control || command || IsFrozen())
14363
14367
             timeout = true;
14364
14368
 // ?? May 2019        else
14365
14369
        // timer.setDelay((modifiers & 128) != 0?0:350);
..
..
@@ -14866,7 +14870,7 @@
14866
14870
                 //RESIZETEXTURE ^= true;
14867
14871
                 //break;
14868
14872
             case 'z':
14869
-                RENDERSHADOW ^= true;
14873
+                Globals.RENDERSHADOW ^= true;
14870
14874
                 Globals.lighttouched = true;
14871
14875
                 repaint();
14872
14876
                 break;
..
..
@@ -16423,16 +16427,16 @@
16423
16427
                             System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16424
16428
                         }
16425
16429
                         
16426
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16430
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16427
16431
                     }
16428
16432
                 }
16429
16433
                 
16430
16434
                 if (!movingcamera && !PAINTMODE)
16431
16435
                     object.editWindow.ScreenFitPoint(); // fev 2014
16432
16436
                 
16433
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16437
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16434
16438
                 {
16435
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16439
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16436
16440
                     
16437
16441
                     Object3D group = new Object3D("inst" + paintcount++);
16438
16442
                     
..
..
@@ -16588,7 +16592,7 @@
16588
16592
                 gl.glDisable(gl.GL_CULL_FACE);
16589
16593
             }
16590
16594
 
16591
-            if (!RENDERSHADOW)
16595
+            if (!Globals.RENDERSHADOW)
16592
16596
                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
16593
16597
 
16594
16598
             // SB gl.glPolygonOffset(2.5f, 10);
..
..
@@ -16598,7 +16602,7 @@
16598
16602
             //gl.glColorMask(false, false, false, false);
16599
16603
 
16600
16604
             //render_scene_from_light_view(gl, drawable, 0, 0);
16601
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16605
+            if (Globals.RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16602
16606
             {
16603
16607
                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
16604
16608