From 1820919095b674e59d6c681115bd39f6fd51eed2 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 13 Apr 2019 13:04:17 +0200
Subject: [PATCH] draw editor displays all coordinates in 3D

---
 langen.cpp    |  1 +
 mapeditor.cpp | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/langen.cpp b/langen.cpp
index 3cfbd759..5ef79b2d 100644
--- a/langen.cpp
+++ b/langen.cpp
@@ -294,6 +294,7 @@ int main() {
   allchars.insert("²");
   allchars.insert("π");
   allchars.insert("Θ");
+  allchars.insert("λ");
 
   langPL(); langCZ(); langRU();
   langTR(); langDE(); langPT();
diff --git a/mapeditor.cpp b/mapeditor.cpp
index 4255ca9d..176eb4d1 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -1289,11 +1289,19 @@ namespace mapeditor {
     if(!mouseout()) {
       transmatrix T = inverse(drawtrans * rgpushxto0(ccenter));
       hyperpoint mh = spintox(gpushxto0(ccenter) * coldcenter) * T * mouseh;
-      displayfr(vid.xres-8, vid.yres-8-fs*6, 2, vid.fsize, XLAT("x: %1", fts4(mh[0])), 0xC0C0C0, 16);
-      displayfr(vid.xres-8, vid.yres-8-fs*5, 2, vid.fsize, XLAT("y: %1", fts4(mh[1])), 0xC0C0C0, 16);
-      displayfr(vid.xres-8, vid.yres-8-fs*4, 2, vid.fsize, XLAT("z: %1", fts4(mh[2])), 0xC0C0C0, 16);
-      displayfr(vid.xres-8, vid.yres-8-fs*2, 2, vid.fsize, XLAT("r: %1", fts4(hdist0(mh))), 0xC0C0C0, 16);
-      displayfr(vid.xres-8, vid.yres-8-fs, 2, vid.fsize, XLAT("ϕ: %1°", fts4(-atan2(mh[1], mh[0]) / degree)), 0xC0C0C0, 16);
+      displayfr(vid.xres-8, vid.yres-8-fs*7, 2, vid.fsize, XLAT("x: %1", fts4(mh[0])), 0xC0C0C0, 16);
+      displayfr(vid.xres-8, vid.yres-8-fs*6, 2, vid.fsize, XLAT("y: %1", fts4(mh[1])), 0xC0C0C0, 16);
+      displayfr(vid.xres-8, vid.yres-8-fs*5, 2, vid.fsize, XLAT("z: %1", fts4(mh[2])) + (DIM == 3 ? "/" + fts4(mh[3]) : ""), 0xC0C0C0, 16);
+      if(DIM == 3)
+        displayfr(vid.xres-8, vid.yres-8-fs*4, 2, vid.fsize, XLAT("w: %1", fts4(mh[3])), 0xC0C0C0, 16);
+      displayfr(vid.xres-8, vid.yres-8-fs*3, 2, vid.fsize, XLAT("r: %1", fts4(hdist0(mh))), 0xC0C0C0, 16);
+      if(DIM == 3) {
+        displayfr(vid.xres-8, vid.yres-8-fs, 2, vid.fsize, XLAT("ϕ: %1°", fts4(-atan2(mh[2], hypot_d(2, mh)) / degree)), 0xC0C0C0, 16);
+        displayfr(vid.xres-8, vid.yres-8-fs*2, 2, vid.fsize, XLAT("λ: %1°", fts4(-atan2(mh[1], mh[0]) / degree)), 0xC0C0C0, 16);
+        }
+      else {
+        displayfr(vid.xres-8, vid.yres-8-fs*2, 2, vid.fsize, XLAT("ϕ: %1°", fts4(-atan2(mh[1], mh[0]) / degree)), 0xC0C0C0, 16);
+        }
       }
 
     if(us) {