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

diff --git a/src/Main.java b/src/Main.java
index da616df..7830f5c 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -3,8 +3,65 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
+import java.util.*;
 
-public class Main implements GLEventListener {
+// FEATURE: check google's 3D warehouse for sample shapes
+
+public class Main implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener {
+    
+    boolean alt = false;
+    boolean shift = false;
+    boolean control = false;
+
+    public void mouseWheelMoved(MouseWheelEvent e) {
+        tz -= e.getWheelRotation() ;
+    }
+
+    public void keyTyped(KeyEvent e)  { }
+    public void keyPressed(KeyEvent e)  {
+        switch(e.getKeyCode()) {
+            case KeyEvent.VK_CONTROL: control = true; break;
+            case KeyEvent.VK_ALT: alt = true; break;
+            case KeyEvent.VK_SHIFT: shift = true; break;
+        }
+    }
+    public void keyReleased(KeyEvent e) {
+        switch(e.getKeyCode()) {
+            case KeyEvent.VK_CONTROL: control = false; break;
+            case KeyEvent.VK_ALT: alt = false; break;
+            case KeyEvent.VK_SHIFT: shift = false; break;
+        }
+    }
+
+    public void mouseClicked(MouseEvent e) { }
+    public void mouseEntered(MouseEvent e) { }
+    public void mouseExited(MouseEvent e) { }
+    public void mousePressed(MouseEvent e) { }
+    public void mouseReleased(MouseEvent e) { }
+
+    int mousex;
+    int mousey;
+    public void mouseMoved(MouseEvent e) {
+        mousex = e.getX();
+        mousey = e.getY();
+    }
+
+    float tx = 0;
+    float ty = 0;
+    float tz = 0;
+    float anglex = 0;
+    float angley = 0;
+    public void mouseDragged(MouseEvent e) {
+        if (shift) {
+            tx += (mousex - e.getX())/(float)20;
+            ty += (mousey - e.getY())/(float)20;
+        } else {
+            anglex -= mousex - e.getX();
+            angley += mousey - e.getY();
+        }
+        mousex = e.getX();
+        mousey = e.getY();
+    }
 
     private Geom geom = new Geom();
 
@@ -55,17 +112,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,6 +144,57 @@ 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.e1().bind(t2.e3().pair);
+                        t1.e2().bind(t2.e2().pair);
+                        t1.e3().bind(t2.e1().pair);
+                    }
+                    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.e2().bind(t2.e3().pair);
+                        t1.e3().bind(t2.e2().pair);
+                        t1.e1().bind(t2.e1().pair);
+                    }
+                    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.e3().bind(t2.e3().pair);
+                        t1.e1().bind(t2.e2().pair);
+                        t1.e2().bind(t2.e1().pair);
+                    }
+                }
+            }
+        }
+
+        //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));
+
+
+        for(Geom.T t : geom) {
+            t.e1().dobind();
+            t.e2().dobind();
+            t.e3().dobind();
+        }
+
+        for(int i=0; i<100; i++) {
+            rand();
+        }
+        
+
 
         /*
         for(int i=0; i<stlf.coordArray.length; i+=3) {
@@ -105,13 +202,25 @@ public class Main implements GLEventListener {
             Geom.P p1 = geom.newP(stlf.coordArray[i+1].x * MAG, stlf.coordArray[i+1].y * MAG, stlf.coordArray[i+1].z * MAG);
             Geom.P p2 = geom.newP(stlf.coordArray[i+2].x * MAG, stlf.coordArray[i+2].y * MAG, stlf.coordArray[i+2].z * MAG);
             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);
+            Geom.T t  = geom.newT(p0, p1, p2, n);
         }
         */
 
 
-        mtf.move(geom.new V(0, (float)-0.05, (float)0.05));
+    }
+        Random random = new Random();
 
+    public void rand() {
+            int which = Math.abs(random.nextInt()) % points.length;
+            float r1 = Math.abs(random.nextFloat());
+            r1 = r1 - (float)Math.floor(r1);
+            r1 = r1 * (float)0.01;
+            r1 = r1 - (float)0.005;
+            switch(Math.abs(random.nextInt()) % 3) {
+                case 0: points[which].move(geom.new V((float)0,  (float)r1, (float)0.00)); break;
+                case 1: points[which].move(geom.new V((float)r1, (float)0,  (float)0.00)); break;
+                case 2: points[which].move(geom.new V((float)0,  (float)0, (float)r1)); break;
+            }
     }
 
     /**
@@ -119,36 +228,35 @@ public class Main implements GLEventListener {
      */
     public void init(GLAutoDrawable gld) {
         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.glClearDepth(1.0);
         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) {
         GL gl = drawable.getGL();
+        GLU glu = new GLU();
         gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
         gl.glPointSize(5.0f);
         gl.glLoadIdentity();
-        gl.glRotatef(angle, 1, 1, 1);
+        glu.gluPerspective(50-tz, ((float)drawable.getWidth())/drawable.getHeight(), 0.5, 10);
+        glu.gluLookAt(0, 0, -1, 0, 0, 0, 0, 1, 0);
+        gl.glTranslatef(tx/(float)20, ty/(float)20, 0);
+        gl.glRotatef(anglex, 0, 1, 0);
+        gl.glRotatef(angley, 1, 0, 0);
 
         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);
@@ -156,6 +264,7 @@ public class Main implements GLEventListener {
             draw(gl, false);
             gl.glTranslatef(-v.x, -v.y, -v.z);
         }
+
     }
 
     private void draw(GL gl, boolean triangles) {
@@ -170,6 +279,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 +292,32 @@ 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 +330,22 @@ 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();
+
+        glcanvas.addMouseListener(main);
+        glcanvas.addMouseMotionListener(main);
+        glcanvas.addMouseWheelListener(main);
+        glcanvas.addKeyListener(main);
+
         while(true) {
             Thread.sleep(100);
-            angle+=5;
             glcanvas.repaint();
-        }
+            main.rand();
+       }
+
     }
 
 }
\ No newline at end of file