From ea193d23b16a2fcbfc3c3ea3a9a3f255db35d007 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Mon, 14 Aug 2023 10:52:17 +0200
Subject: [PATCH] dialog:: made dialog matrix more intuitive for
 anims::movement_angle

---
 dialogs.cpp    |  4 ++--
 screenshot.cpp | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dialogs.cpp b/dialogs.cpp
index 4d5b38b7..dba5ac07 100644
--- a/dialogs.cpp
+++ b/dialogs.cpp
@@ -591,7 +591,7 @@ EX namespace dialog {
     vector<hyperpoint> pts;
     for(int a=0; a<dim; a++) {
       hyperpoint h = C0; h[a] = r;
-      pts.push_back(rot_inverse(T.get()) * h);
+      pts.push_back(T.get() * h);
       }
 
     flat_model_enabler fme;
@@ -612,7 +612,7 @@ EX namespace dialog {
       queuecurve(V, cols[a], 0, PPR::LINE);
       }
     if(dim == 3) for(int a=0; a<dim; a++) {
-      auto pt = pts[a]; ld val = pt[2] * vid.fsize / r / 5;
+      auto pt = pts[a]; ld val = -pt[2] * vid.fsize / r / 5;
       curvepoint(hyperpoint(pt[0], pt[1]+val, 1, 1));
       curvepoint(hyperpoint(pt[0]-val, pt[1]-val*sqrt(3)/2, 1, 1));
       curvepoint(hyperpoint(pt[0]+val, pt[1]-val*sqrt(3)/2, 1, 1));
diff --git a/screenshot.cpp b/screenshot.cpp
index e4e112f0..090994ad 100644
--- a/screenshot.cpp
+++ b/screenshot.cpp
@@ -1299,16 +1299,16 @@ EX void apply() {
 
     case maRotation:
       if(GDIM == 3) shift_view(ztangent(-rotation_distance));
-      rotate_view(movement_angle.get());
-      rotate_view(spin(TAU * t / period));
       rotate_view(rot_inverse(movement_angle.get()));
+      rotate_view(spin(TAU * t / period));
+      rotate_view(movement_angle.get());
       if(GDIM == 3) shift_view(ztangent(rotation_distance));
       moved();
       break;
     
     case maTranslationRotation:
       shift_view(
-        rot_inverse(movement_angle.get()) * xtangent(cycle_length * t / period)
+        movement_angle.get() * xtangent(cycle_length * t / period)
         );
       moved();
       rotate_view(cspin(0, GDIM-1, TAU * t / period));
@@ -1320,19 +1320,21 @@ EX void apply() {
     #if CAP_BT
     case maParabolic:
       reflect_view();
-      View = movement_angle.get() * View;
+      rotate_view(rot_inverse(movement_angle.get()));
       if(GDIM == 2)
         View = bt::parabolic(parabolic_length * t / period) * View;
       else
         View = bt::parabolic3(parabolic_length * t / period, 0) * View;
-      View = rot_inverse(movement_angle.get()) * View;
+      rotate_view(movement_angle.get());
       moved();
       break;
     #endif
     case maCircle: {
+      rotate_view(rot_inverse(movement_angle.get()));
       centerover = rotation_center;
       ld alpha = circle_spins * TAU * ticks / period;
       View = spin(-cos_auto(circle_radius)*alpha) * xpush(circle_radius) * spin(alpha) * rotation_center_View;
+      rotate_view(movement_angle.get());
       moved();
       break;
       }