parent: 3c4c16e0 | patch | commit
Normand Briere
2019-04-22 4a5b9e0b9ecc97203d4089ca0cd0d6df8c76bf1c 
Fix theRenderer
11 files modified
298 ■■■■■ changed files
BoundaryRep.java 16 ●●●●● patch | view | raw | blame | history
CameraPane.java 107 ●●●●● patch | view | raw | blame | history
ClickInfo.java 2 ●●●●● patch | view | raw | blame | history
Globals.java 2 ●●●●● patch | view | raw | blame | history
GroupEditor.java 18 ●●●●● patch | view | raw | blame | history
Mocap.java 2 ●●●●● patch | view | raw | blame | history
ObjEditor.java 2 ●●●●● patch | view | raw | blame | history
Object3D.java 26 ●●●●● patch | view | raw | blame | history
ScriptNode.java 88 ●●●●● patch | view | raw | blame | history
cTree.java 2 ●●●●● patch | view | raw | blame | history
iCameraPane.java 33 ●●●●● patch | view | raw | blame | history 
 BoundaryRep.java
....@@ -2661,7 +2661,7 @@
26612661         if (false) // slow && stepout && onein)
26622662         {
26632663             // sound
2664
-            cVector eye = CameraPane.theRenderer.eyeCamera.location;
2664
+            cVector eye = Globals.theRenderer.EyeCamera().location;
26652665 
26662666             Vertex v = GetVertex(0);
26672667 
....@@ -4460,14 +4460,14 @@
44604460         // june 2014
44614461 //        Camera parentcam = cam;
44624462 //
4463
-//        if (cam == CameraPane.theRenderer.cameras[0])
4463
+//        if (cam == Globals.theRenderer.cameras[0])
44644464 //        {
4465
-//            parentcam = CameraPane.theRenderer.cameras[1];
4465
+//            parentcam = Globals.theRenderer.cameras[1];
44664466 //        }
44674467 //
4468
-//        if (cam == CameraPane.theRenderer.cameras[1])
4468
+//        if (cam == Globals.theRenderer.cameras[1])
44694469 //        {
4470
-//            parentcam = CameraPane.theRenderer.cameras[0];
4470
+//            parentcam = Globals.theRenderer.cameras[0];
44714471 //        }
44724472     
44734473         gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, CameraPane.tempmat, 0);
....@@ -7560,7 +7560,7 @@
75607560             s3 = new cVector();
75617561         }
75627562         
7563
-        CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7563
+        Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
75647564         
75657565         try
75667566         {
....@@ -7655,7 +7655,7 @@
76557655         {
76567656             if (i++%100 == 0)
76577657             {
7658
-                CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7658
+                Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
76597659                 System.out.println("#faces = " + faces.size());
76607660             //    if (i != 1)
76617661             //        break;
....@@ -7699,7 +7699,7 @@
76997699         //Trim(true,cJME.gennormals,true,false); // doesn't work
77007700         Trim(true,false,false,false,false);
77017701         
7702
-        CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
7702
+        Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
77037703     }
77047704     
77057705     void UpdateIndices(Face face, Face minface)


 CameraPane.java
....@@ -150,12 +150,10 @@
150150         defaultcaps.setAccumAlphaBits(16);
151151     }
152152     
153
-    static CameraPane theRenderer;
154
-    
155153     void SetAsGLRenderer(boolean b)
156154     {
157155         isRenderer = b;
158
-        theRenderer = this;
156
+        Globals.theRenderer = this;
159157     }
160158 
161159     CameraPane(Object3D o, Camera cam, boolean withcontext)
....@@ -816,7 +814,7 @@
816814 
817815                         if ((i % 100) == 0 && i != 0)
818816                         {
819
-                    CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
817
+                    Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820818                             //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821819                                 System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822820                         }
....@@ -848,7 +846,7 @@
848846 
849847                         if ((i % 100) == 0 && i != 0)
850848                         {
851
-                    CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
849
+                    Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852850                             //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853851                                 System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854852                         }
....@@ -1624,7 +1622,7 @@
16241622     
16251623     static int camerachangeframe;
16261624     
1627
-    boolean SetCamera(Camera cam)
1625
+    public boolean SetCamera(Camera cam)
16281626     {
16291627         // may 2014 if (cam == cameras[0] || cam == cameras[1])
16301628         //    return false;
....@@ -1752,12 +1750,27 @@
17521750         mainDL ^= true;
17531751     }
17541752 
1755
-    void ToggleTexture()
1753
+    void ToggleFullScreen()
1754
+    {
1755
+        FULLSCREEN ^= true;
1756
+    }
1757
+
1758
+    void ToggleCrowd()
1759
+    {
1760
+        Globals.CROWD ^= true;
1761
+    }
1762
+
1763
+    void ToggleLocal()
1764
+    {
1765
+        LOCALTRANSFORM ^= true;
1766
+    }
1767
+
1768
+    public void ToggleTexture()
17561769     {
17571770         textureon ^= true;
17581771     }
17591772 
1760
-    void ToggleLive()
1773
+    public void ToggleLive()
17611774     {
17621775         Globals.setLIVE(Globals.isLIVE() ^ true);
17631776         
....@@ -1769,92 +1782,67 @@
17691782             repaint(); // start loop // may 2013
17701783     }
17711784 
1772
-    void ToggleSupport()
1785
+    public void ToggleSupport()
17731786     {
17741787         SUPPORT ^= true;
17751788     }
17761789 
1777
-    void ToggleAbort()
1790
+    public void ToggleAbort()
17781791     {
17791792         ABORTMODE ^= true;
17801793     }
17811794 
1782
-    void ToggleFullScreen()
1783
-    {
1784
-        FULLSCREEN ^= true;
1785
-    }
1786
-
1787
-    void ToggleCrowd()
1788
-    {
1789
-        Globals.CROWD ^= true;
1790
-    }
1791
-
1792
-    void ToggleInertia()
1795
+    public void ToggleInertia()
17931796     {
17941797         INERTIA ^= true;
17951798     }
17961799 
1797
-    void ToggleLocal()
1798
-    {
1799
-        LOCALTRANSFORM ^= true;
1800
-    }
1801
-
1802
-    void ToggleFast()
1800
+    public void ToggleFast()
18031801     {
18041802         FAST ^= true;
18051803     }
18061804 
1807
-    void ToggleSlowPose()
1805
+    public void ToggleSlowPose()
18081806     {
18091807         SLOWPOSE ^= true;
18101808     }
18111809 
1812
-    void ToggleFootContact()
1813
-    {
1814
-        FOOTCONTACT ^= true;
1815
-    }
1816
-    
1817
-    void ToggleBoxMode()
1810
+    public void ToggleBoxMode()
18181811     {
18191812         BOXMODE ^= true;
18201813     }
18211814 
1822
-    void ToggleSmoothFocus()
1815
+    public void ToggleSmoothFocus()
18231816     {
18241817         SMOOTHFOCUS ^= true;
18251818     }
18261819 
1827
-    void ToggleImageFlip()
1820
+    public void ToggleImageFlip()
18281821     {
18291822         IMAGEFLIP ^= true;
18301823     }
18311824 
1832
-    void ToggleSpeakerMocap()
1825
+    public void ToggleSpeakerMocap()
18331826     {
18341827         SPEAKERMOCAP ^= true;
18351828     }
18361829 
1837
-    void ToggleSpeakerCamera()
1830
+    public void ToggleSpeakerCamera()
18381831     {
18391832         SPEAKERCAMERA ^= true;
18401833     }
18411834 
1842
-    void ToggleSpeakerFocus()
1835
+    public void ToggleSpeakerFocus()
18431836     {
18441837         SPEAKERFOCUS ^= true;
18451838     }
18461839 
1847
-    void ToggleDebug()
1848
-    {
1849
-        DEBUG ^= true;
1850
-    }
1851
-
1852
-    void ToggleFrustum()
1840
+    public void ToggleFrustum()
18531841     {
18541842         FRUSTUM ^= true;
18551843     }
18561844 
1857
-    void ToggleTrack()
1845
+    public void ToggleTrack()
18581846     {
18591847         TRACK ^= true;
18601848         if (TRACK)
....@@ -1873,25 +1861,35 @@
18731861         repaint();
18741862     }
18751863 
1876
-    void ToggleTrackOnce()
1864
+    public void ToggleTrackOnce()
18771865     {
18781866         TRACKONCE ^= true;
18791867     }
18801868 
1881
-    void ToggleShadowTrack()
1869
+    public void ToggleShadowTrack()
18821870     {
18831871         SHADOWTRACK ^= true;
18841872         repaint();
18851873     }
18861874 
1887
-    void ToggleOeil()
1875
+    public void ToggleOeil()
18881876     {
18891877         OEIL ^= true;
18901878     }
18911879 
1892
-    void ToggleOeilOnce()
1880
+    public void ToggleOeilOnce()
18931881     {
18941882         OEILONCE ^= true;
1883
+    }
1884
+
1885
+    void ToggleFootContact()
1886
+    {
1887
+        FOOTCONTACT ^= true;
1888
+    }
1889
+    
1890
+    void ToggleDebug()
1891
+    {
1892
+        DEBUG ^= true;
18951893     }
18961894 
18971895     void ToggleLookAt()
....@@ -7953,7 +7951,7 @@
79537951         return texture!=null?texture.texture:null;
79547952     }
79557953     
7956
-    com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
7954
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
79577955     {
79587956         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
79597957                 
....@@ -14153,7 +14151,7 @@
1415314151             SetMouseMode(modifiers);
1415414152         }
1415514153 
14156
-        theRenderer.keyPressed(key);
14154
+        Globals.theRenderer.keyPressed(key);
1415714155     }
1415814156 
1415914157     int kompactbit = 4; // power bit
....@@ -14165,7 +14163,7 @@
1416514163     float SATPOW = 1; // 2; // 0.5f;
1416614164     float BRIPOW = 1; // 0.5f; // 0.5f;
1416714165     
14168
-    void keyPressed(int key)
14166
+    public void keyPressed(int key)
1416914167     {
1417014168         if (key >= '0' && key <= '5')
1417114169             clampbit = (key-'0');
....@@ -14602,6 +14600,7 @@
1460214600         }
1460314601     //System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
1460414602     }
14603
+    
1460514604     static double OCCLUSIONBOOST = 1; // 0.5;
1460614605 
1460714606     void keyReleased(int key, int modifiers)
....@@ -14613,7 +14612,7 @@
1461314612         }
1461414613     }
1461514614 
14616
-    protected void processKeyEvent(KeyEvent e)
14615
+    public void processKeyEvent(KeyEvent e)
1461714616     {
1461814617         switch (e.getID())
1461914618         {


 ClickInfo.java
....@@ -24,7 +24,7 @@
2424     Rectangle bounds;
2525     Camera camera;
2626     double toScreen[][];
27
-    CameraPane pane;
27
+    iCameraPane pane;
2828     Graphics g;
2929 
3030     static double matbuffer[][] = new double[4][4];


 Globals.java
....@@ -1,6 +1,8 @@
11 
22 public class Globals
33 {
4
+    static iCameraPane theRenderer;
5
+    
46         private static boolean LIVE = false;
57         
68         static boolean CROWD = false;


 GroupEditor.java
....@@ -1783,7 +1783,7 @@
17831783 		if (event.getSource() == computeAOItem)
17841784 		{
17851785                     Globals.drawMode = CameraPane.OCCLUSION;
1786
-                    CameraPane.theRenderer.repaint();
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;
....@@ -3473,7 +3473,7 @@
34733473                             String pigment = Object3D.GetPigment(tex);
34743474                             //String bump = Object3D.GetBump(tex);
34753475                             
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);
34773477                             
34783478                             double s = v.s;
34793479                             
....@@ -3774,7 +3774,7 @@
37743774             group.selection.RelinkToSupport(); // july 2014
37753775             System.out.println("DONE.");
37763776             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));
37783778         }
37793779         
37803780 	void ReduceMesh(boolean reduction34)
....@@ -4066,9 +4066,9 @@
40664066                             // a camera
40674067                         {
40684068                             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;
40724072                         }
40734073                             
40744074 			refreshContents();


 Mocap.java
