blame | history | patch | commit | commitdiff
Normand Briere
2019-04-22 4a5b9e0b9ecc97203d4089ca0cd0d6df8c76bf1c 
 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         {