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

fix target sharing, remake valentines

Browse source
This commit is contained in:
hiina 2025-02-16 16:10:57 -07:00
parent a6a4d0b4f3
commit d866cdfd46
16 changed files with 5472 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/Materials/Emission.tres
View file

@ -5,3 +5,5 @@ resource_name = "Emission"
cull_mode = 2
albedo_color = Color(0.906332, 0.836398, 0.446766, 1)
roughness = 0.5
emission_enabled = true
emission = Color(1.8, 1.6, 0, 1)

6
assets/Materials/Glass.001.tres
View file

@ -2,6 +2,10 @@
[resource]
resource_name = "Glass.001"
transparency = 4
transparency = 1
cull_mode = 2
albedo_color = Color(1, 1, 1, 0.148)
metallic = 1.0
metallic_specular = 1.0
rim_enabled = true
rim_tint = 0.55

5402
assets/Models/Love Potion.glb.import
View file

File diff suppressed because it is too large Load diff

4
assets/love_potion_target.gd
View file

@ -15,10 +15,6 @@ func _ready() -> void:
$"Flask/Star_003".mesh.surface_set_material(0, material)
$AnimationPlayer.play("HeartAction")
$AnimationPlayer.play("StarAction")
$AnimationPlayer.play("StarAction_001")
$AnimationPlayer.play("StarAction_002")
$AnimationPlayer.play("StarAction_003")
func _on_target_1_occupancy_changed(value: float) -> void:
material.emission_energy_multiplier = value * 10

14
assets/star_bulb_target.gd
View file

@ -5,10 +5,18 @@ var material: StandardMaterial3D
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
var mat = $"Star Bulb".mesh.surface_get_material(1)
# Duplicate meshes and materials
var star_bulb = $"Star Bulb"
var star = $"Star Bulb/Star"
star_bulb.mesh = star_bulb.mesh.duplicate()
star.mesh = star.mesh.duplicate()
var mat = star_bulb.mesh.surface_get_material(1)
material = mat.duplicate()
$"Star Bulb".mesh.surface_set_material(1, material)
$"Star Bulb/Star".mesh.surface_set_material(0, material)
star_bulb.mesh.surface_set_material(1, material)
star.mesh.surface_set_material(0, material)
$AnimationPlayer.play("StarAction")

28
assets/target_love_potion.tscn
View file

