From 3c4c16e0a4ca3949a7a37a24607df7f89abfe7ea Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Mon, 22 Apr 2019 16:52:58 -0400 Subject: [PATCH] Refactoring phase 3 --- Mocap.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Mocap.java b/Mocap.java index f451172..9dc8a09 100644 --- a/Mocap.java +++ b/Mocap.java @@ -1519,7 +1519,7 @@ // mywave = currentwave++; // } // sound - cVector eye = CameraPane.theRenderer.eyeCamera.location; + cVector eye = CameraPane.theRenderer.EyeCamera().location; // if (sourcenode.parent.parent != null) // sourcenode.parent.parent.TransformToWorld(floor, tmp); @@ -1564,7 +1564,7 @@ //GraphreeD. wav.play(volume * usedvolume); //, mywave); - lastsoundtime = CameraPane.framecount; + lastsoundtime = Globals.framecount; GrafreeD.hassound = true; } @@ -3289,7 +3289,7 @@ "; fullname = " + fullname); //int delta = frame - baseframe; - if (CameraPane.CROWD) + if (Globals.CROWD) { baseframe = GetFirstFrame(); // 0 initial point } @@ -3853,7 +3853,7 @@ transient boolean restarted; // CROWD issue? - void drawSelf(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked) + void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked) { //System.err.println("drawSelf Mocap frame # " + frame); //System.err.println("drawSelf Mocap baseframe # " + baseframe); @@ -3871,7 +3871,7 @@ // return; if (!restarted && /*display.restartframe &&*/ - display.isLIVE() && live && display.drawMode == display.SHADOW) // FUCK + Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK { //display.restartframe = false; restarted = true; @@ -3879,7 +3879,7 @@ } else { - if (display.isLIVE() && live && display.drawMode != display.SHADOW) + if (Globals.isLIVE() && live && display.DrawMode() != display.SHADOW) restarted = false; } -- Gitblit v1.6.2