Normand Briere
2019-04-22 4a5b9e0b9ecc97203d4089ca0cd0d6df8c76bf1c
Merge.java
....@@ -135,7 +135,7 @@
135135
136136 // ObjectArrayList<Transform> initialmatrices;
137137
138
- void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
138
+ void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
139139 {
140140 //if (support == null)
141141 // System.err.println("DrawNode Merge # " + ((Mocap)object).frame);
....@@ -192,7 +192,7 @@
192192 try
193193 {
194194 //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"));
196196 } catch (java.io.IOException e)
197197 {
198198 e.printStackTrace();
....@@ -396,9 +396,9 @@
396396
397397 }
398398
399
- public void drawCube(CameraPane display, float extent)
399
+ public void drawCube(iCameraPane display, float extent)
400400 {
401
- GL gl = display.getGL();
401
+ GL gl = display.GetGL();
402402
403403 extent = extent * 0.5f;
404404