Refactoring phase 3

Normand Briere

2019-04-22 3c4c16e0a4ca3949a7a37a24607df7f89abfe7ea

 Object3D.java
..
..
@@ -430,16 +430,16 @@
430
430
     {
431
431
         Object3D copy = this;
432
432
         
433
-            Camera parentcam = CameraPane.theRenderer.manipCamera;
433
+            Camera parentcam = CameraPane.theRenderer.ManipCamera();
434
434
             
435
-            if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
435
+            if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[0])
436
436
             {
437
-                parentcam = CameraPane.theRenderer.cameras[1];
437
+                parentcam = CameraPane.theRenderer.Cameras()[1];
438
438
             }
439
439
             
440
-            if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
440
+            if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[1])
441
441
             {
442
-                parentcam = CameraPane.theRenderer.cameras[0];
442
+                parentcam = CameraPane.theRenderer.Cameras()[0];
443
443
             }
444
444
         
445
445
         if (this == parentcam)
..
..
@@ -447,7 +447,7 @@
447
447
             //assert(this instanceof Camera);
448
448
             
449
449
             for (int count = parentcam.GetTransformCount(); --count>=0;)
450
-                LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
450
+                LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.toParent, CameraPane.theRenderer.TargetLookAt());
451
451
         }
452
452
         
453
453
         copy.marked ^= true;
..
..
@@ -467,7 +467,7 @@
467
467
             //assert(this instanceof Camera);
468
468
             
469
469
             for (int count = parentcam.GetTransformCount(); --count>=0;)
470
-                LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
470
+                LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.fromParent, CameraPane.theRenderer.TargetLookAt());
471
471
         }
472
472
 
473
473
         copy.Touch(); // display list issue
..
..
@@ -602,7 +602,7 @@
602
602
             return;
603
603
         }
604
604
         
605
-        if (CameraPane.fromscript)
605
+        if (Globals.fromscript)
606
606
         {
607
607
             transformcount = 0;
608
608
             return;
..
..
@@ -4854,7 +4854,7 @@
4854
4854
         return globalTransform;
4855
4855
     }
4856
4856
 
