From e1301e10bdd917823fd36b553b7df257d368bd3e Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 17 Dec 2022 11:16:47 +0100
Subject: [PATCH] fixup to shift: moved the shift methods to hyperpoint, also
 removed _auto

---
 hyperpoint.cpp | 20 ++++++++++++++++++++
 hypgraph.cpp   | 28 ----------------------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/hyperpoint.cpp b/hyperpoint.cpp
index 8c54cd54..88efd92d 100644
--- a/hyperpoint.cpp
+++ b/hyperpoint.cpp
@@ -1626,6 +1626,26 @@ EX bool asign(ld y1, ld y2) { return signum(y1) != signum(y2); }
 
 EX ld xcross(ld x1, ld y1, ld x2, ld y2) { return x1 + (x2 - x1) * y1 / (y1 - y2); }
 
+#if HDR
+enum eShiftMethod { smProduct, smIsometric, smEmbedded, smLie, smGeodesic };
+enum eEmbeddedShiftMethodChoice { smcNone, smcBoth, smcAuto };
+#endif
+
+EX eEmbeddedShiftMethodChoice embedded_shift_method_choice = smcBoth;
+
+EX bool use_embedded_shift(bool automatic) {
+  if(automatic) return embedded_shift_method_choice;
+  return embedded_shift_method_choice == smcBoth;
+  }
+
+EX eShiftMethod shift_method(bool automatic IS(false)) {
+  if(gproduct) return smProduct;
+  if(embedded_plane && use_embedded_shift(automatic)) return nonisotropic ? smLie : smEmbedded;
+  if(!nonisotropic && !stretch::in()) return smIsometric;
+  if(!nisot::geodesic_movement && !embedded_plane) return smLie;
+  return smGeodesic;
+  }
+
 EX transmatrix parallel_transport(const transmatrix Position, const transmatrix& ori, const hyperpoint direction) {
   if(nonisotropic) return nisot::parallel_transport(Position, direction);
   else if(gproduct) {
diff --git a/hypgraph.cpp b/hypgraph.cpp
index 0fd2bfbb..73b9ed90 100644
--- a/hypgraph.cpp
+++ b/hypgraph.cpp
@@ -3206,34 +3206,6 @@ EX hyperpoint lie_log(hyperpoint h) {
   return h;
   }
 
-#if HDR
-enum eShiftMethod { smProduct, smIsometric, smEmbedded, smLie, smGeodesic };
-enum eEmbeddedShiftMethodChoice { smcNone, smcBoth, smcAuto };
-#endif
-
-EX eEmbeddedShiftMethodChoice embedded_shift_method_choice = smcBoth;
-
-EX bool use_embedded_shift(bool automatic) {
-  if(automatic) return embedded_shift_method_choice;
-  return embedded_shift_method_choice == smcBoth;
-  }
-
-EX eShiftMethod shift_method(bool automatic IS(false)) {
-  if(gproduct) return smProduct;
-  if(embedded_plane && use_embedded_shift(automatic)) return nonisotropic ? smLie : smEmbedded;
-  if(!nonisotropic && !stretch::in()) return smIsometric;
-  if(!nisot::geodesic_movement && !embedded_plane) return smLie;
-  return smGeodesic;
-  }
-
-EX eShiftMethod shift_method_auto() {
-  if(gproduct) return smProduct;
-  if(embedded_plane) return nonisotropic ? smLie : smEmbedded;
-  if(!nonisotropic && !stretch::in()) return smIsometric;
-  if(!nisot::geodesic_movement) return smLie;
-  return smGeodesic;
-  }
-
 /** shift the view according to the given tangent vector */
 EX transmatrix get_shift_view_of(const hyperpoint H, const transmatrix V, eShiftMethod sm IS(shift_method())) {
   switch(sm) {