Merge pull request #85 from OpenVic2Project/minimap

Minimap with functionality

13 files changed, 266 insertions, 39 deletions

diff --git a/game/common/map/terrain/terrain.png b/game/art/terrain/terrain.png
index 6d36dee..6d36dee 100644
--- a/game/common/map/terrain/terrain.png
+++ b/game/art/terrain/terrain.png
diff --git a/game/common/map/terrain/terrain.png.import b/game/art/terrain/terrain.png.import
index 56ba5dc..d7a078f 100644
--- a/game/common/map/terrain/terrain.png.import
+++ b/game/art/terrain/terrain.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cmw0pvjthnn8c"
-path="res://.godot/imported/terrain.png-c443b8a709ca7acc4b3bb3df1d3095a9.ctex"
+path="res://.godot/imported/terrain.png-06c63c2b87b3131a2067f668f87a9d67.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://common/map/terrain/terrain.png"
-dest_files=["res://.godot/imported/terrain.png-c443b8a709ca7acc4b3bb3df1d3095a9.ctex"]
+source_file="res://art/terrain/terrain.png"
+dest_files=["res://.godot/imported/terrain.png-06c63c2b87b3131a2067f668f87a9d67.ctex"]
 
 [params]
 
@@ -25,7 +25,7 @@ mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
-process/fix_alpha_border=true
+process/fix_alpha_border=false
 process/premult_alpha=false
 process/normal_map_invert_y=false
 process/hdr_as_srgb=false
diff --git a/game/art/ui/minimap.png b/game/art/ui/minimap.png
new file mode 100644
index 0000000..9922b28
--- /dev/null
+++ b/game/art/ui/minimap.png
diff --git a/game/art/ui/minimap.png.import b/game/art/ui/minimap.png.import
new file mode 100644
index 0000000..36f22e7
--- /dev/null
+++ b/game/art/ui/minimap.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c0sm1jfu4kyv3"
+path="res://.godot/imported/minimap.png-05ee44469856e77fd05107fe9e259e25.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/ui/minimap.png"
+dest_files=["res://.godot/imported/minimap.png-05ee44469856e77fd05107fe9e259e25.ctex"]
+
+[params]
+
+compress/mode=3
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=false
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0
diff --git a/game/art/ui/minimap_frame.png b/game/art/ui/minimap_frame.png
new file mode 100644
index 0000000..21aa2ce
--- /dev/null
+++ b/game/art/ui/minimap_frame.png
diff --git a/game/art/ui/minimap_frame.png.import b/game/art/ui/minimap_frame.png.import
new file mode 100644
index 0000000..3d2aeee
--- /dev/null
+++ b/game/art/ui/minimap_frame.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://vr1hq2stk8ny"
+path="res://.godot/imported/minimap_frame.png-3668393435d2582fb1dc8a9598573e80.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/ui/minimap_frame.png"
+dest_files=["res://.godot/imported/minimap_frame.png-3668393435d2582fb1dc8a9598573e80.ctex"]
+
+[params]
+
+compress/mode=3
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=false
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0
diff --git a/game/src/GameSession/GameSession.tscn b/game/src/GameSession/GameSession.tscn
index a645528..bba5671 100644
--- a/game/src/GameSession/GameSession.tscn
+++ b/game/src/GameSession/GameSession.tscn
@@ -29,6 +29,8 @@ anchor_left = 1.0
 anchor_top = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
+offset_left = -350.0
+offset_top = -210.0
 grow_horizontal = 0
 grow_vertical = 0
 
@@ -39,7 +41,11 @@ anchor_right = 0.15625
 offset_top = 0.0
 offset_right = 0.0
 
+[connection signal="map_view_camera_changed" from="MapView" to="MapControlPanel" method="_on_map_view_camera_changed"]
 [connection signal="province_selected" from="MapView" to="ProvinceOverviewPanel" method="_on_province_selected"]
 [connection signal="close_button_pressed" from="GameSessionMenu" to="." method="_on_game_session_menu_close_button_pressed"]
 [connection signal="game_session_menu_button_pressed" from="MapControlPanel" to="." method="_on_game_session_menu_button_pressed"]
 [connection signal="mapmode_changed" from="MapControlPanel" to="MapView" method="_update_colour_texture"]
