From 084fa5ea5e632f5bf47ef4c0b5cec7ee2f862f3c Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 31 Mar 2021 12:36:43 +0200
Subject: [PATCH] rogueviz::hypcity:: spherical and Solv geometry

---
 rogueviz/hypcity.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/rogueviz/hypcity.cpp b/rogueviz/hypcity.cpp
index f119a996..8658d12b 100644
--- a/rogueviz/hypcity.cpp
+++ b/rogueviz/hypcity.cpp
@@ -50,23 +50,25 @@ void prepare_tf() {
       low[i] = min(low[i], h[i]),
       high[i] = max(high[i], h[i]);
       
-    if(hyperbolic) {
+    if(hyperbolic || sphere) {
     
       hyperpoint hx;
       hx[0] = h[0] * t * 2;
       hx[1] = h[1] * t * 2;
       hx[2] = 0;
       hx[3] = 1;
-      hx = spin(45 * degree) * hx;
+      if(hyperbolic) hx = spin(45 * degree) * hx;
       normalize(hx);
-      hx = zshift(hx, h[2]*(t*7));
+      hx = zshift(hx, h[2]*(t*(sphere ? 3 : 7)));
 
       return {0, hx}; 
       }
     
-    if(nil) {
-      swap(h[1], h[2]);
+    if(nil || sol) {
+      if(nil) swap(h[1], h[2]);
       h *= 0.5 / 0.378;
+      if(sol) h *= vid.binary_width;
+      if(nil) h *= nilv::nilwidth;
       h[3] = 1;
       return {0, h};
       }
@@ -82,6 +84,11 @@ bool draw_city_at(cell *c, const shiftmatrix& V) {
     auto co = nilv::get_coord(c->master);
     if(co[1]) return false;
     }
+
+  if(sol) {
+    auto co = c->master->distance;
+    if(co) return false;
+    }
   
   if(c == cwt.at || true) 
     city.render(V);