From ec9d13e42c9c8674739acefb0769a9273a1048c9 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 20:14:09 -0400
Subject: [PATCH] Refactoring GelGL.
---
BoundaryRep.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/BoundaryRep.java b/BoundaryRep.java
index 729177a..cbdb1a9 100644
--- a/BoundaryRep.java
+++ b/BoundaryRep.java
@@ -2661,7 +2661,7 @@
if (false) // slow && stepout && onein)
{
// sound
- cVector eye = CameraPane.theRenderer.eyeCamera.location;
+ cVector eye = Globals.theRenderer.EyeCamera().location;
Vertex v = GetVertex(0);
@@ -4428,7 +4428,7 @@
}
}
- void CullVertex(javax.media.opengl.GL gl, boolean shadow)
+ void CullVertex(javax.media.opengl.GL glNOTUSED, boolean shadowNOTUSED)
{
CameraPane.glu.gluProject(vect5.x,vect5.y,vect5.z,
CameraPane.tempmat,0, CameraPane.tempmat2,0,
@@ -4460,14 +4460,14 @@
// june 2014
// Camera parentcam = cam;
//
-// if (cam == CameraPane.theRenderer.cameras[0])
+// if (cam == Globals.theRenderer.cameras[0])
// {
-// parentcam = CameraPane.theRenderer.cameras[1];
+// parentcam = Globals.theRenderer.cameras[1];
// }
//
-// if (cam == CameraPane.theRenderer.cameras[1])
+// if (cam == Globals.theRenderer.cameras[1])
// {
-// parentcam = CameraPane.theRenderer.cameras[0];
+// parentcam = Globals.theRenderer.cameras[0];
// }
gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, CameraPane.tempmat, 0);
@@ -7560,7 +7560,7 @@
s3 = new cVector();
}
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
try
{
@@ -7655,7 +7655,7 @@
{
if (i++%100 == 0)
{
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
System.out.println("#faces = " + faces.size());
// if (i != 1)
// break;
@@ -7699,7 +7699,7 @@
//Trim(true,cJME.gennormals,true,false); // doesn't work
Trim(true,false,false,false,false);
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
}
void UpdateIndices(Face face, Face minface)
--
Gitblit v1.6.2