Fix theRenderer

Normand Briere

2019-04-22 4a5b9e0b9ecc97203d4089ca0cd0d6df8c76bf1c

 GroupEditor.java
..
..
@@ -437,7 +437,7 @@
437
437
 		oe.aConstraints.gridwidth = 1;
438
438
         	oe.aConstraints.gridx = 0;
439
439
                 
440
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
440
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441
441
                                 liveCB.addItemListener(this);
442
442
 
443
443
         	oe.aConstraints.gridx += 1;
..
..
@@ -449,7 +449,7 @@
449
449
         //                        localCB.addItemListener(this);
450
450
 
451
451
         	oe.aConstraints.gridx += 1;
452
-                oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
452
+                oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
453
453
                                 crowdCB.addItemListener(this);
454
454
 
455
455
         	oe.aConstraints.gridx += 1;
..
..
@@ -1782,8 +1782,8 @@
1782
1782
 		} else
1783
1783
 		if (event.getSource() == computeAOItem)
1784
1784
 		{
1785
-                    CameraPane.drawMode = CameraPane.OCCLUSION;
1786
-                    CameraPane.theRenderer.repaint();
1785
+                    Globals.drawMode = CameraPane.OCCLUSION;
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;
..
..
@@ -2920,7 +2920,8 @@
2920
2920
                         cameraView.cameras[cameraView.cameracount] = radio.camera;
2921
2921
                         cameraView.targetLookAt.set(radio.camera.lookAt);
2922
2922
                         cameraView.object = group;
2923
-                        cameraView.lighttouched = true;
2923
+                        //cameraView.lighttouched = true;
2924
+                        Globals.lighttouched = true;
2924
2925
                         topView.object = group;
2925
2926
                         frontView.object = group;
2926
2927
                         sideView.object = group;
..
..
@@ -2956,7 +2957,7 @@
2956
2957
             if (useclient)
2957
2958
             {
2958
2959
                 cameraView.object = client;
2959
-                cameraView.lighttouched = true;
2960
+                Globals.lighttouched = true;
2960
2961
                 //topView.object = client;
2961
2962
                 //frontView.object = client;
2962
2963
                 //sideView.object = client;
..
..
@@ -2964,7 +2965,7 @@
2964
2965
             else
2965
2966
             {
2966
2967
                 cameraView.object = group;
2967
-                cameraView.lighttouched = true;
2968
+                Globals.lighttouched = true;
2968
2969
                 //topView.object = group;
2969
2970
                 //frontView.object = group;
2970
2971
                 //sideView.object = group;
..
..
@@ -3472,7 +3473,7 @@
3472
3473
                             String pigment = Object3D.GetPigment(tex);
3473
3474
                             //String bump = Object3D.GetBump(tex);
3474
3475
                             
3475
-                            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);
3476
3477
                             
3477
3478
                             double s = v.s;
3478
3479
                             
..
..
@@ -3773,7 +3774,7 @@
3773
3774
             group.selection.RelinkToSupport(); // july 2014
3774
3775
             System.out.println("DONE.");
3775
3776
             refreshContents();
3776
-        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));
3777
3778
         }
3778
3779
         
3779
3780
 	void ReduceMesh(boolean reduction34)
..
..
@@ -4058,16 +4059,16 @@
4058
4059
 			
4059
4060
                         objEditor.SetText(); // jan 2014
4060
4061
                         
4061
-			if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4062
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4062
4063
 				CameraPane.flash = true;
4063
4064
                         
4064
4065
 			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4065
4066
                             // a camera
4066
4067
                         {
4067
4068
                             CameraPane.camerachangeframe = 0; // don't refuse it
4068
-                            CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4069
-                         //   CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4070
-                         //   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;
4071
4072
                         }
4072
4073
                             
4073
4074
 			refreshContents();