X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2FMain.java;h=e97f97547121ada84696cf9f983d3fe1f9319f24;hp=da616df66d77859ac43a00062c2a79f81e6eacc3;hb=207c278791e5d7b53cdb099cb67bb5df713e59d9;hpb=c257689076da7472ec2aff9d5d940647715ecf08

diff --git a/src/Main.java b/src/Main.java
index da616df..e97f975 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -4,6 +4,8 @@ import javax.swing.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 
+// FEATURE: check google's 3D warehouse for sample shapes
+
 public class Main implements GLEventListener {
 
     private Geom geom = new Geom();
@@ -16,6 +18,7 @@ public class Main implements GLEventListener {
 
     public Main(StlFile stlf) {
 
+
         Geom.P ltf = geom.newP(-0.2,  0.1,  0.1);
         Geom.P mtf = geom.newP( 0.0,  0.1,  0.1);
         Geom.P rtf = geom.newP( 0.2,  0.1,  0.1);
@@ -55,17 +58,6 @@ public class Main implements GLEventListener {
             geom.new V(   0,    0, -0.2),
         };
 
-        for(Geom.V v : translations) {
-            for(Geom.P p1 : points) {
-                for(Geom.P p2 : points) {
-                    if (p1.plus(v).minus(p2).mag() < Geom.EPSILON) {
-                        System.out.println("bind " + p1 + " to " + p2);
-                        p1.bind(p2);
-                    }
-                }
-            }
-        }
-
         // top
         geom.newT(ltf, mtf, mtn);
         geom.newT(mtn, ltn, ltf);
@@ -98,8 +90,39 @@ public class Main implements GLEventListener {
         geom.newT(rtf, mtf, rbf);
         geom.newT(rbf, mtf, mbf);
 
+        for(Geom.V v : translations) {
+            for(Geom.T t1 : geom) {
+                for(Geom.T t2 : geom) {
+                    if (t1==t2) continue;
+
+                    if ((t1.p1().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
+                        (t1.p2().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
+                        (t1.p3().plus(v).minus(t2.p2()).mag() < Geom.EPSILON))
+                        t1.bind(t2, 0);
+                    if ((t1.p2().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
+                        (t1.p3().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
+                        (t1.p1().plus(v).minus(t2.p2()).mag() < Geom.EPSILON))
+                        t1.bind(t2, 1);
+                    if ((t1.p3().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
+                        (t1.p1().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
+                        (t1.p2().plus(v).minus(t2.p2()).mag() < Geom.EPSILON))
+                        t1.bind(t2, 2);
+                }
+            }
+        }
+
+        //Geom.P mid = geom.newE(ltf, lbn).shatter();
+
+        //tx.e2.shatter();
+        //tx.e3.shatter();
+
+        //mid.move(geom.new V((float)-0.05,0,0));
+
+        //mtf.move(geom.new V(0, (float)-0.05, (float)0.05));
+        mtf.move(geom.new V(0, (float)-0.05, (float)0.00));
 
         /*
+
         for(int i=0; i<stlf.coordArray.length; i+=3) {
             Geom.P p0 = geom.newP(stlf.coordArray[i+0].x * MAG, stlf.coordArray[i+0].y * MAG, stlf.coordArray[i+0].z * MAG);
             Geom.P p1 = geom.newP(stlf.coordArray[i+1].x * MAG, stlf.coordArray[i+1].y * MAG, stlf.coordArray[i+1].z * MAG);
@@ -107,10 +130,8 @@ public class Main implements GLEventListener {
             Geom.V n  = geom.new V(stlf.normArray[i/3].x * MAG, stlf.normArray[i/3].y  * MAG, stlf.normArray[i/3].z * MAG);
             Geom.T t  = geom.newT(geom.newE(p0, p1), geom.newE(p1, p2), geom.newE(p2, p0), n);
         }
-        */
 
-
-        mtf.move(geom.new V(0, (float)-0.05, (float)0.05));
+        */
 
     }
 
@@ -148,14 +169,15 @@ public class Main implements GLEventListener {
         gl.glBegin(GL.GL_TRIANGLES);
         draw(gl, true);
         gl.glEnd();
-        
+        /*        
         for(Geom.V v1 : translations) {
             if (v1.z==0 && v1.y==0) continue;
             Geom.V v = v1.times((float)1.1);
             gl.glTranslatef(v.x, v.y, v.z);
-            draw(gl, false);
+            //draw(gl, false);
             gl.glTranslatef(-v.x, -v.y, -v.z);
         }
+        */
     }
 
     private void draw(GL gl, boolean triangles) {
@@ -170,6 +192,12 @@ public class Main implements GLEventListener {
             green -= .12f;
             blue -= .15f;
             gl.glColor3f(red, green, blue);
+            switch(t.color) {
+                case 0: gl.glColor3f((float)0.25, (float)0.25, (float)0.75); break;
+                case 1: gl.glColor3f((float)0.25, (float)0.75, (float)0.25); break;
+                case 2: gl.glColor3f((float)0.75, (float)0.25, (float)0.25); break;
+                case 3: gl.glColor3f((float)0.50, (float)0.50, (float)0.50); break;
+            }
             //gl.glBegin(GL.GL_LINES);
             if (triangles) {
                 gl.glBegin(GL.GL_TRIANGLES);
@@ -177,24 +205,31 @@ public class Main implements GLEventListener {
                 gl.glEnd();
             } else {
                 gl.glBegin(GL.GL_LINES);
-                t.e1.p1.glVertex(gl);
-                t.e1.p2.glVertex(gl);
-                t.e2.p1.glVertex(gl);
-                t.e2.p2.glVertex(gl);
-                t.e3.p1.glVertex(gl);
-                t.e3.p2.glVertex(gl);
+                t.e1().p1.glVertex(gl);
+                t.e1().p2.glVertex(gl);
+                t.e2().p1.glVertex(gl);
+                t.e2().p2.glVertex(gl);
+                t.e3().p1.glVertex(gl);
+                t.e3().p2.glVertex(gl);
                 gl.glEnd();
             }
-            /*
+
             Geom.P centroid = t.centroid();
             gl.glBegin(GL.GL_LINES);
             gl.glColor3f(1, 1, 1);
+
             centroid.glVertex(gl);
             centroid.plus(t.norm().times(t.diameter())).glVertex(gl);
+            /*
             t.p1().glVertex(gl);
             t.p1().plus(t.p1().norm().times(t.diameter())).glVertex(gl);
-            gl.glEnd();
+            t.p2().glVertex(gl);
+            t.p2().plus(t.p2().norm().times(t.diameter())).glVertex(gl);
+            t.p3().glVertex(gl);
+            t.p3().plus(t.p3().norm().times(t.diameter())).glVertex(gl);
             */
+            gl.glEnd();
+
         }
     }
 
@@ -207,13 +242,17 @@ public class Main implements GLEventListener {
         GLCanvas glcanvas = new GLCanvas();
         glcanvas.addGLEventListener(main);
         f.add(glcanvas, BorderLayout.CENTER);
+        f.pack();
         f.show();
-        f.setSize(500, 300);
+        f.setSize(900, 900);
+        f.doLayout();
+
         while(true) {
             Thread.sleep(100);
             angle+=5;
             glcanvas.repaint();
         }
+
     }
 
 }
\ No newline at end of file