Fix theRenderer

Normand Briere

2019-04-22 4a5b9e0b9ecc97203d4089ca0cd0d6df8c76bf1c

 Object3D.java
..
..
@@ -430,16 +430,16 @@
430
430
     {
431
431
         Object3D copy = this;
432
432
         
433
-            Camera parentcam = CameraPane.theRenderer.ManipCamera();
433
+            Camera parentcam = Globals.theRenderer.ManipCamera();
434
434
             
435
-            if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[0])
435
+            if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436
436
             {
437
-                parentcam = CameraPane.theRenderer.Cameras()[1];
437
+                parentcam = Globals.theRenderer.Cameras()[1];
438
438
             }
439
439
             
440
-            if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[1])
440
+            if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441
441
             {
442
-                parentcam = CameraPane.theRenderer.Cameras()[0];
442
+                parentcam = Globals.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(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.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(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471
471
         }
472
472
 
473
473
         copy.Touch(); // display list issue
..
..
@@ -6391,7 +6391,7 @@
6391
6391
                 center.add(r);
6392
6392
                 center.mul(1.0/3);
6393
6393
                 
6394
-                center.sub(CameraPane.theRenderer.eyeCamera.location);
6394
+                center.sub(Globals.theRenderer.EyeCamera().location);
6395
6395
                 
6396
6396
                 distance = center.dot(center);
6397
6397
             }
..
..
@@ -7173,7 +7173,7 @@
7173
7173
 
7174
7174
             case hitCenter: // Translate
7175
7175
                 
7176
-                scale *= 0.05f * info.pane.theRenderer.renderCamera.Distance();
7176
+                scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
7177
7177
                 
7178
7178
                 if (modified)
7179
7179
                 {
..
..
@@ -7221,10 +7221,10 @@
7221
7221
                     }
7222
7222
                     LA.xformDir(up, ClickInfo.matbuffer, up);
7223
7223
     //                if (!CameraPane.LOCALTRANSFORM)
7224
-                        LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7224
+                        LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7225
7225
                     LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7226
7226
     //                if (!CameraPane.LOCALTRANSFORM)
7227
-                        LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
7227
+                        LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7228
7228
                     //LA.vecCross(up, cVector.Z, right2);
7229
7229
 
7230
7230
                     cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..
..
@@ -7282,7 +7282,7 @@
7282
7282
                 }
7283
7283
                 /**/
7284
7284
 
7285
-                switch (info.pane.renderCamera.viewCode)
7285
+                switch (info.pane.RenderCamera().viewCode)
7286
7286
                 {
7287
7287
                     case 1: // '\001'
7288
7288
                         LA.matZRotate(toParent, angle);
..
..
@@ -7338,7 +7338,7 @@
7338
7338
                 }
7339
7339
                 /**/
7340
7340
 
7341
-                switch (info.pane.renderCamera.viewCode)
7341
+                switch (info.pane.RenderCamera().viewCode)
7342
7342
                 {
7343
7343
                     case 3: // '\001'
7344
7344
                         if (modified)