From c60a1ad4f6aa4904e80280586b440a584b5ff061 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 15:17:45 -0400
Subject: [PATCH] Refactoring phase 2

---
 Mocap.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Mocap.java b/Mocap.java
index f451172..acb3fd0 100644
--- a/Mocap.java
+++ b/Mocap.java
@@ -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