blame | history | patch | commit | commitdiff
Normand Briere
2019-04-24 07750666120cf38c7ad4f3a3a583a8c4d582bb0e 
 GroupEditor.java
....@@ -437,7 +437,7 @@
437437 		oe.aConstraints.gridwidth = 1;
438438         	oe.aConstraints.gridx = 0;
439439                 
440
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
440
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441441                                 liveCB.addItemListener(this);
442442 
443443         	oe.aConstraints.gridx += 1;
....@@ -449,7 +449,7 @@
449449         //                        localCB.addItemListener(this);
450450 
451451         	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);
453453                                 crowdCB.addItemListener(this);
454454 
455455         	oe.aConstraints.gridx += 1;
....@@ -1782,8 +1782,8 @@
17821782 		} else
17831783 		if (event.getSource() == computeAOItem)
17841784 		{
1785
-                    CameraPane.drawMode = CameraPane.OCCLUSION;
1786
-                    CameraPane.theRenderer.repaint();
1785
+                    Globals.drawMode = CameraPane.OCCLUSION;
1786
+                    Globals.theRenderer.repaint();
17871787 		} else
17881788 		if (event.getSource() == recompileItem)
17891789 		{
....@@ -2094,7 +2094,7 @@
20942094                         if (content instanceof cGroup && ((cGroup)content).transientlink )
20952095                             content = ((cGroup)content).get(0);
20962096 
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));
20982098                         for (int i=0; i<group.selection.size(); i++)
20992099                         {
21002100                             boolean random = CameraPane.RANDOM;
....@@ -2103,7 +2103,7 @@
21032103                       //      group.selection.get(i).setMasterThis(content); // should be identity
21042104                             CameraPane.RANDOM = random;
21052105                         }
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));
21072107 		refreshContents();
21082108                     }
21092109 		} else
....@@ -2911,7 +2911,7 @@
29112911                     }
29122912                     
29132913                     copy = group;
2914
-                    //CameraPane.theRenderer.object = group;
2914
+                    //Globals.theRenderer.object = group;
29152915                     if(!useclient)
29162916                     {
29172917                         cameraView.renderCamera = radio.camera;
....@@ -2920,7 +2920,8 @@
29202920                         cameraView.cameras[cameraView.cameracount] = radio.camera;
29212921                         cameraView.targetLookAt.set(radio.camera.lookAt);
29222922                         cameraView.object = group;
2923
-                        cameraView.lighttouched = true;
2923
+                        //cameraView.lighttouched = true;
2924
+                        Globals.lighttouched = true;
29242925                         topView.object = group;
29252926                         frontView.object = group;
29262927                         sideView.object = group;
....@@ -2956,7 +2957,7 @@
29562957             if (useclient)
29572958             {
29582959                 cameraView.object = client;
2959
-                cameraView.lighttouched = true;
2960
+                Globals.lighttouched = true;
29602961                 //topView.object = client;
29612962                 //frontView.object = client;
29622963                 //sideView.object = client;
....@@ -2964,7 +2965,7 @@
29642965             else
29652966             {
29662967                 cameraView.object = group;
2967
-                cameraView.lighttouched = true;
2968
+                Globals.lighttouched = true;
29682969                 //topView.object = group;
29692970                 //frontView.object = group;
29702971                 //sideView.object = group;
....@@ -3472,7 +3473,7 @@
34723473                             String pigment = Object3D.GetPigment(tex);
34733474                             //String bump = Object3D.GetBump(tex);
34743475                             
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);
34763477                             
34773478                             double s = v.s;
34783479                             
....@@ -3773,7 +3774,7 @@
37733774             group.selection.RelinkToSupport(); // july 2014
37743775             System.out.println("DONE.");
37753776             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));
37773778         }
37783779         
37793780 	void ReduceMesh(boolean reduction34)
....@@ -4058,16 +4059,16 @@
40584059 			
40594060                         objEditor.SetText(); // jan 2014
40604061                         
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))
40624063 				CameraPane.flash = true;
40634064                         
40644065 			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
40654066                             // a camera
40664067                         {
40674068                             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;
40714072                         }
40724073                             
40734074 			refreshContents();