Rename Grafreed

Normand Briere

2019-05-05 623dc0fa8cbd9473830a1786f6d49fa808a09439

 Merge.java
..
..
@@ -160,27 +160,27 @@
160
160
         // debug stuff
161
161
         if (false) // bRep.averagepoints != null)
162
162
         {
163
-            javax.media.opengl.GL gl = display.GetGL();
164
-            
165
-            gl.glColor3f(1, 0, 0);
166
-            //gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
167
-            //gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
168
-
169
-            for (int i=0; i<NumGeometries(GetObject()); i++)
170
-            {
171
-                int i3 = i*3;
172
-                
173
-                float off = 0.005f;
174
-                
175
-                gl.glBegin(gl.GL_LINES);
176
-                gl.glVertex3d(bRep.averagepoints[i3]-off, bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]);
177
-                gl.glVertex3d(bRep.averagepoints[i3]+off, bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]);
178
-                gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1]-off, bRep.averagepoints[i3+2]);
179
-                gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1]+off, bRep.averagepoints[i3+2]);
180
-                gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]-off);
181
-                gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]+off);
182
-                gl.glEnd();
183
-            }
163
+//            javax.media.opengl.GL gl = display.GetGL();
164
+//            
165
+//            gl.glColor3f(1, 0, 0);
166
+//            //gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
167
+//            //gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
168
+//
169
+//            for (int i=0; i<NumGeometries(GetObject()); i++)
170
+//            {
171
+//                int i3 = i*3;
172
+//                
173
+//                float off = 0.005f;
174
+//                
175
+//                gl.glBegin(gl.GL_LINES);
176
+//                gl.glVertex3d(bRep.averagepoints[i3]-off, bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]);
177
+//                gl.glVertex3d(bRep.averagepoints[i3]+off, bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]);
178
+//                gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1]-off, bRep.averagepoints[i3+2]);
179
+//                gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1]+off, bRep.averagepoints[i3+2]);
180
+//                gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]-off);
181
+//                gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]+off);
182
+//                gl.glEnd();
183
+//            }
184
184
         }
185
185
     }
186
186
 
..
..
@@ -192,7 +192,7 @@
192
192
         try
193
193
         {
194
194
             //font = FontRender.createFont("Dialog", 11, false, true);
195
-            font = new FontRender.GLFont(gl, GrafreeD.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();
..
..
@@ -398,7 +398,7 @@
398
398
     
399
399
     public void drawCube(iCameraPane display, float extent)
400
400
     {
401
-        GL gl = display.GetGL();
401
+        GL gl = display.GetGL0();
402
402
 
403
403
         extent = extent * 0.5f;
404
404