@ -1,42 +1,26 @@
[gd_scene load_steps=8 format=3 uid="uid://5yw5sbkwj0qk"]
[gd_scene load_steps=6 format=3 uid="uid://5yw5sbkwj0qk"]
[ext_resource type="Script" path="res://scenes/target.gd" id="1_kdcb3"]
[ext_resource type="AudioStream" uid="uid://cv0f1tu5pac60" path="res://assets/Sounds/02 midpiano.ogg" id="2_thrll"]
[ext_resource type="AudioStream" uid="uid://dnwh2iqwi86ku" path="res://assets/Sounds/04 bass.ogg" id="2_xtxs5"]
[ext_resource type="PackedScene" uid="uid://cp2i64bioqppu" path="res://assets/love_potion.tscn" id="3_l1kad"]
[ext_resource type="Script" path="res://assets/love_potion_target.gd" id="4_6owuw"]
[sub_resource type="BoxShape3D" id="BoxShape3D_2pv4i"]
[sub_resource type="BoxMesh" id="BoxMesh_tp0p7"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_mjtav"]
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
size = Vector3(0.8, 0.8, 0.8)
[node name="Target1" type="StaticBody3D" groups=["targets"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.91143, 3.59885, -3.13788)
script = ExtResource("1_kdcb3")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("BoxShape3D_2pv4i")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
visible = false
layers = 4
mesh = SubResource("BoxMesh_tp0p7")
skeleton = NodePath("../..")
surface_material_override/0 = SubResource("StandardMaterial3D_mjtav")
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="."]
stream = ExtResource("2_thrll")
stream = ExtResource("2_xtxs5")
volume_db = -80.0
autoplay = true
[node name="Love Potion" parent="." instance=ExtResource("3_l1kad")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.330896, 0)
script = ExtResource("4_6owuw")
[connection signal="occupancy_changed" from="." to="Love Potion" method="_on_target_1_occupancy_changed"]

22
assets/target_star_bulb.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=8 format=3 uid="uid://yqgq7gjbu72p"]
[gd_scene load_steps=6 format=3 uid="uid://yqgq7gjbu72p"]
[ext_resource type="Script" path="res://scenes/target.gd" id="1_8ktrr"]
[ext_resource type="AudioStream" uid="uid://cqb1bo72232vs" path="res://assets/Sounds/03 highpiano.ogg" id="2_hpxkg"]
@ -6,32 +6,14 @@
[ext_resource type="Script" path="res://assets/star_bulb_target.gd" id="4_5igaa"]
[sub_resource type="BoxShape3D" id="BoxShape3D_2pv4i"]
[sub_resource type="BoxMesh" id="BoxMesh_tp0p7"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_mjtav"]
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
size = Vector3(0.8, 0.8, 0.8)
[node name="Target1" type="StaticBody3D" groups=["targets"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.91143, 3.59885, -3.13788)
script = ExtResource("1_8ktrr")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("BoxShape3D_2pv4i")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
visible = false
layers = 4
mesh = SubResource("BoxMesh_tp0p7")
skeleton = NodePath("../..")
surface_material_override/0 = SubResource("StandardMaterial3D_mjtav")
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="."]
stream = ExtResource("2_hpxkg")
volume_db = -80.0

1
scenes/pipes_scene/pipes_scene.tscn
View file

@ -569,6 +569,7 @@ shadow_mesh = SubResource("ArrayMesh_ld752")
[node name="PipesScene" type="Node3D"]
script = ExtResource("1_0v4tm")
completion_threshold = 0.3
[node name="XROrigin3D" parent="." instance=ExtResource("2_fv202")]

8
scenes/target.gd
View file

@ -23,10 +23,10 @@ func _ready() -> void:
func _process(delta: float) -> void:
_current_occupancy = lerp(_current_occupancy, _target_occupancy, lerp_speed * delta)
var material = mesh.get_surface_override_material(0)
if material:
material.emission_energy_multiplier = _current_occupancy * 10
if mesh:
var material = mesh.get_surface_override_material(0)
if material:
material.emission_energy_multiplier = _current_occupancy * 10
if audio:
audio.volume_db = linear_to_db(_current_occupancy)

BIN
scenes/title_scene/title_scene.VoxelGI_data.res
View file

Binary file not shown.

2
scenes/title_scene/title_scene.tscn
View file

@ -118,6 +118,8 @@ shading_mode = 0
[node name="TitleScene" type="Node3D"]
script = ExtResource("1_243qh")
completion_threshold = 0.2
completion_time = 2.0
[node name="XROrigin3D" parent="." instance=ExtResource("2_xk21l")]

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

Binary file not shown.

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

Binary file not shown.

7
scenes/tutorial_scenes/tutorial_scene_2.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=19 format=3 uid="uid://wnfi7j3dmjl"]
[gd_scene load_steps=20 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"]
@ -6,6 +6,7 @@
[ext_resource type="PackedScene" uid="uid://ccmx5v2601k8q" path="res://scenes/manipulator/visual_attractor_sphere.tscn" id="4_5h7mx"]
[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"]
[ext_resource type="AudioStream" uid="uid://cv0f1tu5pac60" path="res://assets/Sounds/02 midpiano.ogg" id="6_goelp"]
[sub_resource type="Gradient" id="Gradient_0ygfi"]
colors = PackedColorArray(0.720471, 0.182584, 0.797749, 1, 1, 1, 3, 1)
@ -142,6 +143,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.599, -6.182)
[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)
[node name="AudioStreamPlayer3D" parent="Target1" index="2"]
stream = ExtResource("6_goelp")
[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)
mesh = SubResource("TextMesh_gt0jy")
@ -160,3 +164,4 @@ mesh = SubResource("TextMesh_jioxp")
[connection signal="puzzle_completed" from="." to="WinParticles" method="_on_puzzle_completed"]
[editable path="Target3"]
[editable path="Target1"]

4
scenes/valentine_scene/new_particle_process_material.tres
View file

@ -19,8 +19,8 @@ resource_local_to_scene = true
emission_shape = 3
emission_box_extents = Vector3(0.1, 0.1, 0.1)
spread = 0.0
initial_velocity_min = 1.0
initial_velocity_max = 1.0
initial_velocity_min = 1.5
initial_velocity_max = 1.5
gravity = Vector3(0, 0, 0)
damping_min = 0.05
damping_max = 0.05

95
scenes/valentine_scene/valentine_scene.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=45 format=4 uid="uid://4hr2m5ibwhpy"]
[gd_scene load_steps=41 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"]
@ -13,6 +13,7 @@
[ext_resource type="TubeTrailMesh" uid="uid://cs018yg173f03" path="res://scenes/valentine_scene/new_tube_trail_mesh.tres" id="12_qbtqr"]
[ext_resource type="Material" uid="uid://b4vq6ouyv64bx" path="res://scenes/valentine_scene/new_particle_process_material.tres" id="13_0sy3c"]
[ext_resource type="PackedScene" uid="uid://yqgq7gjbu72p" path="res://assets/target_star_bulb.tscn" id="15_0akd8"]
[ext_resource type="AudioStream" uid="uid://cv0f1tu5pac60" path="res://assets/Sounds/02 midpiano.ogg" id="15_rsyhe"]
[ext_resource type="PackedScene" uid="uid://bifpsyvpcem3a" path="res://scenes/manipulator/manipulator.tscn" id="18_wecvv"]
[ext_resource type="PackedScene" uid="uid://cibwlfqvmirgb" path="res://scenes/ambient_particles.tscn" id="19_ssw3h"]
[ext_resource type="PackedScene" uid="uid://ccmx5v2601k8q" path="res://scenes/manipulator/visual_attractor_sphere.tscn" id="19_xjpkb"]
@ -35,43 +36,6 @@ albedo_color = Color(0.563626, 0.563626, 0.563625, 1)
material = SubResource("StandardMaterial3D_lvd12")
size = Vector2(100, 100)
[sub_resource type="Gradient" id="Gradient_0ygfi"]
colors = PackedColorArray(0.720471, 0.182584, 0.797749, 1, 1, 1, 3, 1)
[sub_resource type="GradientTexture1D" id="GradientTexture1D_e428v"]
gradient = SubResource("Gradient_0ygfi")
use_hdr = true
[sub_resource type="Curve" id="Curve_g0jsu"]
_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.905229, 0.968574), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
point_count = 3
[sub_resource type="CurveTexture" id="CurveTexture_qnerq"]
curve = SubResource("Curve_g0jsu")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_efdjr"]
resource_local_to_scene = true
emission_shape = 3
emission_box_extents = Vector3(0.1, 0.1, 0.1)
spread = 0.0
initial_velocity_min = 1.0
initial_velocity_max = 1.0
gravity = Vector3(0, 0, 0)
damping_min = 0.05
damping_max = 0.05
scale_max = 1.3
scale_curve = SubResource("CurveTexture_qnerq")
color = Color(0.288256, 0.558565, 0.665093, 1)
color_ramp = SubResource("GradientTexture1D_e428v")
hue_variation_min = -0.1
hue_variation_max = 0.1
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
[sub_resource type="PrismMesh" id="PrismMesh_be80n"]
size = Vector3(0.2, 0.2, 0.2)
@ -283,6 +247,7 @@ shadow_mesh = SubResource("ArrayMesh_p4r60")
[node name="ValentineScene" type="Node3D"]
script = ExtResource("1_fbwwc")
completion_threshold = 0.4
[node name="XROrigin3D" parent="." instance=ExtResource("2_i3vfe")]
@ -329,7 +294,7 @@ spot_attenuation = 0.32
spot_angle = 78.21
[node name="Arcane Source 2" parent="." instance=ExtResource("11_1bcu4")]
transform = Transform3D(-3.27835e-08, 0, -0.75, 0, 0.75, 0, 0.75, 0, -3.27835e-08, 3.33249, 0, -2.02237)
transform = Transform3D(-3.27835e-08, 0, -0.75, 0, 0.75, 0, 0.75, 0, -3.27835e-08, 4.59749, 0, -2.02237)
[node name="ProxyCollisionDetector" parent="." instance=ExtResource("12_8ub4t")]
source_particles_paths = Array[NodePath]([NodePath("../GPUParticles3D"), NodePath("../GPUParticles3D2")])
@ -345,21 +310,21 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.40364, 1.523, -2.03293)
cast_shadow = 0
gi_mode = 2
amount = 500
lifetime = 6.75
lifetime = 4.8
randomness = 0.18
visibility_aabb = AABB(-100, -100, -100, 200, 200, 200)
transform_align = 2
trail_enabled = true
trail_lifetime = 0.5
process_material = SubResource("ParticleProcessMaterial_efdjr")
process_material = ExtResource("13_0sy3c")
draw_pass_1 = ExtResource("12_qbtqr")
[node name="GPUParticles3D2" type="GPUParticles3D" parent="."]
transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 3.25566, 1.52311, -2.0325)
transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 4.404, 1.523, -2.033)
cast_shadow = 0
gi_mode = 2
amount = 500
lifetime = 5.5
lifetime = 4.8
randomness = 0.18
visibility_aabb = AABB(-100, -100, -100, 200, 200, 200)
transform_align = 2
@ -369,7 +334,10 @@ process_material = ExtResource("13_0sy3c")
draw_pass_1 = ExtResource("12_qbtqr")
[node name="Target1" parent="." instance=ExtResource("22_edujp")]
transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -0.109229, 3.59648, -4.23545)
transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 3.3549, -5.19378)
[node name="Love Potion" parent="Target1" index="2"]
script = null
[node name="Flask" parent="Target1/Love Potion" index="0"]
layers = 4
@ -390,37 +358,35 @@ layers = 4
layers = 4
[node name="Target2" parent="." instance=ExtResource("15_0akd8")]
transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, -0.613242, 2.06385, -2.61652)
transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, -1.174, 2.737, -3.368)
[node name="MeshInstance3D" parent="Target2" index="1"]
skeleton = NodePath("..")
[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="Star bulb" parent="Target2" index="2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.542325, 0)
[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)
transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, 1.17434, 2.73723, -3.36824)
[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="AudioStreamPlayer3D" parent="Target3" index="1"]
stream = ExtResource("15_rsyhe")
[node name="Star bulb" parent="Target3" index="2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.542325, 0)
[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)
[node name="VisualAttractorSphere" parent="Manipulator0" instance=ExtResource("19_xjpkb")]
strength = 26.31
attenuation = 4.13335
attenuation = 2.21501
radius = 3.0
[node name="Manipulator1" parent="." groups=["manipulators"] instance=ExtResource("18_wecvv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0383019, 1.42738, -2.59085)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.427, -2.591)
[node name="VisualAttractorSphere" parent="Manipulator1" instance=ExtResource("19_xjpkb")]
transform = Transform3D(1, 0, 0, 0, 0.707107, -0.707107, 0, 0.707107, 0.707107, 0, 0, 0)
strength = 6.84
attenuation = 3.13249
attenuation = 2.29312
directionality = 1.0
radius = 1.3
@ -431,10 +397,10 @@ skeleton = NodePath("")
surface_material_override/0 = SubResource("StandardMaterial3D_hyt1m")
[node name="Manipulator2" parent="." groups=["manipulators"] instance=ExtResource("18_wecvv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00211065, 3.71723, -5.02046)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.717, -5.10931)
[node name="VisualAttractorSphere" parent="Manipulator2" instance=ExtResource("19_xjpkb")]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0)
transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 0, 0)
strength = 39.61
attenuation = 1.46136
directionality = 1.0
@ -511,22 +477,22 @@ mesh = SubResource("ArrayMesh_eijwi")
skeleton = NodePath("")
[node name="Pipe Segment Split2" type="MeshInstance3D" parent="Pipes"]
transform = Transform3D(0.999957, 0.00925011, 0, -0.00925011, 0.999957, 0, 0, 0, 1, 2.2697, -0.0507845, 0.289026)
transform = Transform3D(0.99503, 0.0141769, 0, -0.00920453, 1.53255, 0, 0, 0, 1, 2.47181, -0.190739, 0.0225495)
mesh = SubResource("ArrayMesh_iwan1")
skeleton = NodePath("")
[node name="Light Segment5" type="MeshInstance3D" parent="Pipes"]
transform = Transform3D(0.999991, 0, 0.00422368, 0, 1, 0, -0.00422368, 0, 0.999991, 2.26995, 0.468476, 0.287128)
transform = Transform3D(0.999991, 0, 0.00422368, 0, 1, 0, -0.00422368, 0, 0.999991, 2.47206, 0.68979, 0.0206513)
mesh = SubResource("ArrayMesh_ywi2y")
skeleton = NodePath("")
[node name="Pipe Segment Split3" type="MeshInstance3D" parent="Pipes"]
transform = Transform3D(0.999957, 0.00925011, 0, -0.00925011, 0.999957, 0, 0, 0, 1, 1.87704, -0.0507845, 0.289026)
transform = Transform3D(0.996222, 0.0129854, 0, -0.00921556, 1.40375, 0, 0, 0, 1, 1.68981, -0.108888, 0.0263661)
mesh = SubResource("ArrayMesh_iwan1")
skeleton = NodePath("")
[node name="Light Segment6" type="MeshInstance3D" parent="Pipes"]
transform = Transform3D(0.999991, 0, 0.00422368, 0, 1, 0, -0.00422368, 0, 0.999991, 1.87729, 0.468476, 0.287128)
transform = Transform3D(0.999991, 0, 0.00422368, 0, 1, 0, -0.00422368, 0, 0.999991, 1.69006, 0.692465, 0.0244681)
mesh = SubResource("ArrayMesh_ywi2y")
skeleton = NodePath("")
@ -539,7 +505,6 @@ skeleton = NodePath("")
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"]