Added lamps and fog

diff --git a/test/lamp.tscn b/test/lamp.tscn
new file mode 100644 (file)
index 0000000..c182f2e
--- /dev/null
+++ b/test/lamp.tscn
@@ -0,0 +1,20 @@
+[gd_scene load_steps=3 format=3 uid="uid://b2dfg5tywfl7q"]
+
+[sub_resource type="SphereMesh" id="SphereMesh_ynmi2"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_njhr2"]
+emission_enabled = true
+emission = Color(0.977874, 0.899431, 0.778607, 1)
+emission_energy_multiplier = 16.0
+
+[node name="Lamp" type="Node3D"]
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
+mesh = SubResource("SphereMesh_ynmi2")
+surface_material_override/0 = SubResource("StandardMaterial3D_njhr2")
+
+[node name="OmniLight3D" type="OmniLight3D" parent="."]
+light_color = Color(0.329, 0.94, 0.929817, 1)
+light_size = 0.39
+omni_range = 5.72575

diff --git a/test/test.tscn b/test/test.tscn
index 776d67aa606838c8149860619ae2deb859387db9..31af7b6e7c1da34def00ec40f1990630b7279e37 100644 (file)
--- a/test/test.tscn
+++ b/test/test.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=10 format=3 uid="uid://bvydwnbie3pv4"]
+[gd_scene load_steps=11 format=3 uid="uid://bvydwnbie3pv4"]

 
 [ext_resource type="Script" path="res://test/test.gd" id="1_gmol0"]
 [ext_resource type="PackedScene" uid="uid://chtr62feiltax" path="res://player/player.tscn" id="1_ytdba"]
 [ext_resource type="PackedScene" uid="uid://dbthgkok84ru0" path="res://test/block.tscn" id="2_8u8xb"]
 
 [ext_resource type="Script" path="res://test/test.gd" id="1_gmol0"]
 [ext_resource type="PackedScene" uid="uid://chtr62feiltax" path="res://player/player.tscn" id="1_ytdba"]
 [ext_resource type="PackedScene" uid="uid://dbthgkok84ru0" path="res://test/block.tscn" id="2_8u8xb"]

+[ext_resource type="PackedScene" uid="uid://b2dfg5tywfl7q" path="res://test/lamp.tscn" id="4_e2oge"]

 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ohmka"]
 sky_top_color = Color(0.0360979, 0.133006, 0.175678, 1)
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ohmka"]
 sky_top_color = Color(0.0360979, 0.133006, 0.175678, 1)


@@ -19,6 +20,10 @@ sky = SubResource("Sky_mganl")
 tonemap_mode = 2
 ssao_enabled = true
 glow_enabled = true
 tonemap_mode = 2
 ssao_enabled = true
 glow_enabled = true

+volumetric_fog_enabled = true
+volumetric_fog_density = 0.1259
+volumetric_fog_albedo = Color(0.20388, 0.1896, 0.24, 1)
+volumetric_fog_length = 128.0

 
 [sub_resource type="PlaneMesh" id="PlaneMesh_dplfc"]
 size = Vector2(40, 8.98)
 
 [sub_resource type="PlaneMesh" id="PlaneMesh_dplfc"]
 size = Vector2(40, 8.98)


@@ -37,12 +42,15 @@ environment = SubResource("Environment_7wa85")
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
 transform = Transform3D(-0.866025, -0.433013, 0.25, 0, 0.5, 0.866025, -0.5, 0.75, -0.433013, 0, 0, 0)
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
 transform = Transform3D(-0.866025, -0.433013, 0.25, 0, 0.5, 0.866025, -0.5, 0.75, -0.433013, 0, 0, 0)

