From 4617947cc0a1b769beacb750b4ec47667655dc8f Mon Sep 17 00:00:00 2001 From: Gone2Daly <71726742+Gone2Daly@users.noreply.github.com> Date: Fri, 7 Apr 2023 18:10:49 +0200 Subject: minimap-first-try --- extension/src/MapMesh.cpp | 2 +- game/common/map/MapFrame.png | Bin 0 -> 1043 bytes game/common/map/MapFrame.png.import | 34 ++++++++++++++++++++++++++++++ game/common/map/minimap.png | Bin 0 -> 69018 bytes game/common/map/minimap.png.import | 34 ++++++++++++++++++++++++++++++ game/src/GameSession/MapView.tscn | 2 +- game/src/GameSession/Minimap.gd | 15 +++++++++++++ game/src/GameSession/RectangularCamera.gd | 24 +++++++++++++++++++++ 8 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 game/common/map/MapFrame.png create mode 100644 game/common/map/MapFrame.png.import create mode 100644 game/common/map/minimap.png create mode 100644 game/common/map/minimap.png.import create mode 100644 game/src/GameSession/Minimap.gd create mode 100644 game/src/GameSession/RectangularCamera.gd diff --git a/extension/src/MapMesh.cpp b/extension/src/MapMesh.cpp index f0fc819..ff69390 100644 --- a/extension/src/MapMesh.cpp +++ b/extension/src/MapMesh.cpp @@ -8,7 +8,7 @@ using namespace OpenVic2; void MapMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("set_aspect_ratio", "ratio"), &MapMesh::set_aspect_ratio); ClassDB::bind_method(D_METHOD("get_aspect_ratio"), &MapMesh::get_aspect_ratio); - + ClassDB::bind_method(D_METHOD("set_repeat_proportion", "proportion"), &MapMesh::set_repeat_proportion); ClassDB::bind_method(D_METHOD("get_repeat_proportion"), &MapMesh::get_repeat_proportion); diff --git a/game/common/map/MapFrame.png b/game/common/map/MapFrame.png new file mode 100644 index 0000000..21aa2ce Binary files /dev/null and b/game/common/map/MapFrame.png differ diff --git a/game/common/map/MapFrame.png.import b/game/common/map/MapFrame.png.import new file mode 100644 index 0000000..04756cc --- /dev/null +++ b/game/common/map/MapFrame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://vr1hq2stk8ny" +path="res://.godot/imported/MapFrame.png-a4cf5a3479e19f337ce338f6f6ee4eb8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://common/map/MapFrame.png" +dest_files=["res://.godot/imported/MapFrame.png-a4cf5a3479e19f337ce338f6f6ee4eb8.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/game/common/map/minimap.png b/game/common/map/minimap.png new file mode 100644 index 0000000..9e5bdb6 Binary files /dev/null and b/game/common/map/minimap.png differ diff --git a/game/common/map/minimap.png.import b/game/common/map/minimap.png.import new file mode 100644 index 0000000..c69c844 --- /dev/null +++ b/game/common/map/minimap.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0sm1jfu4kyv3" +path="res://.godot/imported/minimap.png-6dff941a6fa3e94c55113971bbb32fcf.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://common/map/minimap.png" +dest_files=["res://.godot/imported/minimap.png-6dff941a6fa3e94c55113971bbb32fcf.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/game/src/GameSession/MapView.tscn b/game/src/GameSession/MapView.tscn index 4650acb..63d16ef 100644 --- a/game/src/GameSession/MapView.tscn +++ b/game/src/GameSession/MapView.tscn @@ -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, 1, 0) [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..4bf028b --- /dev/null +++ b/game/src/GameSession/Minimap.gd @@ -0,0 +1,15 @@ +extends Control + + +var MouseInside: bool = false + +func _process(delta): + if MouseInside: + print(get_local_mouse_position()) + +func _on_mouse_entered(): + MouseInside = true + + +func _on_mouse_exited(): + MouseInside = false diff --git a/game/src/GameSession/RectangularCamera.gd b/game/src/GameSession/RectangularCamera.gd new file mode 100644 index 0000000..55deb1d --- /dev/null +++ b/game/src/GameSession/RectangularCamera.gd @@ -0,0 +1,24 @@ +extends Control + + +@export var pos_x = 100.0 +@export var pos_y = 100.0 +@export var zoom_x = 10 +@export var zoom_y = 10 +@onready var _frame: TextureRect = $"../TextureRect" + +var RectangularCamera = Rect2(pos_x,pos_y,zoom_x,zoom_y) + +func _draw() -> void: + draw_rect(RectangularCamera,Color.BLACK,false,-1) + +func _on_map_view_map_view_camera_change(camera_position): + + zoom_x = camera_position.y*(_frame.size.x/20)*1.77 + zoom_y = camera_position.y*(_frame.size.y/20)*1.77 + + pos_x = camera_position.x*(_frame.size.x/20) + _frame.size.x/2 - zoom_x/2 # + _frame.size.x/2 - zoom_x/2 - Translation from camera_position.x to pos_x (i.e. 0px for center on camera_pos -> 175px for center on rect_camera) + pos_y = camera_position.z*(_frame.size.y/10) + _frame.size.y/2 - zoom_y/2 # + _frame.size.y/2 - zoom_y/2 - Translation from camera_position.y to pos_y (i.e. 0px for center on camera_pos -> 87.5px for center on rect_camera) + + RectangularCamera = Rect2(pos_x,pos_y,zoom_x,zoom_y) + queue_redraw() -- cgit v1.2.3-56-ga3b1 From 3f7193de14d91f25db5cf571fcef05caaba6237f Mon Sep 17 00:00:00 2001 From: Gone2Daly <71726742+Gone2Daly@users.noreply.github.com> Date: Fri, 7 Apr 2023 18:13:25 +0200 Subject: forgot to add emit --- game/src/GameSession/MapView.gd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/game/src/GameSession/MapView.gd b/game/src/GameSession/MapView.gd index faf90e8..8540536 100644 --- a/game/src/GameSession/MapView.gd +++ b/game/src/GameSession/MapView.gd @@ -1,6 +1,8 @@ extends Node3D signal province_selected(identifier : String) +signal map_view_camera_change(camera_position : Vector3) + const _action_north : StringName = &"map_north" const _action_east : StringName = &"map_east" @@ -123,6 +125,7 @@ func _physics_process(delta : float): # Process zooming _zoom_process(delta) # Orient based on height + map_view_camera_change.emit(_camera.position) _update_orientation() # Calculate where the mouse lies on the map _update_mouse_map_position() -- cgit v1.2.3-56-ga3b1 From e97a33883ea80b2c4be02b59db26516833aec1f4 Mon Sep 17 00:00:00 2001 From: Gone2Daly <71726742+Gone2Daly@users.noreply.github.com> Date: Fri, 7 Apr 2023 18:49:09 +0200 Subject: Update GameSession.tscn --- game/src/GameSession/GameSession.tscn | 49 ++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/game/src/GameSession/GameSession.tscn b/game/src/GameSession/GameSession.tscn index 390040e..640e1a6 100644 --- a/game/src/GameSession/GameSession.tscn +++ b/game/src/GameSession/GameSession.tscn @@ -1,10 +1,14 @@ -[gd_scene load_steps=6 format=3 uid="uid://bgnupcshe1m7r"] +[gd_scene load_steps=10 format=3 uid="uid://bgnupcshe1m7r"] [ext_resource type="Script" path="res://src/GameSession/GameSession.gd" id="1_eklvp"] [ext_resource type="PackedScene" uid="uid://g524p8lr574w" path="res://src/GameSession/MapControlPanel.tscn" id="3_afh6d"] [ext_resource type="PackedScene" uid="uid://dvdynl6eir40o" path="res://src/GameSession/GameSessionMenu.tscn" id="3_bvmqh"] [ext_resource type="PackedScene" uid="uid://dkehmdnuxih2r" path="res://src/GameSession/MapView.tscn" id="4_xkg5j"] +[ext_resource type="Texture2D" uid="uid://c0sm1jfu4kyv3" path="res://common/map/minimap.png" id="5_l05wo"] [ext_resource type="PackedScene" uid="uid://byq323jbel48u" path="res://src/GameSession/ProvinceOverviewPanel.tscn" id="5_osjnn"] +[ext_resource type="Script" path="res://src/GameSession/Minimap.gd" id="5_stb8q"] +[ext_resource type="Texture2D" uid="uid://vr1hq2stk8ny" path="res://common/map/MapFrame.png" id="6_ujbv2"] +[ext_resource type="Script" path="res://src/GameSession/RectangularCamera.gd" id="7_go8y3"] [node name="GameSession" type="Node" node_paths=PackedStringArray("_game_session_menu")] editor_description = "SS-102" @@ -24,13 +28,53 @@ grow_horizontal = 2 grow_vertical = 2 [node name="MapControlPanel" parent="." instance=ExtResource("3_afh6d")] +offset_left = 1147.0 +offset_top = 486.0 +offset_right = 1280.0 +offset_bottom = 542.0 +grow_horizontal = 0 +grow_vertical = 0 + +[node name="Minimap" type="Control" parent="."] +layout_mode = 3 anchors_preset = 3 anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 +offset_left = -350.0 +offset_top = -175.0 grow_horizontal = 0 grow_vertical = 0 +script = ExtResource("5_stb8q") + +[node name="TextureRect" type="TextureRect" parent="Minimap"] +layout_mode = 0 +offset_right = 350.0 +offset_bottom = 175.0 +texture = ExtResource("5_l05wo") + +[node name="RectangularCamera" type="Control" parent="Minimap"] +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +mouse_filter = 2 +script = ExtResource("7_go8y3") + +[node name="Frame" type="NinePatchRect" parent="Minimap"] +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -175.0 +offset_top = -87.5 +offset_right = 175.0 +offset_bottom = 87.5 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("6_ujbv2") [node name="ProvinceOverviewPanel" parent="." instance=ExtResource("5_osjnn")] anchors_preset = -1 @@ -39,6 +83,9 @@ anchor_right = 0.15625 offset_top = 0.0 offset_right = 0.0 +[connection signal="map_view_camera_change" from="MapView" to="Minimap/RectangularCamera" method="_on_map_view_map_view_camera_change"] [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="mouse_entered" from="Minimap" to="Minimap" method="_on_mouse_entered"] +[connection signal="mouse_exited" from="Minimap" to="Minimap" method="_on_mouse_exited"] -- cgit v1.2.3-56-ga3b1 From 5e5efa8a3d693f8e39f91f08e24832d08e2695bb Mon Sep 17 00:00:00 2001 From: Hop311 Date: Sat, 8 Apr 2023 22:52:00 +0100 Subject: Accurate minimap viewport shape --- extension/src/MapMesh.cpp | 2 +- game/src/GameSession/GameSession.tscn | 6 ++-- game/src/GameSession/MapView.gd | 50 ++++++++++++++++++++----------- game/src/GameSession/MapView.tscn | 2 +- game/src/GameSession/Minimap.gd | 15 ---------- game/src/GameSession/RectangularCamera.gd | 29 +++++++----------- 6 files changed, 47 insertions(+), 57 deletions(-) delete mode 100644 game/src/GameSession/Minimap.gd diff --git a/extension/src/MapMesh.cpp b/extension/src/MapMesh.cpp index ff69390..f0fc819 100644 --- a/extension/src/MapMesh.cpp +++ b/extension/src/MapMesh.cpp @@ -8,7 +8,7 @@ using namespace OpenVic2; void MapMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("set_aspect_ratio", "ratio"), &MapMesh::set_aspect_ratio); ClassDB::bind_method(D_METHOD("get_aspect_ratio"), &MapMesh::get_aspect_ratio); - + ClassDB::bind_method(D_METHOD("set_repeat_proportion", "proportion"), &MapMesh::set_repeat_proportion); ClassDB::bind_method(D_METHOD("get_repeat_proportion"), &MapMesh::get_repeat_proportion); diff --git a/game/src/GameSession/GameSession.tscn b/game/src/GameSession/GameSession.tscn index 640e1a6..73259b4 100644 --- a/game/src/GameSession/GameSession.tscn +++ b/game/src/GameSession/GameSession.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://bgnupcshe1m7r"] +[gd_scene load_steps=9 format=3 uid="uid://bgnupcshe1m7r"] [ext_resource type="Script" path="res://src/GameSession/GameSession.gd" id="1_eklvp"] [ext_resource type="PackedScene" uid="uid://g524p8lr574w" path="res://src/GameSession/MapControlPanel.tscn" id="3_afh6d"] @@ -6,7 +6,6 @@ [ext_resource type="PackedScene" uid="uid://dkehmdnuxih2r" path="res://src/GameSession/MapView.tscn" id="4_xkg5j"] [ext_resource type="Texture2D" uid="uid://c0sm1jfu4kyv3" path="res://common/map/minimap.png" id="5_l05wo"] [ext_resource type="PackedScene" uid="uid://byq323jbel48u" path="res://src/GameSession/ProvinceOverviewPanel.tscn" id="5_osjnn"] -[ext_resource type="Script" path="res://src/GameSession/Minimap.gd" id="5_stb8q"] [ext_resource type="Texture2D" uid="uid://vr1hq2stk8ny" path="res://common/map/MapFrame.png" id="6_ujbv2"] [ext_resource type="Script" path="res://src/GameSession/RectangularCamera.gd" id="7_go8y3"] @@ -46,7 +45,6 @@ offset_left = -350.0 offset_top = -175.0 grow_horizontal = 0 grow_vertical = 0 -script = ExtResource("5_stb8q") [node name="TextureRect" type="TextureRect" parent="Minimap"] layout_mode = 0 @@ -83,7 +81,7 @@ anchor_right = 0.15625 offset_top = 0.0 offset_right = 0.0 -[connection signal="map_view_camera_change" from="MapView" to="Minimap/RectangularCamera" method="_on_map_view_map_view_camera_change"] +[connection signal="map_view_camera_changed" from="MapView" to="Minimap/RectangularCamera" method="_on_map_view_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"] diff --git a/game/src/GameSession/MapView.gd b/game/src/GameSession/MapView.gd index 8540536..77fea96 100644 --- a/game/src/GameSession/MapView.gd +++ b/game/src/GameSession/MapView.gd @@ -1,8 +1,7 @@ extends Node3D signal province_selected(identifier : String) -signal map_view_camera_change(camera_position : Vector3) - +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" @@ -45,11 +44,13 @@ 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) 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 @@ -94,6 +95,22 @@ func _ready(): var province_colour_texture := ImageTexture.create_from_image(province_colour_image) _map_shader_material.set_shader_parameter(_shader_param_province_colour, province_colour_texture) +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 @@ -118,6 +135,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 @@ -125,8 +143,9 @@ func _physics_process(delta : float): # Process zooming _zoom_process(delta) # Orient based on height - map_view_camera_change.emit(_camera.position) _update_orientation() + # Update viewport on minimap + _update_minimap_viewport() # Calculate where the mouse lies on the map _update_mouse_map_position() @@ -141,8 +160,7 @@ 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); + var mouse_vector := _mouse_pos_viewport / _viewport_dims - Vector2(0.5, 0.5); if pow(mouse_vector.x, 4) + pow(mouse_vector.y, 4) < pow(0.5 - _edge_move_threshold, 4): mouse_vector *= 0 return mouse_vector * _edge_move_speed @@ -172,17 +190,13 @@ 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) + _map_shader_material.set_shader_parameter(_shader_param_hover_pos, _mouse_pos_map) diff --git a/game/src/GameSession/MapView.tscn b/game/src/GameSession/MapView.tscn index 63d16ef..2df06fb 100644 --- a/game/src/GameSession/MapView.tscn +++ b/game/src/GameSession/MapView.tscn @@ -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, 0) +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 deleted file mode 100644 index 4bf028b..0000000 --- a/game/src/GameSession/Minimap.gd +++ /dev/null @@ -1,15 +0,0 @@ -extends Control - - -var MouseInside: bool = false - -func _process(delta): - if MouseInside: - print(get_local_mouse_position()) - -func _on_mouse_entered(): - MouseInside = true - - -func _on_mouse_exited(): - MouseInside = false diff --git a/game/src/GameSession/RectangularCamera.gd b/game/src/GameSession/RectangularCamera.gd index 55deb1d..bc7ca1e 100644 --- a/game/src/GameSession/RectangularCamera.gd +++ b/game/src/GameSession/RectangularCamera.gd @@ -1,24 +1,17 @@ extends Control - -@export var pos_x = 100.0 -@export var pos_y = 100.0 -@export var zoom_x = 10 -@export var zoom_y = 10 -@onready var _frame: TextureRect = $"../TextureRect" - -var RectangularCamera = Rect2(pos_x,pos_y,zoom_x,zoom_y) +@onready var _frame : TextureRect = $"../TextureRect" +var _viewport_points : PackedVector2Array func _draw() -> void: - draw_rect(RectangularCamera,Color.BLACK,false,-1) - -func _on_map_view_map_view_camera_change(camera_position): - - zoom_x = camera_position.y*(_frame.size.x/20)*1.77 - zoom_y = camera_position.y*(_frame.size.y/20)*1.77 - - pos_x = camera_position.x*(_frame.size.x/20) + _frame.size.x/2 - zoom_x/2 # + _frame.size.x/2 - zoom_x/2 - Translation from camera_position.x to pos_x (i.e. 0px for center on camera_pos -> 175px for center on rect_camera) - pos_y = camera_position.z*(_frame.size.y/10) + _frame.size.y/2 - zoom_y/2 # + _frame.size.y/2 - zoom_y/2 - Translation from camera_position.y to pos_y (i.e. 0px for center on camera_pos -> 87.5px for center on rect_camera) + if _viewport_points.size() > 1: + draw_polyline(_viewport_points, Color.WHITE, -1) - RectangularCamera = Rect2(pos_x,pos_y,zoom_x,zoom_y) +func _on_map_view_map_view_camera_changed(near_left : Vector2, far_left : Vector2, far_right : Vector2, near_right : Vector2) -> void: + _viewport_points.clear() + _viewport_points.push_back(near_left * _frame.size) + _viewport_points.push_back(far_left * _frame.size) + _viewport_points.push_back(far_right * _frame.size) + _viewport_points.push_back(near_right * _frame.size) + _viewport_points.push_back(_viewport_points[0]) queue_redraw() -- cgit v1.2.3-56-ga3b1 From 55723c35dfbcf9445873724906f8e3c448b6689f Mon Sep 17 00:00:00 2001 From: Hop311 Date: Sun, 9 Apr 2023 11:00:15 +0100 Subject: Moved assets to R/art/ --- game/art/terrain/terrain.png | Bin 0 -> 27542091 bytes game/art/terrain/terrain.png.import | 34 +++++++++++++++++++++++++++++ game/art/ui/minimap.png | Bin 0 -> 69018 bytes game/art/ui/minimap.png.import | 34 +++++++++++++++++++++++++++++ game/art/ui/minimap_frame.png | Bin 0 -> 1043 bytes game/art/ui/minimap_frame.png.import | 34 +++++++++++++++++++++++++++++ game/common/map/MapFrame.png | Bin 1043 -> 0 bytes game/common/map/MapFrame.png.import | 34 ----------------------------- game/common/map/minimap.png | Bin 69018 -> 0 bytes game/common/map/minimap.png.import | 34 ----------------------------- game/common/map/terrain/terrain.png | Bin 27542091 -> 0 bytes game/common/map/terrain/terrain.png.import | 34 ----------------------------- game/src/GameSession/GameSession.tscn | 13 +++++------ game/src/GameSession/MapView.tscn | 2 +- game/src/GameSession/Minimap.gd | 18 +++++++++++++++ game/src/GameSession/RectangularCamera.gd | 17 --------------- 16 files changed, 127 insertions(+), 127 deletions(-) create mode 100644 game/art/terrain/terrain.png create mode 100644 game/art/terrain/terrain.png.import create mode 100644 game/art/ui/minimap.png create mode 100644 game/art/ui/minimap.png.import create mode 100644 game/art/ui/minimap_frame.png create mode 100644 game/art/ui/minimap_frame.png.import delete mode 100644 game/common/map/MapFrame.png delete mode 100644 game/common/map/MapFrame.png.import delete mode 100644 game/common/map/minimap.png delete mode 100644 game/common/map/minimap.png.import delete mode 100644 game/common/map/terrain/terrain.png delete mode 100644 game/common/map/terrain/terrain.png.import create mode 100644 game/src/GameSession/Minimap.gd delete mode 100644 game/src/GameSession/RectangularCamera.gd diff --git a/game/art/terrain/terrain.png b/game/art/terrain/terrain.png new file mode 100644 index 0000000..6d36dee Binary files /dev/null and b/game/art/terrain/terrain.png differ diff --git a/game/art/terrain/terrain.png.import b/game/art/terrain/terrain.png.import new file mode 100644 index 0000000..2642176 --- /dev/null +++ b/game/art/terrain/terrain.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cmw0pvjthnn8c" +path="res://.godot/imported/terrain.png-06c63c2b87b3131a2067f668f87a9d67.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/terrain/terrain.png" +dest_files=["res://.godot/imported/terrain.png-06c63c2b87b3131a2067f668f87a9d67.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=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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.png b/game/art/ui/minimap.png new file mode 100644 index 0000000..9e5bdb6 Binary files /dev/null and b/game/art/ui/minimap.png differ diff --git a/game/art/ui/minimap.png.import b/game/art/ui/minimap.png.import new file mode 100644 index 0000000..31da5f0 --- /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=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/game/art/ui/minimap_frame.png b/game/art/ui/minimap_frame.png new file mode 100644 index 0000000..21aa2ce Binary files /dev/null and b/game/art/ui/minimap_frame.png differ diff --git a/game/art/ui/minimap_frame.png.import b/game/art/ui/minimap_frame.png.import new file mode 100644 index 0000000..6db81bc --- /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=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/game/common/map/MapFrame.png b/game/common/map/MapFrame.png deleted file mode 100644 index 21aa2ce..0000000 Binary files a/game/common/map/MapFrame.png and /dev/null differ diff --git a/game/common/map/MapFrame.png.import b/game/common/map/MapFrame.png.import deleted file mode 100644 index 04756cc..0000000 --- a/game/common/map/MapFrame.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://vr1hq2stk8ny" -path="res://.godot/imported/MapFrame.png-a4cf5a3479e19f337ce338f6f6ee4eb8.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://common/map/MapFrame.png" -dest_files=["res://.godot/imported/MapFrame.png-a4cf5a3479e19f337ce338f6f6ee4eb8.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/game/common/map/minimap.png b/game/common/map/minimap.png deleted file mode 100644 index 9e5bdb6..0000000 Binary files a/game/common/map/minimap.png and /dev/null differ diff --git a/game/common/map/minimap.png.import b/game/common/map/minimap.png.import deleted file mode 100644 index c69c844..0000000 --- a/game/common/map/minimap.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c0sm1jfu4kyv3" -path="res://.godot/imported/minimap.png-6dff941a6fa3e94c55113971bbb32fcf.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://common/map/minimap.png" -dest_files=["res://.godot/imported/minimap.png-6dff941a6fa3e94c55113971bbb32fcf.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/game/common/map/terrain/terrain.png b/game/common/map/terrain/terrain.png deleted file mode 100644 index 6d36dee..0000000 Binary files a/game/common/map/terrain/terrain.png and /dev/null differ diff --git a/game/common/map/terrain/terrain.png.import b/game/common/map/terrain/terrain.png.import deleted file mode 100644 index 56ba5dc..0000000 --- a/game/common/map/terrain/terrain.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cmw0pvjthnn8c" -path="res://.godot/imported/terrain.png-c443b8a709ca7acc4b3bb3df1d3095a9.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://common/map/terrain/terrain.png" -dest_files=["res://.godot/imported/terrain.png-c443b8a709ca7acc4b3bb3df1d3095a9.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=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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 73259b4..ca24256 100644 --- a/game/src/GameSession/GameSession.tscn +++ b/game/src/GameSession/GameSession.tscn @@ -4,10 +4,10 @@ [ext_resource type="PackedScene" uid="uid://g524p8lr574w" path="res://src/GameSession/MapControlPanel.tscn" id="3_afh6d"] [ext_resource type="PackedScene" uid="uid://dvdynl6eir40o" path="res://src/GameSession/GameSessionMenu.tscn" id="3_bvmqh"] [ext_resource type="PackedScene" uid="uid://dkehmdnuxih2r" path="res://src/GameSession/MapView.tscn" id="4_xkg5j"] -[ext_resource type="Texture2D" uid="uid://c0sm1jfu4kyv3" path="res://common/map/minimap.png" id="5_l05wo"] +[ext_resource type="Texture2D" uid="uid://c0sm1jfu4kyv3" path="res://art/ui/minimap.png" id="5_l05wo"] [ext_resource type="PackedScene" uid="uid://byq323jbel48u" path="res://src/GameSession/ProvinceOverviewPanel.tscn" id="5_osjnn"] -[ext_resource type="Texture2D" uid="uid://vr1hq2stk8ny" path="res://common/map/MapFrame.png" id="6_ujbv2"] -[ext_resource type="Script" path="res://src/GameSession/RectangularCamera.gd" id="7_go8y3"] +[ext_resource type="Texture2D" uid="uid://vr1hq2stk8ny" path="res://art/ui/minimap_frame.png" id="6_ujbv2"] +[ext_resource type="Script" path="res://src/GameSession/Minimap.gd" id="7_go8y3"] [node name="GameSession" type="Node" node_paths=PackedStringArray("_game_session_menu")] editor_description = "SS-102" @@ -52,12 +52,13 @@ offset_right = 350.0 offset_bottom = 175.0 texture = ExtResource("5_l05wo") -[node name="RectangularCamera" type="Control" parent="Minimap"] +[node name="RectangularCamera" type="Control" parent="Minimap" node_paths=PackedStringArray("_background")] anchors_preset = 0 offset_right = 40.0 offset_bottom = 40.0 mouse_filter = 2 script = ExtResource("7_go8y3") +_background = NodePath("../TextureRect") [node name="Frame" type="NinePatchRect" parent="Minimap"] layout_mode = 1 @@ -81,9 +82,7 @@ anchor_right = 0.15625 offset_top = 0.0 offset_right = 0.0 -[connection signal="map_view_camera_changed" from="MapView" to="Minimap/RectangularCamera" method="_on_map_view_map_view_camera_changed"] +[connection signal="map_view_camera_changed" from="MapView" to="Minimap/RectangularCamera" method="_on_camera_view_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="mouse_entered" from="Minimap" to="Minimap" method="_on_mouse_entered"] -[connection signal="mouse_exited" from="Minimap" to="Minimap" method="_on_mouse_exited"] diff --git a/game/src/GameSession/MapView.tscn b/game/src/GameSession/MapView.tscn index 2df06fb..f4f3a9e 100644 --- a/game/src/GameSession/MapView.tscn +++ b/game/src/GameSession/MapView.tscn @@ -2,7 +2,7 @@ [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 diff --git a/game/src/GameSession/Minimap.gd b/game/src/GameSession/Minimap.gd new file mode 100644 index 0000000..dcfc343 --- /dev/null +++ b/game/src/GameSession/Minimap.gd @@ -0,0 +1,18 @@ +extends Control + +@export var _background : TextureRect + +var _viewport_points : PackedVector2Array + +func _draw() -> void: + if _viewport_points.size() > 1: + draw_polyline(_viewport_points, Color.WHITE, -1) + +func _on_camera_view_changed(near_left : Vector2, far_left : Vector2, far_right : Vector2, near_right : Vector2) -> void: + _viewport_points.clear() + _viewport_points.push_back(near_left * _background.size) + _viewport_points.push_back(far_left * _background.size) + _viewport_points.push_back(far_right * _background.size) + _viewport_points.push_back(near_right * _background.size) + _viewport_points.push_back(_viewport_points[0]) + queue_redraw() diff --git a/game/src/GameSession/RectangularCamera.gd b/game/src/GameSession/RectangularCamera.gd deleted file mode 100644 index bc7ca1e..0000000 --- a/game/src/GameSession/RectangularCamera.gd +++ /dev/null @@ -1,17 +0,0 @@ -extends Control - -@onready var _frame : TextureRect = $"../TextureRect" -var _viewport_points : PackedVector2Array - -func _draw() -> void: - if _viewport_points.size() > 1: - draw_polyline(_viewport_points, Color.WHITE, -1) - -func _on_map_view_map_view_camera_changed(near_left : Vector2, far_left : Vector2, far_right : Vector2, near_right : Vector2) -> void: - _viewport_points.clear() - _viewport_points.push_back(near_left * _frame.size) - _viewport_points.push_back(far_left * _frame.size) - _viewport_points.push_back(far_right * _frame.size) - _viewport_points.push_back(near_right * _frame.size) - _viewport_points.push_back(_viewport_points[0]) - queue_redraw() -- cgit v1.2.3-56-ga3b1 From 9c74c5d67569c7ca6c08a2f0ef5a27272332f31d Mon Sep 17 00:00:00 2001 From: Gone2Daly <71726742+Gone2Daly@users.noreply.github.com> Date: Sun, 9 Apr 2023 21:51:15 +0200 Subject: Minimap functionality Adding minimap click, cutting minimap camera edges, adding check for mouse of the window to stop parallax, also adding lock for parallax when mouse on minimap. --- game/art/ui/minimap.png | Bin 69018 -> 122017 bytes game/src/GameSession/GameSession.tscn | 50 ++++-------------------------- game/src/GameSession/MapControlPanel.gd | 21 +++++++++++++ game/src/GameSession/MapControlPanel.tscn | 49 ++++++++++++++++++++++------- game/src/GameSession/MapView.gd | 30 ++++++++++++++++-- game/src/GameSession/Minimap.gd | 9 ++++++ 6 files changed, 101 insertions(+), 58 deletions(-) diff --git a/game/art/ui/minimap.png b/game/art/ui/minimap.png index 9e5bdb6..9922b28 100644 Binary files a/game/art/ui/minimap.png and b/game/art/ui/minimap.png differ diff --git a/game/src/GameSession/GameSession.tscn b/game/src/GameSession/GameSession.tscn index dc3ab75..76a5fcc 100644 --- a/game/src/GameSession/GameSession.tscn +++ b/game/src/GameSession/GameSession.tscn @@ -1,13 +1,10 @@ -[gd_scene load_steps=9 format=3 uid="uid://bgnupcshe1m7r"] +[gd_scene load_steps=6 format=3 uid="uid://bgnupcshe1m7r"] [ext_resource type="Script" path="res://src/GameSession/GameSession.gd" id="1_eklvp"] [ext_resource type="PackedScene" uid="uid://g524p8lr574w" path="res://src/GameSession/MapControlPanel.tscn" id="3_afh6d"] [ext_resource type="PackedScene" uid="uid://dvdynl6eir40o" path="res://src/GameSession/GameSessionMenu.tscn" id="3_bvmqh"] [ext_resource type="PackedScene" uid="uid://dkehmdnuxih2r" path="res://src/GameSession/MapView.tscn" id="4_xkg5j"] -[ext_resource type="Texture2D" uid="uid://c0sm1jfu4kyv3" path="res://art/ui/minimap.png" id="5_l05wo"] [ext_resource type="PackedScene" uid="uid://byq323jbel48u" path="res://src/GameSession/ProvinceOverviewPanel.tscn" id="5_osjnn"] -[ext_resource type="Texture2D" uid="uid://vr1hq2stk8ny" path="res://art/ui/minimap_frame.png" id="6_ujbv2"] -[ext_resource type="Script" path="res://src/GameSession/Minimap.gd" id="7_go8y3"] [node name="GameSession" type="Node" node_paths=PackedStringArray("_game_session_menu")] editor_description = "SS-102" @@ -27,54 +24,16 @@ grow_horizontal = 2 grow_vertical = 2 [node name="MapControlPanel" parent="." instance=ExtResource("3_afh6d")] -offset_left = 1147.0 -offset_top = 486.0 -offset_right = 1280.0 -offset_bottom = 542.0 -grow_horizontal = 0 -grow_vertical = 0 - -[node name="Minimap" type="Control" parent="."] -layout_mode = 3 anchors_preset = 3 anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 offset_left = -350.0 -offset_top = -175.0 +offset_top = -210.0 grow_horizontal = 0 grow_vertical = 0 -[node name="TextureRect" type="TextureRect" parent="Minimap"] -layout_mode = 0 -offset_right = 350.0 -offset_bottom = 175.0 -texture = ExtResource("5_l05wo") - -[node name="RectangularCamera" type="Control" parent="Minimap" node_paths=PackedStringArray("_background")] -anchors_preset = 0 -offset_right = 40.0 -offset_bottom = 40.0 -mouse_filter = 2 -script = ExtResource("7_go8y3") -_background = NodePath("../TextureRect") - -[node name="Frame" type="NinePatchRect" parent="Minimap"] -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -175.0 -offset_top = -87.5 -offset_right = 175.0 -offset_bottom = 87.5 -grow_horizontal = 2 -grow_vertical = 2 -texture = ExtResource("6_ujbv2") - [node name="ProvinceOverviewPanel" parent="." instance=ExtResource("5_osjnn")] anchors_preset = -1 anchor_top = 0.583333 @@ -82,8 +41,11 @@ anchor_right = 0.15625 offset_top = 0.0 offset_right = 0.0 -[connection signal="map_view_camera_changed" from="MapView" to="Minimap/RectangularCamera" method="_on_camera_view_changed"] +[connection signal="map_view_camera_changed" from="MapView" to="MapControlPanel" method="_on_map_view_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="camera_change" from="MapControlPanel" to="MapView" method="_on_map_control_panel_camera_change"] [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="mouse_entered" from="MapControlPanel" to="MapView" method="_on_map_control_panel_mouse_entered"] +[connection signal="mouse_exited" from="MapControlPanel" to="MapView" method="_on_map_control_panel_mouse_exited"] diff --git a/game/src/GameSession/MapControlPanel.gd b/game/src/GameSession/MapControlPanel.gd index cfd102c..b9aaaeb 100644 --- a/game/src/GameSession/MapControlPanel.gd +++ b/game/src/GameSession/MapControlPanel.gd @@ -2,8 +2,16 @@ extends PanelContainer signal game_session_menu_button_pressed signal mapmode_changed +signal camera_change(_camera_pos_clicked: Vector2) + +const _action_click : StringName = &"map_click" @export var _mapmodes_grid : GridContainer +@export var _minimap : PanelContainer +@onready var _map_camera : Control = _minimap.get_node("RectangularCamera") + +var _mouse_inside: bool = false + var _mapmode_button_group : ButtonGroup func _add_mapmode_button(identifier : String) -> void: @@ -30,3 +38,16 @@ 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_map_view_camera_changed(near_left, far_left, far_right, near_right): + _map_camera._on_camera_view_changed(near_left, far_left, far_right, near_right) + +func _process(delta): + if _mouse_inside and Input.is_action_pressed(_action_click): + camera_change.emit($VBoxContainer/Minimap.get_local_mouse_position()) + +func _on_minimap_mouse_entered(): + _mouse_inside = true + +func _on_minimap_mouse_exited(): + _mouse_inside = false diff --git a/game/src/GameSession/MapControlPanel.tscn b/game/src/GameSession/MapControlPanel.tscn index e0ba0b2..daf0c96 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,33 +11,55 @@ 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="PanelContainer" type="PanelContainer" node_paths=PackedStringArray("_mapmodes_grid", "_minimap")] editor_description = "SS-103" +mouse_filter = 1 script = ExtResource("1_ign64") -_mapmodes_grid = NodePath("HBoxContainer/VBoxContainer/MapmodesGrid") +_mapmodes_grid = NodePath("VBoxContainer/HBoxContainer/VBoxContainer/MapmodesGrid") +_minimap = NodePath("VBoxContainer/Minimap") -[node name="HBoxContainer" type="HBoxContainer" parent="."] +[node name="VBoxContainer" type="VBoxContainer" parent="."] layout_mode = 2 -[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] layout_mode = 2 +alignment = 2 -[node name="MapmodesGrid" type="GridContainer" parent="HBoxContainer/VBoxContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"] layout_mode = 2 -columns = 11 -[node name="MinimapPlaceholder" type="Label" parent="HBoxContainer/VBoxContainer"] +[node name="MapmodesGrid" type="GridContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer"] layout_mode = 2 -text = "MINIMAP" +columns = 11 -[node name="AuxiliaryPanel" type="VBoxContainer" parent="HBoxContainer"] +[node name="AuxiliaryPanel" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"] editor_description = "UI-761" layout_mode = 2 -[node name="GameSessionMenuButton" type="Button" parent="HBoxContainer/AuxiliaryPanel"] +[node name="GameSessionMenuButton" type="Button" parent="VBoxContainer/HBoxContainer/AuxiliaryPanel"] editor_description = "UI-9" layout_mode = 2 shortcut = SubResource("Shortcut_fc1tk") text = "ESC" -[connection signal="pressed" from="HBoxContainer/AuxiliaryPanel/GameSessionMenuButton" to="." method="_on_game_session_menu_button_pressed"] +[node name="Minimap" type="PanelContainer" parent="VBoxContainer"] +layout_mode = 2 +mouse_filter = 1 + +[node name="TextureRect" type="TextureRect" parent="VBoxContainer/Minimap"] +layout_mode = 2 +texture = ExtResource("2_r613r") + +[node name="RectangularCamera" type="Control" parent="VBoxContainer/Minimap" node_paths=PackedStringArray("_background")] +layout_mode = 2 +mouse_filter = 2 +script = ExtResource("3_s4dml") +_background = NodePath("../TextureRect") + +[node name="Frame" type="NinePatchRect" parent="VBoxContainer/Minimap"] +layout_mode = 2 +texture = ExtResource("4_f1exl") + +[connection signal="pressed" from="VBoxContainer/HBoxContainer/AuxiliaryPanel/GameSessionMenuButton" to="." method="_on_game_session_menu_button_pressed"] +[connection signal="mouse_entered" from="VBoxContainer/Minimap" to="." method="_on_minimap_mouse_entered"] +[connection signal="mouse_exited" from="VBoxContainer/Minimap" to="." method="_on_minimap_mouse_exited"] diff --git a/game/src/GameSession/MapView.gd b/game/src/GameSession/MapView.gd index 2a60539..0d85706 100644 --- a/game/src/GameSession/MapView.gd +++ b/game/src/GameSession/MapView.gd @@ -25,6 +25,8 @@ const _shader_param_selected_pos : StringName = &"selected_pos" var _drag_anchor : Vector2 var _drag_active : bool = false +var _lock_movement : 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 @@ -55,6 +57,17 @@ var _viewport_dims : Vector2 = Vector2(1, 1) # to a failed HashMap lookup. I'm not sure if this is a bug in the # editor, GDExtension, my own extension, or a combination of them. # This was an absolute pain to track down. --- hop311 + +func _notification(what): + # Working with MainLoop notifications system. + # https://godotengine.org/qa/101601/how-to-detect-when-my-application-is-not-visible + # https://docs.godotengine.org/en/stable/classes/class_mainloop.html#constants + + if what == 1003: # Mouse out of window + _lock_movement = true + elif what == 1002: # Mouse inside window + _lock_movement = false + func _ready(): if _camera == null: push_error("MapView's _camera variable hasn't been set!") @@ -178,8 +191,11 @@ func _movement_process(delta : float) -> void: func _edge_scrolling_vector() -> 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 + if _lock_movement: + mouse_vector = Vector2(0,0) + else: + 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 func _cardinal_movement_vector() -> Vector2: @@ -217,3 +233,13 @@ func _update_minimap_viewport() -> void: func _update_mouse_map_position() -> void: _mouse_pos_map = _viewport_to_map_coords(_mouse_pos_viewport) _map_shader_material.set_shader_parameter(_shader_param_hover_pos, _mouse_pos_map) + +func _on_map_control_panel_mouse_entered(): + _lock_movement = true + +func _on_map_control_panel_mouse_exited(): + _lock_movement = false + +func _on_map_control_panel_camera_change(_camera_pos_clicked): + _camera.position.x = (_camera_pos_clicked.x-$"../MapControlPanel"._minimap.size.x/2)/$"../MapControlPanel"._minimap.size.x * _map_mesh_dims.x + _camera.position.z = (_camera_pos_clicked.y-$"../MapControlPanel"._minimap.size.y/2)/$"../MapControlPanel"._minimap.size.y * _map_mesh_dims.y diff --git a/game/src/GameSession/Minimap.gd b/game/src/GameSession/Minimap.gd index dcfc343..a8b0217 100644 --- a/game/src/GameSession/Minimap.gd +++ b/game/src/GameSession/Minimap.gd @@ -15,4 +15,13 @@ func _on_camera_view_changed(near_left : Vector2, far_left : Vector2, far_right _viewport_points.push_back(far_right * _background.size) _viewport_points.push_back(near_right * _background.size) _viewport_points.push_back(_viewport_points[0]) + + # Cutting out of Frame part of camera polyline + for i in range(0,_viewport_points.size()): + for j in range(0,2): + if _viewport_points[i][j] > _background.size[j]: + _viewport_points[i][j] = _background.size[j] + elif _viewport_points[i][j] < 0: + _viewport_points[i][j] = 1 + queue_redraw() -- cgit v1.2.3-56-ga3b1 From f1995b5ab16366eb0c005c0cafdfd797b6cfd1d2 Mon Sep 17 00:00:00 2001 From: Gone2Daly <71726742+Gone2Daly@users.noreply.github.com> Date: Sun, 9 Apr 2023 21:53:44 +0200 Subject: Minimap hover fix Added check for hovering over provinces when mouse on minimap --- game/src/GameSession/MapView.gd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game/src/GameSession/MapView.gd b/game/src/GameSession/MapView.gd index 0d85706..05da6d5 100644 --- a/game/src/GameSession/MapView.gd +++ b/game/src/GameSession/MapView.gd @@ -232,7 +232,8 @@ func _update_minimap_viewport() -> void: func _update_mouse_map_position() -> void: _mouse_pos_map = _viewport_to_map_coords(_mouse_pos_viewport) - _map_shader_material.set_shader_parameter(_shader_param_hover_pos, _mouse_pos_map) + if not _lock_movement: + _map_shader_material.set_shader_parameter(_shader_param_hover_pos, _mouse_pos_map) func _on_map_control_panel_mouse_entered(): _lock_movement = true -- cgit v1.2.3-56-ga3b1 From 5f09e4720581994ca88446add32d8b6189428b13 Mon Sep 17 00:00:00 2001 From: Hop311 Date: Mon, 10 Apr 2023 23:27:08 +0100 Subject: Minimap viewport loops from x=0 to x=1 --- extension/src/MapSingleton.cpp | 35 +++++++++--- extension/src/MapSingleton.hpp | 5 +- game/art/terrain/terrain.png.import | 2 +- game/art/ui/minimap.png.import | 8 +-- game/art/ui/minimap_frame.png.import | 8 +-- game/src/GameSession/GameSession.tscn | 8 +-- game/src/GameSession/MapControlPanel.gd | 24 +++------ game/src/GameSession/MapControlPanel.tscn | 49 ++++++++--------- game/src/GameSession/MapView.gd | 62 +++++++++++----------- game/src/GameSession/MapView.tscn | 4 +- game/src/GameSession/Minimap.gd | 88 +++++++++++++++++++++++++------ game/src/GameSession/TerrainMap.gdshader | 11 ++-- 12 files changed, 183 insertions(+), 121 deletions(-) diff --git a/extension/src/MapSingleton.cpp b/extension/src/MapSingleton.cpp index 31cbd98..8c38926 100644 --- a/extension/src/MapSingleton.cpp +++ b/extension/src/MapSingleton.cpp @@ -14,7 +14,8 @@ void MapSingleton::_bind_methods() { ClassDB::bind_method(D_METHOD("load_region_file", "file_path"), &MapSingleton::load_region_file); ClassDB::bind_method(D_METHOD("load_province_shape_file", "file_path"), &MapSingleton::load_province_shape_file); - ClassDB::bind_method(D_METHOD("get_province_identifier_from_pixel_coords", "coords"), &MapSingleton::get_province_identifier_from_pixel_coords); + ClassDB::bind_method(D_METHOD("get_province_index_from_uv_coords", "coords"), &MapSingleton::get_province_index_from_uv_coords); + ClassDB::bind_method(D_METHOD("get_province_identifier_from_uv_coords", "coords"), &MapSingleton::get_province_identifier_from_uv_coords); ClassDB::bind_method(D_METHOD("get_width"), &MapSingleton::get_width); ClassDB::bind_method(D_METHOD("get_height"), &MapSingleton::get_height); ClassDB::bind_method(D_METHOD("get_province_index_image"), &MapSingleton::get_province_index_image); @@ -235,15 +236,37 @@ Error MapSingleton::load_province_shape_file(String const& file_path) { return err; } -String MapSingleton::get_province_identifier_from_pixel_coords(Vector2i const& coords) const { +Province* MapSingleton::get_province_from_uv_coords(godot::Vector2 const& coords) { if (province_index_image.is_valid()) { const PackedByteArray index_data_array = province_index_image->get_data(); Province::index_t const* index_data = reinterpret_cast(index_data_array.ptr()); - const int32_t x_mod_w = UtilityFunctions::posmod(coords.x, get_width()); - const int32_t y_mod_h = UtilityFunctions::posmod(coords.y, get_height()); - Province const* province = map.get_province_by_index(index_data[x_mod_w + y_mod_h * get_width()]); - if (province != nullptr) return province->get_identifier().c_str(); + const int32_t x_mod_w = UtilityFunctions::posmod(coords.x, 1.0f) * get_width(); + const int32_t y_mod_h = UtilityFunctions::posmod(coords.y, 1.0f) * get_height(); + return map.get_province_by_index(index_data[x_mod_w + y_mod_h * get_width()]); } + return nullptr; +} + +Province const* MapSingleton::get_province_from_uv_coords(godot::Vector2 const& coords) const { + if (province_index_image.is_valid()) { + const PackedByteArray index_data_array = province_index_image->get_data(); + Province::index_t const* index_data = reinterpret_cast(index_data_array.ptr()); + const int32_t x_mod_w = UtilityFunctions::posmod(coords.x, 1.0f) * get_width(); + const int32_t y_mod_h = UtilityFunctions::posmod(coords.y, 1.0f) * get_height(); + return map.get_province_by_index(index_data[x_mod_w + y_mod_h * get_width()]); + } + return nullptr; +} + +int32_t MapSingleton::get_province_index_from_uv_coords(Vector2 const& coords) const { + Province const* province = get_province_from_uv_coords(coords); + if (province != nullptr) return province->get_index(); + return Province::NULL_INDEX; +} + +String MapSingleton::get_province_identifier_from_uv_coords(Vector2 const& coords) const { + Province const* province = get_province_from_uv_coords(coords); + if (province != nullptr) return province->get_identifier().c_str(); return String{}; } diff --git a/extension/src/MapSingleton.hpp b/extension/src/MapSingleton.hpp index 7d50d55..9205e92 100644 --- a/extension/src/MapSingleton.hpp +++ b/extension/src/MapSingleton.hpp @@ -35,7 +35,10 @@ namespace OpenVic2 { godot::Error load_region_file(godot::String const& file_path); godot::Error load_province_shape_file(godot::String const& file_path); - godot::String get_province_identifier_from_pixel_coords(godot::Vector2i const& coords) const; + Province* get_province_from_uv_coords(godot::Vector2 const& coords); + Province const* get_province_from_uv_coords(godot::Vector2 const& coords) const; + int32_t get_province_index_from_uv_coords(godot::Vector2 const& coords) const; + godot::String get_province_identifier_from_uv_coords(godot::Vector2 const& coords) const; int32_t get_width() const; int32_t get_height() const; godot::Ref get_province_index_image() const; diff --git a/game/art/terrain/terrain.png.import b/game/art/terrain/terrain.png.import index 2642176..d7a078f 100644 --- a/game/art/terrain/terrain.png.import +++ b/game/art/terrain/terrain.png.import @@ -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.import b/game/art/ui/minimap.png.import index 31da5f0..36f22e7 100644 --- a/game/art/ui/minimap.png.import +++ b/game/art/ui/minimap.png.import @@ -15,20 +15,20 @@ dest_files=["res://.godot/imported/minimap.png-05ee44469856e77fd05107fe9e259e25. [params] -compress/mode=0 +compress/mode=3 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=2 compress/channel_pack=0 mipmaps/generate=false 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 process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/game/art/ui/minimap_frame.png.import b/game/art/ui/minimap_frame.png.import index 6db81bc..3d2aeee 100644 --- a/game/art/ui/minimap_frame.png.import +++ b/game/art/ui/minimap_frame.png.import @@ -15,20 +15,20 @@ dest_files=["res://.godot/imported/minimap_frame.png-3668393435d2582fb1dc8a95985 [params] -compress/mode=0 +compress/mode=3 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=2 compress/channel_pack=0 mipmaps/generate=false 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 process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/game/src/GameSession/GameSession.tscn b/game/src/GameSession/GameSession.tscn index 76a5fcc..bba5671 100644 --- a/game/src/GameSession/GameSession.tscn +++ b/game/src/GameSession/GameSession.tscn @@ -41,11 +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_map_view_camera_changed"] +[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="camera_change" from="MapControlPanel" to="MapView" method="_on_map_control_panel_camera_change"] [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="mouse_entered" from="MapControlPanel" to="MapView" method="_on_map_control_panel_mouse_entered"] -[connection signal="mouse_exited" from="MapControlPanel" to="MapView" method="_on_map_control_panel_mouse_exited"] +[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 b9aaaeb..fb4f161 100644 --- a/game/src/GameSession/MapControlPanel.gd +++ b/game/src/GameSession/MapControlPanel.gd @@ -2,15 +2,10 @@ extends PanelContainer signal game_session_menu_button_pressed signal mapmode_changed -signal camera_change(_camera_pos_clicked: Vector2) - -const _action_click : StringName = &"map_click" +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 -@export var _minimap : PanelContainer -@onready var _map_camera : Control = _minimap.get_node("RectangularCamera") - -var _mouse_inside: bool = false var _mapmode_button_group : ButtonGroup @@ -39,15 +34,8 @@ func _mapmode_pressed(button : BaseButton) -> void: MapSingleton.set_mapmode(button.tooltip_text) mapmode_changed.emit() -func _on_map_view_map_view_camera_changed(near_left, far_left, far_right, near_right): - _map_camera._on_camera_view_changed(near_left, far_left, far_right, near_right) - -func _process(delta): - if _mouse_inside and Input.is_action_pressed(_action_click): - camera_change.emit($VBoxContainer/Minimap.get_local_mouse_position()) - -func _on_minimap_mouse_entered(): - _mouse_inside = true +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_mouse_exited(): - _mouse_inside = false +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 daf0c96..b76af10 100644 --- a/game/src/GameSession/MapControlPanel.tscn +++ b/game/src/GameSession/MapControlPanel.tscn @@ -11,55 +11,50 @@ action = &"ui_cancel" [sub_resource type="Shortcut" id="Shortcut_fc1tk"] events = [SubResource("InputEventAction_5nck3")] -[node name="PanelContainer" type="PanelContainer" node_paths=PackedStringArray("_mapmodes_grid", "_minimap")] +[node name="MapControlPanel" type="PanelContainer" node_paths=PackedStringArray("_mapmodes_grid")] editor_description = "SS-103" mouse_filter = 1 script = ExtResource("1_ign64") -_mapmodes_grid = NodePath("VBoxContainer/HBoxContainer/VBoxContainer/MapmodesGrid") -_minimap = NodePath("VBoxContainer/Minimap") +_mapmodes_grid = NodePath("HBoxContainer/VBoxContainer/MapmodesGrid") -[node name="VBoxContainer" type="VBoxContainer" parent="."] -layout_mode = 2 - -[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="."] layout_mode = 2 alignment = 2 -[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"] layout_mode = 2 -[node name="MapmodesGrid" type="GridContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer"] +[node name="MapmodesGrid" type="GridContainer" parent="HBoxContainer/VBoxContainer"] layout_mode = 2 columns = 11 -[node name="AuxiliaryPanel" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"] -editor_description = "UI-761" -layout_mode = 2 - -[node name="GameSessionMenuButton" type="Button" parent="VBoxContainer/HBoxContainer/AuxiliaryPanel"] -editor_description = "UI-9" -layout_mode = 2 -shortcut = SubResource("Shortcut_fc1tk") -text = "ESC" - -[node name="Minimap" type="PanelContainer" parent="VBoxContainer"] +[node name="Minimap" type="PanelContainer" parent="HBoxContainer/VBoxContainer"] layout_mode = 2 mouse_filter = 1 -[node name="TextureRect" type="TextureRect" parent="VBoxContainer/Minimap"] +[node name="TextureRect" type="TextureRect" parent="HBoxContainer/VBoxContainer/Minimap"] layout_mode = 2 texture = ExtResource("2_r613r") -[node name="RectangularCamera" type="Control" parent="VBoxContainer/Minimap" node_paths=PackedStringArray("_background")] +[node name="ViewportQuad" type="Control" parent="HBoxContainer/VBoxContainer/Minimap"] layout_mode = 2 mouse_filter = 2 script = ExtResource("3_s4dml") -_background = NodePath("../TextureRect") -[node name="Frame" type="NinePatchRect" parent="VBoxContainer/Minimap"] +[node name="Frame" type="NinePatchRect" parent="HBoxContainer/VBoxContainer/Minimap"] layout_mode = 2 texture = ExtResource("4_f1exl") -[connection signal="pressed" from="VBoxContainer/HBoxContainer/AuxiliaryPanel/GameSessionMenuButton" to="." method="_on_game_session_menu_button_pressed"] -[connection signal="mouse_entered" from="VBoxContainer/Minimap" to="." method="_on_minimap_mouse_entered"] -[connection signal="mouse_exited" from="VBoxContainer/Minimap" to="." method="_on_minimap_mouse_exited"] +[node name="AuxiliaryPanel" type="VBoxContainer" parent="HBoxContainer"] +editor_description = "UI-761" +layout_mode = 2 + +[node name="GameSessionMenuButton" type="Button" parent="HBoxContainer/AuxiliaryPanel"] +editor_description = "UI-9" +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 05da6d5..fc13b07 100644 --- a/game/src/GameSession/MapView.gd +++ b/game/src/GameSession/MapView.gd @@ -14,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 @@ -25,7 +25,7 @@ const _shader_param_selected_pos : StringName = &"selected_pos" var _drag_anchor : Vector2 var _drag_active : bool = false -var _lock_movement : bool = false +var _mouse_over_viewport : bool = false @export var _zoom_target_min : float = 0.2 @export var _zoom_target_max : float = 5.0 @@ -57,17 +57,6 @@ var _viewport_dims : Vector2 = Vector2(1, 1) # to a failed HashMap lookup. I'm not sure if this is a bug in the # editor, GDExtension, my own extension, or a combination of them. # This was an absolute pain to track down. --- hop311 - -func _notification(what): - # Working with MainLoop notifications system. - # https://godotengine.org/qa/101601/how-to-detect-when-my-application-is-not-visible - # https://docs.godotengine.org/en/stable/classes/class_mainloop.html#constants - - if what == 1003: # Mouse out of window - _lock_movement = true - elif what == 1002: # Mouse inside window - _lock_movement = false - func _ready(): if _camera == null: push_error("MapView's _camera variable hasn't been set!") @@ -121,6 +110,13 @@ 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) @@ -145,10 +141,12 @@ 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!") @@ -190,12 +188,11 @@ func _movement_process(delta : float) -> void: _camera.position += Vector3(direction.x, 0, direction.y) func _edge_scrolling_vector() -> Vector2: + if not _mouse_over_viewport: + return Vector2() var mouse_vector := _mouse_pos_viewport / _viewport_dims - Vector2(0.5, 0.5) - if _lock_movement: - mouse_vector = Vector2(0,0) - else: - if abs(mouse_vector.x) < 0.5 - _edge_move_threshold and abs(mouse_vector.y) < 0.5 - _edge_move_threshold: - mouse_vector *= 0 + 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 func _cardinal_movement_vector() -> Vector2: @@ -232,15 +229,18 @@ func _update_minimap_viewport() -> void: func _update_mouse_map_position() -> void: _mouse_pos_map = _viewport_to_map_coords(_mouse_pos_viewport) - if not _lock_movement: - _map_shader_material.set_shader_parameter(_shader_param_hover_pos, _mouse_pos_map) + 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_map_control_panel_mouse_entered(): - _lock_movement = true +func _on_mouse_entered_viewport(): + _mouse_over_viewport = true -func _on_map_control_panel_mouse_exited(): - _lock_movement = false +func _on_mouse_exited_viewport(): + _mouse_over_viewport = false -func _on_map_control_panel_camera_change(_camera_pos_clicked): - _camera.position.x = (_camera_pos_clicked.x-$"../MapControlPanel"._minimap.size.x/2)/$"../MapControlPanel"._minimap.size.x * _map_mesh_dims.x - _camera.position.z = (_camera_pos_clicked.y-$"../MapControlPanel"._minimap.size.y/2)/$"../MapControlPanel"._minimap.size.y * _map_mesh_dims.y +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 f4f3a9e..b48617a 100644 --- a/game/src/GameSession/MapView.tscn +++ b/game/src/GameSession/MapView.tscn @@ -7,8 +7,8 @@ [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"] diff --git a/game/src/GameSession/Minimap.gd b/game/src/GameSession/Minimap.gd index a8b0217..5d15ce8 100644 --- a/game/src/GameSession/Minimap.gd +++ b/game/src/GameSession/Minimap.gd @@ -1,27 +1,83 @@ extends Control -@export var _background : TextureRect +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_polyline(_viewport_points, Color.WHITE, -1) + draw_multiline(_viewport_points, Color.WHITE, -1) + +func _unhandled_input(event : InputEvent): + if event.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) -func _on_camera_view_changed(near_left : Vector2, far_left : Vector2, far_right : Vector2, near_right : Vector2) -> void: _viewport_points.clear() - _viewport_points.push_back(near_left * _background.size) - _viewport_points.push_back(far_left * _background.size) - _viewport_points.push_back(far_right * _background.size) - _viewport_points.push_back(near_right * _background.size) - _viewport_points.push_back(_viewport_points[0]) - - # Cutting out of Frame part of camera polyline - for i in range(0,_viewport_points.size()): - for j in range(0,2): - if _viewport_points[i][j] > _background.size[j]: - _viewport_points[i][j] = _background.size[j] - elif _viewport_points[i][j] < 0: - _viewport_points[i][j] = 1 + _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; -- cgit v1.2.3-56-ga3b1 From 369880cb44a98853615326255d6e7e4356166b3b Mon Sep 17 00:00:00 2001 From: Gone2Daly <71726742+Gone2Daly@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:41:35 +0200 Subject: Returned movement of camera when it's clicked and mouse have movement Vital RTS feature, vital for multiplayer micro as well. --- game/src/GameSession/Minimap.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/src/GameSession/Minimap.gd b/game/src/GameSession/Minimap.gd index 5d15ce8..7c02698 100644 --- a/game/src/GameSession/Minimap.gd +++ b/game/src/GameSession/Minimap.gd @@ -11,7 +11,7 @@ func _draw() -> void: draw_multiline(_viewport_points, Color.WHITE, -1) func _unhandled_input(event : InputEvent): - if event.is_action_pressed(_action_click): + 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) -- cgit v1.2.3-56-ga3b1