+[connection signal="minimap_clicked" from="MapControlPanel" to="MapView" method="_on_minimap_clicked"]
+[connection signal="mouse_entered" from="MapControlPanel" to="MapView" method="_on_mouse_exited_viewport"]
+[connection signal="mouse_exited" from="MapControlPanel" to="MapView" method="_on_mouse_entered_viewport"]
diff --git a/game/src/GameSession/MapControlPanel.gd b/game/src/GameSession/MapControlPanel.gd
index cfd102c..fb4f161 100644
--- a/game/src/GameSession/MapControlPanel.gd
+++ b/game/src/GameSession/MapControlPanel.gd
@@ -2,8 +2,11 @@ extends PanelContainer
 
 signal game_session_menu_button_pressed
 signal mapmode_changed
+signal map_view_camera_changed(near_left : Vector2, far_left : Vector2, far_right : Vector2, near_right : Vector2)
+signal minimap_clicked(pos_clicked : Vector2)
 
 @export var _mapmodes_grid : GridContainer
+
 var _mapmode_button_group : ButtonGroup
 
 func _add_mapmode_button(identifier : String) -> void:
@@ -30,3 +33,9 @@ func _on_game_session_menu_button_pressed() -> void:
 func _mapmode_pressed(button : BaseButton) -> void:
 	MapSingleton.set_mapmode(button.tooltip_text)
 	mapmode_changed.emit()
+
+func _on_map_view_camera_changed(near_left : Vector2, far_left : Vector2, far_right : Vector2, near_right : Vector2) -> void:
+	map_view_camera_changed.emit(near_left, far_left, far_right, near_right)
+
+func _on_minimap_clicked(pos_clicked : Vector2) -> void:
+	minimap_clicked.emit(pos_clicked)
diff --git a/game/src/GameSession/MapControlPanel.tscn b/game/src/GameSession/MapControlPanel.tscn
index e0ba0b2..b76af10 100644
--- a/game/src/GameSession/MapControlPanel.tscn
+++ b/game/src/GameSession/MapControlPanel.tscn
@@ -1,6 +1,9 @@
-[gd_scene load_steps=4 format=3 uid="uid://g524p8lr574w"]
+[gd_scene load_steps=7 format=3 uid="uid://g524p8lr574w"]
 
 [ext_resource type="Script" path="res://src/GameSession/MapControlPanel.gd" id="1_ign64"]
+[ext_resource type="Texture2D" uid="uid://c0sm1jfu4kyv3" path="res://art/ui/minimap.png" id="2_r613r"]
+[ext_resource type="Script" path="res://src/GameSession/Minimap.gd" id="3_s4dml"]
+[ext_resource type="Texture2D" uid="uid://vr1hq2stk8ny" path="res://art/ui/minimap_frame.png" id="4_f1exl"]
 
 [sub_resource type="InputEventAction" id="InputEventAction_5nck3"]
 action = &"ui_cancel"
@@ -8,13 +11,15 @@ action = &"ui_cancel"
 [sub_resource type="Shortcut" id="Shortcut_fc1tk"]
 events = [SubResource("InputEventAction_5nck3")]
 
-[node name="PanelContainer" type="PanelContainer" node_paths=PackedStringArray("_mapmodes_grid")]
+[node name="MapControlPanel" type="PanelContainer" node_paths=PackedStringArray("_mapmodes_grid")]
 editor_description = "SS-103"
+mouse_filter = 1
 script = ExtResource("1_ign64")
 _mapmodes_grid = NodePath("HBoxContainer/VBoxContainer/MapmodesGrid")
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
 layout_mode = 2
