diff --git a/scenes/world.tscn b/scenes/world.tscn index a55f72b..bd04baa 100644 --- a/scenes/world.tscn +++ b/scenes/world.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=4 uid="uid://dtbrnxalat1d4"] +[gd_scene load_steps=29 format=4 uid="uid://dtbrnxalat1d4"] [ext_resource type="PackedScene" uid="uid://wsu3b5udqtdu" path="res://meshes/village/Wall_UnevenBrick_Straight.gltf" id="1_4mrxx"] [ext_resource type="Texture2D" uid="uid://bgc5rl13dopuj" path="res://addons/proton_scatter/demos/assets/textures/sky_2.png" id="1_w7kh3"] @@ -12,9 +12,10 @@ [ext_resource type="PackedScene" uid="uid://v2td8h7kmqic" path="res://meshes/interior/Bed_Twin2.gltf" id="13_7t5mc"] [ext_resource type="Script" uid="uid://cw1r4c1d7beyv" path="res://addons/portals/scripts/portal_3d.gd" id="13_xo05s"] [ext_resource type="Material" uid="uid://dcfkcyddxkglf" path="res://addons/portals/materials/editor-preview-portal-material.tres" id="14_dss4m"] +[ext_resource type="Script" uid="uid://d2eiwbv6c3kcq" path="res://scripts/door_opener.gd" id="14_lakw3"] [ext_resource type="Script" uid="uid://bxcel82b180o3" path="res://addons/portals/scripts/portal_boxmesh.gd" id="15_7t5mc"] [ext_resource type="PackedScene" uid="uid://clxuoprslq8em" path="res://scenes/house_big.tscn" id="16_dss4m"] -[ext_resource type="Script" uid="uid://co2pjpdo4nyto" path="res://scripts/cinematic_camera.gd" id="18_lakw3"] +[ext_resource type="Script" uid="uid://d2crarvkhd45r" path="res://scripts/player.gd" id="17_7t5mc"] [ext_resource type="PackedScene" uid="uid://dc4ynch2n1ish" path="res://meshes/village/Roof_RoundTiles_4x4.gltf" id="22_kpybi"] [ext_resource type="PackedScene" uid="uid://b7mjoyryltilk" path="res://meshes/village/Roof_Front_Brick4.gltf" id="23_ctatt"] @@ -78,16 +79,9 @@ size = Vector3(1.5, 2.5, 1) [sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_dss4m"] -[sub_resource type="SphereMesh" id="SphereMesh_lakw3"] - -[sub_resource type="Curve3D" id="Curve3D_lakw3"] -_data = { -"points": PackedVector3Array(2.30277, -4.88758e-05, 0.023995, -2.30277, 4.88758e-05, -0.023995, -6.02108, -1.2, -0.757503, 0.560486, 0.0225506, -0.115429, -0.560486, -0.0225506, 0.115429, -13.1853, -1.19995, -0.866791, 0.927, 0, -0.921, -0.927, 0, 0.921, -14.415, -1.2, 0.789, 1.07875, -0.421236, 0.749314, -1.07875, 0.421236, -0.749314, -17.8179, -0.94087, 1.55712, -0.0384521, -0.479881, 1.02453, 0.0384521, 0.479881, -1.02453, -18.2686, 0.298787, -0.965812, -5.40546, 0.0544367, -0.106041, 5.40546, -0.0544367, 0.106041, -12.8151, 1.96112, -3.85685), -"tilts": PackedFloat32Array(0, 0, 0, 0, 0, 0) -} -point_count = 6 - -[sub_resource type="Curve3D" id="Curve3D_7t5mc"] +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_dss4m"] +radius = 0.2 +height = 1.75 [node name="World" type="Node3D"] metadata/movie_file = "captures/b_.png" @@ -186,6 +180,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 3.1, 0 collision_layer = 0 collision_mask = 2 monitorable = false +script = ExtResource("14_lakw3") [node name="CollisionShape3D" type="CollisionShape3D" parent="DoorOpener"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.05282, 0.739908) @@ -268,36 +263,18 @@ shape = SubResource("BoxShape3D_7t5mc") [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"] shape = SubResource("WorldBoundaryShape3D_dss4m") -[node name="CinematicCamera" type="Camera3D" parent="." node_paths=PackedStringArray("path", "target")] -cull_mask = 524287 -current = true -script = ExtResource("18_lakw3") -travel_time = 15.0 -path = NodePath("../B_Camera") -target = NodePath("../Target") +[node name="CharacterBody3D" type="CharacterBody3D" parent="." node_paths=PackedStringArray("camera")] +transform = Transform3D(0.258819, 0, 0.965926, 0, 1, 0, -0.965926, 0, 0.258819, 12.9999, 1.36224, -1.22552) +collision_layer = 3 +script = ExtResource("17_7t5mc") +camera = NodePath("Camera3D") +metadata/_edit_group_ = true -[node name="Target" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 996.473, 0.638, -2.74) -layers = 524288 -mesh = SubResource("SphereMesh_lakw3") +[node name="Camera3D" type="Camera3D" parent="CharacterBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.925, 0) -[node name="A_FlyAround" type="Path3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.0132, 3, -2.29886) -curve = SubResource("Curve3D_lakw3") - -[node name="PathFollow3D" type="PathFollow3D" parent="A_FlyAround"] -transform = Transform3D(0.0104181, 2.12225e-05, 0.999827, 0, 0.999999, -2.12211e-05, -0.999827, 2.21137e-07, 0.0104181, -6.02108, -1.2, -0.757503) - -[node name="B_Camera" type="Path3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1015.01, 3, -2.299) -curve = SubResource("Curve3D_lakw3") - -[node name="PathFollow3D" type="PathFollow3D" parent="B_Camera"] -transform = Transform3D(0.0104181, 2.12225e-05, 0.999827, 0, 0.999999, -2.12211e-05, -0.999827, 2.21137e-07, 0.0104181, -6.02108, -1.2, -0.757503) - -[node name="B_Target" type="Path3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 996.473, 0.638, -2.74) -curve = SubResource("Curve3D_7t5mc") +[node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"] +shape = SubResource("CapsuleShape3D_dss4m") [connection signal="body_entered" from="DoorOpener" to="House_Small/PortalDoor" method="open"] [connection signal="body_entered" from="DoorOpener" to="HouseBig" method="open_door"] diff --git a/scripts/door_opener.gd b/scripts/door_opener.gd new file mode 100644 index 0000000..bc2a5ce --- /dev/null +++ b/scripts/door_opener.gd @@ -0,0 +1,6 @@ +extends Area3D + + +func _process(delta: float) -> void: + if Input.is_key_pressed(KEY_E): + body_entered.emit(null) diff --git a/scripts/door_opener.gd.uid b/scripts/door_opener.gd.uid new file mode 100644 index 0000000..7a5c553 --- /dev/null +++ b/scripts/door_opener.gd.uid @@ -0,0 +1 @@ +uid://d2eiwbv6c3kcq