From 650d2a1263ac66755e76b3b20c4fb38f28ce629f Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Mon, 26 Feb 2024 00:00:52 +0100 Subject: [PATCH] Moved the world to a separate scene --- client/Main.tscn | 88 ++--------------------------------------- client/world/World.tscn | 83 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 84 deletions(-) create mode 100644 client/world/World.tscn diff --git a/client/Main.tscn b/client/Main.tscn index b877097..26f58b8 100644 --- a/client/Main.tscn +++ b/client/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=3 uid="uid://b40y7iuskv1ar"] +[gd_scene load_steps=17 format=3 uid="uid://b40y7iuskv1ar"] [ext_resource type="Script" path="res://Main.gd" id="1_cw3ws"] [ext_resource type="Script" path="res://network/Client.gd" id="2_8hxcx"] @@ -11,34 +11,11 @@ [ext_resource type="Script" path="res://network/PlayerMove.gd" id="8_ke1yy"] [ext_resource type="Script" path="res://network/PlayerJump.gd" id="9_o8sk8"] [ext_resource type="Script" path="res://network/Chat.gd" id="10_y3len"] -[ext_resource type="Script" path="res://world/Sun.gd" id="11_4jb08"] [ext_resource type="Script" path="res://network/PlayerUseSkill.gd" id="11_gyiep"] [ext_resource type="PackedScene" uid="uid://cpdoq0oh84mfw" path="res://camera/Camera.tscn" id="12_aljdh"] -[ext_resource type="Environment" uid="uid://dixa0yso2s1u3" path="res://world/Environment.tres" id="14_kuej8"] -[ext_resource type="Script" path="res://world/generator/Generator.gd" id="15_25nmg"] -[ext_resource type="PackedScene" uid="uid://cb2t7bvvf3gwh" path="res://enemy/slime/Slime.tscn" id="15_hgl78"] +[ext_resource type="PackedScene" uid="uid://be6mcpdaobs5u" path="res://world/World.tscn" id="13_sqmhj"] [ext_resource type="Script" path="res://world/PlayerManager.gd" id="16_dp6bj"] -[ext_resource type="Script" path="res://world/Terrain.gd" id="16_icmfi"] [ext_resource type="PackedScene" uid="uid://dagn5bf7ou3sd" path="res://ui/UI.tscn" id="17_43qhq"] -[ext_resource type="FastNoiseLite" uid="uid://d3f4lk8q04haa" path="res://world/trees/TreeNoise.tres" id="19_ctwmw"] -[ext_resource type="Script" path="res://world/generator/TreeGenerator.gd" id="19_kcwnm"] -[ext_resource type="PackedScene" uid="uid://tr0tn0pkr1ea" path="res://world/trees/Callistemon.tscn" id="19_x2ulu"] -[ext_resource type="Material" uid="uid://bt6an0ynrpkpt" path="res://world/trees/TreeMaterial.tres" id="20_seiv4"] -[ext_resource type="PackedScene" uid="uid://djilgnhedvmtm" path="res://world/house/House.tscn" id="20_xjraj"] -[ext_resource type="Material" uid="uid://dw754wh1xcwgr" path="res://world/trees/LeafMaterial1.tres" id="21_v66do"] -[ext_resource type="Material" uid="uid://cxlib6jo32hxg" path="res://world/trees/LeafMaterial2.tres" id="22_k67l0"] -[ext_resource type="Material" uid="uid://c8o7cihkhrqf6" path="res://world/trees/LeafMaterial3.tres" id="23_lxn2x"] -[ext_resource type="AudioStream" uid="uid://b36mntcqlt553" path="res://assets/audio/ambience/Wind-Vegetation-Leaves-Gusts.wav" id="30_b3a1m"] -[ext_resource type="Terrain3DStorage" uid="uid://c38e3dyrl8lao" path="res://assets/terrain/Storage.res" id="30_bvq0o"] -[ext_resource type="Terrain3DMaterial" uid="uid://nhcs8ekjedbb" path="res://world/terrain/Material.tres" id="31_of12o"] -[ext_resource type="Terrain3DTextureList" uid="uid://cpq0eq7wr08kf" path="res://world/terrain/TextureList.tres" id="32_d5ywf"] - -[sub_resource type="FastNoiseLite" id="FastNoiseLite_yp2fx"] -seed = 100 -frequency = 0.1 - -[sub_resource type="FastNoiseLite" id="FastNoiseLite_xy4ll"] -seed = 300 [node name="Main" type="Node" node_paths=PackedStringArray("ui")] script = ExtResource("1_cw3ws") @@ -107,66 +84,9 @@ process_thread_group_order = 0 process_thread_messages = 0 autostart = true -[node name="World" type="Node3D" parent="."] +[node name="Camera" parent="." instance=ExtResource("12_aljdh")] -[node name="Terrain" type="Terrain3D" parent="World"] -storage = ExtResource("30_bvq0o") -material = ExtResource("31_of12o") -texture_list = ExtResource("32_d5ywf") -script = ExtResource("16_icmfi") - -[node name="Enemies" type="Node3D" parent="World"] -visible = false -script = ExtResource("15_25nmg") -scene = ExtResource("15_hgl78") -noise = SubResource("FastNoiseLite_yp2fx") -size_x = 100.0 -size_z = 100.0 -step = 2.0 -density = 0.3 -tilt = 0.15 - -[node name="Houses" type="Node3D" parent="World"] -visible = false -script = ExtResource("15_25nmg") -scene = ExtResource("20_xjraj") -noise = SubResource("FastNoiseLite_xy4ll") -size_x = 100.0 -size_z = 100.0 -step = 15.0 -density = 0.3 -scale_max = 2.0 - -[node name="Trees" type="Node3D" parent="World"] -visible = false -script = ExtResource("19_kcwnm") -tree_materials = Array[Material]([ExtResource("20_seiv4")]) -leaf_materials = Array[Material]([ExtResource("21_v66do"), ExtResource("22_k67l0"), ExtResource("23_lxn2x")]) -scene = ExtResource("19_x2ulu") -noise = ExtResource("19_ctwmw") -size_x = 100.0 -size_z = 100.0 -step = 5.0 -density = 0.4 -scale_min = 0.6 -scale_max = 1.1 -tilt = 0.15 - -[node name="Camera" parent="World" instance=ExtResource("12_aljdh")] - -[node name="Environment" type="WorldEnvironment" parent="World"] -environment = ExtResource("14_kuej8") - -[node name="Sun" type="DirectionalLight3D" parent="World/Environment"] -transform = Transform3D(-0.350207, 0.827032, -0.439741, 0, 0.469472, 0.882948, 0.936672, 0.309215, -0.164412, 0, 3, 0) -light_energy = 1.8 -shadow_enabled = true -script = ExtResource("11_4jb08") - -[node name="Ambience" type="AudioStreamPlayer" parent="World"] -stream = ExtResource("30_b3a1m") -autoplay = true -bus = &"Ambience" +[node name="World" parent="." instance=ExtResource("13_sqmhj")] [node name="Players" type="Node3D" parent="."] unique_name_in_owner = true diff --git a/client/world/World.tscn b/client/world/World.tscn new file mode 100644 index 0000000..69d9426 --- /dev/null +++ b/client/world/World.tscn @@ -0,0 +1,83 @@ +[gd_scene load_steps=19 format=3 uid="uid://be6mcpdaobs5u"] + +[ext_resource type="Terrain3DStorage" uid="uid://c38e3dyrl8lao" path="res://assets/terrain/Storage.res" id="1_xsh2l"] +[ext_resource type="Terrain3DMaterial" uid="uid://nhcs8ekjedbb" path="res://world/terrain/Material.tres" id="2_3ekjf"] +[ext_resource type="Terrain3DTextureList" uid="uid://cpq0eq7wr08kf" path="res://world/terrain/TextureList.tres" id="3_mxntw"] +[ext_resource type="Script" path="res://world/generator/Generator.gd" id="5_46rjb"] +[ext_resource type="PackedScene" uid="uid://cb2t7bvvf3gwh" path="res://enemy/slime/Slime.tscn" id="6_kjq1a"] +[ext_resource type="PackedScene" uid="uid://djilgnhedvmtm" path="res://world/house/House.tscn" id="7_jr5kn"] +[ext_resource type="Script" path="res://world/generator/TreeGenerator.gd" id="8_js7g7"] +[ext_resource type="Material" uid="uid://bt6an0ynrpkpt" path="res://world/trees/TreeMaterial.tres" id="9_mtvns"] +[ext_resource type="Material" uid="uid://dw754wh1xcwgr" path="res://world/trees/LeafMaterial1.tres" id="10_i1fbg"] +[ext_resource type="Material" uid="uid://cxlib6jo32hxg" path="res://world/trees/LeafMaterial2.tres" id="11_p2bew"] +[ext_resource type="Material" uid="uid://c8o7cihkhrqf6" path="res://world/trees/LeafMaterial3.tres" id="12_m1t4a"] +[ext_resource type="PackedScene" uid="uid://tr0tn0pkr1ea" path="res://world/trees/Callistemon.tscn" id="13_bgn6j"] +[ext_resource type="FastNoiseLite" uid="uid://d3f4lk8q04haa" path="res://world/trees/TreeNoise.tres" id="14_6v5re"] +[ext_resource type="Environment" uid="uid://dixa0yso2s1u3" path="res://world/Environment.tres" id="16_i8t0h"] +[ext_resource type="Script" path="res://world/Sun.gd" id="17_nxk5c"] +[ext_resource type="AudioStream" uid="uid://b36mntcqlt553" path="res://assets/audio/ambience/Wind-Vegetation-Leaves-Gusts.wav" id="18_8j4nl"] + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_yp2fx"] +seed = 100 +frequency = 0.1 + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_xy4ll"] +seed = 300 + +[node name="World" type="Node3D"] + +[node name="Terrain" type="Terrain3D" parent="."] +storage = ExtResource("1_xsh2l") +material = ExtResource("2_3ekjf") +texture_list = ExtResource("3_mxntw") + +[node name="Enemies" type="Node3D" parent="."] +visible = false +script = ExtResource("5_46rjb") +scene = ExtResource("6_kjq1a") +noise = SubResource("FastNoiseLite_yp2fx") +size_x = 100.0 +size_z = 100.0 +step = 2.0 +density = 0.3 +tilt = 0.15 + +[node name="Houses" type="Node3D" parent="."] +visible = false +script = ExtResource("5_46rjb") +scene = ExtResource("7_jr5kn") +noise = SubResource("FastNoiseLite_xy4ll") +size_x = 100.0 +size_z = 100.0 +step = 15.0 +density = 0.3 +scale_max = 2.0 + +[node name="Trees" type="Node3D" parent="."] +visible = false +script = ExtResource("8_js7g7") +tree_materials = Array[Material]([ExtResource("9_mtvns")]) +leaf_materials = Array[Material]([ExtResource("10_i1fbg"), ExtResource("11_p2bew"), ExtResource("12_m1t4a")]) +scene = ExtResource("13_bgn6j") +noise = ExtResource("14_6v5re") +size_x = 100.0 +size_z = 100.0 +step = 5.0 +density = 0.4 +scale_min = 0.6 +scale_max = 1.1 +tilt = 0.15 + +[node name="Environment" type="WorldEnvironment" parent="."] +environment = ExtResource("16_i8t0h") + +[node name="Sun" type="DirectionalLight3D" parent="Environment"] +transform = Transform3D(-0.350207, 0.827032, -0.439741, 0, 0.469472, 0.882948, 0.936672, 0.309215, -0.164412, 0, 3, 0) +light_energy = 1.8 +shadow_enabled = true +script = ExtResource("17_nxk5c") + +[node name="Ambience" type="AudioStreamPlayer" parent="."] +stream = ExtResource("18_8j4nl") +autoplay = true +bus = &"Ambience"