X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=0ff0dcf7552578af068ffa8eec5964394af74879;hb=719b7ba4c0fe32a0c9e97aeb0156a999794dd0f7;hp=1f625fb56745fa73a40e9840415ad99ac12dd680;hpb=f9488635746daea6f8ccbb4680ff7f169dc5b2e5;p=anneal.git

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 1f625fb..0ff0dcf 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -66,7 +66,7 @@ public class Main extends MeshViewer {
         goal.ignorecollision = true;
 
         // rotate to align major axis -- this probably needs to be done by a human.
-        goal.transform(new Matrix(new Vec(0, 0, 1), (float)(Math.PI/2)));
+        goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(Math.PI/2)));
 
         float goal_width  = goal.diagonal().dot(new Vec(1, 0, 0));
         float goal_height = goal.diagonal().dot(new Vec(0, 1, 0));
@@ -89,24 +89,24 @@ public class Main extends MeshViewer {
 
         translations = new Matrix[] {
 
-            new Matrix(new Vec(lshift,  depth,    halfup)),
-            new Matrix(new Vec(rshift,  depth,    halfup)),
-            new Matrix(new Vec(lshift, -depth,    halfup)),
-            new Matrix(new Vec(rshift, -depth,    halfup)),
+            Matrix.translate(new Vec(lshift,  depth,    halfup)),
+            Matrix.translate(new Vec(rshift,  depth,    halfup)),
+            Matrix.translate(new Vec(lshift, -depth,    halfup)),
+            Matrix.translate(new Vec(rshift, -depth,    halfup)),
 
             /*
-            new Matrix(new Vec(0,  depth,    halfup)),
-            new Matrix(new Vec(0, -depth,    halfup)),
+            Matrix.translate(new Vec(0,  depth,    halfup)),
+            Matrix.translate(new Vec(0, -depth,    halfup)),
             */
 
-            new Matrix(new Vec(lshift,       0,  height)),
-            new Matrix(new Vec(rshift,       0,  height)),
-            new Matrix(new Vec(lshift,       0, -height)),
-            new Matrix(new Vec(rshift,       0, -height)),
+            Matrix.translate(new Vec(lshift,       0,  height)),
+            Matrix.translate(new Vec(rshift,       0,  height)),
+            Matrix.translate(new Vec(lshift,       0, -height)),
+            Matrix.translate(new Vec(rshift,       0, -height)),
 
 
-            new Matrix(new Vec( width,           0,    0)),
-            new Matrix(new Vec(-width,           0,    0)),
+            Matrix.translate(new Vec( width,           0,    0)),
+            Matrix.translate(new Vec(-width,           0,    0)),
 
         };
 
@@ -243,10 +243,10 @@ public class Main extends MeshViewer {
 
         // rescale to match volume
         float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0);
-        goal.transform(new Matrix(factor));
+        goal.transform(Matrix.scale(factor));
 
         // translate to match centroid
-        goal.transform(new Matrix(tile.centroid().minus(goal.centroid())));
+        goal.transform(Matrix.translate(tile.centroid().minus(goal.centroid())));
 
         //tx.e2.shatter();
         //tx.e3.shatter();