summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHarvey Harrison <[email protected]>2013-10-18 00:26:18 -0700
committerHarvey Harrison <[email protected]>2013-10-18 00:26:18 -0700
commit6aaca0f31eb25938ffab92dd19ffcaacbe5768d9 (patch)
tree771495c9fc60f50a9070d3a94edf83a4b02860c5 /src
parent9b2013182516b77a39123894ad1b71619bd9785b (diff)
jogl: allow short-circuited comparison in comparison
For this case && and & work equivalently, but using && allows the second comparison to be omitted if the first comparison is false. Likely just a typo. Signed-off-by: Harvey Harrison <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/math/Quaternion.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
index 78cbb18cf..52a59c599 100644
--- a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
+++ b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
@@ -361,7 +361,7 @@ public class Quaternion {
y = (m[6] - m[2]) * S;
z = (m[1] - m[3]) * S;
} else {
- if ((m[0] > m[4]) & (m[0] > m[8])) {
+ if ((m[0] > m[4]) && (m[0] > m[8])) {
final float S = FloatUtil.sqrt(1.0f + m[0] - m[4] - m[8]) * 2f; // S=4*qx
w = (m[7] - m[5]) / S;
x = 0.25f * S;