checkpoint

darcs-hash:20080702004828-5007d-5db4a2b43d2776fb48d036449388365c970a7b9d.gz

diff --git a/src/edu/berkeley/qfat/InteractiveMeshViewer.java b/src/edu/berkeley/qfat/InteractiveMeshViewer.java
index 419e209..2a0af0b 100644 (file)
--- a/src/edu/berkeley/qfat/InteractiveMeshViewer.java
+++ b/src/edu/berkeley/qfat/InteractiveMeshViewer.java
@@ -110,6 +110,7 @@ public class InteractiveMeshViewer extends JPanel implements KeyListener {
                 System.err.println("hak");
                 synchronized(this) {
                     tile.subdivide();
                 System.err.println("hak");
                 synchronized(this) {
                     tile.subdivide();

+                    tile.rebindPoints();

                     break;
                 }
                 //case KeyEvent.VK_SPACE: breaks++; force = true; break;
                     break;
                 }
                 //case KeyEvent.VK_SPACE: breaks++; force = true; break;

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 6048110..5240413 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -11,6 +11,8 @@ import edu.wlu.cs.levy.CG.KDTree;
 import edu.berkeley.qfat.geom.Point;
 import com.infomatiq.jsi.IntProcedure;
 
 import edu.berkeley.qfat.geom.Point;
 import com.infomatiq.jsi.IntProcedure;
 

+// EDGES RUN COUNTER-CLOCKWISE
+

 public class Mesh implements Iterable<Mesh.T> {
 
     public static final float EPSILON = (float)0.0001;
 public class Mesh implements Iterable<Mesh.T> {
 
     public static final float EPSILON = (float)0.0001;

@@ -45,6 +47,12 @@ public class Mesh implements Iterable<Mesh.T> {
                          (float)(0.25+(0.05*t.color)),
                          (float)(0.75+(0.05*t.color)),
                          (float)0.3); 
                          (float)(0.25+(0.05*t.color)),
                          (float)(0.75+(0.05*t.color)),
                          (float)0.3); 

+            if (t.red) {
+            gl.glColor4f((float)(0.75+(0.05*t.color)),
+                         (float)(0.25+(0.05*t.color)),
+                         (float)(0.25+(0.05*t.color)),
+                         (float)0.3); 
+            }

             t.glTriangle(gl, m);
         }
         if (option_errorNormals)
             t.glTriangle(gl, m);
         }
         if (option_errorNormals)

