From 63f50a11360792dc4b5ae66db3fec94e85f35866 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 6 Apr 2018 23:20:04 +0200
Subject: [PATCH] whirl:: fix ggshmup and calc_relative_matrix (also seems to
 fix nonbitrunc in general)

---
 hyper.h      |  1 +
 hypgraph.cpp |  4 ++++
 shmup.cpp    | 10 +++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/hyper.h b/hyper.h
index 7409e128..ba5f9c8d 100644
--- a/hyper.h
+++ b/hyper.h
@@ -2714,6 +2714,7 @@ inline hyperpoint tC0(const transmatrix &T) {
   }
 
 transmatrix actualV(const heptspin& hs, const transmatrix& V);
+transmatrix applyspin(const heptspin& hs, const transmatrix& V);
 transmatrix cview();
 
 extern string bitruncnames[2];
diff --git a/hypgraph.cpp b/hypgraph.cpp
index 2471cd63..8e42f336 100644
--- a/hypgraph.cpp
+++ b/hypgraph.cpp
@@ -456,6 +456,10 @@ transmatrix actualV(const heptspin& hs, const transmatrix& V) {
   return (hs.spin || nonbitrunc) ? V * spin(hs.spin*2*M_PI/S7 + (nonbitrunc ? M_PI:0) + whirl::alpha) : V;
   }
 
+transmatrix applyspin(const heptspin& hs, const transmatrix& V) {
+  return (hs.spin || nonbitrunc) ? V * spin(hs.spin*2*M_PI/S7) : V;
+  }
+
 namespace whirl {
 
 /*
diff --git a/shmup.cpp b/shmup.cpp
index 06c687ba..ca62b810 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -3378,8 +3378,8 @@ transmatrix &ggmatrix(cell *c) {
     else if(euclid) {
       t = gmatrix[centerover.c] * eumove(cell_to_vec(c) - cellwalker_to_vec(centerover));
       }
-    else
-      t = actualV(viewctr, cview()) * calc_relative_matrix(c, viewctr.h);
+    else 
+      t = applyspin(viewctr, cview()) * calc_relative_matrix(c, viewctr.h);
     }
   return t;
   }
@@ -3388,7 +3388,11 @@ transmatrix calc_relative_matrix_help(cell *c, heptagon *h1) {
   transmatrix gm = Id;
   heptagon *h2 = c->master;
   transmatrix where = Id;
-  if(!nonbitrunc) for(int d=0; d<S7; d++) if(h2->c7->mov[d] == c)
+  if(whirl::whirl && c != c->master->c7) {
+    auto li = whirl::get_local_info(c);
+    where = whirl::Tf[li.last_dir][li.relative.first&31][li.relative.second&31][fix6(li.total_dir)];
+    }
+  else if(!nonbitrunc) for(int d=0; d<S7; d++) if(h2->c7->mov[d] == c)
     where = hexmove[d];
   // always add to last!
   while(h1 != h2) {