checkpoint

darcs-hash:20080630001235-5007d-1fb3fc0b5b29c551472b28bb2352d2ef61378f7b.gz

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index 01bb8bb..8c2dca8 100644 (file)
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -37,10 +37,7 @@ public class MeshViewer extends Viewer {
     protected HashSet<Mesh.T> safeTriangles = new HashSet<Mesh.T>();
 
     public MeshViewer(JFrame f) { super(f); }
     protected HashSet<Mesh.T> safeTriangles = new HashSet<Mesh.T>();
 
     public MeshViewer(JFrame f) { super(f); }

-
-    /**
-     * Take care of initialization here.
-     */
+    /*

     public void init(GLAutoDrawable gld) {
         GL gl = gld.getGL();
         gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     public void init(GLAutoDrawable gld) {
         GL gl = gld.getGL();
         gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);

@@ -67,21 +64,19 @@ public class MeshViewer extends Viewer {
         gl.glLightfv(GL.GL_LIGHT5, GL.GL_POSITION, new float[] { 10.0f, -10.0f,  -10.0f, 0.0f }, 0);
         gl.glEnable(GL.GL_LIGHTING);
         gl.glEnable(GL.GL_LIGHT0);
         gl.glLightfv(GL.GL_LIGHT5, GL.GL_POSITION, new float[] { 10.0f, -10.0f,  -10.0f, 0.0f }, 0);
         gl.glEnable(GL.GL_LIGHTING);
         gl.glEnable(GL.GL_LIGHT0);

-        /*
-        gl.glEnable(GL.GL_LIGHT1);
-        gl.glEnable(GL.GL_LIGHT2);
-        gl.glEnable(GL.GL_LIGHT3);
-        gl.glEnable(GL.GL_LIGHT4);
-        gl.glEnable(GL.GL_LIGHT5);
-        */
+
+        //gl.glEnable(GL.GL_LIGHT1);
+        //gl.glEnable(GL.GL_LIGHT2);
+        //gl.glEnable(GL.GL_LIGHT3);
+        //gl.glEnable(GL.GL_LIGHT4);
+        //gl.glEnable(GL.GL_LIGHT5);
+

         gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE);
         gl.glEnable(GL.GL_COLOR_MATERIAL);
 
         display(gld);
     }
         gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE);
         gl.glEnable(GL.GL_COLOR_MATERIAL);
 
         display(gld);
     }

-
-    public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
-    public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { }
+        */

     public void _display(GLAutoDrawable drawable, GL gl) {
 
         if (transforms==null) return;
     public void _display(GLAutoDrawable drawable, GL gl) {
 
         if (transforms==null) return;

diff --git a/src/edu/berkeley/qfat/Viewer.java b/src/edu/berkeley/qfat/Viewer.java
index 92be445..5b33872 100644 (file)
--- a/src/edu/berkeley/qfat/Viewer.java
+++ b/src/edu/berkeley/qfat/Viewer.java
@@ -19,7 +19,6 @@ public abstract class Viewer implements GLEventListener, MouseListener, MouseMot
     public Mesh tile = new Mesh(false);
     public Mesh goal = new Mesh(false);
 
     public Mesh tile = new Mesh(false);
     public Mesh goal = new Mesh(false);
 

-

     JFrame f;
     GLCanvas glcanvas;
     Point clickPoint = null;
     JFrame f;
     GLCanvas glcanvas;
     Point clickPoint = null;

@@ -37,6 +36,9 @@ public abstract class Viewer implements GLEventListener, MouseListener, MouseMot
     boolean shift = false;
     boolean control = false;
 
     boolean shift = false;
     boolean control = false;
 

+    public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
+    public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { }
+

     public abstract void _display(GLAutoDrawable drawable, GL gl);
     public void display(GLAutoDrawable drawable) {
         GL gl = drawable.getGL();
     public abstract void _display(GLAutoDrawable drawable, GL gl);
     public void display(GLAutoDrawable drawable) {
         GL gl = drawable.getGL();