@@ -116,8 +124,54 @@ public class Mesh implements Iterable<Mesh.T> {
 
 
     public void subdivide() {
 
 
     public void subdivide() {

-        for (T t : this) t.old = true;

         for (Vertex v : vertices()) v.original = true;
         for (Vertex v : vertices()) v.original = true;

+        HashSet<E> edges = new HashSet<E>();
+        HashSet<E> flip = new HashSet<E>();
+        HashSet<T> tris = new HashSet<T>();
+        int count = 0;
+        for (T t : this) {
+            tris.add(t);
+            edges.add(t.e1());
+            edges.add(t.e2());
+            edges.add(t.e3());
+            count++;
+        }
+        System.out.println("triangles="+count);
+        count = 0;
+        for(E e : edges) {
+            if (e.destroyed || e.shattered) continue;
+            e.shatter().edge = true;
+            for(E ex : (Iterable<E>)e.getBoundPeers()) {
+                Vertex m = nearest(ex.midpoint());
+                m.edge = true;
+                E e3 = ex.p1.getE(m).next;
+                if (e3.p2.original)
+                    flip.add(e3);
+            }
+        }
+
+        int i=0;
+        for(E e : flip) {
+            e.flip();
+            System.out.println("flip!");
+            i++;
+            //if (i>2) break;
+        }
+        System.out.println("count="+count);
+        /*
+        for (E e : flip) {
+            if (e.p1.original && !e.p2.face && !e.p2.original)      e.flip();
+            else if (e.p2.original && !e.p1.face && !e.p1.original) e.flip();
+        }
+        HashSet<Vertex> verts = new HashSet<Vertex>();
+        for(Vertex v : vertices()) verts.add(v);
+        for(Vertex v : verts) {
+            if (!v.face) continue;
+            //v.move(v.recenter().minus(v.getPoint()), false);
+        }
+        */
+
+        /*

         Queue<T> q = new LinkedList<T>();
         OUTER: while(true) {
             for (T t : this) {
         Queue<T> q = new LinkedList<T>();
         OUTER: while(true) {
             for (T t : this) {

@@ -125,31 +179,6 @@ public class Mesh implements Iterable<Mesh.T> {
             }
             break;
         }
             }
             break;
         }

-        /*
-        while(q.size()>0) {
-            T t = q.remove();
-            if (!t.old || t.destroyed()) continue;
-            E te = t.e1;
-            T to = t.e1.pair.t;
-            if (!t
-            q.add(t.e1().pair.t);
-            q.add(t.e2().pair.t);
-            q.add(t.e3().pair.t);
-            q.add(to.e1().pair.t);
-            q.add(to.e2().pair.t);
-            q.add(to.e3().pair.t);
-            Point p = te.midpoint();
-            Point c = t.centroid();
-            Vertex v1 = t.getOtherVertex(te);
-            Vertex v2 = te.pair.t.getOtherVertex(te.pair);
-            System.out.println("shatter " + te);
-            te.shatter();
-            Vertex v = nearest(p);
-            v.move(c.minus(v.getPoint()), false);
-            v.edge = true;
-            v1.getE(p).shatter();
-            v2.getE(p).shatter();
-        }

         */
         /*
         for (Vertex v : vertices())
         */
         /*
         for (Vertex v : vertices())

@@ -172,6 +201,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
         public boolean original = false;
         public boolean edge = false;
 
         public boolean original = false;
         public boolean edge = false;

+        public boolean face = false;

 
         private boolean illegal = false;
 
 
         private boolean illegal = false;
 

@@ -194,6 +224,17 @@ public class Mesh implements Iterable<Mesh.T> {
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) e.t.reinsert();
         }
 
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) e.t.reinsert();
         }
 

+        // the average of all adjacent points
+        public Point recenter() {
+            int count = 0;
+            Vec vec = Vec.ZERO;
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
+                vec = vec.plus(e.getOther(this).getPoint().minus(Point.ZERO));
+                count++;
+            }
+            return Point.ZERO.plus(vec.div(count));
+        }
+

         public float olderror = 0;
         public void setError(float nerror) {
             error -= olderror;
         public float olderror = 0;
         public void setError(float nerror) {
             error -= olderror;

@@ -324,9 +365,9 @@ public class Mesh implements Iterable<Mesh.T> {
                     //System.out.println(m.minus(m2));
                 }
             */
                     //System.out.println(m.minus(m2));
                 }
             */

-                    pp = getConstraint().times(pp);
+                //pp = getConstraint().times(pp);

             }
             }

