kawaiizenbo/PneumaticPlaything
1
0
Fork 0
Code Issues Pull requests Projects Releases 9 Packages Wiki Activity Actions

fix controller support and add in game menu

Browse source
This commit is contained in:
Persephone Bubblegum-Holiday 2025-08-04 16:59:52 -07:00
parent 9bd94304fe
commit 8c9060147f
10 changed files with 295 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

99
Scenes/EditorStages/1Stage.tscn
View file

@ -254,28 +254,6 @@ transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 3, 4)
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_w3m2i")
[node name="Room Lights" type="Node3D" parent="."]
[node name="OmniLight3D" type="OmniLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 2.5, 3)
light_color = Color(1, 0.960784, 0.85098, 1)
[node name="OmniLight3D2" type="OmniLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 2.5, 3)
light_color = Color(1, 0.960784, 0.85098, 1)
[node name="OmniLight3D3" type="OmniLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, 3)
light_color = Color(1, 0.960784, 0.85098, 1)
[node name="OmniLight3D4" type="OmniLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.86654, 2.5, 0.906235)
light_color = Color(1, 0.960784, 0.85098, 1)
[node name="OmniLight3D5" type="OmniLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7, 2.5, 1)
light_color = Color(1, 0.960784, 0.85098, 1)
[node name="Angle 1" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.984808, 0.173648, 0, -0.173648, 0.984808, 0, 2.75, 3.5)
current = true
@ -296,3 +274,80 @@ fov = 60.0
[node name="Angle 5" type="Camera3D" parent="."]
transform = Transform3D(0.965017, -0.0450779, 0.258285, 0, 0.985109, 0.171929, -0.262189, -0.165914, 0.950647, 2, 2.75, 5)
fov = 60.0
[node name="Room Lights" type="Node3D" parent="."]
[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 2)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 2)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 2)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 6.86654, 3.5, 1.90623)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D6" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 11)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D7" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 11)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D8" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 11)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D9" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 6.86654, 3.5, 10.9062)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D10" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 11)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D11" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 6.5)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D12" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 6.5)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D13" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 6.5)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D14" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 6.86654, 3.5, 6.5)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D15" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 6.5)
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0

57
Scenes/FreeRoam/Generic/Generic1Stage.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=20 format=3 uid="uid://b6rem1te85htp"]
[gd_scene load_steps=18 format=3 uid="uid://b6rem1te85htp"]
[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/FreeRoam/Generic/1StageGenericRoom.glb" id="1_8m4fm"]
[ext_resource type="PackedScene" uid="uid://bf4aq55iy3yey" path="res://Models/1Stage/1StageGeneric.glb" id="2_ncqi6"]
@ -14,8 +14,6 @@
[ext_resource type="PackedScene" uid="uid://dm3wfbhs34bkd" path="res://Models/1Stage/1StageGenericOrganLightsOuter.glb" id="12_rs0sv"]
[ext_resource type="PackedScene" uid="uid://mvv5sjk3vbtl" path="res://Scenes/Props/HelicopterLight.tscn" id="13_1oq0m"]
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/player.tscn" id="14_ncqi6"]
[ext_resource type="ArrayMesh" uid="uid://cxetf6uisjlwr" path="res://Models/FreeRoam/Generic/Generic1StageStageCollider.obj" id="15_fdybi"]
[ext_resource type="ArrayMesh" uid="uid://cf4oa43hi1w5t" path="res://Models/FreeRoam/Generic/Generic1StageRoomCollider.obj" id="16_0hrbq"]
[sub_resource type="Environment" id="Environment_0tsrs"]
ambient_light_source = 1
@ -39,92 +37,77 @@ environment = SubResource("Environment_0tsrs")
[node name="OmniLight3D" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 2)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D2" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 2)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D3" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 2)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D4" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 6.86654, 3.5, 1.90623)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D5" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 2)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D6" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 11)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D7" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 11)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D8" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 11)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D9" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 6.86654, 3.5, 10.9062)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D10" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 11)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D11" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4, 3.5, 6.5)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D12" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -4, 3.5, 6.5)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D13" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 3.5, 6.5)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D14" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 6.86654, 3.5, 6.5)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="OmniLight3D15" type="SpotLight3D" parent="Room Lights"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -7, 3.5, 6.5)
light_color = Color(0.709804, 0.67451, 0.623529, 1)
light_energy = 2.0
light_color = Color(1, 0.960784, 0.85098, 1)
spot_angle = 90.0
[node name="StageAssets" type="Node3D" parent="."]
@ -362,18 +345,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3)
[node name="StageCollider" type="StaticBody3D" parent="."]
[node name="MeshInstance3D" type="MeshInstance3D" parent="StageCollider"]
visible = false
mesh = ExtResource("15_fdybi")
[node name="CollisionShape3D" type="CollisionShape3D" parent="StageCollider"]
shape = SubResource("ConcavePolygonShape3D_5nqmm")
[node name="RoomCollider" type="StaticBody3D" parent="."]
[node name="MeshInstance3D" type="MeshInstance3D" parent="RoomCollider"]
visible = false
mesh = ExtResource("16_0hrbq")
[node name="CollisionShape3D" type="CollisionShape3D" parent="RoomCollider"]
shape = SubResource("ConcavePolygonShape3D_cw8uy")

