downseek works in Euclidean now

celldrawer.cpp

@@ -1629,32 +1629,68 @@ void celldrawer::draw_features_and_walls_3d() {
     queuepoly(face_the_player(V), cgi.shLoveRing, darkena(0x402030, 0, 0xFF));
   }
 
-void celldrawer::check_rotations() {
+#if HDR
-  if(euclid) return;
+struct downseek_t {
+  cell *best;
+  hyperpoint total;
+  hyperpoint point;
+  ld speed;
+  ld depth;
+  int qty;
+  void reset() {
+    qty = 0;
+    total = Hypc;
+    depth = 0;
+    best = nullptr;
+    }
+  };
+#endif
 
-  bool usethis = false;
+EX downseek_t downseek;
-  double spd = 1;
+
-  int side = 0;
+void celldrawer::check_rotations() {
+  
+  auto& ds = downseek;
+
+  // we generally want function(ds.best) but this would fail if ds.best is not known yet,
+  // so we use function(old) which will return the same value as function(c) if ds.best is not known yet
+  cell *old = ds.best ? ds.best : c;
+
+  auto use_if_less = [this] (int a, int b, ld spd, int side) {
+    if(a > b) return;
+    if(!ds.best || a < b) ds.reset();
+    if(a <= b) {
+      ds.best = c;
+      ds.speed = spd;
+      if(prod) {
+        auto pd = product_decompose(tC0(V));
+        ds.total += pd.second;
+        ds.depth += pd.first;
+        }
+      else
+        ds.total += tC0(V);
+      ds.qty++;
+      ds.point = normalize_flat(ds.total);
+      if(prod) ds.point = zshift(ds.point, ds.depth / ds.qty);
+      if(side == 2) for(int i=0; i<3; i++) ds.point[i] = -ds.point[i];
+      if(side == 1) ds.point = spin(-M_PI/2) * ds.point;
+      }
+    };
   
   if(0);
   
   #if CAP_BT
   else if(bt::in() && models::do_rotate >= 2) {
-    if(!straightDownSeek || c->master->distance < straightDownSeek->master->distance) {
+    use_if_less(c->master->distance, old->master->distance, 1, 0);
-      usethis = true;
-      spd = 1;
-      }
     }
   #endif
   
   else if(isGravityLand(cwt.at->land) && cwt.at->land != laMountain) {
+    int side = 0;
     if(cwt.at->land == laDungeon) side = 2;
     if(cwt.at->land == laWestWall) side = 1;
     if(models::do_rotate >= 1)
-    if(!straightDownSeek || edgeDepth(c) < edgeDepth(straightDownSeek)) {
+      use_if_less(edgeDepth(c), edgeDepth(old), cwt.at->landparam / 10., side);
-      usethis = true;
-      spd = cwt.at->landparam / 10.;
-      }
     }
   
   else if(c->master->alt && cwt.at->master->alt &&
@@ -1665,27 +1701,11 @@ void celldrawer::check_rotations() {
       cwt.at->land == laCamelot || cwt.at->land == laPalace))) 
       ))
     && c->land == cwt.at->land && c->master->alt->alt == cwt.at->master->alt->alt) {
-    if(!straightDownSeek || !straightDownSeek->master->alt || celldistAlt(c) < celldistAlt(straightDownSeek)) {
+      use_if_less(celldistAlt(c), celldistAlt(old), .5, (cwt.at->land == laMountain) ? 2 : 0);
-      usethis = true;
-      spd = .5;
-      if(cwt.at->land == laMountain) side = 2;
-      }
     }
 
   else if(models::do_rotate >= 2 && cwt.at->land == laOcean && cwt.at->landparam < 25) {
-    if(!straightDownSeek || coastval(c, laOcean) < coastval(straightDownSeek, laOcean)) {
+    use_if_less(coastval(c, laOcean), coastval(old, laOcean), cwt.at->landparam / 10, 0);
-      usethis = true;
-      spd = cwt.at->landparam / 10;
-      }
-      
-    }
-
-  if(usethis) {
-    straightDownSeek = c;
-    straightDownPoint = tC0(V);
-    straightDownSpeed = spd;
-    if(side == 2) for(int i=0; i<3; i++) straightDownPoint[i] = -straightDownPoint[i];
-    if(side == 1) straightDownPoint = spin(-M_PI/2) * straightDownPoint;
     }
   }
 

graph.cpp

@@ -2756,10 +2756,6 @@ EX bool drawMonster(const transmatrix& Vparam, int ct, cell *c, color_t col, col
   return false;
   }
 
-EX cell *straightDownSeek;
-EX hyperpoint straightDownPoint;
-EX ld straightDownSpeed;
-
 #define AURA 180
 
 array<array<int,4>,AURA+1> aurac;
@@ -4441,7 +4437,7 @@ EX void drawthemap() {
     multi::ccdist[i] = 1e20; multi::ccat[i] = NULL;
     }
 
-  straightDownSeek = NULL;
+  downseek.reset();
 
   #if ISMOBILE
   mouseovers = XLAT("No info about this...");

hypgraph.cpp

@@ -1247,6 +1247,7 @@ void hrmap_standard::draw() {
 
 EX void spinEdge(ld aspd) { 
   ld downspin = 0;
+  auto& ds = downseek;
   if(dual::state == 2 && dual::currently_loaded != dual::main_side) {
     transmatrix our   = dual::get_orientation();
     transmatrix their = dual::player_orientation[dual::main_side];
@@ -1273,8 +1274,8 @@ EX void spinEdge(ld aspd) {
     auto& vo = get_view_orientation();
     // does not work well (also need change auto& to auto)
     // if(hybri && !prod) vo = vo * inverse(nisot::translate(tC0(vo)));
-    if(straightDownSeek) {
+    if(ds.qty) {
-      auto sdp = straightDownPoint;
+      auto sdp = ds.point;
       if(prod) sdp = vo * product::inverse_exp(sdp);
       if(sdp[0])
         downspin = models::rotation * degree - atan2(sdp[0], sdp[1]);
@@ -1284,13 +1285,13 @@ EX void spinEdge(ld aspd) {
         downspin = -atan2(vo[0][2], vo[1][2]);
       }
     }
-  else if(straightDownSeek) {
+  else if(ds.qty) {
-    downspin = atan2(straightDownPoint[1], straightDownPoint[0]);
+    downspin = atan2(ds.point[1], ds.point[0]);
     downspin -= M_PI/2;
     downspin += models::rotation * degree;
     while(downspin < -M_PI) downspin += 2*M_PI;
     while(downspin > +M_PI) downspin -= 2*M_PI;
-    downspin = downspin * min(straightDownSpeed, (double)1);
+    downspin = downspin * min(ds.speed, (double)1);
     }
   if(downspin >  aspd) downspin =  aspd;
   if(downspin < -aspd) downspin = -aspd;