-            pp = pp.minus(op).norm().times(vv.mag()).plus(op);
+            //pp = pp.minus(op).norm().times(vv.mag()).plus(op);

             ok = false;
             Point pt = pp;
             for(Vertex v : (Iterable<Vertex>)getBoundPeers()) {
             ok = false;
             Point pt = pp;
             for(Vertex v : (Iterable<Vertex>)getBoundPeers()) {

@@ -442,8 +483,14 @@ public class Mesh implements Iterable<Mesh.T> {
             return getE(v);
         }
         public E getE(Vertex p2) {
             return getE(v);
         }
         public E getE(Vertex p2) {

-            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
+            if (this.e!=null && this!=this.e.p1 && this!=this.e.p2) throw new RuntimeException();
+            int i=0;
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {

                 if (e.p1 == this && e.p2 == p2) return e;
                 if (e.p1 == this && e.p2 == p2) return e;

+                i++;
+                e.sanity();
+                if (e.destroyed) throw new RuntimeException();
+            }

             return null;
         }
 
             return null;
         }
 

@@ -466,6 +513,13 @@ public class Mesh implements Iterable<Mesh.T> {
     /** [UNIQUE] an edge */
     public final class E extends HasBindingGroup implements Comparable<E> {
 
     /** [UNIQUE] an edge */
     public final class E extends HasBindingGroup implements Comparable<E> {
 

+        public void sanity() {
+            if (destroyed) return;
+            if (pair!=null && (pair.p1!=p2 || pair.p2!=p1)) throw new RuntimeException();
+            if (next!=null && next.p1!=p2) throw new RuntimeException();
+            if (prev!=null && prev.p2!=p1) throw new RuntimeException();
+        }
+

         public final Vertex p1, p2;
         T t;     // triangle to our "left"
         E prev;  // previous half-edge
         public final Vertex p1, p2;
         T t;     // triangle to our "left"
         E prev;  // previous half-edge

@@ -477,6 +531,35 @@ public class Mesh implements Iterable<Mesh.T> {
 
         public Segment getSegment() { return new Segment(p1.getPoint(), p2.getPoint()); }
 
 
         public Segment getSegment() { return new Segment(p1.getPoint(), p2.getPoint()); }
 

+        public void flip() {
+            // FIXME: coplanarity check needed
+            if (destroyed) return;
+            for (E e : (Iterable<E>)getBoundPeers()) {
+                if (!e.pair.isBoundTo(pair)) throw new RuntimeException("cannot flip!");
+            }
+            Vertex v1 = t.getOtherVertex(this);
+            Vertex v2 = pair.t.getOtherVertex(pair);
+            destroy();
+            pair.destroy();
+            newT(v1, v2, p2).red = true;
+            newT(v2, v1, p1).red = true;
+            for (E e : (Iterable<E>)getBoundPeers()) {
+                if (e.destroyed) continue;
+                Vertex v1e = e.t.getOtherVertex(e);
+                Vertex v2e = e.pair.t.getOtherVertex(e.pair);
+                e.destroy();
+                e.pair.destroy();
+                if (v1e.getE(v2e)!=null) throw new RuntimeException();
+                newT(v1e, v2e, e.p2).red = true;
+                newT(v2e, v1e, e.p1).red = true;
+                makeE(v1.getPoint(),
+                      v2.getPoint()).bindTo(this.getBindingMatrix(e), makeE(v1e.getPoint(), v2e.getPoint()));
+                makeE(v2.getPoint(),
+                      v1.getPoint()).bindTo(pair.getBindingMatrix(e.pair), makeE(v2e.getPoint(), v1e.getPoint()));
+
+            }
+        }
+

         public void bindingGroupChanged(edu.berkeley.qfat.geom.BindingGroup newBindingGroup_) {
 
             edu.berkeley.qfat.geom.BindingGroup<E> newBindingGroup =
         public void bindingGroupChanged(edu.berkeley.qfat.geom.BindingGroup newBindingGroup_) {
 
             edu.berkeley.qfat.geom.BindingGroup<E> newBindingGroup =

@@ -563,8 +646,8 @@ public class Mesh implements Iterable<Mesh.T> {
             }
         }
 
             }
         }
 

-        public Point shatter() {
-            if (shattered || destroyed) return null;
+        public Vertex shatter() {
+            if (shattered || destroyed) return nearest(midpoint());

             shattered = true;
             E first = null;
             E firste = null;
             shattered = true;
             E first = null;
             E firste = null;

@@ -605,7 +688,7 @@ public class Mesh implements Iterable<Mesh.T> {
             first.setConstraint(firste.getConstraint());
             firstq.setConstraint(firste.getConstraint());
             */
             first.setConstraint(firste.getConstraint());
             firstq.setConstraint(firste.getConstraint());
             */

-            return null;
+            return nearest(midpoint());

         }
 
         public boolean destroyed = false;
         }
 
         public boolean destroyed = false;

@@ -630,12 +713,22 @@ public class Mesh implements Iterable<Mesh.T> {
             pair.next.t = null;
             pair.prev.t = null;
 
             pair.next.t = null;
             pair.prev.t = null;
 

+            if (next.destroyed) throw new RuntimeException();
+            if (prev.destroyed) throw new RuntimeException();

             pair.prev.next = next;
             next.prev = pair.prev;
             prev.next = pair.next;
             pair.next = prev;
             pair.prev.next = next;
             next.prev = pair.prev;
             prev.next = pair.next;
             pair.next = prev;

+

             if (p1.e == this) p1.e = prev.next;
             if (pair.p1.e == pair) pair.p1.e = pair.prev.next;
             if (p1.e == this) p1.e = prev.next;
             if (pair.p1.e == pair) pair.p1.e = pair.prev.next;

+            if (p2.e == this) throw new RuntimeException();
+            if (pair.p2.e == pair) throw new RuntimeException();
+
+            sanity();
+            next.sanity();
+            prev.sanity();
+            pair.sanity();

         }
 
         private void sync() {
         }
 
         private void sync() {

@@ -677,8 +770,8 @@ public class Mesh implements Iterable<Mesh.T> {
 
         public void makeAdjacent(E e) {
             if (this.next == e) return;
 
         public void makeAdjacent(E e) {
             if (this.next == e) return;

-            if (p2 != e.p1) throw new Error("cannot make adjacent -- no shared vertex");
-            if (t != null || e.t != null) throw new Error("cannot make adjacent -- edges not both free ");
+            if (p2 != e.p1) throw new Error("cannot make adjacent -- no shared vertex: " + this + " " + e);
+            if (t != null || e.t != null) throw new Error("cannot make adjacent -- edges not both free " + t + " " + e.t);

 
             E freeIncident = p2.getFreeIncident(e, this);
 
 
             E freeIncident = p2.getFreeIncident(e, this);
 

@@ -715,6 +808,7 @@ public class Mesh implements Iterable<Mesh.T> {
             this.p1 = prev.p2;
             this.p2 = p2;
             this.prev = prev;
             this.p1 = prev.p2;
             this.p2 = p2;
             this.prev = prev;

+            if (prev.destroyed) throw new RuntimeException();

             if (p2.getE(p1) != null) throw new Error();
             if (p2.e==null) {
                 this.next = this.pair = new E(this, this, prev.next);
             if (p2.getE(p1) != null) throw new Error();
             if (p2.e==null) {
                 this.next = this.pair = new E(this, this, prev.next);

@@ -734,6 +828,7 @@ public class Mesh implements Iterable<Mesh.T> {
         public E(E prev, E pair, E next) {
             this.p1 = prev.p2;
             this.p2 = next.p1;
         public E(E prev, E pair, E next) {
             this.p1 = prev.p2;
             this.p2 = next.p1;

+            if (prev.destroyed) throw new RuntimeException();

             this.prev = prev;
             this.next = next;
             this.pair = pair;
             this.prev = prev;
             this.next = next;
             this.pair = pair;

@@ -806,6 +901,7 @@ public class Mesh implements Iterable<Mesh.T> {
         public final int color;
         public final int colorclass;
 
         public final int color;
         public final int colorclass;
 

+        public boolean red = false;

         public boolean old = false;
 
         public final int serial = max_serial++;
         public boolean old = false;
 
         public final int serial = max_serial++;

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index 97a31f8..a0e9c61 100644 (file)
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -18,6 +18,7 @@ public class MeshViewer extends JPanel implements GLEventListener, MouseListener
     private float angley = 0;
 
     private Mesh.Vertex closest = null;
     private float angley = 0;
 
     private Mesh.Vertex closest = null;

+    private Point       closestOriginallyAt = null;

     private int         mousex;
     private int         mousey;
     private Matrix      projection = null;
     private int         mousex;
     private int         mousey;
     private Matrix      projection = null;

@@ -116,6 +117,7 @@ public class MeshViewer extends JPanel implements GLEventListener, MouseListener
             //Matrix projection = Matrix.getProjectionMatrix(gl);
             double dist = Double.MAX_VALUE;
             closest = null;
             //Matrix projection = Matrix.getProjectionMatrix(gl);
             double dist = Double.MAX_VALUE;
             closest = null;

+            closestOriginallyAt = null;

             for(Mesh mesh : meshes)
                 if (mesh.option_selectable)
                     for(Mesh.Vertex v : mesh.vertices()) {
             for(Mesh mesh : meshes)
                 if (mesh.option_selectable)
                     for(Mesh.Vertex v : mesh.vertices()) {

@@ -213,9 +215,9 @@ public class MeshViewer extends JPanel implements GLEventListener, MouseListener
         if ((e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0) {
             if (closest != null && projection != null) {
                 synchronized(this) {
         if ((e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0) {
             if (closest != null && projection != null) {
                 synchronized(this) {

-                    Point clickClosest = closest == null ? null : closest.getPoint();
+                    if (closestOriginallyAt==null) closestOriginallyAt = closest.getPoint();

                     Vec d1 = projection.inverse().times(getMouse()).minus(projection.inverse().times(clickPoint));
                     Vec d1 = projection.inverse().times(getMouse()).minus(projection.inverse().times(clickPoint));

-                    Vec delta = d1.plus(clickClosest).minus(closest.getPoint());
+                    Vec delta = d1.plus(closestOriginallyAt).minus(closest.getPoint());

                     closest.move(delta, false);
                 }
             }
                     closest.move(delta, false);
                 }
             }

diff --git a/src/edu/berkeley/qfat/geom/Point.java b/src/edu/berkeley/qfat/geom/Point.java
index a4bc276..20048e4 100644 (file)
--- a/src/edu/berkeley/qfat/geom/Point.java
+++ b/src/edu/berkeley/qfat/geom/Point.java
@@ -4,7 +4,11 @@ import javax.media.opengl.glu.*;
 
 /** point in 3-space; immutable */
 public final class Point extends HasPoint implements HasBoundingBox {
 
 /** point in 3-space; immutable */
 public final class Point extends HasPoint implements HasBoundingBox {

+
+    public static final Point ZERO = new Point(0,0,0);
+

     public final float x, y, z;
     public final float x, y, z;

+

     public Point(double x, double y, double z) { this((float)x, (float)y, (float)z); }
     public Point(float x, float y, float z) { this.x = x; this.y = y; this.z = z; }
 
     public Point(double x, double y, double z) { this((float)x, (float)y, (float)z); }
     public Point(float x, float y, float z) { this.x = x; this.y = y; this.z = z; }
 

diff --git a/src/edu/berkeley/qfat/geom/Triangle.java b/src/edu/berkeley/qfat/geom/Triangle.java
index bfc0b84..9db806b 100644 (file)
--- a/src/edu/berkeley/qfat/geom/Triangle.java
+++ b/src/edu/berkeley/qfat/geom/Triangle.java
@@ -2,7 +2,7 @@ package edu.berkeley.qfat.geom;
 import javax.media.opengl.*;
 
 /**
 import javax.media.opengl.*;
 
 /**

- *  An oriented triangle, defined by three points in clockwise order;
+ *  An oriented triangle, defined by three points in order;

  *  note that the Point objects returned by p1/p2/p3 may vary over time.
  */
 public abstract class Triangle implements HasBoundingBox {
  *  note that the Point objects returned by p1/p2/p3 may vary over time.
  */
 public abstract class Triangle implements HasBoundingBox {

diff --git a/src/edu/berkeley/qfat/geom/Vec.java b/src/edu/berkeley/qfat/geom/Vec.java
index bc10a34..979cf2d 100644 (file)
--- a/src/edu/berkeley/qfat/geom/Vec.java
+++ b/src/edu/berkeley/qfat/geom/Vec.java
@@ -4,6 +4,9 @@ import javax.media.opengl.glu.*;
 
 /** vector in 3-space; immutable */
 public final class Vec {
 
 /** vector in 3-space; immutable */
 public final class Vec {

+
+    public static final Vec ZERO = new Vec(0,0,0);
+

     public final float x, y, z;
     public Vec(double x, double y, double z) { this((float)x, (float)y, (float)z); }
     public Vec(float x, float y, float z) { this.x = x; this.y = y; this.z = z; }
     public final float x, y, z;
     public Vec(double x, double y, double z) { this((float)x, (float)y, (float)z); }
     public Vec(float x, float y, float z) { this.x = x; this.y = y; this.z = z; }