From dec0d191a8afa58ec5fe9a8d12d6c8849ed0897b Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 15 May 2019 11:13:23 +0200
Subject: [PATCH] 2d3d:: better radar in sphere, also better sin/cos in general

---
 graph.cpp |  6 ++++++
 hud.cpp   | 22 +++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/graph.cpp b/graph.cpp
index 5f087545..efcc921f 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -721,6 +721,12 @@ void addradar(const transmatrix& V, char ch, color_t col, color_t outline) {
     h[0] = h[0] / (1 + h[3]);
     h[2] = 0;
     }
+  else if(sphere) {
+    ld z = h[2] + h[1]/1000000;
+    h[1] = hypot(h[2], h[1]);
+    if(z < 0) h[1] = -h[1];
+    h[2] = h[3];
+    }
   else {
     ld z = h[2] + h[1]/1000000;
     if(d) h = h * (d / sightranges[geometry] / hypot_d(3, h));
diff --git a/hud.cpp b/hud.cpp
index 01eb76fa..219e72ba 100644
--- a/hud.cpp
+++ b/hud.cpp
@@ -355,6 +355,7 @@ void draw_radar(bool cornermode) {
 
   bool d3 = WDIM == 3 || straightDownSeek || !vid.fixed_yz;
   bool hyp = hyperbolic;
+  bool sph = sphere;
 
   dynamicval<eGeometry> g(geometry, gEuclid);
   dynamicval<eModel> pm(pmodel, mdUnchanged);
@@ -369,26 +370,37 @@ void draw_radar(bool cornermode) {
     curvepoint(atscreenpos(cx-cos(i * degree)*rad, cy-sin(i*degree)*rad, 1) * C0);
   queuecurve(0xFFFFFFFF, 0x000000FF, PPR::ZERO);      
 
+  ld alpha = 15 * degree;
+  ld co = cos(alpha);
+  ld si = sin(alpha);
+  
+  if(sph && !d3) {
+    for(int i=0; i<360; i++)
+      curvepoint(atscreenpos(cx-cos(i * degree)*rad, cy-sin(i*degree)*rad*si, 1) * C0);
+    queuecurve(0, 0x200000FF, PPR::ZERO);
+    }
+
   if(d3) {
     for(int i=0; i<360; i++)
-      curvepoint(atscreenpos(cx-cos(i * degree)*rad, cy-sin(i*degree)*rad/3, 1) * C0);
+      curvepoint(atscreenpos(cx-cos(i * degree)*rad, cy-sin(i*degree)*rad*si, 1) * C0);
     queuecurve(0xFF0000FF, 0x200000FF, PPR::ZERO);
   
-    curvepoint(atscreenpos(cx-sin(vid.fov*degree/2)*rad, cy-sin(vid.fov*degree/2)*rad/3, 1) * C0);
+    curvepoint(atscreenpos(cx-sin(vid.fov*degree/2)*rad, cy-sin(vid.fov*degree/2)*rad*si, 1) * C0);
     curvepoint(atscreenpos(cx, cy, 1) * C0);
-    curvepoint(atscreenpos(cx+sin(vid.fov*degree/2)*rad, cy-sin(vid.fov*degree/2)*rad/3, 1) * C0);
+    curvepoint(atscreenpos(cx+sin(vid.fov*degree/2)*rad, cy-sin(vid.fov*degree/2)*rad*si, 1) * C0);
     queuecurve(0xFF8000FF, 0, PPR::ZERO);
     }
   
   if(d3) for(auto& r: radarpoints) {    
-    queueline(atscreenpos(cx+rad * r.h[0], cy - rad * r.h[2]/3 + rad * r.h[1]*2/3, 0)*C0, atscreenpos(cx+rad*r.h[0], cy - rad*r.h[2]/3, 0)*C0, r.line, -1);
+    queueline(atscreenpos(cx+rad * r.h[0], cy - rad * r.h[2] * si + rad * r.h[1] * co, 0)*C0, atscreenpos(cx+rad*r.h[0], cy - rad*r.h[2] * si, 0)*C0, r.line, -1);
     }
 
   quickqueue();
   glflush();
 
   for(auto& r: radarpoints)
-    if(d3) displaychr(int(cx + rad * r.h[0]), int(cy - rad * r.h[2]/3 + rad * r.h[1]*2/3), 0, 8, r.glyph, r.color);
+    if(d3 || sphere) displaychr(int(cx + rad * r.h[0]), int(cy - rad * r.h[2] * si + rad * r.h[1] * co), 0, 8, r.glyph, r.color);
+    else if(sph) displaychr(int(cx + (rad-10) * r.h[0]), int(cy + (rad-10) * r.h[2] * si - (rad-10) * r.h[1] * co), 0, -r.h[1] * si > r.h[2] * co ? 8 : 16, r.glyph, r.color);
     else if(hyp) {
       int siz = 1/(1+r.h[3]) * scalefactor * current_display->radius / (inHighQual ? 10 : 6);
       displaychr(int(cx + rad * r.h[0]), int(cy - rad * r.h[1]), 0, siz, r.glyph, r.color);