X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMeshViewer.java;h=9e984807ab650b7e9fbb802f03fe2957ea0b37e0;hp=fc17683b746592919214ebb0a238f30fc4ff9f9d;hb=5f15a6155bf7fbf2d62b3ab9fd992a54af10a95a;hpb=57376a862c00fa1c8731f9989085fcfceeee0370 diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java index fc17683..9e98480 100644 --- a/src/edu/berkeley/qfat/MeshViewer.java +++ b/src/edu/berkeley/qfat/MeshViewer.java @@ -12,18 +12,19 @@ import edu.berkeley.qfat.geom.Point; public class MeshViewer implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener { - public Mesh tile = new Mesh(); - public Mesh goal = new Mesh(); + public Mesh tile = new Mesh(false); + public Mesh goal = new Mesh(false); public Matrix[] translations; - public Mesh.Vert[] points; + public Mesh.Vertex[] points; - public boolean tileon = false; + public boolean tileon = true; public boolean tilemeshon = false; - public boolean goalon = true; + public boolean goalon = false; public boolean anneal = false; + public boolean neighbors = false; - public boolean breaks = false; + public int breaks = 0; boolean alt = false; boolean shift = false; boolean control = false; @@ -38,9 +39,10 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi case KeyEvent.VK_CONTROL: control = true; break; case KeyEvent.VK_ALT: alt = true; break; case KeyEvent.VK_SHIFT: shift = true; break; - case KeyEvent.VK_SPACE: breaks = true; break; + case KeyEvent.VK_SPACE: breaks++; break; case KeyEvent.VK_D: dump(); break; case KeyEvent.VK_A: anneal = !anneal; break; + case KeyEvent.VK_N: neighbors = !neighbors; break; case KeyEvent.VK_T: tileon = !tileon; break; case KeyEvent.VK_G: goalon = !goalon; break; case KeyEvent.VK_M: tilemeshon = !tilemeshon; break; @@ -54,7 +56,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi Vec normal = t.norm(); pw.println("facet normal " + normal.x + " " + normal.y + " " + normal.z); pw.println(" outer loop"); - for(Mesh.Vert v : new Mesh.Vert[] { t.v1(), t.v2(), t.v3() }) { + for(Mesh.Vertex v : new Mesh.Vertex[] { t.v1(), t.v2(), t.v3() }) { pw.println(" vertex " + v.p.x + " " + v.p.y + " " + v.p.z); } pw.println(" endloop"); @@ -120,29 +122,29 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi float mat_specular[] = { 0.5f, 0.5f, 0.5f, 0.5f }; float mat_shininess[] = { 50.0f }; gl.glShadeModel(GL.GL_SMOOTH); - gl.glMaterialfv(GL.GL_FRONT, GL.GL_DIFFUSE, mat_specular, 0); + //gl.glMaterialfv(GL.GL_FRONT, GL.GL_DIFFUSE, mat_specular, 0); //gl.glMaterialfv(GL.GL_FRONT, GL.GL_SPECULAR, mat_specular, 0); - gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT, new float[] { 0.3f, 0.3f, 0.3f, 0.3f }, 0); + //gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT, new float[] { 0.3f, 0.3f, 0.3f, 0.3f }, 0); //gl.glMaterialfv(GL.GL_FRONT, GL.GL_SHININESS, mat_shininess, 0); - gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, new float[] { 1.0f, 4.0f, -10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT1, GL.GL_POSITION, new float[] { -10.0f, 10.0f, 10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT2, GL.GL_POSITION, new float[] { 10.0f, -10.0f, 10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT3, GL.GL_POSITION, new float[] { 10.0f, 10.0f, -10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT4, GL.GL_POSITION, new float[] { -10.0f, 10.0f, -10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT5, GL.GL_POSITION, new float[] { 10.0f, -10.0f, -10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, new float[] { 1.0f, 4.0f, -10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT1, GL.GL_POSITION, new float[] { -10.0f, 10.0f, 10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT2, GL.GL_POSITION, new float[] { 10.0f, -10.0f, 10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT3, GL.GL_POSITION, new float[] { 10.0f, 10.0f, -10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT4, GL.GL_POSITION, new float[] { -10.0f, 10.0f, -10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT5, GL.GL_POSITION, new float[] { 10.0f, -10.0f, -10.0f, 0.0f }, 0); gl.glEnable(GL.GL_LIGHTING); gl.glEnable(GL.GL_LIGHT0); + /* gl.glEnable(GL.GL_LIGHT1); gl.glEnable(GL.GL_LIGHT2); gl.glEnable(GL.GL_LIGHT3); gl.glEnable(GL.GL_LIGHT4); gl.glEnable(GL.GL_LIGHT5); - + */ gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE); gl.glEnable(GL.GL_COLOR_MATERIAL); display(gld); - } public int temps; @@ -151,6 +153,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi 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) { + if (translations==null) return; glcanvas.setSize(f.getWidth(), f.getHeight() - 100); @@ -171,17 +174,16 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); gl.glPointSize(5.0f); gl.glLoadIdentity(); - 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); + glu.gluPerspective(50, ((float)drawable.getWidth())/drawable.getHeight(), 0.5, 10); + glu.gluLookAt(0, 0, (tz/10)-1, 0, 0, 0, 0, 1, 0); gl.glRotatef(anglex/3, 0, 1, 0); gl.glRotatef(angley/3, 1, 0, 0); gl.glBegin(GL.GL_TRIANGLES); if (tileon) - draw(gl, true, tile); + draw(gl, true, safeTriangles); if (tilemeshon) - draw(gl, false, tile); + draw(gl, false, safeTriangles); gl.glEnd(); //draw(gl, false, tile); @@ -199,23 +201,31 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi for(Matrix m : translations) { //if (v1.z==0 && v1.y==0) continue; i++; - //if (i != 7 && i!=4) continue; + //if (i>4) continue; + /* Point p = new Point(0, 0, 0).times(m); Vec v = new Vec(p.x, p.y, p.z); v = v.times((float)1.04); gl.glTranslatef(v.x, v.y, v.z); - //draw(gl, false, tile); + */ + if (neighbors) draw(gl, false, safeTriangles, m); + /* gl.glTranslatef(-v.x, -v.y, -v.z); + */ } //gl.glEnable(GL.GL_DEPTH_TEST); gl.glEnable (GL.GL_LIGHTING); } - private void draw(GL gl, boolean triangles, Mesh mesh) { + protected HashSet safeTriangles = new HashSet(); + + private void draw(GL gl, boolean triangles, Iterable tris) { draw(gl, triangles, tris, Matrix.ONE); } + private void draw(GL gl, boolean triangles, Iterable tris, Matrix m) { float red = 0.0f; float green = 0.0f; float blue = 0.0f; - for(Mesh.T t : mesh) { + synchronized(safeTriangles) { + for(Mesh.T t : tris) { if (red < 0.15) red = 1.0f; if (green < 0.15) green = 1.0f; if (blue < 0.15) blue = 1.0f; @@ -223,7 +233,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi green -= .12f; blue -= .15f; - if (triangles) switch(t.colorclass) { + if (triangles) switch(t.color/*class*/) { case 0: gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3); break; case 1: gl.glColor4f((float)0.25, (float)0.75, (float)0.25, (float)0.3); break; case 2: gl.glColor4f((float)0.75, (float)0.25, (float)0.25, (float)0.3); break; @@ -232,7 +242,12 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi case 5: gl.glColor4f((float)0.25, (float)0.75, (float)0.75, (float)0.3); break; case 6: gl.glColor4f((float)0.75, (float)0.25, (float)0.75, (float)0.3); break; } - gl.glColor4f((float)0.75, (float)0.25, (float)0.25, (float)0.3); + /* + if (t.e1().pair.t==null) gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3); + else if (t.e2().pair.t==null) gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3); + else if (t.e3().pair.t==null) gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3); + else gl.glColor4f((float)0.75, (float)0.25, (float)0.25, (float)0.3); + */ //gl.glBegin(GL.GL_LINES); if (triangles) { @@ -244,12 +259,12 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi gl.glDisable(GL.GL_LIGHTING); gl.glBegin(GL.GL_LINES); gl.glColor3f(1, 1, 1); - t.e1().p1.p.glVertex(gl); - t.e1().p2.p.glVertex(gl); - t.e2().p1.p.glVertex(gl); - t.e2().p2.p.glVertex(gl); - t.e3().p1.p.glVertex(gl); - t.e3().p2.p.glVertex(gl); + m.times(t.e1().p1.p).glVertex(gl); + m.times(t.e1().p2.p).glVertex(gl); + m.times(t.e2().p1.p).glVertex(gl); + m.times(t.e2().p2.p).glVertex(gl); + m.times(t.e3().p1.p).glVertex(gl); + m.times(t.e3().p2.p).glVertex(gl); gl.glEnd(); gl.glEnable(GL.GL_LIGHTING); @@ -264,7 +279,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi */ /* if (mesh==goal) - for(Mesh.Vert p : new Mesh.Vert[] { t.v1(), t.v2(), t.v3() }) { + for(Mesh.Vertex p : new Mesh.Vertex[] { t.v1(), t.v2(), t.v3() }) { gl.glDisable(GL.GL_LIGHTING); gl.glBegin(GL.GL_LINES); gl.glColor3f(1, 1, 1); @@ -277,7 +292,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi } */ gl.glEnd(); - + } } }