Merge pull request #53 from HaZuki/FixQuaternionSpike

Fix Bug : Quaternion multiplication unexpected behavior

Matches description in Bug 631
https://jogamp.org/bugzilla/show_bug.cgi?id=636

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;