Refactoring phase 2

Normand Briere

2019-04-22 c60a1ad4f6aa4904e80280586b440a584b5ff061

 Merge.java
..
..
@@ -135,7 +135,7 @@
135
135
 
136
136
 //    ObjectArrayList<Transform> initialmatrices;
137
137
 
138
-    void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
138
+    void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
139
139
     {
140
140
         //if (support == null)
141
141
       //      System.err.println("DrawNode Merge # " + ((Mocap)object).frame);
..
..
@@ -192,7 +192,7 @@
192
192
         try
193
193
         {
194
194
             //font = FontRender.createFont("Dialog", 11, false, true);
195
-            font = new FontRender.GLFont(gl, GraphreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
195
+            font = new FontRender.GLFont(gl, GrafreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
196
196
         } catch (java.io.IOException e)
197
197
         {
198
198
             e.printStackTrace();