diff --git a/levels/level_cube_portals.tscn b/levels/level_cube_portals.tscn index 3d4b140..bef111c 100644 --- a/levels/level_cube_portals.tscn +++ b/levels/level_cube_portals.tscn @@ -136,9 +136,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.89275, 0) billboard = 2 text = "Portal B" -[node name="PortalEnvironmentAdapter" type="Node" parent="." node_paths=PackedStringArray("base")] +[node name="PortalEnvironmentAdapter" type="Node" parent="."] script = ExtResource("6_jdap8") -base = NodePath("") [node name="ProceduralMeshMaker" parent="." node_paths=PackedStringArray("portal") instance=ExtResource("7_mq505")] height = 3.0 diff --git a/levels/level_hermione.tscn b/levels/level_hermione.tscn index c240ee1..4ffcb42 100644 --- a/levels/level_hermione.tscn +++ b/levels/level_hermione.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=6 format=3 uid="uid://dgvdetmbv5jya"] +[gd_scene load_steps=8 format=3 uid="uid://dgvdetmbv5jya"] [ext_resource type="PackedScene" uid="uid://b5x7fmpwck335" path="res://hud.tscn" id="1_2k7q4"] [ext_resource type="Script" uid="uid://ca45js46kc0l7" path="res://levels/level_hermione.gd" id="1_gyvwl"] @@ -6,9 +6,65 @@ [ext_resource type="PackedScene" uid="uid://ci81nttn6foio" path="res://levels/room_hermione_inside.tscn" id="2_lv1mc"] [ext_resource type="PackedScene" uid="uid://cgdlowfuuorvi" path="res://player.tscn" id="3_gyvwl"] +[sub_resource type="ViewportTexture" id="ViewportTexture_gyvwl"] +viewport_path = NodePath("InsideWorld/DebugInside") + +[sub_resource type="ViewportTexture" id="ViewportTexture_34g5f"] +viewport_path = NodePath("SubViewportContainer/OutsideWorld/DebugOutside") + [node name="level_hermione" type="Node"] script = ExtResource("1_gyvwl") +[node name="Window" type="Window" parent="."] +mode = 1 +title = "Marek Debug" +position = Vector2i(960, 0) +size = Vector2i(480, 270) + +[node name="Inside" type="TextureRect" parent="Window"] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 0 +texture = SubResource("ViewportTexture_gyvwl") +expand_mode = 2 +stretch_mode = 3 + +[node name="Label" type="Label" parent="Window/Inside"] +layout_mode = 1 +anchors_preset = 1 +anchor_left = 1.0 +anchor_right = 1.0 +offset_left = -40.0 +offset_bottom = 23.0 +grow_horizontal = 0 +text = "Inside" + +[node name="Window2" type="Window" parent="."] +auto_translate_mode = 1 +mode = 1 +title = "Marek Debug 2" +position = Vector2i(480, 0) +size = Vector2i(480, 270) + +[node name="Outside" type="TextureRect" parent="Window2"] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 8 +texture = SubResource("ViewportTexture_34g5f") +expand_mode = 2 + +[node name="Label" type="Label" parent="Window2/Outside"] +layout_mode = 1 +offset_right = 55.0 +offset_bottom = 23.0 +text = "Ouside" + [node name="SubViewportContainer" type="SubViewportContainer" parent="."] anchors_preset = 15 anchor_right = 1.0 @@ -30,6 +86,11 @@ render_target_update_mode = 4 unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.08041, 1.41104, 0) +[node name="DebugOutside" type="SubViewport" parent="SubViewportContainer/OutsideWorld"] + +[node name="DebugCamera3D" type="Camera3D" parent="SubViewportContainer/OutsideWorld/DebugOutside"] +transform = Transform3D(0.243648, -0.561794, 0.790584, 0, 0.81515, 0.57925, -0.969864, -0.141133, 0.19861, 11.8586, 7.0378, 3.58701) + [node name="HUD" parent="." instance=ExtResource("1_2k7q4")] [node name="TeleportButton" type="Button" parent="HUD"] @@ -45,4 +106,9 @@ size = Vector2i(1920, 1080) [node name="room_hermione_inside" parent="InsideWorld/InsideWorldContainer" instance=ExtResource("2_lv1mc")] +[node name="DebugInside" type="SubViewport" parent="InsideWorld"] + +[node name="DebugCamera3D" type="Camera3D" parent="InsideWorld/DebugInside"] +transform = Transform3D(0.243648, -0.561794, 0.790584, 0, 0.81515, 0.57925, -0.969864, -0.141133, 0.19861, 11.8586, 7.0378, 3.58701) + [connection signal="pressed" from="HUD/TeleportButton" to="." method="_on_teleport_button_pressed"] diff --git a/levels/room_hermione_inside.tscn b/levels/room_hermione_inside.tscn index 2e2aa51..b87de3b 100644 --- a/levels/room_hermione_inside.tscn +++ b/levels/room_hermione_inside.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=4 uid="uid://ci81nttn6foio"] +[gd_scene load_steps=19 format=4 uid="uid://ci81nttn6foio"] [ext_resource type="Material" uid="uid://b7kc8jfs4fowj" path="res://addons/kenney_prototype_tools/materials/green/material_02.tres" id="1_ofsgw"] [ext_resource type="PackedScene" uid="uid://dve8bvx87r1mm" path="res://models/kenney-house/wall-doorway-square.glb" id="2_4aydi"] @@ -10,6 +10,7 @@ [ext_resource type="PackedScene" uid="uid://d3yk6et3d4yw3" path="res://models/kenney-house/border.glb" id="8_rmadb"] [ext_resource type="PackedScene" uid="uid://dsogp3m6bedxp" path="res://models/kenney-house/column.glb" id="9_jpxld"] [ext_resource type="PackedScene" uid="uid://b4mndlgalycyh" path="res://models/kenney-house/roof-flat-center.glb" id="10_5h2gx"] +[ext_resource type="PackedScene" uid="uid://birikia38m0g7" path="res://skybox_world_environment.tscn" id="11_p5xd2"] [sub_resource type="BoxShape3D" id="BoxShape3D_w2gbp"] size = Vector3(40, 1, 40) @@ -18,20 +19,6 @@ size = Vector3(40, 1, 40) material = ExtResource("1_ofsgw") size = Vector3(40, 1, 40) -[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_soise"] -sky_top_color = Color(0.220994, 0.465185, 0.685758, 1) -sky_horizon_color = Color(0.775585, 0.617199, 0.525157, 1) -ground_bottom_color = Color(0.0327392, 0.0238974, 0.0155985, 1) -ground_horizon_color = Color(0.67988, 0.550619, 0.418075, 1) - -[sub_resource type="Sky" id="Sky_m1tf4"] -sky_material = SubResource("ProceduralSkyMaterial_soise") - -[sub_resource type="Environment" id="Environment_p5xd2"] -background_mode = 2 -sky = SubResource("Sky_m1tf4") -tonemap_mode = 1 - [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_soise"] albedo_color = Color(1, 0.6, 0.235294, 1) @@ -500,13 +487,6 @@ transform = Transform3D(1, 0, -1.74846e-07, 0, 1, 0, 1.74846e-07, 0, 1, -1, 5.3, [node name="roof-flat-center2" parent="House" instance=ExtResource("10_5h2gx")] transform = Transform3D(5, 0, 0, 0, 1, 0, 0, 0, 5, -6.5, 5.3, 1.5) -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource("Environment_p5xd2") - -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(0.69407, -0.512887, 0.505188, 0.0341743, 0.724421, 0.68851, -0.719096, -0.46061, 0.520327, 6.21356, 1.32592, -0.575947) -shadow_enabled = true - [node name="Prism" type="MeshInstance3D" parent="."] transform = Transform3D(0.679275, 0, 0.733884, 0, 1, 0, -0.733884, 0, 0.679275, 6.21356, 1.32592, -0.575947) mesh = SubResource("PrismMesh_p5xd2") @@ -518,3 +498,9 @@ mesh = SubResource("ArrayMesh_km368") [node name="CollisionShape3D" type="CollisionShape3D" parent="Prism/StaticBody3D"] shape = SubResource("ConcavePolygonShape3D_soise") + +[node name="WorldEnvironment2" parent="." instance=ExtResource("11_p5xd2")] + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(0.999197, -0.0103569, -0.0386982, 0.0341743, 0.724421, 0.68851, 0.0209029, -0.68928, 0.724194, 0, 0, 0) +shadow_enabled = true diff --git a/player.tscn b/player.tscn index 105df18..00d41d5 100644 --- a/player.tscn +++ b/player.tscn @@ -20,6 +20,7 @@ metadata/teleportable = false [node name="Camera3D" type="Camera3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.32153, 0) cull_mask = 1048571 +current = true [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.875, 0)