-light_color = Color(0.968627, 1, 0.913725, 1)
+light_color = Color(0.5261, 0.571658, 0.783167, 1)
+light_energy = 0.25
+light_volumetric_fog_energy = 7.526

 shadow_enabled = true
 
 [node name="Player" parent="." instance=ExtResource("1_ytdba")]
 
 [node name="map" type="Node3D" parent="."]
 shadow_enabled = true
 
 [node name="Player" parent="." instance=ExtResource("1_ytdba")]
 
 [node name="map" type="Node3D" parent="."]

+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.8662, 0, 0)

 
 [node name="ground" type="MeshInstance3D" parent="map"]
 mesh = SubResource("PlaneMesh_dplfc")
 
 [node name="ground" type="MeshInstance3D" parent="map"]
 mesh = SubResource("PlaneMesh_dplfc")


@@ -54,56 +62,72 @@ surface_material_override/0 = SubResource("StandardMaterial3D_87x6o")
 [node name="CollisionShape3D" type="CollisionShape3D" parent="map/ground/StaticBody3D"]
 shape = SubResource("ConcavePolygonShape3D_73kmu")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="map/ground/StaticBody3D"]
 shape = SubResource("ConcavePolygonShape3D_73kmu")
 

-[node name="Block" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="blocks" type="Node3D" parent="map"]
+
+[node name="Block" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.30582, 0, 0.134318)
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.30582, 0, 0.134318)
 

-[node name="Block2" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block2" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.94243, 1.91616, 0.268636)
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.94243, 1.91616, 0.268636)
 

-[node name="Block8" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block8" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.27066, 3.80975, 0.268636)
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.27066, 3.80975, 0.268636)
 

-[node name="Block9" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block9" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.126355, 3.80975, 0.268636)
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.126355, 3.80975, 0.268636)
 

-[node name="Block3" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block3" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.315662, -0.336864, -3.10105)
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.315662, -0.336864, -3.10105)
 

-[node name="Block4" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block4" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.899326, -0.296218, -2.69083)
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.899326, -0.296218, -2.69083)
 

-[node name="Block5" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block5" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.8697, 0, 3.31299)
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.8697, 0, 3.31299)
 

