X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FTriangle.java;h=bfc0b845941cdc7a71c19a6db1f973d830e0609e;hp=fece872cd29201adb49d1ac214a420be463f9f14;hb=fe5601878bcdd906f4b58aa204af45272bf21c61;hpb=42acb5af8ff15b7af9fa8f34c071ee58e24faf98

diff --git a/src/edu/berkeley/qfat/geom/Triangle.java b/src/edu/berkeley/qfat/geom/Triangle.java
index fece872..bfc0b84 100644
--- a/src/edu/berkeley/qfat/geom/Triangle.java
+++ b/src/edu/berkeley/qfat/geom/Triangle.java
@@ -23,17 +23,18 @@ public abstract class Triangle implements HasBoundingBox {
     }
 
     /** issue gl.glVertex() for each of the triangle's points */
-    public void glVertices(GL gl) {
-        norm().glNormal(gl);
-        p1().glVertex(gl);
-        p2().glVertex(gl);
-        p3().glVertex(gl);
-    }
     public void glVertices(GL gl, Matrix m) {
-        m.times(norm()).glNormal(gl);
-        m.times(p1()).glVertex(gl);
-        m.times(p2()).glVertex(gl);
-        m.times(p3()).glVertex(gl);
+        if (m==null) {
+            norm().glNormal(gl);
+            p1().glVertex(gl);
+            p2().glVertex(gl);
+            p3().glVertex(gl);
+        } else {
+            m.times(norm()).glNormal(gl);
+            m.times(p1()).glVertex(gl);
+            m.times(p2()).glVertex(gl);
+            m.times(p3()).glVertex(gl);
+        }
     }
 
     /** the triangle's centroid */