From 95963288a5702539b9e7bcf8e10f96e37a7c723d Mon Sep 17 00:00:00 2001 From: selim Date: Tue, 13 Jan 2026 22:05:25 +0100 Subject: [PATCH] ..........---------........ --- ChronoWatch.gd | 10 ++++++++-- level.tscn | 4 +++- player.tscn | 50 ++++++++++++++++++++++++++------------------------ 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/ChronoWatch.gd b/ChronoWatch.gd index ce4fc09..fb966fb 100644 --- a/ChronoWatch.gd +++ b/ChronoWatch.gd @@ -29,6 +29,8 @@ var current_age = AgeState.BABY @export var heavy_object : RigidBody3D # Das Regal @export var age_paper : Node3D # Das Papier mit dem Hinweis +@export var codepad : XRToolsViewport2DIn3D + func _ready(): # Automatisch Controller finden, falls vergessen if not controller: @@ -45,9 +47,9 @@ func _ready(): func _on_button_pressed(button_name: String): match button_name: - "trigger_click": # Älter werden + "ax_button": # Älter werden change_age(1) - "grip_click": # Jünger werden + "by_button": # Jünger werden change_age(-1) func change_age(direction: int): @@ -113,6 +115,8 @@ func apply_age_physics(animate: bool = true): make_object_movable = false # Regal fest is_teen_state = false # Papier = Gekritzel + codepad.visible = false + AgeState.TEEN: # TEEN WERTE target_saturation = 0.5 # Grau @@ -135,6 +139,8 @@ func apply_age_physics(animate: bool = true): # Interaktionen make_object_movable = true # Regal beweglich is_teen_state = true # Papier = Klartext + + codepad.visible = true # --- ANWENDUNG --- diff --git a/level.tscn b/level.tscn index 46f9fe4..aecc28d 100644 --- a/level.tscn +++ b/level.tscn @@ -550,7 +550,7 @@ max_distance = 10.0 [node name="Player" parent="." instance=ExtResource("2_0b4ue")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 5, 1, 0) -[node name="Watch" parent="Player/RightController" index="1" node_paths=PackedStringArray("world_env", "audio_baby", "audio_teen", "castle", "fort", "heavy_object", "age_paper")] +[node name="Watch" parent="Player/LeftController" index="3" node_paths=PackedStringArray("world_env", "audio_baby", "audio_teen", "castle", "fort", "heavy_object", "age_paper", "codepad")] world_env = NodePath("../../../WorldEnvironment") audio_baby = NodePath("../../../GoalAudioSource/AudioBaby") audio_teen = NodePath("../../../GoalAudioSource/AudioTeen") @@ -558,6 +558,7 @@ castle = NodePath("../../../Castle") fort = NodePath("../../../KidsFort") heavy_object = NodePath("../../../Bookcase") age_paper = NodePath("../../../Paper/MysteryPaper") +codepad = NodePath("../../../Door3/Codepad/Sprite3D/Viewport2Din3D") [node name="Ceiling" type="StaticBody3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.05, 0) @@ -817,6 +818,7 @@ texture = SubResource("ViewportTexture_r5f7e") [node name="Viewport2Din3D" parent="Door3/Codepad/Sprite3D" instance=ExtResource("12_td4uw")] transform = Transform3D(-4.371139e-09, 0, -0.2, 0, 0.2, 0, 0.1, 0, -8.742278e-09, 2.7467213, -0.5347973, -0.49616164) +visible = false scene = ExtResource("11_lrhm2") viewport_size = Vector2(248, 323) transparent = 1 diff --git a/player.tscn b/player.tscn index 3ee1346..214a34c 100644 --- a/player.tscn +++ b/player.tscn @@ -28,13 +28,13 @@ mesh = SubResource("QuadMesh_dw050") surface_material_override/0 = SubResource("StandardMaterial3D_b26j0") [node name="Label3D" type="Label3D" parent="Camera/FadeScreen"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.110438704, 0.018422484) +transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0.110438704, 0.018422484) modulate = Color(1, 1, 1, 0) outline_modulate = Color(0, 0, 0, 0) text = "YEARS APART" [node name="Label3D2" type="Label3D" parent="Camera/FadeScreen"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.10656129, 0.014999986) +transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, -0.10656129, 0.014999986) pixel_size = 0.0025 modulate = Color(1, 1, 1, 0) outline_modulate = Color(0, 0, 0, 0) @@ -43,23 +43,26 @@ text = "by Lukas, Daniel & Selim" [node name="LeftController" type="XRController3D" parent="."] tracker = &"left_hand" -[node name="MovementDirect" parent="LeftController" instance=ExtResource("2_sweqy")] -strafe = true +[node name="LeftHand" parent="LeftController" instance=ExtResource("2_hqtel")] +hand_offset_mode = 4 [node name="FunctionPickup" parent="LeftController" instance=ExtResource("3_1jxqw")] hand_offset_mode = 4 -[node name="FunctionPointer" parent="LeftController" instance=ExtResource("7_dw050")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.02, 0.05, -0.028981276) -y_offset = -0.07 -active_button_action = "primary_click" -show_laser = 0 -show_target = true -target_radius = 0.025 -hand_offset_mode = 4 +[node name="MovementDirect" parent="LeftController" instance=ExtResource("2_sweqy")] +strafe = true -[node name="LeftHand" parent="LeftController" instance=ExtResource("2_hqtel")] -hand_offset_mode = 4 +[node name="Watch" type="Node3D" parent="LeftController" node_paths=PackedStringArray("controller", "player_body", "player", "movement_direct", "camera")] +transform = Transform3D(-3.059797e-08, -0.7, 0, 0.69954056, -3.0577887e-08, 0.025357574, -0.025357574, 1.1084147e-09, 0.69954056, -0.07915196, -0.053435795, -0.0026622415) +script = ExtResource("4_sweqy") +controller = NodePath("..") +player_body = NodePath("../../PlayerBody") +player = NodePath("../..") +movement_direct = NodePath("../MovementDirect") +camera = NodePath("../../Camera") + +[node name="Sketchfab_Scene" parent="LeftController/Watch" instance=ExtResource("6_1jxqw")] +transform = Transform3D(0.002, 0, 0, 0, 0.002, 0, 0, 0, 0.002, 0, -0.034, 0.108) [node name="RightController" type="XRController3D" parent="."] tracker = &"right_hand" @@ -67,17 +70,16 @@ tracker = &"right_hand" [node name="RightHand" parent="RightController" instance=ExtResource("2_i3pqv")] hand_offset_mode = 4 -[node name="Watch" type="Node3D" parent="RightController" node_paths=PackedStringArray("controller", "player_body", "player", "movement_direct", "camera")] -transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, 0) -script = ExtResource("4_sweqy") -controller = NodePath("..") -player_body = NodePath("../../PlayerBody") -player = NodePath("../..") -movement_direct = NodePath("../../LeftController/MovementDirect") -camera = NodePath("../../Camera") +[node name="FunctionPickup" parent="RightController" instance=ExtResource("3_1jxqw")] +hand_offset_mode = 4 -[node name="Sketchfab_Scene" parent="RightController/Watch" instance=ExtResource("6_1jxqw")] -transform = Transform3D(0.00025759128, -0.0019833425, 0, 0.0018915471, 0.00024566916, -0.0006014116, 0.00059640256, 7.745919e-05, 0.001907434, 0, -0.034, 0.108) +[node name="FunctionPointer" parent="RightController" instance=ExtResource("7_dw050")] +y_offset = -0.07 +active_button_action = "ax_button" +show_laser = 0 +show_target = true +target_radius = 0.025 +hand_offset_mode = 4 [node name="PlayerBody" parent="." instance=ExtResource("4_2hs0m")] collision_layer = 524289