import javax.media.opengl.*;
import javax.media.opengl.glu.*;
import java.util.*;
+import edu.berkeley.qfat.bind.*;
import edu.berkeley.qfat.geom.*;
+import edu.berkeley.qfat.stl.*;
+import edu.berkeley.qfat.voxel.*;
import edu.berkeley.qfat.geom.Point;
import edu.berkeley.qfat.geom.Polygon;
+/*
+
+
+Todo
+- review catmull-clark; move vertex points?
+- re-anneal fish
+
+- show constraints (?)
+- show in red if user tries to move a point to an illegal location
+
+- eliminate use of bindinggroupschanged()
+
+- post qfat on my software page
+
+
+With Sequin
+- constraints admit intersections (lattice)
+- constraints may be transformed linearly
+
+
+
+
+Log console
+ - blend-shaded overlay? slick.
+
+face/vertex count
+rendering FPS
+ability to not draw edges between faces
+
+
+three circumcircles showing crystal ball -- these don't get scaled
+axes?
+
+drawing modes:
+ - bounding box
+ - vertices
+ - edges
+ - visible-edges
+ - flat with or without edges
+ - shaded with or without edges
+ * contrasting-faces
+
+
+quadric decimation?
+
+show normals
+show bounding box
+show axes (big+fat)
+ */
+
// 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
// Editing:
// - fracture edge, face
// - change aspect ratio
+// - translate, rotate goal mesh
// - 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?
-// - symmetry constraints withing the tile
-// - rotation matrices
-// - overbinding results in forced equational constraints on the leader
-// - shatter in invertd-triforce pattern brian mentioned
-// - aspect ratio? non-uniform deformation?
-// - rotational alignment
-
-// - movie-style user interface like
-// http://www.coleran.com/markcoleranreell.html ?
-
-// - consider recasting the Shewchuk predicates in Java?
-// http://www.cs.cmu.edu/afs/cs/project/quake/public/code/predicates.c
-
/*
blender keys
- middle mouse = option+click
wheel: zoom
home: home view: take current angle, zoom to whole scnee
5 = ortho vs non-ortho
-
*/
/*
+Meshlab Notes:
+Log console
+ - blend-shaded overlay? slick.
+face/vertex count
+rendering FPS
+ability to not draw edges between faces
- */
+three circumcircles showing crystal ball -- these don't get scaled
+axes?
-// FIXME: re-orient goal (how?)
+drawing modes:
+ - bounding box
+ - vertices
+ - edges
+ - visible-edges
+ - flat with or without edges
+ - shaded with or without edges
+ * contrasting-faces
-public class Main extends InteractiveMeshViewer {
+quadric decimation?
+
+show normals
+show bounding box
+show axes (big+fat)
+ */
+public class Main extends InteractiveMeshViewer {
public static int verts = 1;
if (v.mag() < 0.0001) continue;
v = v.times(-1);
v = v.times(0.5f);
- Point p = Point.ORIGIN.plus(v);
+ Point p = Point.ZERO.plus(v);
v = v.times(-1);
//System.out.println(v);
polygons.add(new Polygon(hs));
}
for(Polygon p : polygons) {
- System.out.println(p.plane.norm + " " + p.plane.dvalue);
+ System.out.println(p.plane.norm() + " " + p.plane.d);
for(HalfSpace hs : halfSpaces) {
if (p.plane==hs) continue;
p = p.intersect(hs);
Point t1v1 = m.times(t1.v1().p);
Point t1v2 = m.times(t1.v2().p);
Point t1v3 = m.times(t1.v3().p);
+
if (t1v1.distance(t2.v1().p) < MATCHING_EPSILON &&
t1v2.distance(t2.v3().p) < MATCHING_EPSILON &&
t1v3.distance(t2.v2().p) < MATCHING_EPSILON) {
- t2.e3().bindEdge(t1.e1(), m);
- t2.e2().bindEdge(t1.e2(), m);
- t2.e1().bindEdge(t1.e3(), m);
+ t2.e3().bindEdge(t1.e1().pair, m);
+ t2.e2().bindEdge(t1.e2().pair, m);
+ t2.e1().bindEdge(t1.e3().pair, m);
}
if (t1v2.distance(t2.v1().p) < MATCHING_EPSILON &&
t1v3.distance(t2.v3().p) < MATCHING_EPSILON &&
t1v1.distance(t2.v2().p) < MATCHING_EPSILON) {
- t2.e3().bindEdge(t1.e2(), m);
- t2.e2().bindEdge(t1.e3(), m);
- t2.e1().bindEdge(t1.e1(), m);
+ t2.e3().bindEdge(t1.e2().pair, m);
+ t2.e2().bindEdge(t1.e3().pair, m);
+ t2.e1().bindEdge(t1.e1().pair, m);
}
if (t1v3.distance(t2.v1().p) < MATCHING_EPSILON &&
t1v1.distance(t2.v3().p) < MATCHING_EPSILON &&
t1v2.distance(t2.v2().p) < MATCHING_EPSILON) {
- t2.e3().bindEdge(t1.e3(), m);
- t2.e2().bindEdge(t1.e1(), m);
- t2.e1().bindEdge(t1.e2(), m);
+ t2.e3().bindEdge(t1.e3().pair, m);
+ t2.e2().bindEdge(t1.e1().pair, m);
+ t2.e1().bindEdge(t1.e2().pair, m);
}
+
if (t1v1.distance(t2.v1().p) < MATCHING_EPSILON &&
t1v2.distance(t2.v2().p) < MATCHING_EPSILON &&
t1v3.distance(t2.v3().p) < MATCHING_EPSILON) {
- t2.e1().bindEdge(t1.e1().pair, m);
- t2.e2().bindEdge(t1.e2().pair, m);
- t2.e3().bindEdge(t1.e3().pair, m);
+ t2.e1().bindEdge(t1.e1(), m);
+ t2.e2().bindEdge(t1.e2(), m);
+ t2.e3().bindEdge(t1.e3(), m);
}
if (t1v2.distance(t2.v1().p) < MATCHING_EPSILON &&
t1v3.distance(t2.v2().p) < MATCHING_EPSILON &&
t1v1.distance(t2.v3().p) < MATCHING_EPSILON) {
- t2.e2().bindEdge(t1.e1().pair, m);
- t2.e3().bindEdge(t1.e2().pair, m);
- t2.e1().bindEdge(t1.e3().pair, m);
+ t2.e2().bindEdge(t1.e1(), m);
+ t2.e3().bindEdge(t1.e2(), m);
+ t2.e1().bindEdge(t1.e3(), m);
}
if (t1v3.distance(t2.v1().p) < MATCHING_EPSILON &&
t1v1.distance(t2.v2().p) < MATCHING_EPSILON &&
t1v2.distance(t2.v3().p) < MATCHING_EPSILON) {
- t2.e3().bindEdge(t1.e1().pair, m);
- t2.e1().bindEdge(t1.e2().pair, m);
- t2.e2().bindEdge(t1.e3().pair, m);
+ t2.e3().bindEdge(t1.e1(), m);
+ t2.e1().bindEdge(t1.e2(), m);
+ t2.e2().bindEdge(t1.e3(), m);
}
+
}
}
}
fixupGoal();
}
- public void breakit() {
- int oldverts = verts;
- if (verts > 2000 && !force) return;
- force = false;
- System.out.println("doubling vertices.");
- PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
- for(Mesh.T t : tile) {
- es.add(t.e1());
- es.add(t.e2());
- es.add(t.e3());
- Thread.yield();
- repaint();
- }
- for(int i=0; i<Math.min(oldverts,50); i++) {
- Mesh.E e = es.poll();
- verts++;
- e.shatter();
- Thread.yield();
- repaint();
- }
- System.out.println("now have " + verts + " vertices; max is 2000");
- tile.rebindPoints();
- }
-
- public boolean rand(double temp, Mesh.Vertex p) {
-
- p.reComputeErrorAround();
- double tile_error = tile.error();
- double goal_error = goal.error();
-
- float max = p.averageEdgeLength()/5;
- Vec v = new Vec(random.nextFloat(), random.nextFloat(), random.nextFloat());
- v = v.norm().times((random.nextFloat() - 0.5f) * max);
- Matrix m = Matrix.translate(v);
- boolean good = p.move(v, false);
- if (!good) { return false; }
-
- double new_tile_error = tile.error();
- double new_goal_error = goal.error();
- double tile_delta = (new_tile_error - tile_error) / tile_error;
- double goal_delta = (new_goal_error - goal_error) / goal_error;
- double delta = tile_delta + goal_delta;
- double swapProbability = Math.exp((-1 * delta) / temp);
-
- //boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
- //boolean doSwap = good && (tile_delta + goal_delta <= 0);
- //if (temp < 0.000001) doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
- boolean doSwap = good && (Math.random() < swapProbability);
-
- // always move uphill if possible -- potential idea
- if (tile_delta <= 0 && goal_delta <= 0 && good) doSwap = true;
- if (hillclimb)
- doSwap = tile_delta <= 0 && goal_delta <= 0 && good;
-
- if (doSwap) {
- tile_error = new_tile_error;
- goal_error = new_goal_error;
- hits++;
- p.goodp = p.p;
- } else {
- p.move(v.times(-1), true);
- misses++;
- }
- p.reComputeErrorAround();
- return true;
- }
-
- float hits = 0;
- float misses = 0;
- public void anneal() throws Exception {
- double hightemp = 1;
- temp = hightemp;
- double last = 10;
- boolean seek_upward = false;
- double acceptance = 1;
- while(true) {
- synchronized(this) {
- if (!anneal) { repaint(); Thread.sleep(10); continue; }
-
- double ratio = (hits+misses==0) ? 1 : (hits / (hits+misses));
- hits = 0;
- misses = 0;
- double gamma = 1;
- acceptance = (ratio+acceptance)/2;
- accepts = (int)(Math.ceil(ratio*100));
- temps = (int)(Math.ceil(temp*1000));
- vertss = tile.size();
- if (breaks > 0) {
- while (breaks>0) {
- breaks--;
- breakit();
- }
- seek_upward = true;
- continue;
- } else if (acceptance > 0.96) gamma = 0.1f;
- else if (acceptance > 0.9) gamma = 0.2f;
- else if (acceptance > 0.8) gamma = 0.3f;
- else if (acceptance > 0.6) gamma = 0.4f;
- else if (acceptance > 0.3) gamma = 0.8f;
- else if (acceptance > 0.15) gamma = 0.94f;
- else if (acceptance > 0.10) gamma = 0.98f;
-
- else if (acceptance < 0.01) breaks++;
-
- if (seek_upward) {
- if (acceptance > 0.25) seek_upward = false;
- else gamma = 2-gamma;
- }
-
- if (anneal)
- temp = temp * gamma;
-
-
- HashSet<Mesh.Vertex> hs = new HashSet<Mesh.Vertex>();
- for(Mesh.Vertex p : tile.vertices()) hs.add(p);
- Mesh.Vertex[] pts = (Mesh.Vertex[])hs.toArray(new Mesh.Vertex[0]);
-
- int count = 0;
- long then = System.currentTimeMillis();
- for(int i=0; i<300; i++) {
- if (anneal) {
- Mesh.Vertex v = pts[Math.abs(random.nextInt()) % pts.length];
- if (breaks>0) break;
- if (!rand(temp,v)) { i--; continue; }
- v.recomputeFundamentalQuadricIfStale();
- v.recomputeFundamentalQuadricIfNeighborChanged();
- count++;
- }
- Thread.yield();
- repaint();
- }
-
- System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " +
- "points_per_second=" +
- (count*1000)/((double)(System.currentTimeMillis()-then)));
- for(Mesh.Vertex p : goal.vertices()) {
- p.quadricStale = true;
- p.recomputeFundamentalQuadricIfNeighborChanged();
- }
- }
- }
- }
-
-
- public static void main(String[] s) throws Exception {
- 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();
- f.setSize(900, 900);
- f.doLayout();
- main.anneal();
- }
public class MyMenuItem extends JMenuItem implements ActionListener {
public MyMenuItem(String s) {
public void hit() {}
}
+ public void marchingCubes() {
+ Mesh mesh = new Mesh(false);
+ mesh.coalesce = true;
+ MarchingCubes.march(new SampledField() {
+ public float getSample(Point p) {
+ double x = p.x;
+ double y = p.y;
+ double z = p.z;
+ x-=0.7;
+ y-=0.7;
+ z-=0.7;
+ return (float)Math.sqrt(x*x+y*y+z*z);
+ }
+ },
+ 0.8, 20, 0.1, mesh);
+ setTile(mesh);
+ //fixupTile();
+ }
+
public void hexBrick(boolean offset, boolean rotated) {
setTile(new Mesh(false));
float width = (float)0.8;
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[] {
generateTile(transforms, tile);
fixupTile();
} });
+
tileMenu.add(new MyMenuItem("Slim Dense Packing (Cubic)") { public void hit() {
setTile(new Mesh(false));
float unit = 0.4f;
float height = 2*r*(float)Math.sqrt(2f/3f);
transforms = new Matrix[] {
+
+ //Matrix.reflect(new Vec( 0, height, -z).norm()),
+
Matrix.translate(new Vec(-unit, 0, 0)),
Matrix.translate(new Vec( unit, 0, 0)),
Matrix.translate(new Vec(-cos, 0, sin)),
Matrix.translate(new Vec(-cos, 0, -sin)),
Matrix.translate(new Vec( cos, 0, -sin)),
+ Matrix.translate(new Vec( 0, height, -z)),
+ Matrix.translate(new Vec(-r, height, x)),
+ Matrix.translate(new Vec( r, height, x)),
+ Matrix.translate(new Vec( 0, -height, z)),
+ Matrix.translate(new Vec(-r, -height, -x)),
+ Matrix.translate(new Vec( r, -height, -x)),
+
/*
Matrix.translate(new Vec( 0, height, -z)).times(Matrix.rotate(new Vec(0,1,0), (float)Math.PI)),
Matrix.translate(new Vec(-r, height, x)).times(Matrix.rotate(new Vec(0,1,0), (float)Math.PI)),
Matrix.translate(new Vec( r, -height, x)).times(Matrix.rotate(new Vec(0,1,0), (float)Math.PI)),
*/
- Matrix.translate(new Vec( 0, height, -z)),
- Matrix.translate(new Vec(-r, height, x)),
- Matrix.translate(new Vec( r, height, x)),
- Matrix.translate(new Vec( 0, -height, z)),
- Matrix.translate(new Vec(-r, -height, -x)),
- Matrix.translate(new Vec( r, -height, -x)),
- //Matrix.rotate(new Vec(0,0,1), (float)Math.PI),
-
/*
Matrix.translate(new Vec( 0, height, -z)).times(Matrix.scale(-1,1,-1)),
Matrix.translate(new Vec(-r, height, x)).times(Matrix.scale(-1,1,-1)),
Matrix.ONE
};
generateTile(transforms, tile);
+
+
+ transforms = new Matrix[] {
+ Matrix.reflect(new Vec( 0, height, -z).norm()),
+ //Matrix.reflect(new Vec( 0, -height, z)),
+ Matrix.ONE,
+ Matrix.translate(new Vec(-unit, 0, 0)),
+ Matrix.translate(new Vec( unit, 0, 0)),
+ /*
+ Matrix.translate(new Vec(-cos, 0, sin)),
+ Matrix.translate(new Vec( cos, 0, sin)),
+ Matrix.translate(new Vec(-cos, 0, -sin)),
+ Matrix.translate(new Vec( cos, 0, -sin)),
+
+ Matrix.translate(new Vec( 0, height, -z)),
+ Matrix.translate(new Vec(-r, height, x)),
+ Matrix.translate(new Vec( r, height, x)),
+ Matrix.translate(new Vec( 0, -height, z)),
+ Matrix.translate(new Vec(-r, -height, -x)),
+ Matrix.translate(new Vec( r, -height, -x)),
+ */
+ };
+
+
//for(int i=0; i<transforms.length; i++) transforms[i] = Matrix.translate(m.times(vecs[i]));
+
Matrix m = Matrix.scale(1.9f, 1f ,1);
//Matrix m = Matrix.scale(1f, 2.1f, 1f);
tile.transform(m);
for(int i=0; i<transforms.length; i++)
- transforms[i] = transforms[i].preMultiplyTranslationalComponentBy(m);
+ transforms[i] = preMultiplyTranslationalComponentBy(transforms[i], m);
+
+
fixupTile();
} });
};
fixupTile();
}}});
+ tileMenu.add(new MyMenuItem("Marching Cubes") { public void hit() {
+ marchingCubes();
+ }});
// Finally, add all the menus to the menu bar.
add(tileMenu);
- add(goalMenu);
- add(hideMenu);
+ //add(goalMenu);
+ //add(hideMenu);
}
}
+ private static Matrix preMultiplyTranslationalComponentBy(Matrix mthis, Matrix mm) {
+ Vec v = mm.times(mthis.getTranslationalComponent());
+ return new Matrix(mthis.a, mthis.b, mthis.c, v.x,
+ mthis.e, mthis.f, mthis.g, v.y,
+ mthis.i, mthis.j, mthis.k, v.z,
+ mthis.m, mthis.n, mthis.o, 1);
+ }
+
+//////////////////////////////////////////////////////////////////////////////
+ public void breakit() {
+ int oldverts = verts;
+ if (verts > 2000 && !force) return;
+ force = false;
+ System.out.println("doubling vertices.");
+ PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
+ for(Mesh.T t : tile) {
+ es.add(t.e1());
+ es.add(t.e2());
+ es.add(t.e3());
+ Thread.yield();
+ repaint();
+ }
+ for(int i=0; i<Math.min(oldverts,50); i++) {
+ Mesh.E e = es.poll();
+ verts++;
+ e.shatter();
+ Thread.yield();
+ repaint();
+ }
+ System.out.println("now have " + verts + " vertices; max is 2000");
+ tile.rebindPoints();
+ }
+
+ public boolean rand(double temp, Mesh.Vertex p) {
+
+ p.reComputeErrorAround();
+ double tile_error = tile.error();
+ double goal_error = goal.error();
+
+ float max = p.averageEdgeLength()/5;
+ Vec v = new Vec(random.nextFloat(), random.nextFloat(), random.nextFloat());
+ v = v.norm().times((random.nextFloat() - 0.5f) * max);
+ Matrix m = Matrix.translate(v);
+ boolean good = p.move(v, false);
+ if (!good) { return false; }
+
+ double new_tile_error = tile.error();
+ double new_goal_error = goal.error();
+ double tile_delta = (new_tile_error - tile_error) / tile_error;
+ double goal_delta = (new_goal_error - goal_error) / goal_error;
+ double delta = tile_delta + goal_delta;
+ double swapProbability = Math.exp((-1 * delta) / temp);
+
+ //boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
+ //boolean doSwap = good && (tile_delta + goal_delta <= 0);
+ //if (temp < 0.000001) doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
+ boolean doSwap = good && (Math.random() < swapProbability);
+
+ // always move uphill if possible -- potential idea
+ if (tile_delta <= 0 && goal_delta <= 0 && good) doSwap = true;
+ if (hillclimb)
+ doSwap = tile_delta <= 0 && goal_delta <= 0 && good;
+
+ if (doSwap) {
+ tile_error = new_tile_error;
+ goal_error = new_goal_error;
+ hits++;
+ p.goodp = p.p;
+ } else {
+ p.move(v.times(-1), true);
+ misses++;
+ }
+ p.reComputeErrorAround();
+ return true;
+ }
+
+ float hits = 0;
+ float misses = 0;
+ public void anneal() throws Exception {
+ double hightemp = 1;
+ temp = hightemp;
+ double last = 10;
+ boolean seek_upward = false;
+ double acceptance = 1;
+ while(true) {
+ synchronized(this) {
+ if (!anneal) { repaint(); Thread.sleep(10); continue; }
+
+ double ratio = (hits+misses==0) ? 1 : (hits / (hits+misses));
+ hits = 0;
+ misses = 0;
+ double gamma = 1;
+ acceptance = (ratio+acceptance)/2;
+ accepts = (int)(Math.ceil(ratio*100));
+ temps = (int)(Math.ceil(temp*1000));
+ vertss = tile.size();
+ if (breaks > 0) {
+ while (breaks>0) {
+ breaks--;
+ breakit();
+ }
+ seek_upward = true;
+ continue;
+ } else if (acceptance > 0.96) gamma = 0.1f;
+ else if (acceptance > 0.9) gamma = 0.2f;
+ else if (acceptance > 0.8) gamma = 0.3f;
+ else if (acceptance > 0.6) gamma = 0.4f;
+ else if (acceptance > 0.3) gamma = 0.8f;
+ else if (acceptance > 0.15) gamma = 0.94f;
+ else if (acceptance > 0.10) gamma = 0.98f;
+
+ else if (acceptance < 0.01) breaks++;
+
+ if (seek_upward) {
+ if (acceptance > 0.25) seek_upward = false;
+ else gamma = 2-gamma;
+ }
+
+ if (anneal)
+ temp = temp * gamma;
+
+
+ HashSet<Mesh.Vertex> hs = new HashSet<Mesh.Vertex>();
+ for(Mesh.Vertex p : tile.vertices()) hs.add(p);
+ Mesh.Vertex[] pts = (Mesh.Vertex[])hs.toArray(new Mesh.Vertex[0]);
+
+ int count = 0;
+ long then = System.currentTimeMillis();
+ for(int i=0; i<300; i++) {
+ if (anneal) {
+ Mesh.Vertex v = pts[Math.abs(random.nextInt()) % pts.length];
+ if (breaks>0) break;
+ if (!rand(temp,v)) { i--; continue; }
+ v.recomputeFundamentalQuadricIfStale();
+ v.recomputeFundamentalQuadricIfNeighborChanged();
+ count++;
+ }
+ Thread.yield();
+ repaint();
+ }
+
+ System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " +
+ "points_per_second=" +
+ (count*1000)/((double)(System.currentTimeMillis()-then)));
+ for(Mesh.Vertex p : goal.vertices()) {
+ p.quadricStale = true;
+ p.recomputeFundamentalQuadricIfNeighborChanged();
+ }
+ }
+ }
+ }
+
+
+ public static void main(String[] s) throws Exception {
+ JFrame f = new JFrame();
+ f.setLayout(new BorderLayout());
+ Main main = new Main(f);
+ f.add(main, BorderLayout.CENTER);
+
+ f.addWindowListener(new WindowListener() {
+ public void windowActivated(WindowEvent e) { }
+ public void windowClosed(WindowEvent e) { System.exit(0); }
+ public void windowClosing(WindowEvent e) { System.exit(0); }
+ public void windowDeactivated(WindowEvent e) { }
+ public void windowDeiconified(WindowEvent e) { }
+ public void windowIconified(WindowEvent e) { }
+ public void windowOpened(WindowEvent e) { }
+ });
+
+ f.pack();
+ f.show();
+ f.setSize(900, 900);
+ f.doLayout();
+
+ JFrame f2 = new JFrame();
+ f2.setJMenuBar(main.new MyMenuBar());
+ f2.setSize(100,100);
+ f2.show();
+
+ main.anneal();
+ }
+
+
}
\ No newline at end of file
projects / anneal.git / blobdiff