aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes
diff options
context:
space:
mode:
authorHaZuki <[email protected]>2012-11-16 17:35:07 +0900
committerHaZuki <[email protected]>2012-11-16 17:35:07 +0900
commitdbe36a8ff7d3f0ebe75d2f02e93e0ece1000ee15 (patch)
treee76825feaabca49d1b7f0e594cde83da5e785d18 /src/jogl/classes
parent1f33b196d339006d132fc6adafa345913bc08f53 (diff)
Fix Bug : Quaternion multiplication unexpected behavior
Diffstat (limited to 'src/jogl/classes')
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/math/Quaternion.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
index 7a753d18d..e9e29fe2f 100755
--- a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
+++ b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
@@ -179,8 +179,8 @@ public class Quaternion {
float w1 = w*q.w - x*q.x - y*q.y - z*q.z;
float x1 = w*q.x + x*q.w + y*q.z - z*q.y;
- float y1 = w*q.y - x*q.z + y*q.w + x*q.x;
- float z1 = w*q.z + x*q.y - y*q.x + y*q.w;
+ float y1 = w*q.y - x*q.z + y*q.w + z*q.x;
+ float z1 = w*q.z + x*q.y - y*q.x + z*q.w;
w = w1;
x = x1;