Normand Briere
2019-05-01 d1e1417edc8a6ccf195b6da3270f22234dda61e4
Merge.java
....@@ -160,27 +160,27 @@
160160 // debug stuff
161161 if (false) // bRep.averagepoints != null)
162162 {
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
+// }
184184 }
185185 }
186186
....@@ -398,7 +398,7 @@
398398
399399 public void drawCube(iCameraPane display, float extent)
400400 {
401
- GL gl = display.GetGL();
401
+ GL gl = display.GetGL0();
402402
403403 extent = extent * 0.5f;
404404