diff --git a/hexmapper/assets/ui_images/button_down.png b/hexmapper/assets/ui_images/button_down.png index dba817b..01928f7 100644 Binary files a/hexmapper/assets/ui_images/button_down.png and b/hexmapper/assets/ui_images/button_down.png differ diff --git a/hexmapper/assets/ui_images/button_left.png b/hexmapper/assets/ui_images/button_left.png index 5434254..efb64fe 100644 Binary files a/hexmapper/assets/ui_images/button_left.png and b/hexmapper/assets/ui_images/button_left.png differ diff --git a/hexmapper/assets/ui_images/button_right.png b/hexmapper/assets/ui_images/button_right.png index 58039a2..0bdb3f1 100644 Binary files a/hexmapper/assets/ui_images/button_right.png and b/hexmapper/assets/ui_images/button_right.png differ diff --git a/hexmapper/assets/ui_images/button_up.png b/hexmapper/assets/ui_images/button_up.png index 2190358..fd9bb91 100644 Binary files a/hexmapper/assets/ui_images/button_up.png and b/hexmapper/assets/ui_images/button_up.png differ diff --git a/hexmapper/scenes/MainMap/_MainMap.tscn b/hexmapper/scenes/MainMap/_MainMap.tscn index 03632cf..9a6706e 100644 --- a/hexmapper/scenes/MainMap/_MainMap.tscn +++ b/hexmapper/scenes/MainMap/_MainMap.tscn @@ -127,6 +127,7 @@ size_flags_vertical = 3 metadata/_edit_use_anchors_ = true [node name="Camera2D" type="Camera2D" parent="."] +unique_name_in_owner = true anchor_mode = 0 editor_draw_limits = true editor_draw_drag_margin = true @@ -271,7 +272,8 @@ text = "MapName" horizontal_alignment = 2 vertical_alignment = 1 -[node name="TextureButtonUp" type="TextureButton" parent="UI/MenuTop"] +[node name="ScrollButtonUp" type="TextureButton" parent="UI/MenuTop"] +unique_name_in_owner = true clip_contents = true custom_minimum_size = Vector2(32, 32) layout_mode = 2 @@ -280,7 +282,8 @@ texture_normal = ExtResource("9_e5fbg") ignore_texture_size = true stretch_mode = 4 -[node name="TextureButtonDown" type="TextureButton" parent="UI/MenuTop"] +[node name="ScrollButtonDown" type="TextureButton" parent="UI/MenuTop"] +unique_name_in_owner = true clip_contents = true custom_minimum_size = Vector2(32, 32) layout_mode = 2 @@ -289,7 +292,8 @@ texture_normal = ExtResource("10_26b7d") ignore_texture_size = true stretch_mode = 4 -[node name="TextureButtonLeft" type="TextureButton" parent="UI/MenuTop"] +[node name="ScrollButtonLeft" type="TextureButton" parent="UI/MenuTop"] +unique_name_in_owner = true clip_contents = true custom_minimum_size = Vector2(32, 32) layout_mode = 2 @@ -298,7 +302,8 @@ texture_normal = ExtResource("11_33jd8") ignore_texture_size = true stretch_mode = 4 -[node name="TextureButtonRight" type="TextureButton" parent="UI/MenuTop"] +[node name="ScrollButtonRight" type="TextureButton" parent="UI/MenuTop"] +unique_name_in_owner = true clip_contents = true custom_minimum_size = Vector2(32, 32) layout_mode = 2 diff --git a/hexmapper/scenes/MainMap/map/map_manager.gd b/hexmapper/scenes/MainMap/map/map_manager.gd index c075920..9c2ac13 100644 --- a/hexmapper/scenes/MainMap/map/map_manager.gd +++ b/hexmapper/scenes/MainMap/map/map_manager.gd @@ -3,6 +3,7 @@ extends Node @onready var vbox_palette: VBoxContainer = %PaletteContainer @onready var ground_map = %GroundMapLayer @onready var map_menu_container = %MapMenuContainer +@onready var camera_2d = %Camera2D var content = null var coord2tilename = {} @@ -175,3 +176,19 @@ func load_map_from(): func _on_load_map_from(full_filename): %ResourceSaver.loadMap(full_filename) + +func scroll_up(): + var tile_width = ground_map.tile_set.tile_size.x + camera_2d.position.y -= tile_width + +func scroll_down(): + var tile_width = ground_map.tile_set.tile_size.x + camera_2d.position.y += tile_width + +func scroll_left(): + var tile_width = ground_map.tile_set.tile_size.x + camera_2d.position.x -= tile_width + +func scroll_right(): + var tile_width = ground_map.tile_set.tile_size.x + camera_2d.position.x += tile_width diff --git a/hexmapper/scenes/MainMap/startup.gd b/hexmapper/scenes/MainMap/startup.gd index ff6d075..3ad535c 100644 --- a/hexmapper/scenes/MainMap/startup.gd +++ b/hexmapper/scenes/MainMap/startup.gd @@ -10,6 +10,11 @@ extends Node @onready var map_cursor_timer:Timer = %MapCursorTimer @onready var menu_top:HBoxContainer = %MenuTop +@onready var scroll_button_up = %ScrollButtonUp +@onready var scroll_button_down = %ScrollButtonDown +@onready var scroll_button_left = %ScrollButtonLeft +@onready var scroll_button_right = %ScrollButtonRight + signal selected_map_for_loading(map_file_name:String) func _ready(): @@ -25,6 +30,10 @@ func _ready(): map_menu.mouse_entered.connect(map_cursor_timer.disable_cursor) map_menu.mouse_exited.connect(map_cursor_timer.enable_cursor) + scroll_button_up.pressed.connect(map_manager.scroll_up) + scroll_button_down.pressed.connect(map_manager.scroll_down) + scroll_button_left.pressed.connect(map_manager.scroll_left) + scroll_button_right.pressed.connect(map_manager.scroll_right) load_settings() func load_settings(): diff --git a/workbench/button_down.png b/workbench/button_down.png index dba817b..8e93bec 100644 Binary files a/workbench/button_down.png and b/workbench/button_down.png differ diff --git a/workbench/button_left.png b/workbench/button_left.png index 5434254..1bb162d 100644 Binary files a/workbench/button_left.png and b/workbench/button_left.png differ diff --git a/workbench/button_right.png b/workbench/button_right.png index 58039a2..4fa62d5 100644 Binary files a/workbench/button_right.png and b/workbench/button_right.png differ diff --git a/workbench/button_up.png b/workbench/button_up.png index 2190358..909704c 100644 Binary files a/workbench/button_up.png and b/workbench/button_up.png differ