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;
..
..
@@ -1120,6 +1120,8 @@
1120
1120
 		resetParentItem.addActionListener(this);
1121
1121
 		repairParentItem = menu.add(new MenuItem("Repair Parent"));
1122
1122
 		repairParentItem.addActionListener(this);
1123
+		repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
1124
+		repairShadowItem.addActionListener(this);
1123
1125
 		menu.add(invariantsItem = new MenuItem("Invariants"));
1124
1126
 		invariantsItem.addActionListener(this);
1125
1127
 		menu.add(recompileItem = new MenuItem("Recompile"));
..
..
@@ -1780,7 +1782,7 @@
1780
1782
 		} else
1781
1783
 		if (event.getSource() == computeAOItem)
1782
1784
 		{
1783
-                    CameraPane.drawMode = CameraPane.OCCLUSION;
1785
+                    Globals.drawMode = CameraPane.OCCLUSION;
1784
1786
                     CameraPane.theRenderer.repaint();
1785
1787
 		} else
1786
1788
 		if (event.getSource() == recompileItem)
..
..
@@ -2545,6 +2547,20 @@
2545
2547
 			
2546
2548
 			refreshContents();
2547
2549
 		} else
2550
+		if (event.getSource() == repairShadowItem)
2551
+		{
2552
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553
+			{
2554
+				Object3D obj = (Object3D)e.nextElement();
2555
+                                obj.RepairShadow();
2556
+//                                for (int i=0; i<obj.size(); i++)
2557
+//                                {
2558
+//                                    obj.get(i).parent = obj;
2559
+//                                }
2560
+			}
2561
+			
2562
+			refreshContents();
2563
+		} else
2548
2564
 		if (event.getSource() == sortbysizeItem)
2549
2565
 		{
2550
2566
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -2904,7 +2920,8 @@
2904
2920
                         cameraView.cameras[cameraView.cameracount] = radio.camera;
2905
2921
                         cameraView.targetLookAt.set(radio.camera.lookAt);
2906
2922
                         cameraView.object = group;
2907
-                        cameraView.lighttouched = true;
2923
+                        //cameraView.lighttouched = true;
2924
+                        Globals.lighttouched = true;
2908
2925
                         topView.object = group;
2909
2926
                         frontView.object = group;
2910
2927
                         sideView.object = group;
..
..
@@ -2940,7 +2957,7 @@
2940
2957
             if (useclient)
2941
2958
             {
2942
2959
                 cameraView.object = client;
2943
-                cameraView.lighttouched = true;
2960
+                Globals.lighttouched = true;
2944
2961
                 //topView.object = client;
2945
2962
                 //frontView.object = client;
2946
2963
                 //sideView.object = client;
..
..
@@ -2948,7 +2965,7 @@
2948
2965
             else
2949
2966
             {
2950
2967
                 cameraView.object = group;
2951
-                cameraView.lighttouched = true;
2968
+                Globals.lighttouched = true;
2952
2969
                 //topView.object = group;
2953
2970
                 //frontView.object = group;
2954
2971
                 //sideView.object = group;
..
..
@@ -4042,7 +4059,7 @@
4042
4059
 			
4043
4060
                         objEditor.SetText(); // jan 2014
4044
4061
                         
4045
-			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))
4046
4063
 				CameraPane.flash = true;
4047
4064
                         
4048
4065
 			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
..
..
@@ -5009,6 +5026,7 @@
5009
5026
         
5010
5027
 	private MenuItem resetParentItem;
5011
5028
 	private MenuItem repairParentItem;
5029
+	private MenuItem repairShadowItem;
5012
5030
 	private MenuItem sortbysizeItem;
5013
5031
 	private MenuItem sortbynameItem;
5014
5032