+alignment = 2
 
 [node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"]
 layout_mode = 2
@@ -23,9 +28,22 @@ layout_mode = 2
 layout_mode = 2
 columns = 11
 
-[node name="MinimapPlaceholder" type="Label" parent="HBoxContainer/VBoxContainer"]
+[node name="Minimap" type="PanelContainer" parent="HBoxContainer/VBoxContainer"]
 layout_mode = 2
-text = "MINIMAP"
+mouse_filter = 1
+
+[node name="TextureRect" type="TextureRect" parent="HBoxContainer/VBoxContainer/Minimap"]
+layout_mode = 2
+texture = ExtResource("2_r613r")
+
+[node name="ViewportQuad" type="Control" parent="HBoxContainer/VBoxContainer/Minimap"]
+layout_mode = 2
+mouse_filter = 2
+script = ExtResource("3_s4dml")
+
+[node name="Frame" type="NinePatchRect" parent="HBoxContainer/VBoxContainer/Minimap"]
+layout_mode = 2
+texture = ExtResource("4_f1exl")
 
 [node name="AuxiliaryPanel" type="VBoxContainer" parent="HBoxContainer"]
 editor_description = "UI-761"
@@ -37,4 +55,6 @@ layout_mode = 2
 shortcut = SubResource("Shortcut_fc1tk")
 text = "ESC"
 
+[connection signal="map_view_camera_changed" from="." to="HBoxContainer/VBoxContainer/Minimap/ViewportQuad" method="_on_map_view_camera_changed"]
+[connection signal="minimap_clicked" from="HBoxContainer/VBoxContainer/Minimap/ViewportQuad" to="." method="_on_minimap_clicked"]
 [connection signal="pressed" from="HBoxContainer/AuxiliaryPanel/GameSessionMenuButton" to="." method="_on_game_session_menu_button_pressed"]
diff --git a/game/src/GameSession/MapView.gd b/game/src/GameSession/MapView.gd
index b13f09d..fc13b07 100644
--- a/game/src/GameSession/MapView.gd
+++ b/game/src/GameSession/MapView.gd
@@ -1,6 +1,7 @@
 extends Node3D
 
 signal province_selected(identifier : String)
+signal map_view_camera_changed(near_left : Vector2, far_left : Vector2, far_right : Vector2, near_right : Vector2)
 
 const _action_north : StringName = &"map_north"
 const _action_east : StringName = &"map_east"
@@ -13,8 +14,8 @@ const _action_click : StringName = &"map_click"
 
 const _shader_param_province_index : StringName = &"province_index_tex"
 const _shader_param_province_colour : StringName = &"province_colour_tex"
-const _shader_param_hover_pos : StringName = &"hover_pos"
-const _shader_param_selected_pos : StringName = &"selected_pos"
+const _shader_param_hover_index : StringName = &"hover_index"
+const _shader_param_selected_index : StringName = &"selected_index"
 
 @export var _camera : Camera3D
 
@@ -24,6 +25,8 @@ const _shader_param_selected_pos : StringName = &"selected_pos"
 var _drag_anchor : Vector2
 var _drag_active : bool = false
 
+var _mouse_over_viewport : bool = false
+
 @export var _zoom_target_min : float = 0.2
 @export var _zoom_target_max : float = 5.0
 @export var _zoom_target_step : float = 0.1
@@ -45,6 +48,7 @@ var _map_mesh_dims : Vector2
 
 var _mouse_pos_viewport : Vector2 = Vector2(0.5, 0.5)
 var _mouse_pos_map : Vector2 = Vector2(0.5, 0.5)
+var _viewport_dims : Vector2 = Vector2(1, 1)
 
 # ??? Strange Godot/GDExtension Bug ???
 # Upon first opening a clone of this repo with the Godot Editor,
@@ -57,6 +61,7 @@ func _ready():
 	if _camera == null:
 		push_error("MapView's _camera variable hasn't been set!")
 		return
+	_zoom_target = _camera.position.y
 	if _map_mesh_instance == null:
 		push_error("MapView's _map_mesh variable hasn't been set!")
 		return
@@ -105,18 +110,43 @@ func _ready():
 		map_mesh_aabb.position.z - map_mesh_aabb.end.z
 	))
 
+func _notification(what : int):
+	match what:
+		NOTIFICATION_WM_MOUSE_ENTER: # Mouse inside window
+			_on_mouse_entered_viewport()
+		NOTIFICATION_WM_MOUSE_EXIT: # Mouse out of window
+			_on_mouse_exited_viewport()
+
 func _update_colour_texture() -> void:
 	MapSingleton.update_colour_image()
 	_map_province_colour_texture.update(_map_province_colour_image)
 
