X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=d56e2a0d639a827160e9adbd35611e0d7515c21e;hp=c0417924b2a4c1c780567b86b10c9b60357b38b2;hb=2a2e64829786ee415fd0c0f16957c55e174b793b;hpb=42acb5af8ff15b7af9fa8f34c071ee58e24faf98

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index c041792..d56e2a0 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -19,6 +19,47 @@ public class Mesh implements Iterable<Mesh.T> {
     private RTree<T>         triangles = new RTree<T>();
     private PointSet<Vertex> vertices  = new PointSet<Vertex>();
 
+
+    public boolean option_wireframe = false;
+    public boolean option_errorNormals = false;
+
+    public void render(GL gl, Matrix m) {
+        if (option_wireframe) {
+            gl.glDisable(GL.GL_LIGHTING);
+            gl.glBegin(GL.GL_LINES);
+            gl.glColor3f(1, 1, 1);
+            for (T t : this) {
+                m.times(t.e1().p1.goodp).glVertex(gl);
+                m.times(t.e1().p2.goodp).glVertex(gl);
+                m.times(t.e2().p1.goodp).glVertex(gl);
+                m.times(t.e2().p2.goodp).glVertex(gl);
+                m.times(t.e3().p1.goodp).glVertex(gl);
+                m.times(t.e3().p2.goodp).glVertex(gl);
+            }
+            gl.glEnd();
+            gl.glEnable(GL.GL_LIGHTING);
+            return;
+        }
+        for(T t : this) {
+            gl.glColor4f((float)(0.25+(0.05*t.color)),
+                         (float)(0.25+(0.05*t.color)),
+                         (float)(0.75+(0.05*t.color)),
+                         (float)0.3); 
+            t.glTriangle(gl, m);
+        }
+        if (option_errorNormals)
+            for(T t : this)
+                for(Mesh.Vertex p : new Mesh.Vertex[] { t.v1(), t.v2(), t.v3() }) {
+                    if (p.ok) {
+                        gl.glBegin(GL.GL_LINES);
+                        gl.glColor3f(1, 1, 1);
+                        p.p.glVertex(gl);
+                        p.p.plus(p.norm().times((float)p.error()*10)).glVertex(gl);
+                        gl.glEnd();
+                    }
+                }
+    }
+
     public boolean immutableVertices;
     public Mesh    error_against      = null;
     public double  error              = 0;
@@ -84,6 +125,8 @@ public class Mesh implements Iterable<Mesh.T> {
 
         private boolean illegal = false;
 
+        public boolean visible = false;
+
         public Point getPoint() { return p; }
         public float error() { return olderror; }
 
@@ -108,6 +151,22 @@ public class Mesh implements Iterable<Mesh.T> {
             error += olderror;
         }
 
+        /*
+        public Vertex hack(GL gl, Point mouse) {
+            double dist = Double.MAX_VALUE;
+            Vertex cur = null;
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
+                Vertex v = e.getOther(this);
+                double dist2 = v.getPoint().glProject(gl).distance(mouse);
+                if ((cur==null || dist2 < dist) && v.visible) {
+                    dist = dist2;
+                    cur = v;
+                }
+            }
+            return cur;
+        }
+        */
+
         public float averageTriangleArea() {
             int count = 0;
             float ret = 0;
@@ -306,6 +365,7 @@ public class Mesh implements Iterable<Mesh.T> {
             return !illegal;
         }
 
+        public E getEdge() { return e; }
         public E getFreeIncident() {
             E ret = getFreeIncident(e, e);
             if (ret != null) return ret;
@@ -360,6 +420,8 @@ public class Mesh implements Iterable<Mesh.T> {
 
         public boolean intersects(T t) { return t.intersects(p1.p, p2.p); }
 
+        public Segment getSegment() { return new Segment(p1.getPoint(), p2.getPoint()); }
+
         public void bindingGroupChanged(edu.berkeley.qfat.geom.BindingGroup newBindingGroup_) {
 
             edu.berkeley.qfat.geom.BindingGroup<E> newBindingGroup =
@@ -552,6 +614,12 @@ public class Mesh implements Iterable<Mesh.T> {
             return Math.acos(v1.norm().dot(v2.norm()));
         }
 
+        public Vertex getOther(Vertex v) {
+            if (this.p1 == v) return p2;
+            if (this.p2 == v) return p1;
+            throw new Error();
+        }
+
         public void makeAdjacent(E e) {
             if (this.next == e) return;
             if (p2 != e.p1) throw new Error("cannot make adjacent -- no shared vertex");
@@ -673,12 +741,16 @@ public class Mesh implements Iterable<Mesh.T> {
         return ret;
     }
 
+    private int max_serial = 0;
     /** [UNIQUE] a triangle (face) */
     public final class T extends Triangle {
         public final E e1;
         public final int color;
         public final int colorclass;
 
+        public final int serial = max_serial++;
+        public boolean occluded;
+
         T(E e1, int colorclass) {
             this.e1 = e1;
             E e2 = e1.next;
@@ -730,17 +802,18 @@ public class Mesh implements Iterable<Mesh.T> {
             return true;
         }
 
+        public void glTriangle(GL gl, Matrix m) {
+            gl.glPushName(serial);
+            gl.glBegin(GL.GL_TRIANGLES);
+            glVertices(gl, m);
+            gl.glEnd();
+            gl.glPopName();
+        }
+
         /** issue gl.glVertex() for each of the triangle's points */
-        public void glVertices(GL gl) {
+        public void glVertices(GL gl, Matrix m) {
             if (!shouldBeDrawn()) return;
-            norm().glNormal(gl);
-            Point p1 = v1().goodp;
-            Point p2 = v2().goodp;
-            Point p3 = v3().goodp;
-            p1.glVertex(gl);
-            p2.glVertex(gl);
-            p3.glVertex(gl);
+            super.glVertices(gl, m);
         }
-
     }
 }