X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2FMain.java;h=fc8d2eed78d70375c14a1e2e065d2de001c597de;hb=895456322db6e2b117fc2188683f91304165b72d;hp=bd40d1301181a138e2df01ef132ccd1026b271d8;hpb=2c711bea0246aca2caeace0a704a97d1305970d6;p=anneal.git

diff --git a/src/Main.java b/src/Main.java
index bd40d13..fc8d2ee 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();
@@ -11,7 +13,116 @@ public class Main implements GLEventListener {
     /** magnification factor */
     private static final float MAG = 1;
 
+    Geom.V[] translations;
+    Geom.P[] points;
+
     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);
+        Geom.P ltn = geom.newP(-0.2,  0.1, -0.1);
+        Geom.P mtn = geom.newP( 0.0,  0.1, -0.1);
+        Geom.P rtn = geom.newP( 0.2,  0.1, -0.1);
+        Geom.P lbf = geom.newP(-0.2, -0.1,  0.1);
+        Geom.P mbf = geom.newP( 0.0, -0.1,  0.1);
+        Geom.P rbf = geom.newP( 0.2, -0.1,  0.1);
+        Geom.P lbn = geom.newP(-0.2, -0.1, -0.1);
+        Geom.P mbn = geom.newP( 0.0, -0.1, -0.1);
+        Geom.P rbn = geom.newP( 0.2, -0.1, -0.1);
+        
+        points = new Geom.P[] {
+            ltf,
+            mtf,
+            rtf,
+            ltn,
+            mtn,
+            rtn,
+            lbf,
+            mbf,
+            rbf,
+            lbn,
+            mbn,
+            rbn
+        };
+
+        translations = new Geom.V[] {
+            geom.new V(-0.2,  0.2,    0),
+            geom.new V( 0.2,  0.2,    0),
+            geom.new V(-0.2, -0.2,    0),
+            geom.new V( 0.2, -0.2,    0),
+            geom.new V( 0.4,    0,    0),
+            geom.new V(-0.4,    0,    0),
+            geom.new V(   0,    0,  0.2),
+            geom.new V(   0,    0, -0.2),
+        };
+
+        // top
+        geom.newT(ltf, mtf, mtn);
+        geom.newT(mtn, ltn, ltf);
+        geom.newT(mtf, rtf, rtn);
+        geom.newT(rtn, mtn, mtf);
+
+        // bottom (swap normals)
+        geom.newT(mbf, lbf, mbn);
+        geom.newT(lbn, mbn, lbf);
+        geom.newT(rbf, mbf, rbn);
+        geom.newT(mbn, rbn, mbf);
+        
+        // left
+        geom.newT(ltf, ltn, lbn);
+        geom.newT(lbn, lbf, ltf);
+
+        // right (swap normals)
+        geom.newT(rtn, rtf, rbn);
+        geom.newT(rbf, rbn, rtf);
+
+        // front
+        geom.newT(ltn, mtn, mbn);
+        geom.newT(ltn, mbn, lbn);
+        geom.newT(mtn, rtn, rbn);
+        geom.newT(mtn, rbn, mbn);
+
+        // back
+        geom.newT(mtf, ltf, mbf);
+        geom.newT(mbf, ltf, lbf);
+        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);
@@ -19,6 +130,9 @@ 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);
         }
+
+        */
+
     }
 
     /**
@@ -28,41 +142,93 @@ public class Main implements GLEventListener {
         GL gl = gld.getGL();
         GLU glu = new GLU();
         gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+        gl.glClearDepth(1.0);
         gl.glViewport(0, 0, 500, 300);
         gl.glMatrixMode(GL.GL_PROJECTION);
+        gl.glEnable(GL.GL_DEPTH_TEST);
+        gl.glDepthFunc(GL.GL_LEQUAL);
+        
         gl.glLoadIdentity();
+        gl.glRotatef((float)45, 1, 1, 1);
+
         //glu.gluOrtho2D(0.0, 500.0, 0.0, 300.0);
         display(gld);
     }
 
+    public static int angle = 0;
+
     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) {
-        float red = 0.0f;
-        float green = 0.0f;
-        float blue = 0.0f;
         GL gl = drawable.getGL();
-        gl.glClear(GL.GL_COLOR_BUFFER_BIT);
+        gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
         gl.glPointSize(5.0f);
+        gl.glLoadIdentity();
+        gl.glRotatef(angle, 1, 1, 1);
 
+        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);
+            gl.glTranslatef(-v.x, -v.y, -v.z);
+        }
+        */
+    }
+
+    private void draw(GL gl, boolean triangles) {
+        float red = 0.0f;
+        float green = 0.0f;
+        float blue = 0.0f;
         for(Geom.T t : geom) {
-            red -= .09f;
-            green -= .12f;
-            blue -= .15f;
             if (red < 0.15) red = 1.0f;
             if (green < 0.15) green = 1.0f;
             if (blue < 0.15) blue = 1.0f;
+            red -= .09f;
+            green -= .12f;
+            blue -= .15f;
             gl.glColor3f(red, green, blue);
-            gl.glBegin(GL.GL_TRIANGLES);
-            t.glVertices(gl);
-            gl.glEnd();
+            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);
+                t.glVertices(gl);
+                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);
+                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);
+            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();
-            
 
         }
     }
@@ -76,8 +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