cleanup of conformal/history menu

basegraph.cpp

@@ -199,7 +199,7 @@ void stereo::set_projection(int ed) {
   
   if(pmodel && !stereo::active()) {
 
-    glhr::projection_multiply(glhr::ortho(vid.xres/2, -vid.yres/2, stereo::scrdist/.4));
+    glhr::projection_multiply(glhr::ortho(vid.xres/2, -vid.yres/2, abs(stereo::scrdist) + 30000));
     }
   else if(pmodel) {
 

config.cpp

@@ -1192,10 +1192,7 @@ void show3D() {
   dialog::addSelItem(XLAT("Y shift"), fts3(vid.yshift), 'y');
   dialog::addSelItem(XLAT("camera rotation"), fts3(vid.camera_angle), 's');
   dialog::addBreak(50);
-  dialog::addBoolItem(XLAT("ball model"), pmodel == mdBall, 'B');
+  dialog::addSelItem(XLAT("model used"), conformal::get_model_name(pmodel), 'M');
-  dialog::addBoolItem(XLAT("hyperboloid model"), pmodel == mdHyperboloid, 'M');
-  dialog::addSelItem(XLAT("camera rotation in 3D models"), fts3(vid.ballangle), 'b');
-  dialog::addSelItem(XLAT("projection in ball model"), fts3(vid.ballproj), 'x');
   
   if(sphere)
     dialog::addSelItem(XLAT("brightness behind the sphere"), fts3(backbrightness), 'i');
@@ -1253,18 +1250,13 @@ void show3D() {
         );
     else if(uni == 'b') 
       config_camera_rotation();
-    else if(uni == 'x') 
-      dialog::editNumber(vid.ballproj, 0, 100, .1, 0, XLAT("projection in ball model"), 
-        "This parameter affects the ball model the same way as the projection parameter affects the disk model.");
     else if(uni == 'i') 
       dialog::editNumber(backbrightness, 0, 1, .01, 0.25, XLAT("brightness behind the sphere"), 
         "brightness behind the sphere");
-    else if(uni == 'B') 
-      pmodel = (pmodel == mdBall ? mdDisk : mdBall);
     else if(uni == 'M') 
-      pmodel = (pmodel == mdHyperboloid ? mdDisk : mdHyperboloid);
+      pushScreen(conformal::model_menu);  
-  
+    else if(doexiton(sym, uni)) 
-    else if(doexiton(sym, uni)) popScreen();
+      popScreen();
     };
   }
 

conformal.cpp

@@ -544,38 +544,54 @@ namespace conformal {
   const char *modelnames[MODELCOUNT] = {
     "disk", "half-plane", "band", "polygonal", "polynomial",
     "azimuthal equidistant", "azimuthal equi-area", 
-    "ball model", "hyperboloid", "hemisphere"
+    "ball model", "Minkowski hyperboloid", "hemisphere"
     };
   
-  void show() {
+  string get_model_name(eModel pm) {
-    cmode = sm::SIDE;
+    return XLAT(
+      pm == mdBand && sphere ? "Mercator" : 
+      pm == mdHalfplane && euclid ? "inversion" : 
+      pm == mdHemisphere && !hyperbolic ? "sphere" :
+      pm == mdHyperboloid && euclid ? "plane" :
+      pm == mdHyperboloid && sphere ? "sphere" :
+      modelnames[pm]);
+    }
+  
+  bool model_available(eModel pm) {
+    if(mdEqui() || pm == mdDisk || pm == mdPolynomial || pm == mdHyperboloid || pm == mdHemisphere)
+      return true;
+    if(sphere && pm == mdBand)
+      return true;
+    if(euclid && (pm == mdHalfplane || pm == mdBall))
+      return true;
+    if(hyperbolic)
+      return true;
+    return false;
+    }    
+  
+  void model_menu() {
+    cmode = sm::SIDE | sm::MAYDARK;
     gamescreen(0);
+    dialog::init(XLAT("models of hyperbolic geometry"));
+    for(int i=0; i<mdGUARD; i++) {
+      eModel m = eModel(i);
+      if(model_available(m))
+        dialog::addBoolItem(get_model_name(m), pmodel == m, '0' + i);
+      }
     
-    dialog::init(XLAT("conformal/history mode"));
+    dialog::addBreak(100);
 
-    dialog::addBoolItem(XLAT("include history"), (includeHistory), 'i');
+    // if(pmodel == mdBand && sphere)
-    
-    bool notconformal0 = (pmodel >= 5 && pmodel <= 6) && !euclid;
-    bool notconformal = notconformal0 || abs(vid.alpha-1) > 1e-3;
-
-    dialog::addSelItem(notconformal ? XLAT("model used (not conformal!)") : XLAT("model used"), 
-      XLAT(
-        pmodel == mdBand && sphere ? "Mercator" : 
-        pmodel == mdHalfplane && euclid ? "inversion" : 
-        pmodel == mdHemisphere && !hyperbolic ? "sphere" :
-        pmodel == mdHyperboloid && euclid ? "plane" :
-        pmodel == mdHyperboloid && sphere ? "sphere" :
-        modelnames[pmodel]), 'm');
-    dialog::addSelItem(XLAT("rotation"), directions[pmodel][rotation&3], 'r');
-    
-    if(pmodel == mdBand && sphere)
     dialog::addSelItem(XLAT("scale factor"), fts(vid.scale), 'z');
     
-    if(abs(vid.alpha-1) > 1e-3 && pmodel != mdBall && pmodel != mdHyperboloid && pmodel != mdHemisphere) {
+    if(abs(vid.alpha-1) > 1e-3 && pmodel != mdBall && pmodel != mdHyperboloid && pmodel != mdHemisphere && pmodel != mdDisk) {
       dialog::addBreak(50);
       dialog::addInfo("NOTE: this works 'correctly' only if the Poincaré model/stereographic projection is used.");
       dialog::addBreak(50);
-      dialog::addBoolItem("Switch", false, '6');
+      }
+    
+    if(pmodel == mdDisk || pmodel == mdBall || pmodel == mdHyperboloid) {
+      dialog::addSelItem(XLAT("Projection at the ground level"), fts3(vid.alpha), 'p');
       }
     
     if(pmodel == mdPolynomial) {
@@ -586,6 +602,9 @@ namespace conformal {
       dialog::addSelItem(XLAT("which coefficient"), its(polygonal::coefid), 'n');
       }
 
+    if(pmodel == mdBall)
+      dialog::addSelItem(XLAT("projection in ball model"), fts3(vid.ballproj), 'x');
+
     if(pmodel == mdPolygonal) {
       dialog::addSelItem(XLAT("polygon sides"), its(polygonal::SI), 'x');
       dialog::addSelItem(XLAT("star factor"), fts(polygonal::STAR), 'y');
@@ -597,73 +616,20 @@ namespace conformal {
       }    
     
     if(pmodel == mdHemisphere) {
-      dialog::addSelItem(XLAT("euclid to sphere projection"), fts3(vid.euclid_to_sphere), 'l');
+      dialog::addSelItem(XLAT("parameter"), fts3(vid.euclid_to_sphere), 'l');
       }
       
-    if(!bounded && !euclid) dialog::addBoolItem(XLAT("prepare the line animation"), (on), 'e');
+    dialog::addBreak(100);
-    if(on) dialog::addSelItem(XLAT("animation speed"), fts(lvspeed), 'a');
+    dialog::addItem(XLAT("history mode"), 'a');
-    
+    dialog::addItem(XLAT("hypersian rug mode"), 'u');
-#if CAP_SDL
-    dialog::addBoolItem(XLAT("render bands automatically"), (autoband), 'o');
-    if(autoband)
-      dialog::addBoolItem(XLAT("include history when auto-rendering"), (autobandhistory), 'j');
-    
-    bool renderable = on && pmodel == 2 && !euclid && !sphere;
-    if(renderable || autoband) {
-      dialog::addSelItem(XLAT("band width"), "2*"+its(bandhalf), 'd');
-      dialog::addSelItem(XLAT("length of a segment"), its(bandsegment), 's');
-      dialog::addBoolItem(XLAT("spiral on rendering"), (dospiral), 'g');
-      if(renderable)
-        dialog::addItem(XLAT("render now (length: %1)", its(measureLength())), 'f');
-      }
-#endif
-      
     dialog::addItem(XLAT("exit this menu"), 'q');
     dialog::display();
-    mouseovers = XLAT("see http://www.roguetemple.com/z/hyper/conformal.php");
-    keyhandler = handleKeyC;
-    }
     
-  void handleKeyC(int sym, int uni) {
+    keyhandler = [] (int sym, int uni) {
       dialog::handleNavigation(sym, uni);
       
-    if(uni == '6')
+      if(uni >= '0' && uni <= '9') {
-      vid.alpha = 1, vid.scale = 1;
+        pmodel = eModel(uni - '0');
-    else if(uni == 'z')
-      editScale();
-    else if(uni == 'e') {
-      if(on) clear();
-      else {
-        if(canmove && !cheater) {
-          addMessage("Enable cheat mode or GAME OVER to use this");
-          return;
-          }
-        if(canmove && cheater) cheater++;
-        create();
-        }
-      }
-    else if(uni == 'b') 
-      config_camera_rotation();
-    else if(uni == 'l')  {
-      dialog::editNumber(vid.euclid_to_sphere, 0, 10, .1, 1, XLAT("euclid to sphere projection"), 
-        "Stereographic projection to a sphere. Choose the radius of the sphere."
-        );
-      dialog::scaleLog();
-      }
-    else if(uni == 'o') 
-      autoband = !autoband;
-    else if(uni == 'm' || uni == 'M') {
-
-      switchagain: {
-        pmodel = eModel((pmodel + (shiftmul > 0 ? 1 : -1) + MODELCOUNT) % MODELCOUNT);
-        
-        if(!mdEqui() && pmodel != mdDisk && pmodel != mdPolynomial && pmodel != mdHyperboloid && pmodel != mdHemisphere) {
-          if(sphere && pmodel != mdBand)
-              goto switchagain;
-          if(euclid && pmodel != mdHalfplane && pmodel != mdBall)
-              goto switchagain;
-          }
-        }
         polygonal::solve();
         vid.alpha = 1; vid.scale = 1;
         if(pmodel == mdBand && sphere)
@@ -671,6 +637,27 @@ namespace conformal {
         if(pmodel == mdDisk && sphere)
           vid.scale = .4;
         }
+      else if(uni == '6')
+        vid.alpha = 1, vid.scale = 1;
+      else if(uni == 'z')
+        editScale();
+      else if(uni == 'p')
+        projectionDialog();
+      else if(uni == 'b') 
+        config_camera_rotation();
+      else if(uni == 'u')
+        pushScreen(rug::show);
+      else if(uni == 'a')
+        pushScreen(history_menu);
+      else if(uni == 'l')  {
+        dialog::editNumber(vid.euclid_to_sphere, 0, 10, .1, 1, XLAT("parameter"), 
+          "Stereographic projection to a sphere. Choose the radius of the sphere."
+          );
+        dialog::scaleLog();
+        }
+      else if(uni == 'x' && pmodel == mdBall) 
+        dialog::editNumber(vid.ballproj, 0, 100, .1, 0, XLAT("projection in ball model"), 
+          "This parameter affects the ball model the same way as the projection parameter affects the disk model.");
       else if(sym == 'x' && pmodel == mdPolygonal)
         dialog::editNumber(polygonal::SI, 3, 10, 1, 4, XLAT("polygon sides"), "");
       else if(sym == 'y' && pmodel == mdPolygonal)
@@ -690,6 +677,65 @@ namespace conformal {
       else if(sym == 'n' && pmodel == mdPolynomial)
         dialog::editNumber(polygonal::coefid, 0, polygonal::MSI-1, 1, 0, XLAT("which coefficient"), "");
       else if(sym == 'r') rotation += (shiftmul > 0 ? 1:3);
+      else if(doexiton(sym, uni)) popScreen();
+      };
+    }
+  
+  void history_menu() {
+    cmode = sm::SIDE | sm::MAYDARK;
+    gamescreen(0);
+    
+    dialog::init(XLAT("history mode"));
+
+    dialog::addBoolItem(XLAT("include history"), (includeHistory), 'i');
+    
+    // bool notconformal0 = (pmodel >= 5 && pmodel <= 6) && !euclid;
+    // bool notconformal = notconformal0 || abs(vid.alpha-1) > 1e-3;
+
+    dialog::addSelItem(XLAT("model used"), get_model_name(pmodel), 'm');
+    
+    if(!bounded && !euclid) dialog::addBoolItem(XLAT("prepare the line animation"), (on), 'e');
+    if(on) dialog::addSelItem(XLAT("animation speed"), fts(lvspeed), 'a');
+    
+#if CAP_SDL
+    dialog::addBoolItem(XLAT("render bands automatically"), (autoband), 'o');
+    if(autoband)
+      dialog::addBoolItem(XLAT("include history when auto-rendering"), (autobandhistory), 'j');
+    
+    bool renderable = on && pmodel == mdBand && !euclid && !sphere;
+    if(renderable || autoband) {
+      dialog::addSelItem(XLAT("band width"), "2*"+its(bandhalf), 'd');
+      dialog::addSelItem(XLAT("length of a segment"), its(bandsegment), 's');
+      dialog::addBoolItem(XLAT("spiral on rendering"), (dospiral), 'g');
+      if(renderable)
+        dialog::addItem(XLAT("render now (length: %1)", its(measureLength())), 'f');
+      }
+#endif
+      
+    dialog::addItem(XLAT("exit this menu"), 'q');
+    dialog::display();
+    mouseovers = XLAT("see http://www.roguetemple.com/z/hyper/conformal.php");
+    keyhandler = handleKeyC;
+    }
+
+  void handleKeyC(int sym, int uni) {
+    dialog::handleNavigation(sym, uni);
+  
+    if(uni == 'e') {
+      if(on) clear();
+      else {
+        if(canmove && !cheater) {
+          addMessage("Enable cheat mode or GAME OVER to use this");
+          return;
+          }
+        if(canmove && cheater) cheater++;
+        create();
+        }
+      }
+    else if(uni == 'o') 
+      autoband = !autoband;
+    else if(uni == 'm') 
+      pushScreen(model_menu);
     else if(sym == 'a') 
       dialog::editNumber(lvspeed, -5, 5, .1, 1, XLAT("animation speed"), "");
     else if(sym == 'd') 
@@ -697,9 +743,6 @@ namespace conformal {
     else if(sym == 's') 
       dialog::editNumber(bandsegment, 500, 32000, 500, 16000, XLAT("band segment"), "");
     else if(sym == 'g') { dospiral = !dospiral; }
-#if CAP_SDL
-    else if(uni == 'f' && pmodel == mdBand && on) createImage(dospiral);
-#endif
     else if(sym == 'i') { 
       if(canmove && !cheater) {
         addMessage("Enable cheat mode or GAME OVER to use this");
@@ -708,6 +751,9 @@ namespace conformal {
       if(canmove && cheater) cheater++;
       includeHistory = !includeHistory; 
       }
+#if CAP_SDL
+    else if(uni == 'f' && pmodel == mdBand && on) createImage(dospiral);
+#endif
     else if(sym == 'j') { 
       autobandhistory = !autobandhistory; 
       }

hyper.h

@@ -885,6 +885,12 @@ namespace rug {
 
 #define HASLINEVIEW
 
+enum eModel {
+  mdDisk, mdHalfplane, mdBand, mdPolygonal, mdPolynomial,
+  mdEquidistant, mdEquiarea, mdBall, mdHyperboloid, 
+  mdHemisphere,
+  mdGUARD, mdUnchanged };
+
 namespace conformal {
   extern bool on;
   extern vector<pair<cell*, eMonster> > killhistory;
@@ -901,7 +907,9 @@ namespace conformal {
   
   void create();
   void clear();
-  void show();
+  void model_menu();
+  void history_menu();
+  string get_model_name(eModel);
   void apply();
   void movetophase();
   void renderAutoband();
@@ -1595,12 +1603,6 @@ int angledist(cell *c, int d1, int d2);
 
 void setcameraangle(bool b);
 
-enum eModel {
-  mdDisk, mdHalfplane, mdBand, mdPolygonal, mdPolynomial,
-  mdEquidistant, mdEquiarea, mdBall, mdHyperboloid, 
-  mdHemisphere,
-  mdGUARD, mdUnchanged };
-
 #define MODELCOUNT ((int) mdGUARD)
 
 void drawShape(pair<ld,ld>* coords, int qty, int color);

hypgraph.cpp

@@ -83,7 +83,7 @@ void ballmodel(hyperpoint& ret, double alpha, double d, double zl) {
   
   ret[0] = ax * ca;
   ret[1] = ay * cb + ax * sa * sb;
-  ret[2] = - ax * sa * cb - ay * sb;
+  ret[2] = ax * sa * cb - ay * sb;
   }
 
 void apply_depth(hyperpoint &f, ld z) {
@@ -164,12 +164,12 @@ void applymodel(hyperpoint H, hyperpoint& ret) {
 
   if(pmodel == mdHyperboloid) {
 
-    ld ball = vid.ballangle * M_PI / 180;
+    ld ball = -vid.ballangle * M_PI / 180;
     ld cb = cos(ball), sb = sin(ball);
 
     ret[0] = H[0] / 3;
-    ret[1] = (1 - H[2]) / 3 * cb + H[1] / 3 * sb;
+    ret[1] = (1 - H[2]) / 3 * cb - H[1] / 3 * sb;
-    ret[2] = H[1] / 3 * cb - (1 - H[2]) / 3 * sb;
+    ret[2] = -(-H[1] / 3 * cb - (1 - H[2]) / 3 * sb);
 
     ghcheck(ret,H);
     return;

menus.cpp

@@ -351,7 +351,10 @@ void showDisplayMode() {
 #if CAP_MODEL
   dialog::addBoolItem(XLAT("paper model creator"), (false), 'n');
 #endif
-  dialog::addBoolItem(XLAT("conformal/history mode"), (conformal::on || pmodel || conformal::includeHistory), 'a');
+
+  dialog::addBoolItem(XLAT("models of hyperbolic geometry"), pmodel, 'a');
+
+  dialog::addBoolItem(XLAT("history mode"), (conformal::on || conformal::includeHistory), 'A');
 //  dialog::addBoolItem(XLAT("expansion"), viewdists, 'x');
   
   showAllConfig();
@@ -360,7 +363,7 @@ void showDisplayMode() {
   keyhandler = [] (int sym, int uni) {
     dialog::handleNavigation(sym, uni);
     char xuni = uni;
-    if((xuni >= 'A' && xuni <= 'Z') || (xuni >= 1 && xuni <= 26)) xuni |= 32;
+    // if((xuni >= 'A' && xuni <= 'Z') || (xuni >= 1 && xuni <= 26)) xuni |= 32;
   
     if(xuni == 'p') projectionDialog();
     
@@ -392,7 +395,9 @@ void showDisplayMode() {
       }
   #endif
     else if(uni == 'a')
-      pushScreen(conformal::show);
+      pushScreen(conformal::model_menu);
+    else if(uni == 'A')
+      pushScreen(conformal::history_menu);
   
   #if CAP_MODEL
     else if(xuni == 'n')