rotate() check for zero vectors, fixed naming error in PGL.Context class

codeanticode · codeanticode · commit a01538db096e · 2012-04-24T16:13:09.000Z
diff --git a/core/src/processing/core/PMatrix3D.java b/core/src/processing/core/PMatrix3D.java
@@ -229,7 +229,19 @@ public void rotateZ(float angle) {
 
 
   public void rotate(float angle, float v0, float v1, float v2) {
-    // TODO should make sure this vector is normalized
+    float norm2 = v0 * v0 + v1 * v1 + v2 * v2;
+    if (norm2 < PConstants.EPSILON) {
+      // The vector is zero, cannot apply rotation.
+      return;
+    }    
+    
+    if (Math.abs(norm2 - 1) > PConstants.EPSILON) {
+      // The rotation vector is not normalized.
+      float norm = PApplet.sqrt(norm2);
+      v0 /= norm;
+      v1 /= norm;
+      v2 /= norm;
+    } 
 
     float c = cos(angle);
     float s = sin(angle);
diff --git a/java/libraries/opengl/src/processing/opengl/PGL.java b/java/libraries/opengl/src/processing/opengl/PGL.java
@@ -1135,35 +1135,35 @@ public Context getCurrentContext() {
 
   
   public class Context {
-    protected GLContext context;
+    protected GLContext glContext;
 
     Context() {
-      context = null;    
+      glContext = null;    
     }
     
     Context(GLContext context) {
-      this.context = context;
+      glContext = context;
     }
 
     boolean current() {
       return equal(context);
     }    
     
     boolean equal(GLContext context) {
-      if (this.context == null || context == null) {
+      if (glContext == null || context == null) {
         // A null context means a still non-created resource,
         // so it is considered equal to the argument.
         return true; 
       } else {        
-        return this.context.hashCode() == context.hashCode();
+        return glContext.hashCode() == context.hashCode();
       }
     }
     
     int code() {
-      if (context == null) {
+      if (glContext == null) {
         return -1;
       } else {
-        return context.hashCode();
+        return glContext.hashCode();
       }
     }
   }
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
@@ -1429,8 +1429,8 @@ public void beginDraw() {
       } else {
         setFramebuffer(offscreenFramebuffer);
       }
-      pgl.glDrawBuffer(PGL.GL_COLOR_ATTACHMENT0);
       pgl.updateOffscreen(pg.pgl);
+      pgl.glDrawBuffer(PGL.GL_COLOR_ATTACHMENT0);      
     }
 
     // We are ready to go!
@@ -3159,14 +3159,12 @@ public void rotate(float angle, float v0, float v1, float v2) {
       flush();
     }
 
-    modelview.rotate(angle, v0, v1, v2);
-    invRotate(modelviewInv, angle, v0, v1, v2);
-    calcProjmodelview(); // Possibly cheaper than doing projmodelview.rotate()
-  }
-
-
-  static private void invRotate(PMatrix3D matrix, float angle, float v0, float v1, float v2) {
     float norm2 = v0 * v0 + v1 * v1 + v2 * v2;
+    if (norm2 < EPSILON) {
+      // The vector is zero, cannot apply rotation.
+      return;
+    }    
+    
     if (Math.abs(norm2 - 1) > EPSILON) {
       // The rotation vector is not normalized.
       float norm = PApplet.sqrt(norm2);
@@ -3175,6 +3173,13 @@ static private void invRotate(PMatrix3D matrix, float angle, float v0, float v1,
       v2 /= norm;
     }    
     
+    modelview.rotate(angle, v0, v1, v2);
+    invRotate(modelviewInv, angle, v0, v1, v2);
+    calcProjmodelview(); // Possibly cheaper than doing projmodelview.rotate()
+  }
+
+
+  static private void invRotate(PMatrix3D matrix, float angle, float v0, float v1, float v2) {
     float c = PApplet.cos(-angle);
     float s = PApplet.sin(-angle);
     float t = 1.0f - c;
@@ -5010,10 +5015,10 @@ protected void initOffscreen() {
     // Getting the context and capabilities from the main renderer.
     pg = (PGraphicsOpenGL)parent.g;
     pgl.initOffscreenSurface(pg.pgl);
-
     pgl.updateOffscreen(pg.pgl);
+    
     loadTextureImpl(BILINEAR);
-
+    
     // In case of reinitialization (for example, when the smooth level
     // is changed), we make sure that all the OpenGL resources associated
     // to the surface are released by calling delete().

Original file line number	Diff line number	Diff line change
`@@ -1135,35 +1135,35 @@ public Context getCurrentContext() {`
`1135`	`1135`
`1136`	`1136`
`1137`	`1137`	`public class Context {`
`1138`		`- protected GLContext context;`
	`1138`	`+ protected GLContext glContext;`
`1139`	`1139`
`1140`	`1140`	`Context() {`
`1141`		`- context = null;`
	`1141`	`+ glContext = null;`
`1142`	`1142`	`}`
`1143`	`1143`
`1144`	`1144`	`Context(GLContext context) {`
`1145`		`- this.context = context;`
	`1145`	`+ glContext = context;`
`1146`	`1146`	`}`
`1147`	`1147`
`1148`	`1148`	`boolean current() {`
`1149`	`1149`	`return equal(context);`
`1150`	`1150`	`}`
`1151`	`1151`
`1152`	`1152`	`boolean equal(GLContext context) {`
`1153`		`- if (this.context == null \|\| context == null) {`
	`1153`	`+ if (glContext == null \|\| context == null) {`
`1154`	`1154`	`// A null context means a still non-created resource,`
`1155`	`1155`	`// so it is considered equal to the argument.`
`1156`	`1156`	`return true;`
`1157`	`1157`	`} else {`
`1158`		`- return this.context.hashCode() == context.hashCode();`
	`1158`	`+ return glContext.hashCode() == context.hashCode();`
`1159`	`1159`	`}`
`1160`	`1160`	`}`
`1161`	`1161`
`1162`	`1162`	`int code() {`
`1163`		`- if (context == null) {`
	`1163`	`+ if (glContext == null) {`
`1164`	`1164`	`return -1;`
`1165`	`1165`	`} else {`
`1166`		`- return context.hashCode();`
	`1166`	`+ return glContext.hashCode();`
`1167`	`1167`	`}`
`1168`	`1168`	`}`
`1169`	`1169`	`}`