summaryrefslogtreecommitdiffstats
path: root/demo/Main.gd
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2023-03-14 21:45:00 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2023-03-14 21:45:00 +0100
commitc2a17228c19c4f959367b139e39c5e24dd7edd36 (patch)
tree2a898121b636f621bca67e332d439fc7c2e1c0fb /demo/Main.gd
parentd7ae050e7dc27fa052a9f4dbf065fdb86a966967 (diff)
downloadgodot-hexgrid-c2a17228c19c4f959367b139e39c5e24dd7edd36.zip
godot-hexgrid-c2a17228c19c4f959367b139e39c5e24dd7edd36.tar.gz
go godot4
Diffstat (limited to 'demo/Main.gd')
-rw-r--r--demo/Main.gd29
1 files changed, 14 insertions, 15 deletions
diff --git a/demo/Main.gd b/demo/Main.gd
index 42b52a9..8aad56f 100644
--- a/demo/Main.gd
+++ b/demo/Main.gd
@@ -1,26 +1,25 @@
-#warning-ignore-all:return_value_discarded
extends Node2D
var moved : int = 0
var drag_map : bool = false
-onready var UI : Control = $CanvasLayer/HBOX/UI
-onready var Map : Sprite = $CanvasLayer/HBOX/ViewportContainer/Viewport/Map
-onready var Camera : Camera2D = $CanvasLayer/HBOX/ViewportContainer/Viewport/Camera
+@onready var UI : Control = $CanvasLayer/HBOX/UI
+@onready var Map : Sprite2D = $CanvasLayer/HBOX/ViewportContainer/Viewport/Map
+@onready var Camera : Camera2D = $CanvasLayer/HBOX/ViewportContainer/Viewport/Camera
func _ready():
- UI.get_node("rotate").connect("pressed", self, "on_rotate")
- UI.get_node("zin").connect("pressed", self, "on_zoom", [true])
- UI.get_node("zout").connect("pressed", self, "on_zoom", [false])
- UI.get_node("LOS").connect("pressed", self, "on_toggle")
- UI.get_node("Move").connect("pressed", self, "on_toggle")
- UI.get_node("Influence").connect("pressed", self, "on_toggle")
- Map.connect("hex_touched", self, "on_hex_touched")
- $CanvasLayer/HBOX/ViewportContainer.connect("resized", self, "on_viewport_resized")
+ UI.get_node("rotate").connect("pressed", on_rotate)
+ UI.get_node("zin").connect("pressed", func(): on_zoom(true))
+ UI.get_node("zout").connect("pressed", func(): on_zoom(false))
+ UI.get_node("LOS").connect("pressed", on_toggle)
+ UI.get_node("Move").connect("pressed", on_toggle)
+ UI.get_node("Influence").connect("pressed", on_toggle)
+ Map.connect("hex_touched", on_hex_touched)
+ $CanvasLayer/HBOX/ViewportContainer.connect("resized", on_viewport_resized)
on_toggle()
- yield(get_tree().create_timer(.2), 'timeout')
+ await get_tree().create_timer(.2).timeout
on_viewport_resized()
- UI.get_node("OSInfo").text = "screen\n%s\ndpi %d" % [OS.get_screen_size(), OS.get_screen_dpi()]
+ UI.get_node("OSInfo").text = "screen\n%s\ndpi %d" % [DisplayServer.screen_get_size(), DisplayServer.screen_get_dpi()]
func on_viewport_resized() -> void:
Camera.configure($CanvasLayer/HBOX/ViewportContainer/Viewport.size, Map.center(), Map.texture_size())
@@ -33,7 +32,7 @@ func on_zoom(b : bool) -> void:
Camera.update_camera(0, 0, -0.05 if b else 0.05)
func on_toggle() -> void:
- Map.set_mode(UI.get_node("LOS").pressed, UI.get_node("Move").pressed, UI.get_node("Influence").pressed)
+ Map.set_mode(UI.get_node("LOS").is_pressed(), UI.get_node("Move").is_pressed(), UI.get_node("Influence").is_pressed())
func on_hex_touched(pos : Vector2, hex : Hex, key : int) -> void:
var s : String = ("offmap" if key == -1 else hex.inspect())