From 7c6aced9ca130efc31085b1e6a7eb7ea3ed0d740 Mon Sep 17 00:00:00 2001 From: mehbark Date: Sat, 5 Sep 2026 20:25:29 -0400 Subject: [PATCH] 4.7! also fps thing --- fps.gd | 4 ++++ fps.gd.uid | 1 + main.tscn | 39 +++++++++++++++++++++++---------------- model/ball.tres | 2 +- model/floor_ice.tres | 2 +- model/goal.tres | 2 +- model/player.tres | 2 +- model/player_barrier.tres | 4 ++-- model/wall.tres | 2 +- piece/player_barrier.tscn | 4 ++-- piece/wall.tscn | 4 ++-- project.godot | 6 +++++- 12 files changed, 44 insertions(+), 28 deletions(-) create mode 100644 fps.gd create mode 100644 fps.gd.uid diff --git a/fps.gd b/fps.gd new file mode 100644 index 0000000..c611325 --- /dev/null +++ b/fps.gd @@ -0,0 +1,4 @@ +extends Label + +func _process(_delta: float) -> void: + text = str(int(Engine.get_frames_per_second())) diff --git a/fps.gd.uid b/fps.gd.uid new file mode 100644 index 0000000..886dae4 --- /dev/null +++ b/fps.gd.uid @@ -0,0 +1 @@ +uid://c8kqyoomhve1g diff --git a/main.tscn b/main.tscn index 66e37bc..b13ab25 100644 --- a/main.tscn +++ b/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://lrk2whqxl0w0"] +[gd_scene format=3 uid="uid://lrk2whqxl0w0"] [ext_resource type="Script" uid="uid://c707s0tgd88pg" path="res://main.gd" id="1_ig7tw"] [ext_resource type="Texture2D" uid="uid://crahyipmcudoy" path="res://ui/undo.png" id="3_lquwl"] @@ -7,6 +7,7 @@ [ext_resource type="Shader" uid="uid://c7e17bwc7nrgt" path="res://ground.gdshader" id="5_lquwl"] [ext_resource type="Texture2D" uid="uid://q6x7t05nx1d1" path="res://ui/rolltime-indicator.png" id="6_7mycd"] [ext_resource type="Texture2D" uid="uid://b8kvn3kumc08s" path="res://ui/victory-indicator.png" id="7_272bh"] +[ext_resource type="Script" uid="uid://c8kqyoomhve1g" path="res://fps.gd" id="8_5vw27"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_1bvp3"] sky_top_color = Color(0.467272, 0.753409, 0.87431, 1) @@ -46,33 +47,33 @@ shader_parameter/noise_strength = 0.1 material = SubResource("ShaderMaterial_lquwl") size = Vector2(64, 64) -[node name="Main" type="Node3D"] +[node name="Main" type="Node3D" unique_id=1819655365] script = ExtResource("1_ig7tw") -[node name="Sun" type="DirectionalLight3D" parent="."] +[node name="Sun" type="DirectionalLight3D" parent="." unique_id=86560667] transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 0, 0) light_energy = 0.1 shadow_enabled = true shadow_opacity = 0.75 -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +[node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=954776949] environment = SubResource("Environment_7mycd") -[node name="Camera" type="Camera3D" parent="."] +[node name="Camera" type="Camera3D" parent="." unique_id=925153376] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 20, 0) fov = 30.0 -[node name="Sound" type="AudioStreamPlayer" parent="."] +[node name="Sound" type="AudioStreamPlayer" parent="." unique_id=88445396] -[node name="TopLeft" type="VisibleOnScreenNotifier3D" parent="."] +[node name="TopLeft" type="VisibleOnScreenNotifier3D" parent="." unique_id=1405523715] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.5, 0, -0.25) aabb = AABB(-0.25, 0, -0.25, 2, 2, 2) -[node name="BottomRight" type="VisibleOnScreenNotifier3D" parent="."] +[node name="BottomRight" type="VisibleOnScreenNotifier3D" parent="." unique_id=1877862461] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 0, 0.25) aabb = AABB(0, 0, 0, 2, 2, 2) -[node name="UndoButton" type="Button" parent="."] +[node name="UndoButton" type="Button" parent="." unique_id=1224849043] offset_left = -5.0 offset_top = 1.0 offset_right = 101.0 @@ -82,7 +83,7 @@ icon = ExtResource("3_lquwl") flat = true expand_icon = true -[node name="RedoButton" type="Button" parent="."] +[node name="RedoButton" type="Button" parent="." unique_id=1856584366] offset_left = 108.0 offset_top = 3.0 offset_right = 226.0 @@ -92,7 +93,7 @@ icon = ExtResource("4_7mycd") flat = true expand_icon = true -[node name="RestartButton" type="Button" parent="."] +[node name="RestartButton" type="Button" parent="." unique_id=46580298] visible = false offset_left = 245.0 offset_top = 4.0 @@ -103,7 +104,7 @@ icon = ExtResource("5_272bh") flat = true expand_icon = true -[node name="Clock" type="RichTextLabel" parent="."] +[node name="Clock" type="RichTextLabel" parent="." unique_id=286900933] offset_left = 1063.0 offset_top = 28.0 offset_right = 1244.0 @@ -111,7 +112,7 @@ offset_bottom = 76.0 theme_override_font_sizes/normal_font_size = 32 fit_content = true -[node name="SlowmoIndicator" type="Label" parent="."] +[node name="SlowmoIndicator" type="Label" parent="." unique_id=820839621] offset_left = 1065.0 offset_top = 615.0 offset_right = 1150.0 @@ -120,21 +121,27 @@ text = "slowmo" horizontal_alignment = 1 vertical_alignment = 1 -[node name="Ground" type="MeshInstance3D" parent="."] +[node name="Ground" type="MeshInstance3D" parent="." unique_id=1791379229] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.01, 0) mesh = SubResource("PlaneMesh_1bvp3") -[node name="RolltimeIndicator" type="Sprite2D" parent="."] +[node name="RolltimeIndicator" type="Sprite2D" parent="." unique_id=1995599430] modulate = Color(1, 1, 1, 0) texture = ExtResource("6_7mycd") centered = false -[node name="VictoryIndicator" type="Sprite2D" parent="."] +[node name="VictoryIndicator" type="Sprite2D" parent="." unique_id=1017286535] modulate = Color(0.796078, 0.639216, 0.0627451, 0) z_index = 1 texture = ExtResource("7_272bh") centered = false +[node name="FPS" type="Label" parent="." unique_id=1725697550] +visible = false +offset_right = 40.0 +offset_bottom = 23.0 +script = ExtResource("8_5vw27") + [connection signal="pressed" from="UndoButton" to="." method="undo"] [connection signal="pressed" from="RedoButton" to="." method="redo"] [connection signal="pressed" from="RestartButton" to="." method="restart"] diff --git a/model/ball.tres b/model/ball.tres index e0591c4..65d912d 100644 --- a/model/ball.tres +++ b/model/ball.tres @@ -1,4 +1,4 @@ -[gd_resource type="SphereMesh" load_steps=2 format=3 uid="uid://bxuewsvlsvexw"] +[gd_resource type="SphereMesh" format=3 uid="uid://bxuewsvlsvexw"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yae82"] resource_local_to_scene = true diff --git a/model/floor_ice.tres b/model/floor_ice.tres index 6745a5d..eebb3c0 100644 --- a/model/floor_ice.tres +++ b/model/floor_ice.tres @@ -1,4 +1,4 @@ -[gd_resource type="QuadMesh" load_steps=2 format=3 uid="uid://cs4ct3wp7xqeo"] +[gd_resource type="QuadMesh" format=3 uid="uid://cs4ct3wp7xqeo"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yh6g8"] albedo_color = Color(0.607843, 1, 1, 1) diff --git a/model/goal.tres b/model/goal.tres index 648df2a..382e4fa 100644 --- a/model/goal.tres +++ b/model/goal.tres @@ -1,4 +1,4 @@ -[gd_resource type="CylinderMesh" load_steps=2 format=3 uid="uid://dip4i2st1vn1j"] +[gd_resource type="CylinderMesh" format=3 uid="uid://dip4i2st1vn1j"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tr67r"] albedo_color = Color(0.345098, 0.658824, 0.819608, 1) diff --git a/model/player.tres b/model/player.tres index f19c999..a0fa9c0 100644 --- a/model/player.tres +++ b/model/player.tres @@ -1,4 +1,4 @@ -[gd_resource type="CapsuleMesh" load_steps=2 format=3 uid="uid://mjvk342gmemc"] +[gd_resource type="CapsuleMesh" format=3 uid="uid://mjvk342gmemc"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8tqic"] albedo_color = Color(0.51788, 0.672061, 0.871029, 1) diff --git a/model/player_barrier.tres b/model/player_barrier.tres index c915209..2dd7272 100644 --- a/model/player_barrier.tres +++ b/model/player_barrier.tres @@ -1,7 +1,7 @@ -[gd_resource type="BoxMesh" load_steps=2 format=3 uid="uid://bvfmi7q57va1u"] +[gd_resource type="BoxMesh" format=3 uid="uid://bvfmi7q57va1u"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wvmwf"] -transparency = 4 +transparency = 1 albedo_color = Color(0.819608, 0.254902, 0.321569, 0.47451) [resource] diff --git a/model/wall.tres b/model/wall.tres index 3276e63..756825c 100644 --- a/model/wall.tres +++ b/model/wall.tres @@ -1,4 +1,4 @@ -[gd_resource type="BoxMesh" load_steps=2 format=3 uid="uid://b36l7brqc2lml"] +[gd_resource type="BoxMesh" format=3 uid="uid://b36l7brqc2lml"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ig7tw"] albedo_color = Color(0.458824, 0.34902, 0.317647, 0.784314) diff --git a/piece/player_barrier.tscn b/piece/player_barrier.tscn index a07a052..0df8187 100644 --- a/piece/player_barrier.tscn +++ b/piece/player_barrier.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=3 format=3 uid="uid://bxgv16ue166pp"] +[gd_scene format=3 uid="uid://bxgv16ue166pp"] [ext_resource type="BoxMesh" uid="uid://bvfmi7q57va1u" path="res://model/player_barrier.tres" id="1_y608q"] [ext_resource type="Script" uid="uid://bq3a5hhccxndn" path="res://piece.gd" id="2_xveqp"] -[node name="PlayerBarrier" type="MeshInstance3D"] +[node name="PlayerBarrier" type="MeshInstance3D" unique_id=1011067630] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 0.5, 0.5) mesh = ExtResource("1_y608q") script = ExtResource("2_xveqp") diff --git a/piece/wall.tscn b/piece/wall.tscn index 5fc75e9..abff4d7 100644 --- a/piece/wall.tscn +++ b/piece/wall.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=3 format=3 uid="uid://bkaa4sl1n2f5w"] +[gd_scene format=3 uid="uid://bkaa4sl1n2f5w"] [ext_resource type="BoxMesh" uid="uid://b36l7brqc2lml" path="res://model/wall.tres" id="1_ostjl"] [ext_resource type="Script" uid="uid://bq3a5hhccxndn" path="res://piece.gd" id="2_j8o2k"] -[node name="Wall" type="MeshInstance3D"] +[node name="Wall" type="MeshInstance3D" unique_id=852012625] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 0.600054, 0.5) mesh = ExtResource("1_ostjl") script = ExtResource("2_j8o2k") diff --git a/project.godot b/project.godot index d5e01e0..1289efd 100644 --- a/project.godot +++ b/project.godot @@ -8,12 +8,16 @@ config_version=5 +[animation] + +compatibility/default_parent_skeleton_in_mesh_instance_3d=true + [application] config/name="rolltime" config/description="it's rolltime" run/main_scene="uid://lrk2whqxl0w0" -config/features=PackedStringArray("4.5", "GL Compatibility") +config/features=PackedStringArray("4.7", "GL Compatibility") config/icon="res://icon.svg" [display]