-[node name="Block6" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block6" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(0.963985, -4.58956e-08, 1.20097, 0.840186, 1.1004, -0.674393, -0.858149, 1.07737, 0.688812, 1.79621, 4.76837e-07, 2.44774)
 
 transform = Transform3D(0.963985, -4.58956e-08, 1.20097, 0.840186, 1.1004, -0.674393, -0.858149, 1.07737, 0.688812, 1.79621, 4.76837e-07, 2.44774)
 

-[node name="Block10" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block10" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(-1.12697, 1.0177, 0.256559, 0.840186, 1.1004, -0.674393, -0.628994, -0.353546, -1.3605, 0.26934, 4.76837e-07, 2.44774)
 
 transform = Transform3D(-1.12697, 1.0177, 0.256559, 0.840186, 1.1004, -0.674393, -0.628994, -0.353546, -1.3605, 0.26934, 4.76837e-07, 2.44774)
 

-[node name="Block11" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block11" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(-1.97474, 0.396604, -1.81307, 1.47851, 1.93642, -1.18676, 1.12184, -1.85394, -1.62742, -1.54759, 4.76837e-07, 4.88015)
 
 transform = Transform3D(-1.97474, 0.396604, -1.81307, 1.47851, 1.93642, -1.18676, 1.12184, -1.85394, -1.62742, -1.54759, 4.76837e-07, 4.88015)
 

-[node name="Block12" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block12" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(0.126059, -1.48386, -2.26415, 1.47851, 1.93642, -1.18676, 2.26765, -1.18006, 0.899631, 4.62201, 4.76837e-07, 4.88015)
 
 transform = Transform3D(0.126059, -1.48386, -2.26415, 1.47851, 1.93642, -1.18676, 2.26765, -1.18006, 0.899631, 4.62201, 4.76837e-07, 4.88015)
 

-[node name="Block13" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block13" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(5.05779, -3.47782, 0.626465, 3.3662, 4.40875, -2.70195, 1.07536, 2.55668, 5.51143, 4.62201, 4.76837e-07, 13.0351)
 
 transform = Transform3D(5.05779, -3.47782, 0.626465, 3.3662, 4.40875, -2.70195, 1.07536, 2.55668, 5.51143, 4.62201, 4.76837e-07, 13.0351)
 

-[node name="Block17" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block17" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(5.17073, -2.89113, 1.72447, 3.3662, 4.40875, -2.70195, 0.0338593, 3.20519, 5.27205, 8.94593, 4.76837e-07, 15.5634)
 
 transform = Transform3D(5.17073, -2.89113, 1.72447, 3.3662, 4.40875, -2.70195, 0.0338593, 3.20519, 5.27205, 8.94593, 4.76837e-07, 15.5634)
 

-[node name="Block18" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block18" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(-2.27808, 4.15875, 3.94766, 3.3662, 4.40875, -2.70195, -4.64198, 1.15613, -3.8967, -1.4144, 4.76837e-07, 15.5634)
 
 transform = Transform3D(-2.27808, 4.15875, 3.94766, 3.3662, 4.40875, -2.70195, -4.64198, 1.15613, -3.8967, -1.4144, 4.76837e-07, 15.5634)
 

-[node name="Block14" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block14" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(-2.28035, 4.15931, 3.94576, 3.3662, 4.40875, -2.70195, -4.64087, 1.1541, -3.89863, 9.48973, 4.76837e-07, 2.7354)
 
 transform = Transform3D(-2.28035, 4.15931, 3.94576, 3.3662, 4.40875, -2.70195, -4.64087, 1.1541, -3.89863, 9.48973, 4.76837e-07, 2.7354)
 

-[node name="Block15" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block15" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(-2.28035, 4.15931, 3.94576, 3.3662, 4.40875, -2.70195, -4.64087, 1.1541, -3.89863, 11.7752, 4.76837e-07, 2.7354)
 
 transform = Transform3D(-2.28035, 4.15931, 3.94576, 3.3662, 4.40875, -2.70195, -4.64087, 1.1541, -3.89863, 11.7752, 4.76837e-07, 2.7354)
 

-[node name="Block16" parent="map" instance=ExtResource("2_8u8xb")]
+[node name="Block16" parent="map/blocks" instance=ExtResource("2_8u8xb")]

 transform = Transform3D(-3.59526, 4.67433, 1.81486, 3.58307, 3.95713, -3.09381, -3.5078, -0.748826, -5.02031, 7.85471, -1.80343, 4.65367)
 
 transform = Transform3D(-3.59526, 4.67433, 1.81486, 3.58307, 3.95713, -3.09381, -3.5078, -0.748826, -5.02031, 7.85471, -1.80343, 4.65367)
 

-[node name="Block7" parent="map" instance=ExtResource("2_8u8xb")]
-transform = Transform3D(0.833637, -0.580818, -1.236, 0.914655, 1.31279, 2.72588e-08, 1.01413, -0.706571, 1.01602, 3.30079, -0.0345068, 3.26074)
+[node name="Block7" parent="map/blocks" instance=ExtResource("2_8u8xb")]
+transform = Transform3D(0.854299, -0.5507, -1.23568, 0.895387, 1.32571, 0.0282141, 1.01413, -0.706571, 1.01602, 3.30079, -0.0345068, 3.26074)
+
+[node name="lights" type="Node3D" parent="map"]
+
+[node name="Lamp" parent="map/lights" instance=ExtResource("4_e2oge")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.65743, 2.16469, 3.69796)
+
+[node name="Lamp2" parent="map/lights" instance=ExtResource("4_e2oge")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.529578, 0, -1.86579)
+
+[node name="Lamp4" parent="map/lights" instance=ExtResource("4_e2oge")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.53808, 0, 1.71538)
+
+[node name="Lamp3" parent="map/lights" instance=ExtResource("4_e2oge")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.77066, 3.93679, 0.160806)