From 36bf34e62fbaa7591ed32902cc9e3c08a4f7edc0 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 14 Sep 2019 16:40:53 +0200
Subject: Fix rotation

---
 ldc_3d_gl_interop.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'ldc_3d_gl_interop.py')

diff --git a/ldc_3d_gl_interop.py b/ldc_3d_gl_interop.py
index cccc610..22bcd71 100644
--- a/ldc_3d_gl_interop.py
+++ b/ldc_3d_gl_interop.py
@@ -66,7 +66,7 @@ def get_projection(width, height):
     return numpy.matmul(look, projection), point_size
 
 class Rotation:
-    def __init__(self, shift, x = 0.0, z = 0.0):
+    def __init__(self, shift, x = numpy.pi, z = numpy.pi):
         self.shift = shift
         self.rotation_x = x
         self.rotation_z = z
@@ -76,8 +76,8 @@ class Rotation:
         self.rotation_z += z
 
     def get(self):
-        qx = quaternion.Quaternion(quaternion.create(1,0,0,self.rotation_x))
-        qz = quaternion.Quaternion(quaternion.create(0,0,1,self.rotation_z))
+        qx = quaternion.Quaternion(quaternion.create_from_eulers([self.rotation_x,0,0]))
+        qz = quaternion.Quaternion(quaternion.create_from_eulers([0,0,self.rotation_z]))
         rotation = qz.cross(qx)
         return numpy.matmul(
             matrix44.create_from_translation(self.shift),
@@ -244,12 +244,12 @@ def on_keyboard(key, x, y):
     global rotation
 
     x = {
-        b'w': -numpy.pi/100,
-        b's':  numpy.pi/100
+        b'w':  numpy.pi/10,
+        b's': -numpy.pi/10
     }.get(key, 0.0)
     z = {
-        b'a': -numpy.pi/100,
-        b'd':  numpy.pi/100
+        b'a':  numpy.pi/10,
+        b'd': -numpy.pi/10
     }.get(key, 0.0)
 
     rotation.update(x,z)
-- 
cgit v1.2.3