+func _world_to_map_coords(pos : Vector3) -> Vector2:
+	return (Vector2(pos.x, pos.z) - _map_mesh_corner) / _map_mesh_dims
+
+func _viewport_to_map_coords(pos_viewport : Vector2) -> Vector2:
+	var ray_origin := _camera.project_ray_origin(pos_viewport)
+	var ray_normal := _camera.project_ray_normal(pos_viewport)
+	# Plane with normal (0,1,0) facing upwards, at a distance 0 from the origin
+	var intersection = Plane(0, 1, 0, 0).intersects_ray(ray_origin, ray_normal)
+	if typeof(intersection) == TYPE_VECTOR3:
+		return _world_to_map_coords(intersection as Vector3)
+	else:
+		# Normals parallel to the xz-plane could cause null intersections,
+		# but the camera's orientation should prevent such normals
+		push_error("Invalid intersection: ", intersection)
+		return Vector2(0.5, 0.5)
+
 func _unhandled_input(event : InputEvent):
 	if event.is_action_pressed(_action_click):
 		# Check if the mouse is outside of bounds
 		if _map_mesh.is_valid_uv_coord(_mouse_pos_map):
-			_map_shader_material.set_shader_parameter(_shader_param_selected_pos, _mouse_pos_map)
-			var mouse_pixel_pos := Vector2i(_mouse_pos_map * _map_image_size)
-			var province_identifier := MapSingleton.get_province_identifier_from_pixel_coords(mouse_pixel_pos)
+			var selected_index := MapSingleton.get_province_index_from_uv_coords(_mouse_pos_map)
+			_map_shader_material.set_shader_parameter(_shader_param_selected_index, selected_index)
+			var province_identifier := MapSingleton.get_province_identifier_from_uv_coords(_mouse_pos_map)
 			province_selected.emit(province_identifier)
+		else:
+			print("Clicked outside the map!")
 	elif event.is_action_pressed(_action_drag):
 		if _drag_active:
 			push_warning("Drag being activated while already active!")
@@ -133,6 +163,7 @@ func _unhandled_input(event : InputEvent):
 
 func _physics_process(delta : float):
 	_mouse_pos_viewport = get_viewport().get_mouse_position()
+	_viewport_dims = Vector2(Resolution.get_current_resolution())
 	# Process movement
 	_movement_process(delta)
 	# Keep within map bounds
@@ -141,6 +172,8 @@ func _physics_process(delta : float):
 	_zoom_process(delta)
 	# Orient based on height
 	_update_orientation()
+	# Update viewport on minimap
+	_update_minimap_viewport()
 	# Calculate where the mouse lies on the map
 	_update_mouse_map_position()
 
@@ -155,8 +188,9 @@ func _movement_process(delta : float) -> void:
 	_camera.position += Vector3(direction.x, 0, direction.y)
 
 func _edge_scrolling_vector() -> Vector2:
-	var viewport_dims := Vector2(Resolution.get_current_resolution())
-	var mouse_vector := _mouse_pos_viewport / viewport_dims - Vector2(0.5, 0.5);
+	if not _mouse_over_viewport:
+		return Vector2()
+	var mouse_vector := _mouse_pos_viewport / _viewport_dims - Vector2(0.5, 0.5)
 	if abs(mouse_vector.x) < 0.5 - _edge_move_threshold and abs(mouse_vector.y) < 0.5 - _edge_move_threshold:
 		mouse_vector *= 0
 	return mouse_vector * _edge_move_speed
@@ -186,17 +220,27 @@ func _update_orientation() -> void:
 	var dir := Vector3(0, -1, -exp(-_camera.position.y * 2.0 + 0.5))
 	_camera.look_at(_camera.position + dir)
 
+func _update_minimap_viewport() -> void:
+	var near_left := _viewport_to_map_coords(Vector2(0, _viewport_dims.y))
+	var far_left := _viewport_to_map_coords(Vector2(0, 0))
+	var far_right := _viewport_to_map_coords(Vector2(_viewport_dims.x, 0))
+	var near_right := _viewport_to_map_coords(_viewport_dims)
+	map_view_camera_changed.emit(near_left, far_left, far_right, near_right)
+
 func _update_mouse_map_position() -> void:
