checkpoint

[anneal.git] / src / edu / berkeley / qfat / Main.java

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 5dbba74..8683a75 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -11,6 +11,31 @@ import edu.berkeley.qfat.geom.Point;
 import edu.berkeley.qfat.geom.Polygon;
 
 // TO DO:
+//
+// - Implement "real" constraints (plane, line, point)
+//
+// - Constrained surface subdivision
+//     - Edge.flip() gets us the triforce subdivision
+//     - Edge.delete() gets us the catmull-clark subdivision
+//     - Catmull-Clark: just don't move points if we can't.  Need to average the influence of the points on a binding group.
+//
+// - Ability to snap three views to orthgonal
+// - SLIDE UI
+//     - left button -> crystal ball
+//     - translate
+//     - rightbutton/mousewheel zoom
+// - v+click to select vertex
+// - show: constraints, bindings, faces
+//
+// Editing:
+//  - fracture edge, face
+//  - change aspect ratio
+//  - ability to select a point, rotate the model, then move the point
+//  - when moving a vertex in one window, show that window's axes in all other windows
+//
+
+
+// TO DO:
 // - real anneal
 // - solve self-intersection problem
 // - get a better test model?
@@ -52,7 +77,7 @@ import edu.berkeley.qfat.geom.Polygon;
 
 public class Main extends InteractiveMeshViewer {
 
-    public Matrix[] transforms;
+
 
     public static int verts = 1;
 
@@ -350,6 +375,7 @@ public class Main extends InteractiveMeshViewer {
         JFrame f = new JFrame();
         f.setLayout(new BorderLayout());
         Main main = new Main(f);
+        f.add(main, BorderLayout.CENTER);
         f.setJMenuBar(main.new MyMenuBar());
         f.pack();
         f.show();
@@ -495,9 +521,9 @@ public class Main extends InteractiveMeshViewer {
                         es.add(t.e3());
                     }
                     for(Mesh.E e : es) {
-                        if (e.p1.p.x == e.p2.p.x && e.p1.p.y == e.p2.p.y) continue;
-                        if (e.p1.p.z == e.p2.p.z && e.p1.p.y == e.p2.p.y) continue;
-                        if (e.p1.p.x == e.p2.p.x && e.p1.p.z == e.p2.p.z) continue;
+                        if (e.v1.p.x == e.v2.p.x && e.v1.p.y == e.v2.p.y) continue;
+                        if (e.v1.p.z == e.v2.p.z && e.v1.p.y == e.v2.p.y) continue;
+                        if (e.v1.p.x == e.v2.p.x && e.v1.p.z == e.v2.p.z) continue;
                         e.shatter();
                     }
                     transforms = new Matrix[] {