hiina/xrjamfeb2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace targets with stars in all scenes

Browse source
This commit is contained in:
hiina 2025-02-16 15:09:44 -07:00
parent 0fd35136c2
commit a6a4d0b4f3
6 changed files with 60 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
scenes/title_scene/title_scene.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=45 format=3 uid="uid://bd86thqpujh3p"]
[gd_scene load_steps=39 format=3 uid="uid://bd86thqpujh3p"]
[ext_resource type="Script" path="res://addons/godot-xr-tools/staging/scene_base.gd" id="1_t86sx"]
[ext_resource type="Script" path="res://scenes/base_game_scene.gd" id="1_243qh"]
[ext_resource type="PackedScene" uid="uid://7uc6tf2tvn1k" path="res://scenes/xr_origin_3d.tscn" id="2_xk21l"]
[ext_resource type="PackedScene" uid="uid://clc5dre31iskm" path="res://addons/godot-xr-tools/xr/start_xr.tscn" id="3_hdcpx"]
[ext_resource type="Environment" uid="uid://c1yf8e4qr42hr" path="res://scenes/environment.tres" id="3_v4538"]
@ -10,12 +10,12 @@
[ext_resource type="PackedScene" uid="uid://rsrnbs08nv1n" path="res://scenes/collisions/proxy_collision_detector.tscn" id="7_1kkxh"]
[ext_resource type="Script" path="res://scenes/performance_settings/voxel_gi_toggle.gd" id="7_4p11s"]
[ext_resource type="PackedScene" uid="uid://c20kawop2lrv" path="res://assets/Models/Arcane Source 2.glb" id="8_h17hj"]
[ext_resource type="Script" path="res://scenes/target.gd" id="11_7oif6"]
[ext_resource type="AudioStream" uid="uid://dnwh2iqwi86ku" path="res://assets/Sounds/04 bass.ogg" id="12_8dki8"]
[ext_resource type="AudioStream" uid="uid://cv0f1tu5pac60" path="res://assets/Sounds/02 midpiano.ogg" id="13_6bsa0"]
[ext_resource type="PackedScene" uid="uid://clujaf3u776a3" path="res://addons/godot-xr-tools/objects/viewport_2d_in_3d.tscn" id="13_ab6mb"]
[ext_resource type="AudioStream" uid="uid://cqb1bo72232vs" path="res://assets/Sounds/03 highpiano.ogg" id="14_8b4v6"]
[ext_resource type="PackedScene" uid="uid://cyd8poa47ir2i" path="res://scenes/performance_settings/performance_settings_menu.tscn" id="14_s5dwy"]
[ext_resource type="PackedScene" uid="uid://b47wuj6l7jcer" path="res://scenes/star_bulb_target.tscn" id="17_3djum"]
[ext_resource type="PackedScene" uid="uid://bu0fu4uiwyu65" path="res://scenes/win_particles.tscn" id="17_68lw0"]
[ext_resource type="PackedScene" uid="uid://bifpsyvpcem3a" path="res://scenes/manipulator/manipulator.tscn" id="17_uqqr1"]
[ext_resource type="PackedScene" uid="uid://ccmx5v2601k8q" path="res://scenes/manipulator/visual_attractor_sphere.tscn" id="18_qmvne"]
[ext_resource type="PackedScene" uid="uid://cibwlfqvmirgb" path="res://scenes/ambient_particles.tscn" id="19_dlo8s"]
@ -106,39 +106,6 @@ cap_top = false
cap_bottom = false
curve = SubResource("Curve_y0yng")
[sub_resource type="BoxShape3D" id="BoxShape3D_gofwq"]
[sub_resource type="BoxMesh" id="BoxMesh_0cc1r"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m6mak"]
transparency = 1
albedo_color = Color(1, 1, 1, 0.3)
emission_enabled = true
emission = Color(1, 1, 1, 1)
emission_energy_multiplier = 0.61
rim = 0.38
refraction_scale = 0.88
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_sffkp"]
transparency = 1
albedo_color = Color(1, 1, 1, 0.3)
emission_enabled = true
emission = Color(1, 1, 1, 1)
emission_energy_multiplier = 0.61
rim = 0.38
refraction_scale = 0.88
[sub_resource type="BoxMesh" id="BoxMesh_ootr5"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_o8q0i"]
transparency = 1
albedo_color = Color(1, 1, 1, 0.3)
emission_enabled = true
emission = Color(1, 1, 1, 1)
emission_energy_multiplier = 0.61
rim = 0.38
refraction_scale = 0.88
[sub_resource type="PrismMesh" id="PrismMesh_be80n"]
size = Vector3(0.2, 0.2, 0.2)
@ -150,7 +117,7 @@ emission = Color(0.208505, 0.70691, 0.626474, 1)
shading_mode = 0
[node name="TitleScene" type="Node3D"]
script = ExtResource("1_t86sx")
script = ExtResource("1_243qh")
[node name="XROrigin3D" parent="." instance=ExtResource("2_xk21l")]
@ -231,60 +198,6 @@ trail_lifetime = 0.5
process_material = SubResource("ParticleProcessMaterial_y126y")
draw_pass_1 = SubResource("TubeTrailMesh_xiw4w")
[node name="Target1" type="StaticBody3D" parent="." groups=["targets"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.31548, 4.27292, -10.1667)
script = ExtResource("11_7oif6")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Target1"]
shape = SubResource("BoxShape3D_gofwq")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Target1"]
layers = 4
mesh = SubResource("BoxMesh_0cc1r")
skeleton = NodePath("../..")
surface_material_override/0 = SubResource("StandardMaterial3D_m6mak")
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Target1"]
stream = ExtResource("14_8b4v6")
volume_db = -80.0
autoplay = true
[node name="Target2" type="StaticBody3D" parent="." groups=["targets"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.21807, 4.27292, -10.0553)
script = ExtResource("11_7oif6")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Target2"]
shape = SubResource("BoxShape3D_gofwq")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Target2"]
layers = 4
mesh = SubResource("BoxMesh_0cc1r")
skeleton = NodePath("../..")
surface_material_override/0 = SubResource("StandardMaterial3D_sffkp")
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Target2"]
stream = ExtResource("13_6bsa0")
volume_db = -80.0
autoplay = true
[node name="Target3" type="StaticBody3D" parent="." groups=["targets"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.005826, 1.90465, -9.1875)
script = ExtResource("11_7oif6")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Target3"]
shape = SubResource("BoxShape3D_gofwq")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Target3"]
layers = 4
mesh = SubResource("BoxMesh_ootr5")
skeleton = NodePath("../..")
surface_material_override/0 = SubResource("StandardMaterial3D_o8q0i")
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Target3"]
stream = ExtResource("12_8dki8")
volume_db = -80.0
autoplay = true
[node name="Manipulator0" parent="." instance=ExtResource("17_uqqr1")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.63926, -9.75923)
@ -316,3 +229,27 @@ scene = ExtResource("20_b65a1")
viewport_size = Vector2(200, 200)
material = SubResource("StandardMaterial3D_6y3wb")
scene_properties_keys = PackedStringArray()
[node name="WinParticles" parent="." instance=ExtResource("17_68lw0")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6, -8)
[node name="Target4" parent="." instance=ExtResource("17_3djum")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.31548, 4.27292, -10.1667)
[node name="Target5" parent="." instance=ExtResource("17_3djum")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.21807, 4.27292, -10.0553)
[node name="AudioStreamPlayer3D" parent="Target5" index="2"]
stream = ExtResource("13_6bsa0")
[node name="Target6" parent="." instance=ExtResource("17_3djum")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.005826, 1.90465, -9.1875)
[node name="AudioStreamPlayer3D" parent="Target6" index="2"]
stream = ExtResource("12_8dki8")
[connection signal="puzzle_completed" from="." to="WinParticles" method="_on_puzzle_completed"]
[editable path="Target4"]
[editable path="Target5"]
[editable path="Target6"]

BIN
scenes/tutorial_scenes/tutorial_scene_1.VoxelGI_data.res
View file

Binary file not shown.

1
scenes/tutorial_scenes/tutorial_scene_1.tscn
View file

@ -142,6 +142,7 @@ skeleton = NodePath("")
surface_material_override/0 = SubResource("StandardMaterial3D_vyhi3")
[node name="Target1" parent="." index="18" instance=ExtResource("5_g0pjq")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.521359, 3.59335, -3.06702)
[node name="WinParticles" parent="." index="20" instance=ExtResource("9_31knv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -3)

74
scenes/tutorial_scenes/tutorial_scene_2.tscn
View file

@ -1,12 +1,11 @@
[gd_scene load_steps=25 format=3 uid="uid://wnfi7j3dmjl"]
[gd_scene load_steps=19 format=3 uid="uid://wnfi7j3dmjl"]
[ext_resource type="PackedScene" uid="uid://1rwj4eq63xgb" path="res://scenes/tutorial_scenes/tutorial_scene_base.tscn" id="1_ef0x7"]
[ext_resource type="VoxelGIData" uid="uid://nhfw6m8oc1hi" path="res://scenes/tutorial_scenes/tutorial_scene_2.VoxelGI_data.res" id="2_eyu4w"]
[ext_resource type="PackedScene" uid="uid://bifpsyvpcem3a" path="res://scenes/manipulator/manipulator.tscn" id="3_00eva"]
[ext_resource type="PackedScene" uid="uid://ccmx5v2601k8q" path="res://scenes/manipulator/visual_attractor_sphere.tscn" id="4_5h7mx"]
[ext_resource type="Script" path="res://scenes/target.gd" id="5_nrhx8"]
[ext_resource type="AudioStream" uid="uid://cqb1bo72232vs" path="res://assets/Sounds/03 highpiano.ogg" id="6_8qjxs"]
[ext_resource type="AudioStream" uid="uid://cv0f1tu5pac60" path="res://assets/Sounds/02 midpiano.ogg" id="7_bmi33"]
[ext_resource type="PackedScene" uid="uid://b47wuj6l7jcer" path="res://scenes/star_bulb_target.tscn" id="5_rw8un"]
[ext_resource type="PackedScene" uid="uid://bu0fu4uiwyu65" path="res://scenes/win_particles.tscn" id="6_5uqih"]
[sub_resource type="Gradient" id="Gradient_0ygfi"]
colors = PackedColorArray(0.720471, 0.182584, 0.797749, 1, 1, 1, 3, 1)
@ -73,30 +72,6 @@ size = Vector3(0.2, 0.2, 0.2)
emission_enabled = true
emission = Color(0.208505, 0.70691, 0.626474, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_5cvp1"]
[sub_resource type="BoxMesh" id="BoxMesh_swij7"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_w1uvt"]
transparency = 1
albedo_color = Color(1, 1, 1, 0.3)
emission_enabled = true
emission = Color(1, 1, 1, 1)
emission_energy_multiplier = 0.61
rim = 0.38
refraction_scale = 0.88
[sub_resource type="BoxMesh" id="BoxMesh_cvybi"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jqpsb"]
transparency = 1
albedo_color = Color(1, 1, 1, 0.3)
emission_enabled = true
emission = Color(1, 1, 1, 1)
emission_energy_multiplier = 0.61
rim = 0.38
refraction_scale = 0.88
[sub_resource type="TextMesh" id="TextMesh_gt0jy"]
text = "the
target"
@ -161,41 +136,11 @@ mesh = SubResource("PrismMesh_vebbs")
skeleton = NodePath("")
surface_material_override/0 = SubResource("StandardMaterial3D_6o2tn")
[node name="Target1" type="StaticBody3D" parent="." index="15" groups=["targets"]]
[node name="Target3" parent="." index="15" instance=ExtResource("5_rw8un")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.599, -6.182)
script = ExtResource("5_nrhx8")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Target1" index="0"]
shape = SubResource("BoxShape3D_5cvp1")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Target1" index="1"]
layers = 4
mesh = SubResource("BoxMesh_swij7")
skeleton = NodePath("../..")
surface_material_override/0 = SubResource("StandardMaterial3D_w1uvt")
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Target1" index="2"]
stream = ExtResource("6_8qjxs")
volume_db = -80.0
autoplay = true
[node name="Target2" type="StaticBody3D" parent="." index="16" groups=["targets"]]
[node name="Target1" parent="." index="16" instance=ExtResource("5_rw8un")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.85112, -4.45978)
script = ExtResource("5_nrhx8")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Target2" index="0"]
shape = SubResource("BoxShape3D_5cvp1")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Target2" index="1"]
layers = 4
mesh = SubResource("BoxMesh_cvybi")
skeleton = NodePath("../..")
surface_material_override/0 = SubResource("StandardMaterial3D_jqpsb")
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Target2" index="2"]
stream = ExtResource("7_bmi33")
volume_db = -80.0
autoplay = true
[node name="TheTarget" type="MeshInstance3D" parent="." index="17"]
transform = Transform3D(0.996969, 0, -0.0777979, 0, 1, 0, 0.0777979, 0, 0.996969, -1.65468, 2.00334, -4.59936)
@ -205,6 +150,13 @@ mesh = SubResource("TextMesh_gt0jy")
transform = Transform3D(0.996969, 0, -0.0777979, 0, 1, 0, 0.0777979, 0, 0.996969, -1.53939, 3.57846, -6.22573)
mesh = SubResource("TextMesh_tfnjp")
[node name="LevelSelect" type="MeshInstance3D" parent="." index="20"]
[node name="WinParticles" parent="." index="20" instance=ExtResource("6_5uqih")]
transform = Transform3D(0.933054, 0, 0.359736, 0, 1, 0, -0.359736, 0, 0.933054, 0, 5, -3.5)
[node name="LevelSelect" type="MeshInstance3D" parent="." index="21"]
transform = Transform3D(0.933054, 0, 0.359736, 0, 1, 0, -0.359736, 0, 0.933054, -3.68075, 2.72605, -4.01316)
mesh = SubResource("TextMesh_jioxp")
[connection signal="puzzle_completed" from="." to="WinParticles" method="_on_puzzle_completed"]
[editable path="Target3"]

4
scenes/valentine_scene/new_particle_process_material.tres
View file

@ -34,5 +34,5 @@ turbulence_noise_scale = 6.228
turbulence_influence_min = 0.01
turbulence_influence_max = 0.01
collision_mode = 1
collision_friction = 0.06
collision_bounce = 1.0
collision_friction = 1.0
collision_bounce = 0.0

26
scenes/valentine_scene/valentine_scene.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=44 format=4 uid="uid://4hr2m5ibwhpy"]
[gd_scene load_steps=45 format=4 uid="uid://4hr2m5ibwhpy"]
[ext_resource type="Script" path="res://scenes/base_game_scene.gd" id="1_fbwwc"]
[ext_resource type="PackedScene" uid="uid://7uc6tf2tvn1k" path="res://scenes/xr_origin_3d.tscn" id="2_i3vfe"]
@ -19,6 +19,7 @@
[ext_resource type="PackedScene" uid="uid://bch40cmi2hgkl" path="res://assets/Models/Pipes.glb" id="20_dn0uk"]
[ext_resource type="PackedScene" uid="uid://g4esih4vcves" path="res://scenes/level_select_3d.tscn" id="20_l6q7q"]
[ext_resource type="Texture2D" uid="uid://c6chhj2jhli1w" path="res://assets/Models/Pipes_Pipe_Base_color.png" id="21_5tu01"]
[ext_resource type="PackedScene" uid="uid://bu0fu4uiwyu65" path="res://scenes/win_particles.tscn" id="21_xyf8w"]
[ext_resource type="PackedScene" uid="uid://5yw5sbkwj0qk" path="res://assets/target_love_potion.tscn" id="22_edujp"]
[sub_resource type="BoxShape3D" id="BoxShape3D_gj4t1"]
@ -321,6 +322,7 @@ mesh = SubResource("PlaneMesh_gsjte")
[node name="SpotLight3D" type="SpotLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.629158, 0.777278, 0, -0.777278, 0.629158, 0, 4.06392, -0.511663)
light_color = Color(0.938193, 0.801023, 0.819717, 1)
shadow_enabled = true
spot_range = 40.0
spot_attenuation = 0.32
@ -393,20 +395,16 @@ transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, -0.613242, 2.06385,
[node name="MeshInstance3D" parent="Target2" index="1"]
skeleton = NodePath("..")
[node name="Star Bulb" parent="Target2/Star bulb" index="0"]
layers = 4
[node name="Star" parent="Target2/Star bulb/Star Bulb" index="0"]
layers = 4
[node name="Star bulb" parent="Target2" index="3"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
script = null
[node name="Target3" parent="." instance=ExtResource("15_0akd8")]
transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, 0.572697, 2.053, -2.54185)
[node name="Star Bulb" parent="Target3/Star bulb" index="0"]
layers = 4
[node name="Star" parent="Target3/Star bulb/Star Bulb" index="0"]
layers = 4
[node name="Star bulb" parent="Target3" index="3"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
script = null
[node name="Manipulator0" parent="." groups=["manipulators"] instance=ExtResource("18_wecvv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.75019, -3.96693)
@ -537,6 +535,12 @@ transform = Transform3D(-1.31134e-07, 3, -1.31134e-07, 0, -1.31134e-07, -3, -3,
mesh = SubResource("ArrayMesh_n7qi3")
skeleton = NodePath("")
[node name="WinParticles" parent="." instance=ExtResource("21_xyf8w")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -2)
[connection signal="puzzle_completed" from="." to="WinParticles" method="_on_puzzle_completed"]
[connection signal="occupancy_changed" from="Target1" to="Target1/Love Potion" method="_on_target_1_occupancy_changed"]
[editable path="Target1"]
[editable path="Target1/Love Potion"]
[editable path="Target2"]