From 1098453b5ed1dbd489a36e87a3d09f645ff629dd Mon Sep 17 00:00:00 2001 From: fram3d Date: Fri, 5 Jul 2024 01:54:23 +0200 Subject: [PATCH] add UI --- ...e.png-2588384f69d078ed3af39e5e39672e7d.md5 | 3 ++ ....png-2588384f69d078ed3af39e5e39672e7d.stex | Bin 0 -> 138 bytes ...d.png-75f5ca870dd580ad6bde90f6052ac60c.md5 | 3 ++ ....png-75f5ca870dd580ad6bde90f6052ac60c.stex | Bin 0 -> 169 bytes ...d.png-e048a0c8cbfcfb27218f5843c49bbd6c.md5 | 3 ++ ....png-e048a0c8cbfcfb27218f5843c49bbd6c.stex | Bin 0 -> 639 bytes src/UI/GUI.gd | 22 ++++++++++ src/UI/GUI.tscn | 41 ++++++++++++++++++ src/UI/pause.png | 3 ++ src/UI/pause.png.import | 34 +++++++++++++++ src/UI/speed.png | 3 ++ src/UI/speed.png.import | 34 +++++++++++++++ src/World.tscn | 6 ++- 13 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 src/.import/pause.png-2588384f69d078ed3af39e5e39672e7d.md5 create mode 100644 src/.import/pause.png-2588384f69d078ed3af39e5e39672e7d.stex create mode 100644 src/.import/speed.png-75f5ca870dd580ad6bde90f6052ac60c.md5 create mode 100644 src/.import/speed.png-75f5ca870dd580ad6bde90f6052ac60c.stex create mode 100644 src/.import/spped.png-e048a0c8cbfcfb27218f5843c49bbd6c.md5 create mode 100644 src/.import/spped.png-e048a0c8cbfcfb27218f5843c49bbd6c.stex create mode 100644 src/UI/GUI.gd create mode 100644 src/UI/GUI.tscn create mode 100644 src/UI/pause.png create mode 100644 src/UI/pause.png.import create mode 100644 src/UI/speed.png create mode 100644 src/UI/speed.png.import diff --git a/src/.import/pause.png-2588384f69d078ed3af39e5e39672e7d.md5 b/src/.import/pause.png-2588384f69d078ed3af39e5e39672e7d.md5 new file mode 100644 index 0000000..ca8a39e --- /dev/null +++ b/src/.import/pause.png-2588384f69d078ed3af39e5e39672e7d.md5 @@ -0,0 +1,3 @@ +source_md5="ea70ad65cae93d474483e7709e543dac" +dest_md5="59c8e93bedf75c1f3aa313f10b030468" + diff --git a/src/.import/pause.png-2588384f69d078ed3af39e5e39672e7d.stex b/src/.import/pause.png-2588384f69d078ed3af39e5e39672e7d.stex new file mode 100644 index 0000000000000000000000000000000000000000..06004a9f9a893e75b0bd2cdd953c0374105c7fe8 GIT binary patch literal 138 zcmZ>F2@c_6U|;}Y2oPXn1Tyk~IKaEak7F*P}1fn-O2|9^RT`Tz3b^E)G&PlQXz%dhu~6@JOiAezp( UfBqt)UqJN?p00i_>zopr0C;X72><{9 literal 0 HcmV?d00001 diff --git a/src/.import/speed.png-75f5ca870dd580ad6bde90f6052ac60c.md5 b/src/.import/speed.png-75f5ca870dd580ad6bde90f6052ac60c.md5 new file mode 100644 index 0000000..12f580b --- /dev/null +++ b/src/.import/speed.png-75f5ca870dd580ad6bde90f6052ac60c.md5 @@ -0,0 +1,3 @@ +source_md5="d81b98260931c2758f0a53edaa052c2e" +dest_md5="ea3bcd09037e5a0180b92cb09eee9e82" + diff --git a/src/.import/speed.png-75f5ca870dd580ad6bde90f6052ac60c.stex b/src/.import/speed.png-75f5ca870dd580ad6bde90f6052ac60c.stex new file mode 100644 index 0000000000000000000000000000000000000000..8664287b95fcac5a1c7fa41f7c183fb320e04334 GIT binary patch literal 169 zcmZ>F2@c_BU|`?^Vh9jmV+1mKfjGd=U7-_5@N!9kq6>a&K?!c^Isf4WTA*&`V#2|%Fee)#}1!!0Wnw<5;17l6hwc)I$ztaD0e0s!$v BE~5Yd literal 0 HcmV?d00001 diff --git a/src/.import/spped.png-e048a0c8cbfcfb27218f5843c49bbd6c.md5 b/src/.import/spped.png-e048a0c8cbfcfb27218f5843c49bbd6c.md5 new file mode 100644 index 0000000..9b076fd --- /dev/null +++ b/src/.import/spped.png-e048a0c8cbfcfb27218f5843c49bbd6c.md5 @@ -0,0 +1,3 @@ +source_md5="cf4e7f29d2304ad291f0348a9ba0fa19" +dest_md5="9f55c32f5fc2d8c3dd5c4467572ec9c9" + diff --git a/src/.import/spped.png-e048a0c8cbfcfb27218f5843c49bbd6c.stex b/src/.import/spped.png-e048a0c8cbfcfb27218f5843c49bbd6c.stex new file mode 100644 index 0000000000000000000000000000000000000000..b3cce058e904cd76bc7d073c71424cc2a7f74661 GIT binary patch literal 639 zcmV-_0)YKTL{n5e0000e000000000001yWO0001E0ssI|PDdb#P)Px%8A(JzRA_IJOtet0f|Q6tD0I2XZIX zG`fsmxP~1C@@k2^(qFM>K4S04^L1QQEkYL2S3R=B__JQWkKt3SYZ1;tAWCq~5& z*Nn}r9~N(0kbL1p4^LF$M+($uz4-3n+;G8YbBUhn7k!fWwuYGleA7UDo;y6wsQ6N$ z%&_<(h1=FILgbZdEBpdiu{!cuTj85Hk1x3s79qTbE7pr9nhM{-Spm_+JcVb8CZfWP zMHBN7evQjm!QYy(xx)8w8lN-APbDH;*W4Rik|&y5e+8!mMQ0r-O6>4k)d?penwYkT z_i<7|(L@{JcetRLXkuLW0Zy2MXrhVmd)2x14*o=%n((JS2|vUcd@IJvE&EQy|evym3h;WwdJnoZAW;Q*o{KrNYO|%x?ETSD99UUE; Zfq&eNoM`lk?85*6002ovPDHLkV1jPt9H0OI literal 0 HcmV?d00001 diff --git a/src/UI/GUI.gd b/src/UI/GUI.gd new file mode 100644 index 0000000..22d7f42 --- /dev/null +++ b/src/UI/GUI.gd @@ -0,0 +1,22 @@ +extends CanvasLayer + +#onready var fps = get("physics/common/physics_fps") +onready var fps = Engine.target_fps +onready var timer = $"/root/World/Timer" +onready var timerspeed = timer.wait_time + +func _on_pause_toggled(button_pressed): + get_tree().paused = button_pressed + + +func _on_speed_toggled(button_pressed): + if button_pressed: + Engine.time_scale = 2 + Engine.iterations_per_second = 10 + + else: + Engine.time_scale = 1 + Engine.iterations_per_second = 5 + + + diff --git a/src/UI/GUI.tscn b/src/UI/GUI.tscn new file mode 100644 index 0000000..ab35bed --- /dev/null +++ b/src/UI/GUI.tscn @@ -0,0 +1,41 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://UI/pause.png" type="Texture" id=1] +[ext_resource path="res://UI/speed.png" type="Texture" id=2] +[ext_resource path="res://UI/GUI.gd" type="Script" id=3] + +[node name="GUI" type="CanvasLayer"] +pause_mode = 2 +script = ExtResource( 3 ) + +[node name="HBoxContainer" type="HBoxContainer" parent="."] +anchor_left = 1.0 +anchor_right = 1.0 +margin_left = -6.0 +margin_right = 49.0 +margin_bottom = 24.0 +rect_scale = Vector2( 0.1, 0.1 ) +alignment = 2 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="pause" type="Button" parent="HBoxContainer"] +margin_left = 2.0 +margin_right = 24.0 +margin_bottom = 20.0 +size_flags_horizontal = 0 +size_flags_vertical = 0 +toggle_mode = true +icon = ExtResource( 1 ) + +[node name="speed" type="Button" parent="HBoxContainer"] +margin_left = 28.0 +margin_right = 55.0 +margin_bottom = 20.0 +size_flags_horizontal = 0 +size_flags_vertical = 0 +toggle_mode = true +icon = ExtResource( 2 ) +[connection signal="toggled" from="HBoxContainer/pause" to="." method="_on_pause_toggled"] +[connection signal="toggled" from="HBoxContainer/speed" to="." method="_on_speed_toggled"] diff --git a/src/UI/pause.png b/src/UI/pause.png new file mode 100644 index 0000000..b41ddc6 --- /dev/null +++ b/src/UI/pause.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:351a7bf15be5cc4934c3fe0e86076f1f0e1d15eb95b6937a78f05d3112563971 +size 4298 diff --git a/src/UI/pause.png.import b/src/UI/pause.png.import new file mode 100644 index 0000000..5bb74b4 --- /dev/null +++ b/src/UI/pause.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/pause.png-2588384f69d078ed3af39e5e39672e7d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/pause.png" +dest_files=[ "res://.import/pause.png-2588384f69d078ed3af39e5e39672e7d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/UI/speed.png b/src/UI/speed.png new file mode 100644 index 0000000..066f095 --- /dev/null +++ b/src/UI/speed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31e826600525fec5cd86c076861b4fc4da256b7a4975999f8a39c7efb91552ad +size 4328 diff --git a/src/UI/speed.png.import b/src/UI/speed.png.import new file mode 100644 index 0000000..01dd251 --- /dev/null +++ b/src/UI/speed.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/speed.png-75f5ca870dd580ad6bde90f6052ac60c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/speed.png" +dest_files=[ "res://.import/speed.png-75f5ca870dd580ad6bde90f6052ac60c.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/World.tscn b/src/World.tscn index 5f38a0b..d41be3c 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=24 format=2] [ext_resource path="res://Tilesets/stone.png" type="Texture" id=1] [ext_resource path="res://Tilesets/dirt.png" type="Texture" id=2] [ext_resource path="res://Tilesets/water.png" type="Texture" id=3] +[ext_resource path="res://UI/GUI.tscn" type="PackedScene" id=4] [ext_resource path="res://Audio/Background/cave.ogg" type="AudioStream" id=7] [ext_resource path="res://camera.gd" type="Script" id=8] [ext_resource path="res://spawn.gd" type="Script" id=10] @@ -218,6 +219,7 @@ points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 ) [node name="World" type="Node2D"] [node name="Camera2D" type="Camera2D" parent="."] +pause_mode = 2 position = Vector2( 132, 132 ) current = true zoom = Vector2( 4, 4 ) @@ -243,4 +245,6 @@ process_mode = 0 wait_time = 10.0 autostart = true script = ExtResource( 10 ) + +[node name="GUI" parent="." instance=ExtResource( 4 )] [connection signal="timeout" from="Timer" to="Timer" method="_on_Timer_timeout"]