checkpoint

[anneal.git] / src / edu / berkeley / qfat / geom / Triangle.java

diff --git a/src/edu/berkeley/qfat/geom/Triangle.java b/src/edu/berkeley/qfat/geom/Triangle.java
index fece872..ddeae34 100644 (file)
--- a/src/edu/berkeley/qfat/geom/Triangle.java
+++ b/src/edu/berkeley/qfat/geom/Triangle.java
@@ -2,7 +2,7 @@ package edu.berkeley.qfat.geom;
 import javax.media.opengl.*;
 
 /**
- *  An oriented triangle, defined by three points in clockwise order;
+ *  An oriented triangle, defined by three points in order;
  *  note that the Point objects returned by p1/p2/p3 may vary over time.
  */
 public abstract class Triangle implements HasBoundingBox {
@@ -23,17 +23,11 @@ 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);
+        (m==null ? norm() : m.times(norm())).glNormal(gl);
+        (m==null ? p1()   : m.times(p1())).glVertex(gl);
+        (m==null ? p2()   : m.times(p2())).glVertex(gl);
+        (m==null ? p3()   : m.times(p3())).glVertex(gl);
     }
 
     /** the triangle's centroid */
@@ -52,22 +46,24 @@ public abstract class Triangle implements HasBoundingBox {
         return 1/(1+area()/(max*max));
     }
     */
-
+    /*
     public float circumcircleRadius() {
         double a = p1().distance(p2());
         double b = p2().distance(p3());
         double c = p3().distance(p1());
         return (float)((a*b*c)/Math.sqrt((a+b+c)*(b+c-a)*(c+a-b)*(a+b-c)));
     }
-
+    */
+    /*
     public float shortestEdgeLength() {
         float a = p1().distance(p2());
         float b = p2().distance(p3());
         float c = p3().distance(p1());
         return Math.min(a, Math.min(b,c));
     }
-
+    */
     /** a number ranging from 0..1 with 0 being lower quality */
+    /*
     public float quality() {
         float d = shortestEdgeLength();
         float r = circumcircleRadius();
@@ -76,6 +72,7 @@ public abstract class Triangle implements HasBoundingBox {
         if (ret < 0 || ret > 1) throw new Error("ret="+ret);
         return ret;
     }
+    */
 
     // FIXME: I stole this off the net, and I need to credit whoever wrote it
     /** decide if the segment from p1-p2 intersects this triangle */