Change turntable to have Y pointing up.

WickedSmoke · WickedSmoke · commit b5e71a8814e2 · 2024-12-11T16:30:26.000-05:00
Turntable was added in commit e67f967.
diff --git a/src/confscreen.cpp b/src/confscreen.cpp
@@ -95,8 +95,8 @@ void TextWindow::ScreenChangeBackFaces(int link, uint32_t v) {
 void TextWindow::ScreenChangeTurntableNav(int link, uint32_t v) {
     SS.turntableNav = !SS.turntableNav;
     if(SS.turntableNav) {
-        // If turntable nav is being turned on, align view so Z is vertical
-        SS.GW.AnimateOnto(Quaternion::From(Vector::From(-1, 0, 0), Vector::From(0, 0, 1)),
+        // If turntable nav is being turned on, align view so Y is vertical
+        SS.GW.AnimateOnto(Quaternion::From(Vector::From(-1, 0, 0), Vector::From(0, 1, 0)),
                           SS.GW.offset);
     }
 }
diff --git a/src/graphicswin.cpp b/src/graphicswin.cpp
@@ -465,13 +465,13 @@ void GraphicsWindow::AnimateOntoWorkplane() {
     Entity *w = SK.GetEntity(ActiveWorkplane());
     Quaternion quatf = w->Normal()->NormalGetNum();
 
-    // Get Z pointing vertical, if we're on turntable nav mode:
+    // Get Y pointing vertical, if we're on turntable nav mode:
     if(SS.turntableNav) {
         Vector normalRight = quatf.RotationU();
-        Vector normalUp    = quatf.RotationV();
+        Vector normalUp    = quatf.RotationN();
         Vector normal      = normalRight.Cross(normalUp);
-        if(normalRight.z != 0) {
-            double theta = atan2(normalUp.z, normalRight.z);
+        if(normalRight.y != 0) {
+            double theta = atan2(normalUp.y, normalRight.y);
             theta -= atan2(1, 0);
             normalRight = normalRight.RotatedAbout(normal, theta);
             normalUp    = normalUp.RotatedAbout(normal, theta);
diff --git a/src/mouse.cpp b/src/mouse.cpp
@@ -141,10 +141,10 @@ void GraphicsWindow::MouseMoved(double x, double y, bool leftDown,
         if(!(shiftDown || ctrlDown)) {
             double sign = SS.cameraNav ? -1.0 : 1.0;
             double s = 0.3*(PI/180)*scale*sign; // degrees per pixel
-            if(SS.turntableNav) {               // lock the Z to vertical
-                projRight = orig.projRight.RotatedAbout(Vector::From(0, 0, 1), -s * dx);
+            if(SS.turntableNav) {               // lock the Y to vertical
+                projRight = orig.projRight.RotatedAbout(Vector::From(0, 1, 0), -s * dx);
                 projUp    = orig.projUp.RotatedAbout(
-                    Vector::From(orig.projRight.x, orig.projRight.y, orig.projRight.y), s * dy);
+                    Vector::From(orig.projRight.x, orig.projRight.z, orig.projRight.z), s * dy);
             } else {
                 projRight = orig.projRight.RotatedAbout(orig.projUp, -s * dx);
                 projUp    = orig.projUp.RotatedAbout(orig.projRight, s * dy);

Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,8 @@ void TextWindow::ScreenChangeBackFaces(int link, uint32_t v) {`
`95`	`95`	`void TextWindow::ScreenChangeTurntableNav(int link, uint32_t v) {`
`96`	`96`	`SS.turntableNav = !SS.turntableNav;`
`97`	`97`	`if(SS.turntableNav) {`
`98`		`- // If turntable nav is being turned on, align view so Z is vertical`
`99`		`- SS.GW.AnimateOnto(Quaternion::From(Vector::From(-1, 0, 0), Vector::From(0, 0, 1)),`
	`98`	`+ // If turntable nav is being turned on, align view so Y is vertical`
	`99`	`+ SS.GW.AnimateOnto(Quaternion::From(Vector::From(-1, 0, 0), Vector::From(0, 1, 0)),`
`100`	`100`	`SS.GW.offset);`
`101`	`101`	`}`
`102`	`102`	`}`