-	var ray_origin := _camera.project_ray_origin(_mouse_pos_viewport)
-	var ray_normal := _camera.project_ray_normal(_mouse_pos_viewport)
-	# Plane with normal (0,1,0) facing upwards, at a distance 0 from the origin
-	var intersection = Plane(0, 1, 0, 0).intersects_ray(ray_origin, ray_normal)
-	if typeof(intersection) == TYPE_VECTOR3:
-		var intersection_vec := intersection as Vector3
-		# This loops both horizontally (good) and vertically (bad)
-		_mouse_pos_map = (Vector2(intersection_vec.x, intersection_vec.z) - _map_mesh_corner) / _map_mesh_dims
-		_map_shader_material.set_shader_parameter(_shader_param_hover_pos, _mouse_pos_map)
-	else:
-		# Normals parallel to the xz-plane could cause null intersections,
-		# but the camera's orientation should prevent such normals
-		push_error("Invalid intersection: ", intersection)
+	_mouse_pos_map = _viewport_to_map_coords(_mouse_pos_viewport)
+	var hover_index := MapSingleton.get_province_index_from_uv_coords(_mouse_pos_map)
+	if not _mouse_over_viewport:
+		_map_shader_material.set_shader_parameter(_shader_param_hover_index, hover_index)
+
+func _on_mouse_entered_viewport():
+	_mouse_over_viewport = true
+
+func _on_mouse_exited_viewport():
+	_mouse_over_viewport = false
+
+func _on_minimap_clicked(pos_clicked : Vector2):
+	pos_clicked *= _map_mesh_dims
+	_camera.position.x = pos_clicked.x
+	_camera.position.z = pos_clicked.y
+	_clamp_over_map()
diff --git a/game/src/GameSession/MapView.tscn b/game/src/GameSession/MapView.tscn
index 4650acb..b48617a 100644
--- a/game/src/GameSession/MapView.tscn
+++ b/game/src/GameSession/MapView.tscn
@@ -2,13 +2,13 @@
 
 [ext_resource type="Script" path="res://src/GameSession/MapView.gd" id="1_exccw"]
 [ext_resource type="Shader" path="res://src/GameSession/TerrainMap.gdshader" id="1_upocn"]
-[ext_resource type="Texture2D" uid="uid://cmw0pvjthnn8c" path="res://common/map/terrain/terrain.png" id="3_l8pnf"]
+[ext_resource type="Texture2D" uid="uid://cmw0pvjthnn8c" path="res://art/terrain/terrain.png" id="3_l8pnf"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_tayeg"]
 render_priority = 0
 shader = ExtResource("1_upocn")
-shader_parameter/hover_pos = Vector2(0.5, 0.5)
-shader_parameter/selected_pos = Vector2(0.5, 0.5)
+shader_parameter/hover_index = null
+shader_parameter/selected_index = null
 shader_parameter/terrain_tex = ExtResource("3_l8pnf")
 
 [sub_resource type="MapMesh" id="MapMesh_3gtsd"]
@@ -19,7 +19,7 @@ _camera = NodePath("MapCamera")
 _map_mesh_instance = NodePath("MapMeshInstance")
 
 [node name="MapCamera" type="Camera3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 1, 1)
+transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0.25, 1.5, -2.75)
 
 [node name="MapMeshInstance" type="MeshInstance3D" parent="."]
 transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0)
