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

---
 Merge.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Merge.java b/Merge.java
index 57b88a3..138d4b1 100644
--- a/Merge.java
+++ b/Merge.java
@@ -135,7 +135,7 @@
 
 //    ObjectArrayList<Transform> initialmatrices;
 
-    void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
+    void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
     {
         //if (support == null)
       //      System.err.println("DrawNode Merge # " + ((Mocap)object).frame);
@@ -192,7 +192,7 @@
         try
         {
             //font = FontRender.createFont("Dialog", 11, false, true);
-            font = new FontRender.GLFont(gl, GraphreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
+            font = new FontRender.GLFont(gl, GrafreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
         } catch (java.io.IOException e)
         {
             e.printStackTrace();
@@ -396,9 +396,9 @@
 
     }
     
-    public void drawCube(CameraPane display, float extent)
+    public void drawCube(iCameraPane display, float extent)
     {
-        GL gl = display.getGL();
+        GL gl = display.GetGL();
 
         extent = extent * 0.5f;
 

--
Gitblit v1.6.2