87
Scenes/GUI/InGameMenu.tscn Normal file
View file

@ -0,0 +1,87 @@
[gd_scene load_steps=2 format=3 uid="uid://cd67bfok34xhy"]
[ext_resource type="Script" uid="uid://pwg37gka2qr4" path="res://Scripts/InGameMenu.gd" id="1_cp535"]
[node name="InGameMenu" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_cp535")
[node name="ColorRect" type="ColorRect" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
color = Color(0.121569, 0.121569, 0.121569, 0.501961)
[node name="Buttons" type="Panel" parent="."]
layout_mode = 1
anchors_preset = 2
anchor_top = 1.0
anchor_bottom = 1.0
offset_left = 60.0
offset_top = -380.0
offset_right = 324.0
offset_bottom = -64.0
grow_vertical = 0
[node name="ReturnButton" type="Button" parent="Buttons"]
layout_mode = 0
offset_left = 4.0
offset_top = 4.0
offset_right = 260.0
offset_bottom = 52.0
text = "Return to Game"
[node name="LoadShowButton" type="Button" parent="Buttons"]
layout_mode = 0
offset_left = 4.0
offset_top = 56.0
offset_right = 260.0
offset_bottom = 104.0
text = "Load Show"
[node name="CosmeticsButton" type="Button" parent="Buttons"]
layout_mode = 0
offset_left = 4.0
offset_top = 108.0
offset_right = 260.0
offset_bottom = 156.0
text = "Cosmetics"
[node name="FlowControlsButton" type="Button" parent="Buttons"]
layout_mode = 0
offset_left = 4.0
offset_top = 160.0
offset_right = 260.0
offset_bottom = 208.0
text = "Flow Controls"
[node name="ExitMenuButton" type="Button" parent="Buttons"]
layout_mode = 0
offset_left = 4.0
offset_top = 212.0
offset_right = 260.0
offset_bottom = 260.0
text = "Exit to Menu"
[node name="ExitButton" type="Button" parent="Buttons"]
layout_mode = 0
offset_left = 4.0
offset_top = 264.0
offset_right = 260.0
offset_bottom = 312.0
text = "Exit to Desktop"
[connection signal="pressed" from="Buttons/ReturnButton" to="." method="_on_return_button_pressed"]
[connection signal="pressed" from="Buttons/LoadShowButton" to="." method="_on_load_show_button_pressed"]
[connection signal="pressed" from="Buttons/CosmeticsButton" to="." method="_on_cosmetics_button_pressed"]
[connection signal="pressed" from="Buttons/FlowControlsButton" to="." method="_on_flow_controls_button_pressed"]
[connection signal="pressed" from="Buttons/ExitMenuButton" to="." method="_on_exit_menu_button_pressed"]
[connection signal="pressed" from="Buttons/ExitButton" to="." method="_on_exit_button_pressed"]

12
Scenes/GUI/MainMenu.tscn
View file

@ -113,6 +113,8 @@ offset_left = 4.0
offset_top = 4.0
offset_right = 260.0
offset_bottom = 52.0
focus_next = NodePath("../FreeRoamButton")
focus_previous = NodePath("../ExitButton")
text = "Editor"
[node name="FreeRoamButton" type="Button" parent="Buttons"]
@ -121,6 +123,8 @@ offset_left = 4.0
offset_top = 56.0
offset_right = 260.0
offset_bottom = 104.0
focus_next = NodePath("../ModsButton")
focus_previous = NodePath("../EditorButton")
text = "Free Roam
"
@ -130,6 +134,8 @@ offset_left = 4.0
offset_top = 108.0
offset_right = 260.0
offset_bottom = 156.0
focus_next = NodePath("../ControlsButton")
focus_previous = NodePath("../FreeRoamButton")
text = "Manage Mods"
[node name="ControlsButton" type="Button" parent="Buttons"]
@ -138,6 +144,8 @@ offset_left = 4.0
offset_top = 160.0
offset_right = 260.0
offset_bottom = 208.0
focus_next = NodePath("../CreditsButton")
focus_previous = NodePath("../ModsButton")
text = "Controls"
[node name="CreditsButton" type="Button" parent="Buttons"]
@ -146,6 +154,8 @@ offset_left = 4.0
offset_top = 212.0
offset_right = 260.0
offset_bottom = 260.0
focus_next = NodePath("../ExitButton")
focus_previous = NodePath("../ControlsButton")
text = "Credits"
[node name="ExitButton" type="Button" parent="Buttons"]
@ -154,6 +164,8 @@ offset_left = 4.0
offset_top = 264.0
offset_right = 260.0
offset_bottom = 312.0
focus_next = NodePath("../EditorButton")
focus_previous = NodePath("../CreditsButton")
text = "Exit to Desktop"
[node name="FreeRoamChooseScreen" type="Control" parent="."]