Refactoring GelGL.

Normand Briere

2019-04-23 ec9d13e42c9c8674739acefb0769a9273a1048c9

 GroupEditor.java
..
..
@@ -1783,7 +1783,7 @@
1783
1783
 		if (event.getSource() == computeAOItem)
1784
1784
 		{
1785
1785
                     Globals.drawMode = CameraPane.OCCLUSION;
1786
-                    CameraPane.theRenderer.repaint();
1786
+                    Globals.theRenderer.repaint();
1787
1787
 		} else
1788
1788
 		if (event.getSource() == recompileItem)
1789
1789
 		{
..
..
@@ -2094,7 +2094,7 @@
2094
2094
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2095
2095
                             content = ((cGroup)content).get(0);
2096
2096
 
2097
-            CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2097
+            Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098
2098
                         for (int i=0; i<group.selection.size(); i++)
2099
2099
                         {
2100
2100
                             boolean random = CameraPane.RANDOM;
..
..
@@ -2103,7 +2103,7 @@
2103
2103
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2104
2104
                             CameraPane.RANDOM = random;
2105
2105
                         }
2106
-            CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2106
+            Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107
2107
 		refreshContents();
2108
2108
                     }
2109
2109
 		} else
..
..
@@ -2911,7 +2911,7 @@
2911
2911
                     }
2912
2912
                     
2913
2913
                     copy = group;
2914
-                    //CameraPane.theRenderer.object = group;
2914
+                    //Globals.theRenderer.object = group;
2915
2915
                     if(!useclient)
2916
2916
                     {
2917
2917
                         cameraView.renderCamera = radio.camera;
..
..
@@ -3473,7 +3473,7 @@
3473
3473
                             String pigment = Object3D.GetPigment(tex);
3474
3474
                             //String bump = Object3D.GetBump(tex);
3475
3475
                             
3476
-                            com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
3476
+                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3477
3477
                             
3478
3478
                             double s = v.s;
3479
3479
                             
..
..
@@ -3774,7 +3774,7 @@
3774
3774
             group.selection.RelinkToSupport(); // july 2014
3775
3775
             System.out.println("DONE.");
3776
3776
             refreshContents();
3777
-        CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3777
+        Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3778
3778
         }
3779
3779
         
3780
3780
 	void ReduceMesh(boolean reduction34)
..
..
@@ -4066,9 +4066,9 @@
4066
4066
                             // a camera
4067
4067
                         {
4068
4068
                             CameraPane.camerachangeframe = 0; // don't refuse it
4069
-                            CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4070
-                         //   CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4071
-                         //   CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
4069
+                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4070
+                         //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4071
+                         //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072
4072
                         }
4073
4073
                             
4074
4074
 			refreshContents();