From 4a5b9e0b9ecc97203d4089ca0cd0d6df8c76bf1c Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 17:29:27 -0400
Subject: [PATCH] Fix theRenderer
---
Object3D.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index fb14401..bdfe925 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -430,16 +430,16 @@
{
Object3D copy = this;
- Camera parentcam = CameraPane.theRenderer.ManipCamera();
+ Camera parentcam = Globals.theRenderer.ManipCamera();
- if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[0])
+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
{
- parentcam = CameraPane.theRenderer.Cameras()[1];
+ parentcam = Globals.theRenderer.Cameras()[1];
}
- if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[1])
+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
{
- parentcam = CameraPane.theRenderer.Cameras()[0];
+ parentcam = Globals.theRenderer.Cameras()[0];
}
if (this == parentcam)
@@ -447,7 +447,7 @@
//assert(this instanceof Camera);
for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.toParent, CameraPane.theRenderer.TargetLookAt());
+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
}
copy.marked ^= true;
@@ -467,7 +467,7 @@
//assert(this instanceof Camera);
for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.fromParent, CameraPane.theRenderer.TargetLookAt());
+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
}
copy.Touch(); // display list issue
@@ -6391,7 +6391,7 @@
center.add(r);
center.mul(1.0/3);
- center.sub(CameraPane.theRenderer.eyeCamera.location);
+ center.sub(Globals.theRenderer.EyeCamera().location);
distance = center.dot(center);
}
@@ -7173,7 +7173,7 @@
case hitCenter: // Translate
- scale *= 0.05f * info.pane.theRenderer.renderCamera.Distance();
+ scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
if (modified)
{
@@ -7221,10 +7221,10 @@
}
LA.xformDir(up, ClickInfo.matbuffer, up);
// if (!CameraPane.LOCALTRANSFORM)
- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
// if (!CameraPane.LOCALTRANSFORM)
- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
//LA.vecCross(up, cVector.Z, right2);
cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
@@ -7282,7 +7282,7 @@
}
/**/
- switch (info.pane.renderCamera.viewCode)
+ switch (info.pane.RenderCamera().viewCode)
{
case 1: // '\001'
LA.matZRotate(toParent, angle);
@@ -7338,7 +7338,7 @@
}
/**/
- switch (info.pane.renderCamera.viewCode)
+ switch (info.pane.RenderCamera().viewCode)
{
case 3: // '\001'
if (modified)
--
Gitblit v1.6.2