diff --git a/game/src/GameSession/Minimap.gd b/game/src/GameSession/Minimap.gd
new file mode 100644
index 0000000..7c02698
--- /dev/null
+++ b/game/src/GameSession/Minimap.gd
@@ -0,0 +1,83 @@
+extends Control
+
+signal minimap_clicked(pos_clicked : Vector2)
+
+const _action_click : StringName = &"map_click"
+
+var _viewport_points : PackedVector2Array
+
+func _draw() -> void:
+	if _viewport_points.size() > 1:
+		draw_multiline(_viewport_points, Color.WHITE, -1)
+
+func _unhandled_input(event : InputEvent):
+	if event is InputEventMouseMotion and Input.is_action_pressed(_action_click):
+		var pos_clicked := get_local_mouse_position() / size - Vector2(0.5, 0.5)
+		if abs(pos_clicked.x) < 0.5 and abs(pos_clicked.y) < 0.5:
+			minimap_clicked.emit(pos_clicked)
+
+# Returns the point on the line going through p and q with the specific x coord
+func _intersect_x(p : Vector2, q : Vector2, x : float) -> Vector2:
+	if p.x == q.x:
+		return Vector2(x, 0.5 * (p.y + q.y))
+	var t := (x - q.x) / (p.x - q.x)
+	return q + t * (p - q)
+
+# Returns the point on the line going through p and q with the specific y coord
+func _intersect_y(p : Vector2, q : Vector2, y : float) -> Vector2:
+	if p.y == q.y:
+		return Vector2(0.5 * (p.x + q.x), y)
+	var t := (y - q.y) / (p.y - q.y)
+	return q + t * (p - q)
+
+const _one_x := Vector2(1, 0)
+
+func _add_line_looped_over_x(left : Vector2, right : Vector2) -> void:
+	if left.x < 0:
+		if right.x < 0:
+			_viewport_points.push_back(left + _one_x)
+			_viewport_points.push_back(right + _one_x)
+		else:
+			var mid_point := _intersect_x(left, right, 0)
+			_viewport_points.push_back(mid_point)
+			_viewport_points.push_back(right)
+			mid_point.x = 1
+			_viewport_points.push_back(left + _one_x)
+			_viewport_points.push_back(mid_point)
+	elif right.x > 1:
+		if left.x > 1:
+			_viewport_points.push_back(left - _one_x)
+			_viewport_points.push_back(right - _one_x)
+		else:
+			var mid_point := _intersect_x(left, right, 1)
+			_viewport_points.push_back(left)
+			_viewport_points.push_back(mid_point)
+			mid_point.x = 0
+			_viewport_points.push_back(mid_point)
+			_viewport_points.push_back(right - _one_x)
+	else:
+		_viewport_points.push_back(left)
+		_viewport_points.push_back(right)
+
+# This can break if the viewport is rotated too far!
+func _on_map_view_camera_changed(near_left : Vector2, far_left : Vector2, far_right : Vector2, near_right : Vector2) -> void:
+	# Bound far y coords
+	if far_left.y < 0:
+		far_left = _intersect_y(near_left, far_left, 0)
+	if far_right.y < 0:
+		far_right = _intersect_y(near_right, far_right, 0)
+	# Bound near y coords
+	if near_left.y > 1:
+		near_left = _intersect_y(near_left, far_left, 1)
+	if near_right.y > 1:
+		near_right = _intersect_y(near_right, far_right, 1)
+
+	_viewport_points.clear()
+	_add_line_looped_over_x(near_left, near_right)
+	_add_line_looped_over_x(far_left, far_right)
+	_add_line_looped_over_x(far_left, near_left)
+	_add_line_looped_over_x(near_right, far_right)
+
+	for i in _viewport_points.size():
+		_viewport_points[i] *= size
+	queue_redraw()
diff --git a/game/src/GameSession/TerrainMap.gdshader b/game/src/GameSession/TerrainMap.gdshader
index f3d0c7d..7aca0f9 100644
--- a/game/src/GameSession/TerrainMap.gdshader
+++ b/game/src/GameSession/TerrainMap.gdshader
@@ -8,10 +8,10 @@ uniform sampler2D terrain_tex: source_color, repeat_enable, filter_linear;
 uniform sampler2D province_index_tex : repeat_enable, filter_nearest;
 // Province colour texture
 uniform sampler2D province_colour_tex: source_color, repeat_enable, filter_nearest;
-// Position of the mouse over the map mesh in UV coords
-uniform vec2 hover_pos;
-// Position in UV coords of a pixel belonging to the currently selected province
-uniform vec2 selected_pos;
+// Index of the mouse over the map mesh
+uniform uint hover_index;
+// Index of the currently selected province
+uniform uint selected_index;
 
 uvec2 vec2_to_uvec2(vec2 v) {
 	return uvec2(v * 255.0);
@@ -31,10 +31,7 @@ uint read_uint16(sampler2D tex, vec2 uv) {
 
 void fragment() {
 	uvec2 prov_idx_split = read_uvec2(province_index_tex, UV);
-
 	uint prov_index = uvec2_to_uint(prov_idx_split);
-	uint hover_index = read_uint16(province_index_tex, hover_pos);
-	uint selected_index = read_uint16(province_index_tex, selected_pos);
 
 	// Boost prov_colour's contribution if it matches hover_colour or selected_colour
 	float mix_val = 0.3 + float(prov_index == hover_index) * 0.3 + float(prov_index == selected_index) * 0.3;