Cross-platform main.

Normand Briere

2019-04-24 07750666120cf38c7ad4f3a3a583a8c4d582bb0e

 BoundaryRep.java
..
..
@@ -2661,7 +2661,7 @@
2661
2661
         if (false) // slow && stepout && onein)
2662
2662
         {
2663
2663
             // sound
2664
-            cVector eye = CameraPane.theRenderer.eyeCamera.location;
2664
+            cVector eye = Globals.theRenderer.EyeCamera().location;
2665
2665
 
2666
2666
             Vertex v = GetVertex(0);
2667
2667
 
..
..
@@ -4428,7 +4428,7 @@
4428
4428
         }
4429
4429
     }
4430
4430
     
4431
-    void CullVertex(javax.media.opengl.GL gl, boolean shadow)
4431
+    void CullVertex(javax.media.opengl.GL glNOTUSED, boolean shadowNOTUSED)
4432
4432
     {
4433
4433
         CameraPane.glu.gluProject(vect5.x,vect5.y,vect5.z,
4434
4434
                 CameraPane.tempmat,0, CameraPane.tempmat2,0,
..
..
@@ -4460,14 +4460,14 @@
4460
4460
         // june 2014
4461
4461
 //        Camera parentcam = cam;
4462
4462
 //
4463
-//        if (cam == CameraPane.theRenderer.cameras[0])
4463
+//        if (cam == Globals.theRenderer.cameras[0])
4464
4464
 //        {
4465
-//            parentcam = CameraPane.theRenderer.cameras[1];
4465
+//            parentcam = Globals.theRenderer.cameras[1];
4466
4466
 //        }
4467
4467
 //
4468
-//        if (cam == CameraPane.theRenderer.cameras[1])
4468
+//        if (cam == Globals.theRenderer.cameras[1])
4469
4469
 //        {
4470
-//            parentcam = CameraPane.theRenderer.cameras[0];
4470
+//            parentcam = Globals.theRenderer.cameras[0];
4471
4471
 //        }
4472
4472
     
4473
4473
         gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, CameraPane.tempmat, 0);
..
..
@@ -7560,7 +7560,7 @@
7560
7560
             s3 = new cVector();
7561
7561
         }
7562
7562
         
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));
7564
7564
         
7565
7565
         try
7566
7566
         {
..
..
@@ -7655,7 +7655,7 @@
7655
7655
         {
7656
7656
             if (i++%100 == 0)
7657
7657
             {
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));
7659
7659
                 System.out.println("#faces = " + faces.size());
7660
7660
             //    if (i != 1)
7661
7661
             //        break;
..
..
@@ -7699,7 +7699,7 @@
7699
7699
         //Trim(true,cJME.gennormals,true,false); // doesn't work
7700
7700
         Trim(true,false,false,false,false);
7701
7701
         
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));
7703
7703
     }
7704
7704
     
7705
7705
     void UpdateIndices(Face face, Face minface)