From c3f58fd208ae48c70be404ba694743abcae56a27 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 24 Nov 2016 09:37:57 -0500 Subject: [PATCH] unified processing order of quaternion properties to w,x,y,z --- lib/damask/orientation.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/damask/orientation.py b/lib/damask/orientation.py index 0ef6725cf..7d97d2c81 100644 --- a/lib/damask/orientation.py +++ b/lib/damask/orientation.py @@ -137,18 +137,18 @@ class Quaternion: def __imul__(self, other): """In-place multiplication""" try: # Quaternion + Aw = self.w Ax = self.x Ay = self.y Az = self.z - Aw = self.w + Bw = other.w Bx = other.x By = other.y Bz = other.z - Bw = other.w - self.x = Ax * Bw + Ay * Bz - Az * By + Aw * Bx - self.y = -Ax * Bz + Ay * Bw + Az * Bx + Aw * By - self.z = Ax * By - Ay * Bx + Az * Bw + Aw * Bz - self.w = -Ax * Bx - Ay * By - Az * Bz + Aw * Bw + self.w = - Ax * Bx - Ay * By - Az * Bz + Aw * Bw + self.x = + Ax * Bw + Ay * Bz - Az * By + Aw * Bx + self.y = - Ax * Bz + Ay * Bw + Az * Bx + Aw * By + self.z = + Ax * By - Ay * Bx + Az * Bw + Aw * Bz except: pass return self