From 660f912e803e3decddd37abbd49253ed6525cde3 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Sat, 14 Nov 2020 11:03:04 +0000
Subject: [PATCH] Added site icons to main map

---
 assets/voxygen/shaders/lod-terrain-frag.glsl |  4 +-
 voxygen/src/hud/map.rs                       | 46 +++++++++++++++++++-
 voxygen/src/hud/minimap.rs                   |  1 +
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/assets/voxygen/shaders/lod-terrain-frag.glsl b/assets/voxygen/shaders/lod-terrain-frag.glsl
index 4e65cdbf0d..192840146c 100644
--- a/assets/voxygen/shaders/lod-terrain-frag.glsl
+++ b/assets/voxygen/shaders/lod-terrain-frag.glsl
@@ -340,9 +340,9 @@ void main() {
         f_ao *= mix(1.0, clamp(fract(my_alt) / length(my_norm.xy) + clamp(dot(side_norm, -cam_dir), 0, 1), 0, 1), voxelize_factor);
         voxel_norm = top_norm;
     } else {
-        f_ao *= mix(1.0, clamp(fract(my_alt), 0, 1), voxelize_factor);
+        f_ao *= mix(1.0, clamp(pow(fract(my_alt), 0.5), 0, 1), voxelize_factor);
 
-        if (fract(f_pos.x) < cam_dir.x / my_norm.x + clamp(dot(vec3(1, 0, 0), -cam_dir), 0, 1)) {
+        if (fract(f_pos.x) * abs(my_norm.x / cam_dir.x) < fract(f_pos.y) * abs(my_norm.y / cam_dir.y)) {//cam_dir.x / my_norm.x + clamp(dot(vec3(1, 0, 0), -cam_dir), 0, 1)) {
             voxel_norm = vec3(sign(cam_dir.x), 0, 0);
         } else {
             voxel_norm = vec3(0, sign(cam_dir.y), 0);
diff --git a/voxygen/src/hud/map.rs b/voxygen/src/hud/map.rs
index 046ca31e29..d5700297a4 100644
--- a/voxygen/src/hud/map.rs
+++ b/voxygen/src/hud/map.rs
@@ -8,7 +8,7 @@ use crate::{
     GlobalState,
 };
 use client::{self, Client};
-use common::{comp, terrain::TerrainChunkSize, vol::RectVolSize};
+use common::{comp, terrain::TerrainChunkSize, vol::RectVolSize, msg::world_msg::SiteKind};
 use conrod_core::{
     color, position,
     widget::{self, Button, Image, Rectangle, Text},
@@ -31,6 +31,7 @@ widget_ids! {
         map_title,
         qlog_title,
         zoom_slider,
+        mmap_site_icons[],
     }
 }
 
@@ -194,8 +195,12 @@ impl<'a> Widget for Map<'a> {
             .read_storage::<comp::Pos>()
             .get(self.client.entity())
             .map_or(Vec3::zero(), |pos| pos.0);
+
         let max_zoom = (worldsize / TerrainChunkSize::RECT_SIZE.map(|e| e as f64))
             .reduce_partial_max()/*.min(f64::MAX)*/;
+
+        let map_size = Vec2::new(760.0, 760.0);
+
         let w_src = max_zoom / zoom;
         let h_src = max_zoom / zoom;
         let rect_src = position::Rect::from_xy_dim(
@@ -207,7 +212,7 @@ impl<'a> Widget for Map<'a> {
         );
         Image::new(world_map.none)
             .mid_top_with_margin_on(state.ids.map_align, 10.0)
-            .w_h(760.0, 760.0)
+            .w_h(map_size.x, map_size.y)
             .parent(state.ids.bg)
             .source_rectangle(rect_src)
             .set(state.ids.grid, ui);
@@ -228,6 +233,43 @@ impl<'a> Widget for Map<'a> {
         {
             events.push(Event::MapZoom(new_val as f64));
         }
+
+        // Map icons
+        if state.ids.mmap_site_icons.len() < self.client.sites().len() {
+            state.update(|state| {
+                state.ids.mmap_site_icons.resize(
+                    self.client.sites().len(),
+                    &mut ui.widget_id_generator(),
+                )
+            });
+        }
+        for (i, site) in self.client.sites().iter().enumerate() {
+            let rwpos = site.wpos.map(|e| e as f32) - player_pos;
+            let rcpos = rwpos.map2(TerrainChunkSize::RECT_SIZE, |e, sz| e / sz as f32) * zoom as f32 * 3.0 / 4.0;
+            let rpos = Vec2::unit_x().rotated_z(0.0) * rcpos.x
+                + Vec2::unit_y().rotated_z(0.0) * rcpos.y;
+
+            // TODO: Why does this require the magic constant 0.73? This this related to scaling issues?
+            if rpos.map2(map_size, |e, sz| e.abs() > sz as f32 / 2.0).reduce_or() {
+                continue;
+            }
+
+            Image::new(match &site.kind {
+                SiteKind::Town => self.imgs.mmap_site_town,
+                SiteKind::Dungeon => self.imgs.mmap_site_dungeon,
+                SiteKind::Castle => continue,
+            })
+                .x_y_position_relative_to(
+                    state.ids.grid,
+                    position::Relative::Scalar(rpos.x as f64),
+                    position::Relative::Scalar(rpos.y as f64),
+                )
+                .w_h(16.0 / 0.73, 16.0 / 0.73)
+                .floating(true)
+                .parent(ui.window)
+                .set(state.ids.mmap_site_icons[i], ui);
+        }
+
         // Cursor pos relative to playerpos and widget size
         // Cursor stops moving on an axis as soon as it's position exceeds the maximum
         // // size of the widget
diff --git a/voxygen/src/hud/minimap.rs b/voxygen/src/hud/minimap.rs
index 18ebb4213c..84259e2168 100644
--- a/voxygen/src/hud/minimap.rs
+++ b/voxygen/src/hud/minimap.rs
@@ -253,6 +253,7 @@ impl<'a> Widget for MiniMap<'a> {
                         position::Relative::Scalar(rpos.x as f64),
                         position::Relative::Scalar(rpos.y as f64),
                     )
+                    .w_h(16.0 / 0.73, 16.0 / 0.73)
                     .floating(true)
                     .parent(ui.window)
                     .set(state.ids.mmap_site_icons[i], ui);