4857
-    void PreprocessOcclusion(CameraPane cp)
4857
+    void PreprocessOcclusion(iCameraPane cp)
4858
4858
     {
4859
4859
         /*
4860
4860
         if (AOdone)
..
..
@@ -5327,6 +5327,7 @@
5327
5327
                     && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
5328
5328
     }
5329
5329
     
5330
+    static boolean DEBUG_SELECTION = false;
5330
5331
     
5331
5332
     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
5332
5333
     {
..
..
@@ -5365,7 +5366,7 @@
5365
5366
         }
5366
5367
 
5367
5368
         if ((//display.DrawMode() == CameraPane.SHADOW ||
5368
-                display.DrawMode() == CameraPane.SELECTION || CameraPane.DEBUG_SELECTION) && HasTransparency())
5369
+                display.DrawMode() == iCameraPane.SELECTION || display.IsDebugSelection()) && HasTransparency())
5369
5370
         {
5370
5371
             return;
5371
5372
         }
..
..
@@ -5406,7 +5407,7 @@
5406
5407
 
5407
5408
         boolean compiled = false;
5408
5409
 
5409
-        boolean selectmode = display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION;
5410
+        boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
5410
5411
         
5411
5412
         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5412
5413
                 (touched || (bRep != null && bRep.displaylist <= 0)))
..
..
@@ -5484,9 +5485,9 @@
5484
5485
         
5485
5486
         // frustum culling
5486
5487
         if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5487
-                && display.DrawMode() != CameraPane.SELECTION)
5488
+                && display.DrawMode() != iCameraPane.SELECTION)
5488
5489
         {
5489
-            if (display.DrawMode() == CameraPane.SHADOW)
5490
+            if (display.DrawMode() == iCameraPane.SHADOW)
5490
5491
             {
5491
5492
                 if (!link2master // tricky to cull in shadow mode.
5492
5493
                          && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
..
..
@@ -5533,7 +5534,7 @@
5533
5534
 
5534
5535
 
5535
5536
         if (!culled)
5536
-        if (display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION)
5537
+        if (display.DrawMode() == display.SELECTION || display.IsDebugSelection())
5537
5538
         {
5538
5539
             if (GetBRep() != null)
5539
5540
             {
..
..
@@ -5973,7 +5974,7 @@
5973
5974
         {
5974
5975
             //throw new Error();
5975
5976
 
5976
-            boolean selectmode = display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION;
5977
+            boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
5977
5978
 
5978
5979
             int[] strips = bRep.getRawIndices();
5979
5980
 
..
..
@@ -6993,83 +6994,83 @@
6993
6994
             int spotw = spot.x + spot.width;
6994
6995
             int spoth = spot.y + spot.height;
6995
6996
             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6996
-            if (CameraPane.Xmin > spot.x)
6997
-            {
6998
-                CameraPane.Xmin = spot.x;
6999
-            }
7000
-            if (CameraPane.Xmax < spotw)
7001
-            {
7002
-                CameraPane.Xmax = spotw;
7003
-            }
7004
-            if (CameraPane.Ymin > spot.y)
7005
-            {
7006
-                CameraPane.Ymin = spot.y;
7007
-            }
7008
-            if (CameraPane.Ymax < spoth)
7009
-            {
7010
-                CameraPane.Ymax = spoth;
7011
-            }
6997
+//            if (CameraPane.Xmin > spot.x)
6998
+//            {
6999
+//                CameraPane.Xmin = spot.x;
7000
+//            }
7001
+//            if (CameraPane.Xmax < spotw)
7002
+//            {
7003
+//                CameraPane.Xmax = spotw;
7004
+//            }
7005
+//            if (CameraPane.Ymin > spot.y)
7006
+//            {
7007
+//                CameraPane.Ymin = spot.y;
7008
+//            }
7009
+//            if (CameraPane.Ymax < spoth)
7010
+//            {
7011
+//                CameraPane.Ymax = spoth;
7012
+//            }
7012
7013
             spot.translate(32, 32);
7013
7014
             spotw = spot.x + spot.width;
7014
7015
             spoth = spot.y + spot.height;
7015
7016
             info.g.setColor(Color.blue);
7016
7017
             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7017
-            if (CameraPane.Xmin > spot.x)
7018
-            {
7019
-                CameraPane.Xmin = spot.x;
7020
-            }
7021
-            if (CameraPane.Xmax < spotw)
7022
-            {
7023
-                CameraPane.Xmax = spotw;
7024
-            }
7025
-            if (CameraPane.Ymin > spot.y)
7026
-            {
7027
-                CameraPane.Ymin = spot.y;
7028
-            }
7029
-            if (CameraPane.Ymax < spoth)
7030
-            {
7031
-                CameraPane.Ymax = spoth;
7032
-            }
7018
+//            if (CameraPane.Xmin > spot.x)
7019
+//            {
7020
+//                CameraPane.Xmin = spot.x;
7021
+//            }
7022
+//            if (CameraPane.Xmax < spotw)
7023
+//            {
7024
+//                CameraPane.Xmax = spotw;
7025
+//            }
7026
+//            if (CameraPane.Ymin > spot.y)
7027
+//            {
7028
+//                CameraPane.Ymin = spot.y;
7029
+//            }
7030
+//            if (CameraPane.Ymax < spoth)
7031
+//            {
7032
+//                CameraPane.Ymax = spoth;
7033
+//            }
7033
7034
             info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7034
7035
             info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7035
7036
             spot.translate(0, -32);
7036
7037
             info.g.setColor(Color.green);
7037
7038
             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7038
-            if (CameraPane.Xmin > spot.x)
7039
-            {
7040
-                CameraPane.Xmin = spot.x;
7041
-            }
7042
-            if (CameraPane.Xmax < spotw)
7043
-            {
7044
-                CameraPane.Xmax = spotw;
7045
-            }
7046
-            if (CameraPane.Ymin > spot.y)
7047
-            {
7048
-                CameraPane.Ymin = spot.y;
7049
-            }
7050
-            if (CameraPane.Ymax < spoth)
7051
-            {
7052
-                CameraPane.Ymax = spoth;
7053
-            }
7039
+//            if (CameraPane.Xmin > spot.x)
7040
+//            {
7041
+//                CameraPane.Xmin = spot.x;
7042
+//            }
7043
+//            if (CameraPane.Xmax < spotw)
7044
+//            {
7045
+//                CameraPane.Xmax = spotw;
7046
+//            }
7047
+//            if (CameraPane.Ymin > spot.y)
7048
+//            {
7049
+//                CameraPane.Ymin = spot.y;
7050
+//            }
7051
+//            if (CameraPane.Ymax < spoth)
7052
+//            {
7053
+//                CameraPane.Ymax = spoth;
7054
+//            }
7054
7055
             info.g.drawArc(boundary.x, boundary.y,
7055
7056
                     boundary.width, boundary.height, 0, 360);
7056
7057
             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7057
-            if (CameraPane.Xmin > boundary.x)
7058
-            {
7059
-                CameraPane.Xmin = boundary.x;
7060
-            }
7061
-            if (CameraPane.Xmax < boundary.x + boundary.width)
7062
-            {
7063
-                CameraPane.Xmax = boundary.x + boundary.width;
7064
-            }
7065
-            if (CameraPane.Ymin > boundary.y)
7066
-            {
7067
-                CameraPane.Ymin = boundary.y;
7068
-            }
7069
-            if (CameraPane.Ymax < boundary.y + boundary.height)
7070
-            {
7071
-                CameraPane.Ymax = boundary.y + boundary.height;
7072
-            }
7058
+//            if (CameraPane.Xmin > boundary.x)
7059
+//            {
7060
+//                CameraPane.Xmin = boundary.x;
7061
+//            }
7062
+//            if (CameraPane.Xmax < boundary.x + boundary.width)
7063
+//            {
7064
+//                CameraPane.Xmax = boundary.x + boundary.width;
7065
+//            }
7066
+//            if (CameraPane.Ymin > boundary.y)
7067
+//            {
7068
+//                CameraPane.Ymin = boundary.y;
7069
+//            }
7070
+//            if (CameraPane.Ymax < boundary.y + boundary.height)
7071
+//            {
7072
+//                CameraPane.Ymax = boundary.y + boundary.height;
7073
+//            }
7073
7074
             return;
7074
7075
         }
7075
7076
     }