....@@ -1519,7 +1519,7 @@
15191519 //            mywave = currentwave++;
15201520 //        }
15211521                     // sound
1522
-                    cVector eye = CameraPane.theRenderer.EyeCamera().location;
1522
+                    cVector eye = Globals.theRenderer.EyeCamera().location;
15231523 
15241524 //                    if (sourcenode.parent.parent != null)
15251525 //                        sourcenode.parent.parent.TransformToWorld(floor, tmp);


 ObjEditor.java
....@@ -124,7 +124,7 @@
124124     void keyPressed(int key, int modifiers)
125125     {
126126     System.out.println("KEY PRESSED");
127
-    CameraPane.theRenderer.keyPressed(key, modifiers);
127
+    Globals.theRenderer.keyPressed(key, modifiers);
128128     }
129129      */
130130 


 Object3D.java
....@@ -430,16 +430,16 @@
430430     {
431431         Object3D copy = this;
432432         
433
-            Camera parentcam = CameraPane.theRenderer.ManipCamera();
433
+            Camera parentcam = Globals.theRenderer.ManipCamera();
434434             
435
-            if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[0])
435
+            if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436436             {
437
-                parentcam = CameraPane.theRenderer.Cameras()[1];
437
+                parentcam = Globals.theRenderer.Cameras()[1];
438438             }
439439             
440
-            if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[1])
440
+            if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441441             {
442
-                parentcam = CameraPane.theRenderer.Cameras()[0];
442
+                parentcam = Globals.theRenderer.Cameras()[0];
443443             }
444444         
445445         if (this == parentcam)
....@@ -447,7 +447,7 @@
447447             //assert(this instanceof Camera);
448448             
449449             for (int count = parentcam.GetTransformCount(); --count>=0;)
450
-                LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.toParent, CameraPane.theRenderer.TargetLookAt());
450
+                LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451451         }
452452         
453453         copy.marked ^= true;
....@@ -467,7 +467,7 @@
467467             //assert(this instanceof Camera);
468468             
469469             for (int count = parentcam.GetTransformCount(); --count>=0;)
470
-                LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.fromParent, CameraPane.theRenderer.TargetLookAt());
470
+                LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471471         }
472472 
473473         copy.Touch(); // display list issue
....@@ -6391,7 +6391,7 @@
63916391                 center.add(r);
63926392                 center.mul(1.0/3);
63936393                 
6394
-                center.sub(CameraPane.theRenderer.eyeCamera.location);
6394
+                center.sub(Globals.theRenderer.EyeCamera().location);
63956395                 
63966396                 distance = center.dot(center);
63976397             }
....@@ -7173,7 +7173,7 @@
71737173 
71747174             case hitCenter: // Translate
71757175                 
7176
-                scale *= 0.05f * info.pane.theRenderer.renderCamera.Distance();
7176
+                scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
71777177                 
71787178                 if (modified)
71797179                 {
....@@ -7221,10 +7221,10 @@
72217221                     }
72227222                     LA.xformDir(up, ClickInfo.matbuffer, up);
72237223     //                if (!CameraPane.LOCALTRANSFORM)
7224
-                        LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7224
+                        LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
72257225                     LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
72267226     //                if (!CameraPane.LOCALTRANSFORM)
7227
-                        LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
7227
+                        LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
72287228                     //LA.vecCross(up, cVector.Z, right2);
72297229 
72307230                     cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
....@@ -7282,7 +7282,7 @@
72827282                 }
72837283                 /**/
72847284 
7285
-                switch (info.pane.renderCamera.viewCode)
7285
+                switch (info.pane.RenderCamera().viewCode)
72867286                 {
72877287                     case 1: // '\001'
72887288                         LA.matZRotate(toParent, angle);
....@@ -7338,7 +7338,7 @@
73387338                 }
73397339                 /**/
73407340 
7341
-                switch (info.pane.renderCamera.viewCode)
7341
+                switch (info.pane.RenderCamera().viewCode)
73427342                 {
73437343                     case 3: // '\001'
73447344                         if (modified)


 ScriptNode.java
....@@ -268,7 +268,7 @@
268268         if (reader.line == null)
269269         {
270270 //            if (CameraPane.LIVE)
271
-//                CameraPane.theRenderer.ToggleLive();
271
+//                Globals.theRenderer.ToggleLive();
272272 //            Reset();
273273 //            
274274 //            try
....@@ -521,7 +521,7 @@
521521         
522522         if (command.equals("recompile"))
523523         {
524
-            assert (GetRoot() == CameraPane.theRenderer.object);
524
+            // TODO assert (GetRoot() == Globals.theRenderer.object);
525525             GetRoot().editWindow.Recompile();
526526             return;
527527         }
....@@ -532,205 +532,205 @@
532532         }
533533         if (command.equals("deselect") || command.equals("unselect"))
534534         {
535
-            assert (GetRoot() == CameraPane.theRenderer.object);
535
+            // TODO assert (GetRoot() == Globals.theRenderer.object);
536536             GetRoot().editWindow.jTree.clearSelection();
537537             return;
538538         }
539539         if (command.equals("stoplive") || command.equals("liveoff"))
540540         {
541541             if (Globals.isLIVE())
542
-                CameraPane.theRenderer.ToggleLive();
542
+                Globals.theRenderer.ToggleLive();
543543             return;
544544         }
545545         if (command.equals("startlive") || command.equals("liveon"))
546546         {
547547             if (!Globals.isLIVE())
548
-                CameraPane.theRenderer.ToggleLive();
548
+                Globals.theRenderer.ToggleLive();
549549             return;
550550         }
551551         if (command.equals("frustumon"))
552552         {
553553             if (!CameraPane.FRUSTUM)
554
-                CameraPane.theRenderer.ToggleFrustum();
554
+                Globals.theRenderer.ToggleFrustum();
555555             return;
556556         }
557557         if (command.equals("frustumoff"))
558558         {
559559             if (CameraPane.FRUSTUM)
560
-                CameraPane.theRenderer.ToggleFrustum();
560
+                Globals.theRenderer.ToggleFrustum();
561561             return;
562562         }
563563         if (command.equals("flipon"))
564564         {
565565             if (!CameraPane.IMAGEFLIP)
566
-                CameraPane.theRenderer.ToggleImageFlip();
566
+                Globals.theRenderer.ToggleImageFlip();
567567             return;
568568         }
569569         if (command.equals("flipoff"))
570570         {
571571             if (CameraPane.IMAGEFLIP)
572
-                CameraPane.theRenderer.ToggleImageFlip();
572
+                Globals.theRenderer.ToggleImageFlip();
573573             return;
574574         }
575575         if (command.equals("smoothon"))
576576         {
577577             if (!CameraPane.SMOOTHFOCUS)
578
-                CameraPane.theRenderer.ToggleSmoothFocus();
578
+                Globals.theRenderer.ToggleSmoothFocus();
579579             return;
580580         }
581581         if (command.equals("smoothoff"))
582582         {
583583             if (CameraPane.SMOOTHFOCUS)
584
-                CameraPane.theRenderer.ToggleSmoothFocus();
584
+                Globals.theRenderer.ToggleSmoothFocus();
585585             return;
586586         }
587587         if (command.equals("inertiaon"))
588588         {
589589             if (!CameraPane.INERTIA)
590
-                CameraPane.theRenderer.ToggleInertia();
590
+                Globals.theRenderer.ToggleInertia();
591591             return;
592592         }
593593         if (command.equals("inertiaoff"))
594594         {
595595             if (CameraPane.INERTIA)
596
-                CameraPane.theRenderer.ToggleInertia();
596
+                Globals.theRenderer.ToggleInertia();
597597             return;
598598         }
599599         if (command.equals("mocapon"))
600600         {
601601             if (!CameraPane.SPEAKERMOCAP)
602
-                CameraPane.theRenderer.ToggleSpeakerMocap();
602
+                Globals.theRenderer.ToggleSpeakerMocap();
603603             return;
604604         }
605605         if (command.equals("mocapoff"))
606606         {
607607             if (CameraPane.SPEAKERMOCAP)
608
-                CameraPane.theRenderer.ToggleSpeakerMocap();
608
+                Globals.theRenderer.ToggleSpeakerMocap();
609609             return;
610610         }
611611         if (command.equals("cameraon"))
612612         {
613613             if (!CameraPane.SPEAKERCAMERA)
614
-                CameraPane.theRenderer.ToggleSpeakerCamera();
614
+                Globals.theRenderer.ToggleSpeakerCamera();
615615             return;
616616         }
617617         if (command.equals("cameraoff"))
618618         {
619619             if (CameraPane.SPEAKERCAMERA)
620
-                CameraPane.theRenderer.ToggleSpeakerCamera();
620
+                Globals.theRenderer.ToggleSpeakerCamera();
621621             return;
622622         }
623623         if (command.equals("zoomon"))
624624         {
625625             if (!CameraPane.SPEAKERFOCUS)
626
-                CameraPane.theRenderer.ToggleSpeakerFocus();
626
+                Globals.theRenderer.ToggleSpeakerFocus();
627627             return;
628628         }
629629         if (command.equals("zoomoff"))
630630         {
631631             if (CameraPane.SPEAKERFOCUS)
632
-                CameraPane.theRenderer.ToggleSpeakerFocus();
632
+                Globals.theRenderer.ToggleSpeakerFocus();
633633             return;
634634         }
635635         if (command.equals("shadowon"))
636636         {
637637             if (!CameraPane.SHADOWTRACK)
638
-                CameraPane.theRenderer.ToggleShadowTrack();
638
+                Globals.theRenderer.ToggleShadowTrack();
639639             return;
640640         }
641641         if (command.equals("shadowoff"))
642642         {
643643             if (CameraPane.SHADOWTRACK)
644
-                CameraPane.theRenderer.ToggleShadowTrack();
644
+                Globals.theRenderer.ToggleShadowTrack();
645645             return;
646646         }
647647         if (command.equals("trackon"))
648648         {
649649             CameraPane.TRACK = false; // force selection to be used
650650             if (!CameraPane.TRACK)
651
-                CameraPane.theRenderer.ToggleTrack();
651
+                Globals.theRenderer.ToggleTrack();
652652             return;
653653         }
654654         if (command.equals("trackoff"))
655655         {
656656             if (CameraPane.TRACK)
657
-                CameraPane.theRenderer.ToggleTrack();
657
+                Globals.theRenderer.ToggleTrack();
658658             return;
659659         }
660660         if (command.equals("trackonceon"))
661661         {
662662             if (!CameraPane.TRACKONCE)
663
-                CameraPane.theRenderer.ToggleTrackOnce();
663
+                Globals.theRenderer.ToggleTrackOnce();
664664             return;
665665         }
666666         if (command.equals("trackonceoff"))
667667         {
668668             if (CameraPane.TRACKONCE)
669
-                CameraPane.theRenderer.ToggleTrackOnce();
669
+                Globals.theRenderer.ToggleTrackOnce();
670670             return;
671671         }
672672         if (command.equals("oeilon"))
673673         {
674674             if (!CameraPane.OEIL && !CameraPane.OEILONCE)
675
-                CameraPane.theRenderer.ToggleOeil();
675
+                Globals.theRenderer.ToggleOeil();
676676             return;
677677         }
678678         if (command.equals("oeiloff"))
679679         {
680680             if (CameraPane.OEIL && !CameraPane.OEILONCE)
681
-                CameraPane.theRenderer.ToggleOeil();
681
+                Globals.theRenderer.ToggleOeil();
682682             return;
683683         }
684684         
685685         if (command.equals("oeilonceon"))
686686         {
687687             if (!CameraPane.OEILONCE)
688
-                CameraPane.theRenderer.ToggleOeilOnce();
688
+                Globals.theRenderer.ToggleOeilOnce();
689689             return;
690690         }
691691         if (command.equals("oeilonceoff"))
692692         {
693693             if (CameraPane.OEILONCE)
694
-                CameraPane.theRenderer.ToggleOeilOnce();
694
+                Globals.theRenderer.ToggleOeilOnce();
695695             return;
696696         }
697697         
698698         if (command.equals("faston"))
699699         {
700700             if (!CameraPane.FAST)
701
-                CameraPane.theRenderer.ToggleFast();
701
+                Globals.theRenderer.ToggleFast();
702702             return;
703703         }
704704         if (command.equals("fastoff"))
705705         {
706706             if (CameraPane.FAST)
707
-                CameraPane.theRenderer.ToggleFast();
707
+                Globals.theRenderer.ToggleFast();
708708             return;
709709         }
710710         
711711         if (command.equals("slowposeon"))
712712         {
713713             if (!CameraPane.SLOWPOSE)
714
-                CameraPane.theRenderer.ToggleSlowPose();
714
+                Globals.theRenderer.ToggleSlowPose();
715715             return;
716716         }
717717         if (command.equals("slowposeoff"))
718718         {
719719             if (CameraPane.SLOWPOSE)
720
-                CameraPane.theRenderer.ToggleSlowPose();
720
+                Globals.theRenderer.ToggleSlowPose();
721721             return;
722722         }
723723         
724724         if (command.equals("supporton"))
725725         {
726726             if (!CameraPane.SUPPORT)
727
-                CameraPane.theRenderer.ToggleSupport();
727
+                Globals.theRenderer.ToggleSupport();
728728             return;
729729         }
730730         if (command.equals("supportoff"))
731731         {
732732             if (CameraPane.SUPPORT)
733
-                CameraPane.theRenderer.ToggleSupport();
733
+                Globals.theRenderer.ToggleSupport();
734734             return;
735735         }
736736         
....@@ -756,13 +756,13 @@
756756         if (command.equals("aborton"))
757757         {
758758             if (!CameraPane.ABORTMODE)
759
-                CameraPane.theRenderer.ToggleAbort();
759
+                Globals.theRenderer.ToggleAbort();
760760             return;
761761         }
762762         if (command.equals("abortoff"))
763763         {
764764             if (CameraPane.ABORTMODE)
765
-                CameraPane.theRenderer.ToggleAbort();
765
+                Globals.theRenderer.ToggleAbort();
766766             return;
767767         }
768768         
....@@ -770,7 +770,7 @@
770770         {
771771             if (!CameraPane.BOXMODE)
772772             {
773
-                CameraPane.theRenderer.ToggleBoxMode();
773
+                Globals.theRenderer.ToggleBoxMode();
774774                 GetRoot().editWindow.Recompile();
775775             }
776776             return;
....@@ -779,7 +779,7 @@
779779         {
780780             if (CameraPane.BOXMODE)
781781             {
782
-                CameraPane.theRenderer.ToggleBoxMode();
782
+                Globals.theRenderer.ToggleBoxMode();
783783                 GetRoot().editWindow.Recompile();
784784             }
785785             return;
....@@ -800,7 +800,7 @@
800800         {
801801             if (!CameraPane.textureon)
802802             {
803
-                CameraPane.theRenderer.ToggleTexture();
803
+                Globals.theRenderer.ToggleTexture();
804804             }
805805             return;
806806         }
....@@ -808,7 +808,7 @@
808808         {
809809             if (CameraPane.textureon)
810810             {
811
-                CameraPane.theRenderer.ToggleTexture();
811
+                Globals.theRenderer.ToggleTexture();
812812             }
813813             return;
814814         }
....@@ -1155,7 +1155,7 @@
11551155                         boolean success = false;
11561156 
11571157                         if (cam instanceof Camera) // ?
1158
-                            success = CameraPane.theRenderer.SetCamera((Camera) cam);
1158
+                            success = Globals.theRenderer.SetCamera((Camera) cam);
11591159 
11601160                         if (success)
11611161                         {
....@@ -1462,7 +1462,7 @@
14621462         }
14631463         if (command.equals("select"))
14641464         {
1465
-            assert (GetRoot() == CameraPane.theRenderer.object);
1465
+            // TODO assert (GetRoot() == Globals.theRenderer.object);
14661466             String path = GetAlias(strs[index+1]);
14671467             GetRoot().editWindow.Select(GetRoot().GetTreePath(path.split("/"), 0), false, false);
14681468             return;
....@@ -1558,7 +1558,7 @@
15581558             boolean success = false;
15591559             
15601560             if (object instanceof Camera) // ?
1561
-                success = CameraPane.theRenderer.SetCamera((Camera) object);
1561
+                success = Globals.theRenderer.SetCamera((Camera) object);
15621562             
15631563             if (success && CameraPane.ABORTMODE)
15641564             {


 cTree.java
....@@ -24,7 +24,7 @@
2424     protected void processKeyEvent(java.awt.event.KeyEvent e)
2525     {
2626         //System.out.println("KEY PRESSED");
27
-        CameraPane.theRenderer.processKeyEvent(e);
27
+        Globals.theRenderer.processKeyEvent(e);
2828     }
2929     private int margin = 12;
3030 


 iCameraPane.java
....@@ -42,6 +42,8 @@
4242     Camera ManipCamera();
4343     Camera RenderCamera();
4444     
45
+    boolean SetCamera(Camera c);
46
+            
4547     cVector TargetLookAt();
4648 
4749     // Should be cMaterial
....@@ -61,4 +63,35 @@
6163     void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate);
6264     
6365     void PrepOcclusion(BoundaryRep br, double[][] transform);
66
+    
67
+    void setCursor(java.awt.Cursor cursor);
68
+    
69
+    com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution);
70
+            
71
+    void repaint();
72
+    
73
+    void processKeyEvent(java.awt.event.KeyEvent e);
74
+    
75
+    void keyPressed(int key);
76
+    
77
+    // For scripts
78
+    void ToggleLive();
79
+    void ToggleFrustum();
80
+    void ToggleTexture();
81
+    void ToggleBoxMode();
82
+    void ToggleSupport();
83
+    void ToggleSlowPose();
84
+    void ToggleAbort();
85
+    void ToggleFast();
86
+    void ToggleOeilOnce();
87
+    void ToggleOeil();
88
+    void ToggleTrackOnce();
89
+    void ToggleTrack();
90
+    void ToggleShadowTrack();
91
+    void ToggleInertia();
92
+    void ToggleSmoothFocus();
93
+    void ToggleImageFlip();
94
+    void ToggleSpeakerFocus();
95
+    void ToggleSpeakerCamera();
96
+    void ToggleSpeakerMocap();
6497 }