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
---
CameraPane.java | 107 ++++++++++++++++++++++++++---------------------------
1 files changed, 53 insertions(+), 54 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index fc57173..b54e1a7 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -150,12 +150,10 @@
defaultcaps.setAccumAlphaBits(16);
}
- static CameraPane theRenderer;
-
void SetAsGLRenderer(boolean b)
{
isRenderer = b;
- theRenderer = this;
+ Globals.theRenderer = this;
}
CameraPane(Object3D o, Camera cam, boolean withcontext)
@@ -816,7 +814,7 @@
if ((i % 100) == 0 && i != 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("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
}
@@ -848,7 +846,7 @@
if ((i % 100) == 0 && i != 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("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
}
@@ -1624,7 +1622,7 @@
static int camerachangeframe;
- boolean SetCamera(Camera cam)
+ public boolean SetCamera(Camera cam)
{
// may 2014 if (cam == cameras[0] || cam == cameras[1])
// return false;
@@ -1752,12 +1750,27 @@
mainDL ^= true;
}
- void ToggleTexture()
+ void ToggleFullScreen()
+ {
+ FULLSCREEN ^= true;
+ }
+
+ void ToggleCrowd()
+ {
+ Globals.CROWD ^= true;
+ }
+
+ void ToggleLocal()
+ {
+ LOCALTRANSFORM ^= true;
+ }
+
+ public void ToggleTexture()
{
textureon ^= true;
}
- void ToggleLive()
+ public void ToggleLive()
{
Globals.setLIVE(Globals.isLIVE() ^ true);
@@ -1769,92 +1782,67 @@
repaint(); // start loop // may 2013
}
- void ToggleSupport()
+ public void ToggleSupport()
{
SUPPORT ^= true;
}
- void ToggleAbort()
+ public void ToggleAbort()
{
ABORTMODE ^= true;
}
- void ToggleFullScreen()
- {
- FULLSCREEN ^= true;
- }
-
- void ToggleCrowd()
- {
- Globals.CROWD ^= true;
- }
-
- void ToggleInertia()
+ public void ToggleInertia()
{
INERTIA ^= true;
}
- void ToggleLocal()
- {
- LOCALTRANSFORM ^= true;
- }
-
- void ToggleFast()
+ public void ToggleFast()
{
FAST ^= true;
}
- void ToggleSlowPose()
+ public void ToggleSlowPose()
{
SLOWPOSE ^= true;
}
- void ToggleFootContact()
- {
- FOOTCONTACT ^= true;
- }
-
- void ToggleBoxMode()
+ public void ToggleBoxMode()
{
BOXMODE ^= true;
}
- void ToggleSmoothFocus()
+ public void ToggleSmoothFocus()
{
SMOOTHFOCUS ^= true;
}
- void ToggleImageFlip()
+ public void ToggleImageFlip()
{
IMAGEFLIP ^= true;
}
- void ToggleSpeakerMocap()
+ public void ToggleSpeakerMocap()
{
SPEAKERMOCAP ^= true;
}
- void ToggleSpeakerCamera()
+ public void ToggleSpeakerCamera()
{
SPEAKERCAMERA ^= true;
}
- void ToggleSpeakerFocus()
+ public void ToggleSpeakerFocus()
{
SPEAKERFOCUS ^= true;
}
- void ToggleDebug()
- {
- DEBUG ^= true;
- }
-
- void ToggleFrustum()
+ public void ToggleFrustum()
{
FRUSTUM ^= true;
}
- void ToggleTrack()
+ public void ToggleTrack()
{
TRACK ^= true;
if (TRACK)
@@ -1873,25 +1861,35 @@
repaint();
}
- void ToggleTrackOnce()
+ public void ToggleTrackOnce()
{
TRACKONCE ^= true;
}
- void ToggleShadowTrack()
+ public void ToggleShadowTrack()
{
SHADOWTRACK ^= true;
repaint();
}
- void ToggleOeil()
+ public void ToggleOeil()
{
OEIL ^= true;
}
- void ToggleOeilOnce()
+ public void ToggleOeilOnce()
{
OEILONCE ^= true;
+ }
+
+ void ToggleFootContact()
+ {
+ FOOTCONTACT ^= true;
+ }
+
+ void ToggleDebug()
+ {
+ DEBUG ^= true;
}
void ToggleLookAt()
@@ -7953,7 +7951,7 @@
return texture!=null?texture.texture:null;
}
- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
{
CacheTexture texture = GetCacheTexture(tex, bump, resolution);
@@ -14153,7 +14151,7 @@
SetMouseMode(modifiers);
}
- theRenderer.keyPressed(key);
+ Globals.theRenderer.keyPressed(key);
}
int kompactbit = 4; // power bit
@@ -14165,7 +14163,7 @@
float SATPOW = 1; // 2; // 0.5f;
float BRIPOW = 1; // 0.5f; // 0.5f;
- void keyPressed(int key)
+ public void keyPressed(int key)
{
if (key >= '0' && key <= '5')
clampbit = (key-'0');
@@ -14602,6 +14600,7 @@
}
//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
}
+
static double OCCLUSIONBOOST = 1; // 0.5;
void keyReleased(int key, int modifiers)
@@ -14613,7 +14612,7 @@
}
}
- protected void processKeyEvent(KeyEvent e)
+ public void processKeyEvent(KeyEvent e)
{
switch (e.getID())
{
--
Gitblit v1.6.2