From 623dc0fa8cbd9473830a1786f6d49fa808a09439 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 14:06:12 -0400
Subject: [PATCH] Rename Grafreed
---
Merge.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Merge.java b/Merge.java
index aa47522..24d1788 100644
--- a/Merge.java
+++ b/Merge.java
@@ -160,27 +160,27 @@
// debug stuff
if (false) // bRep.averagepoints != null)
{
- javax.media.opengl.GL gl = display.GetGL();
-
- gl.glColor3f(1, 0, 0);
- //gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
- //gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
-
- for (int i=0; i<NumGeometries(GetObject()); i++)
- {
- int i3 = i*3;
-
- float off = 0.005f;
-
- gl.glBegin(gl.GL_LINES);
- gl.glVertex3d(bRep.averagepoints[i3]-off, bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]);
- gl.glVertex3d(bRep.averagepoints[i3]+off, bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]);
- gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1]-off, bRep.averagepoints[i3+2]);
- gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1]+off, bRep.averagepoints[i3+2]);
- gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]-off);
- gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]+off);
- gl.glEnd();
- }
+// javax.media.opengl.GL gl = display.GetGL();
+//
+// gl.glColor3f(1, 0, 0);
+// //gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
+// //gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
+//
+// for (int i=0; i<NumGeometries(GetObject()); i++)
+// {
+// int i3 = i*3;
+//
+// float off = 0.005f;
+//
+// gl.glBegin(gl.GL_LINES);
+// gl.glVertex3d(bRep.averagepoints[i3]-off, bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]);
+// gl.glVertex3d(bRep.averagepoints[i3]+off, bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]);
+// gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1]-off, bRep.averagepoints[i3+2]);
+// gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1]+off, bRep.averagepoints[i3+2]);
+// gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]-off);
+// gl.glVertex3d(bRep.averagepoints[i3], bRep.averagepoints[i3+1], bRep.averagepoints[i3+2]+off);
+// gl.glEnd();
+// }
}
}
@@ -192,7 +192,7 @@
try
{
//font = FontRender.createFont("Dialog", 11, false, true);
- font = new FontRender.GLFont(gl, GrafreeD.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.GetGL0();
extent = extent * 0.5f;
--
Gitblit v1.6.2