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 | 171 ++++++++++++++++++++++++++++----------------------------
1 files changed, 86 insertions(+), 85 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 18fd57e..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
@@ -602,7 +602,7 @@
return;
}
- if (CameraPane.fromscript)
+ if (Globals.fromscript)
{
transformcount = 0;
return;
@@ -4854,7 +4854,7 @@
return globalTransform;
}
- void PreprocessOcclusion(CameraPane cp)
+ void PreprocessOcclusion(iCameraPane cp)
{
/*
if (AOdone)
@@ -5327,6 +5327,7 @@
&& (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
}
+ static boolean DEBUG_SELECTION = false;
void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
{
@@ -5365,7 +5366,7 @@
}
if ((//display.DrawMode() == CameraPane.SHADOW ||
- display.DrawMode() == CameraPane.SELECTION || CameraPane.DEBUG_SELECTION) && HasTransparency())
+ display.DrawMode() == iCameraPane.SELECTION || display.IsDebugSelection()) && HasTransparency())
{
return;
}
@@ -5406,7 +5407,7 @@
boolean compiled = false;
- boolean selectmode = display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION;
+ boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
if (!selectmode && //display.DrawMode() != display.SELECTION &&
(touched || (bRep != null && bRep.displaylist <= 0)))
@@ -5484,9 +5485,9 @@
// frustum culling
if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
- && display.DrawMode() != CameraPane.SELECTION)
+ && display.DrawMode() != iCameraPane.SELECTION)
{
- if (display.DrawMode() == CameraPane.SHADOW)
+ if (display.DrawMode() == iCameraPane.SHADOW)
{
if (!link2master // tricky to cull in shadow mode.
&& GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
@@ -5533,7 +5534,7 @@
if (!culled)
- if (display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION)
+ if (display.DrawMode() == display.SELECTION || display.IsDebugSelection())
{
if (GetBRep() != null)
{
@@ -5973,7 +5974,7 @@
{
//throw new Error();
- boolean selectmode = display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION;
+ boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
int[] strips = bRep.getRawIndices();
@@ -6390,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);
}
@@ -6993,83 +6994,83 @@
int spotw = spot.x + spot.width;
int spoth = spot.y + spot.height;
info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
- if (CameraPane.Xmin > spot.x)
- {
- CameraPane.Xmin = spot.x;
- }
- if (CameraPane.Xmax < spotw)
- {
- CameraPane.Xmax = spotw;
- }
- if (CameraPane.Ymin > spot.y)
- {
- CameraPane.Ymin = spot.y;
- }
- if (CameraPane.Ymax < spoth)
- {
- CameraPane.Ymax = spoth;
- }
+// if (CameraPane.Xmin > spot.x)
+// {
+// CameraPane.Xmin = spot.x;
+// }
+// if (CameraPane.Xmax < spotw)
+// {
+// CameraPane.Xmax = spotw;
+// }
+// if (CameraPane.Ymin > spot.y)
+// {
+// CameraPane.Ymin = spot.y;
+// }
+// if (CameraPane.Ymax < spoth)
+// {
+// CameraPane.Ymax = spoth;
+// }
spot.translate(32, 32);
spotw = spot.x + spot.width;
spoth = spot.y + spot.height;
info.g.setColor(Color.blue);
info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
- if (CameraPane.Xmin > spot.x)
- {
- CameraPane.Xmin = spot.x;
- }
- if (CameraPane.Xmax < spotw)
- {
- CameraPane.Xmax = spotw;
- }
- if (CameraPane.Ymin > spot.y)
- {
- CameraPane.Ymin = spot.y;
- }
- if (CameraPane.Ymax < spoth)
- {
- CameraPane.Ymax = spoth;
- }
+// if (CameraPane.Xmin > spot.x)
+// {
+// CameraPane.Xmin = spot.x;
+// }
+// if (CameraPane.Xmax < spotw)
+// {
+// CameraPane.Xmax = spotw;
+// }
+// if (CameraPane.Ymin > spot.y)
+// {
+// CameraPane.Ymin = spot.y;
+// }
+// if (CameraPane.Ymax < spoth)
+// {
+// CameraPane.Ymax = spoth;
+// }
info.g.drawLine(spotw, spoth, spotw, spoth - 15);
info.g.drawLine(spotw, spoth, spotw - 15, spoth);
spot.translate(0, -32);
info.g.setColor(Color.green);
info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
- if (CameraPane.Xmin > spot.x)
- {
- CameraPane.Xmin = spot.x;
- }
- if (CameraPane.Xmax < spotw)
- {
- CameraPane.Xmax = spotw;
- }
- if (CameraPane.Ymin > spot.y)
- {
- CameraPane.Ymin = spot.y;
- }
- if (CameraPane.Ymax < spoth)
- {
- CameraPane.Ymax = spoth;
- }
+// if (CameraPane.Xmin > spot.x)
+// {
+// CameraPane.Xmin = spot.x;
+// }
+// if (CameraPane.Xmax < spotw)
+// {
+// CameraPane.Xmax = spotw;
+// }
+// if (CameraPane.Ymin > spot.y)
+// {
+// CameraPane.Ymin = spot.y;
+// }
+// if (CameraPane.Ymax < spoth)
+// {
+// CameraPane.Ymax = spoth;
+// }
info.g.drawArc(boundary.x, boundary.y,
boundary.width, boundary.height, 0, 360);
//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
- if (CameraPane.Xmin > boundary.x)
- {
- CameraPane.Xmin = boundary.x;
- }
- if (CameraPane.Xmax < boundary.x + boundary.width)
- {
- CameraPane.Xmax = boundary.x + boundary.width;
- }
- if (CameraPane.Ymin > boundary.y)
- {
- CameraPane.Ymin = boundary.y;
- }
- if (CameraPane.Ymax < boundary.y + boundary.height)
- {
- CameraPane.Ymax = boundary.y + boundary.height;
- }
+// if (CameraPane.Xmin > boundary.x)
+// {
+// CameraPane.Xmin = boundary.x;
+// }
+// if (CameraPane.Xmax < boundary.x + boundary.width)
+// {
+// CameraPane.Xmax = boundary.x + boundary.width;
+// }
+// if (CameraPane.Ymin > boundary.y)
+// {
+// CameraPane.Ymin = boundary.y;
+// }
+// if (CameraPane.Ymax < boundary.y + boundary.height)
+// {
+// CameraPane.Ymax = boundary.y + boundary.height;
+// }
return;
}
}
@@ -7172,7 +7173,7 @@
case hitCenter: // Translate
- scale *= 0.05f * info.pane.theRenderer.renderCamera.Distance();
+ scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
if (modified)
{
@@ -7220,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);
@@ -7281,7 +7282,7 @@
}
/**/
- switch (info.pane.renderCamera.viewCode)
+ switch (info.pane.RenderCamera().viewCode)
{
case 1: // '\001'
LA.matZRotate(toParent, angle);
@@ -7337,7 +7338,7 @@
}
/**/
- switch (info.pane.renderCamera.viewCode)
+ switch (info.pane.RenderCamera().viewCode)
{
case 3: // '\001'
if (modified)
--
Gitblit v1.6.2