Refactoring phase 2

Normand Briere

2019-04-22 c60a1ad4f6aa4904e80280586b440a584b5ff061

 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,7 +1782,7 @@
1782
1782
 		} else
1783
1783
 		if (event.getSource() == computeAOItem)
1784
1784
 		{
1785
-                    CameraPane.drawMode = CameraPane.OCCLUSION;
1785
+                    Globals.drawMode = CameraPane.OCCLUSION;
1786
1786
                     CameraPane.theRenderer.repaint();
1787
1787
 		} else
1788
1788
 		if (event.getSource() == recompileItem)
..
..
@@ -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;
..
..
@@ -4058,7 +4059,7 @@
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)