Lighting for new rooms etc

This commit is contained in:
Pal
2026-01-21 14:46:48 -08:00
parent faf3288061
commit 92b39c1ee9
21 changed files with 435 additions and 47 deletions

View File

@@ -1,4 +1,4 @@
<Project Sdk="Godot.NET.Sdk/4.4.0">
<Project Sdk="Godot.NET.Sdk/4.4.1">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>

View File

@@ -0,0 +1,38 @@
<Project Sdk="Godot.NET.Sdk/4.4.0">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
<WarningsAsErrors>CS9057</WarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Chickensoft.AutoInject" Version="2.5.0" />
<PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.4.0" />
<PackageReference Include="Chickensoft.Introspection" Version="2.2.0" />
<PackageReference Include="Chickensoft.Introspection.Generator" Version="2.2.0" />
<PackageReference Include="Chickensoft.LogicBlocks" Version="5.16.0" />
<PackageReference Include="Chickensoft.LogicBlocks.DiagramGenerator" Version="5.16.0" />
<PackageReference Include="Chickensoft.SaveFileBuilder" Version="1.1.0" />
<PackageReference Include="Chickensoft.Serialization.Godot" Version="0.7.6" />
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250131-2115.Release" />
<PackageReference Include="SimpleInjector" Version="5.5.0" />
<PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.11" />
<PackageReference Include="Zeroconf" Version="3.7.16" />
</ItemGroup>
<ItemGroup>
<None Include=".editorconfig" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Zennysoft.Game.Godot.Implementation\Zennysoft.Game.Implementation.csproj" />
<ProjectReference Include="..\Zennysoft.Game.Ma.Implementation\Zennysoft.Ma.Adapter.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Godot.SourceGenerators" Version="4.4.0-dev.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="GodotSharp" Version="4.4.0-dev.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="GodotSharpEditor" Version="4.4.0-dev.2" />
</ItemGroup>
</Project>

View File

@@ -15,7 +15,7 @@
script = ExtResource("1_x62lg")
[node name="Balcony Room A" parent="." instance=ExtResource("1_op53i")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.1836, 133, 14.7066)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -59.1591, 4.31337, 24.3275)
[node name="Statue Room" parent="." instance=ExtResource("2_e824x")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.7716, 0, 8.6137)
@@ -24,7 +24,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.7716, 0, 8.6137)
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 64.2092, 0, 12.4445)
[node name="Node3D" parent="." instance=ExtResource("4_j1a5r")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.7721, 0, 14.5442)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.7721, 0, 21.5442)
[node name="A1CircleRoom" parent="." instance=ExtResource("5_i84xt")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17, 11, -30)

View File

@@ -3,7 +3,7 @@
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dw56jlwkmqktu"
uid="uid://bqvkbpfsuu0d4"
path="res://.godot/imported/A2 Donut.glb-364282a3e11d05e1247cc2f510ee59b0.scn"
[deps]

View File

@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cas2st4gn8h7x"
uid="uid://dmewkutmd4j6d"
path="res://.godot/imported/A2 Donut_8.png-aec6535ede840504c051951579426130.ctex"
metadata={
"vram_texture": false

View File

@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://qr8aj73f2r68"
uid="uid://b33d74elnba3e"
path="res://.godot/imported/A2 Donut_CC302614.png-7204606554b131bceb852c1f216b3c05.ctex"
metadata={
"vram_texture": false

View File

@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://h5h2eg44tsfv"
uid="uid://dd0aed3be44w5"
path="res://.godot/imported/A2 Donut_IMG0031.png-4a76d53036973834d0fa2f07143287d1.ctex"
metadata={
"vram_texture": false

View File

@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dyvao7sy1tiax"
uid="uid://caqchdb37mwq6"
path="res://.godot/imported/A2 Donut_JUPITER2.jpg-6efa91a78f40a7822efa6641bd4a8f4d.ctex"
metadata={
"vram_texture": false

View File

@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://3jpsgr2jf8n"
uid="uid://c7t1jtyhfmn7m"
path="res://.godot/imported/A2 Donut_NEWDONE.jpg-017fb92f5f4e6f5b0efe0b41ea290a0b.ctex"
metadata={
"vram_texture": false

View File

@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://byubg3tok4ro3"
uid="uid://d1wgynu5sfwqj"
path="res://.godot/imported/A2 Donut_PLATEOX2.jpg-bd99891df35aa7f8ec164bbb018d8553.ctex"
metadata={
"vram_texture": false

View File

@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://da07qqny2xhrv"
uid="uid://bog6kb64afid2"
path="res://.godot/imported/A2 Donut_TXTR0004.png-36ae2c51fcd11bd5d251438cdce3f520.ctex"
metadata={
"vram_texture": false

View File

@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://eg4aw8puvwdd"
uid="uid://qoxljnf8oqib"
path="res://.godot/imported/A2 Donut_a1maerb.jpg-5a54684a66cf092067b123d29cd8d995.ctex"
metadata={
"vram_texture": false

View File

@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://6o6e3f6ssv8q"
uid="uid://dfhwsno17dbf8"
path="res://.godot/imported/A2 Donut_mottled.png-b73d9621b00241d3b3aab5127b5074f3.ctex"
metadata={
"vram_texture": false

View File

@@ -73,7 +73,7 @@ subdivide_depth = 1
script = ExtResource("1_5ni02")
[node name="OmniLight3D11" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 60.7801, 5.13098, -26.3464)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.4186, 5.13098, -17.8153)
light_color = Color(1.97336e-06, 0.703962, 0.150021, 1)
light_energy = 0.155
light_cull_mask = 4294967293
@@ -82,7 +82,7 @@ omni_range = 11.236
omni_attenuation = -0.343
[node name="OmniLight3D12" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 79.5466, 5.13098, -25.1778)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 37.1851, 5.13098, -16.6467)
light_color = Color(1.97336e-06, 0.703962, 0.150021, 1)
light_energy = 0.155
light_cull_mask = 4294967293
@@ -91,7 +91,7 @@ omni_range = 11.236
omni_attenuation = -0.343
[node name="OmniLight3D13" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 78.886, 5.13098, -45.2653)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 36.5245, 5.13098, -36.7342)
light_color = Color(1.97336e-06, 0.703962, 0.150021, 1)
light_energy = 0.155
light_cull_mask = 4294967293
@@ -100,7 +100,7 @@ omni_range = 11.236
omni_attenuation = -0.343
[node name="OmniLight3D14" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 61.2028, 5.13098, -44.5032)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.8413, 5.13098, -35.9721)
light_color = Color(1.97336e-06, 0.703962, 0.150021, 1)
light_energy = 0.155
light_cull_mask = 4294967293
@@ -109,14 +109,13 @@ omni_range = 11.236
omni_attenuation = -0.343
[node name="A1-Pit2" parent="." instance=ExtResource("2_ial2h")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 43.4707, -1.67631, -8.80541)
[node name="Model" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.10919, -1.67631, -0.274271)
[node name="Collision" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.02876, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.15117, 0)
[node name="StaticBody3D" type="StaticBody3D" parent="Collision"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -41.479, 0, 8.23696)
[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 42.8897, 7.58684, -49.2063)
@@ -215,7 +214,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 83.817
shape = SubResource("BoxShape3D_ueomb")
[node name="Spawn Points" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.02876, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.02876, -28.8813)
visible = false
[node name="ItemSpawnPoints" type="Node3D" parent="Spawn Points"]
@@ -247,7 +246,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.23212, -1.76654, 7.753)
[node name="Room" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.77516, 0)
visible = false
[node name="Room" type="Area3D" parent="Room"]
unique_name_in_owner = true
@@ -256,10 +254,11 @@ collision_layer = 0
collision_mask = 10
[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Room"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.0457, -13.6094, 18)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.8392, -13.6094, -27.7034)
shape = SubResource("BoxShape3D_c4wqw")
[node name="Minimap" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -35.0071)
[node name="Minimap" type="MeshInstance3D" parent="Minimap"]
unique_name_in_owner = true
@@ -269,7 +268,7 @@ layers = 2
mesh = SubResource("PlaneMesh_gx7da")
[node name="GPUParticles3D2" type="GPUParticles3D" parent="."]
transform = Transform3D(0.869, 0, 0, 0, 0.332, 0, 0, 0, 0.967, 69.7365, 4.51225, -35.39)
transform = Transform3D(0.869, 0, 0, 0, 0.332, 0, 0, 0, 0.967, 27.375, 4.51225, -26.8589)
amount = 20
lifetime = 41.19
local_coords = true
@@ -277,7 +276,7 @@ process_material = SubResource("ParticleProcessMaterial_hisav")
draw_pass_1 = SubResource("QuadMesh_1b53s")
[node name="OmniLight3D2" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 74.5118, 1.72011, -35.2162)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 32.1503, 1.72011, -26.6851)
light_color = Color(0.288422, 0.532296, 0.224511, 1)
light_energy = 1.875
light_cull_mask = 4294967293
@@ -285,7 +284,7 @@ shadow_enabled = true
omni_range = 16.104
[node name="OmniLight3D3" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 64.9303, 1.72011, -34.9767)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.5688, 1.72011, -26.4456)
light_color = Color(0.288422, 0.532296, 0.224511, 1)
light_energy = 1.875
light_cull_mask = 4294967293
@@ -293,7 +292,7 @@ shadow_enabled = true
omni_range = 16.104
[node name="OmniLight3D4" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 66.2649, 1.72011, -38.3302)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.9034, 1.72011, -29.7991)
light_color = Color(0.288422, 0.532296, 0.224511, 1)
light_energy = 1.875
light_cull_mask = 4294967293
@@ -301,7 +300,7 @@ shadow_enabled = true
omni_range = 16.104
[node name="OmniLight3D5" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 66.3162, 1.72011, -31.5548)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.9547, 1.72011, -23.0237)
light_color = Color(0.288422, 0.532296, 0.224511, 1)
light_energy = 1.875
light_cull_mask = 4294967293
@@ -309,7 +308,7 @@ shadow_enabled = true
omni_range = 16.104
[node name="OmniLight3D6" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 69.8066, 1.72011, -30.2544)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.4451, 1.72011, -21.7233)
light_color = Color(0.288422, 0.532296, 0.224511, 1)
light_energy = 1.875
light_cull_mask = 4294967293
@@ -317,7 +316,7 @@ shadow_enabled = true
omni_range = 16.104
[node name="OmniLight3D7" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 73.2286, 1.72011, -31.7087)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.8671, 1.72011, -23.1776)
light_color = Color(0.288422, 0.532296, 0.224511, 1)
light_energy = 1.875
light_cull_mask = 4294967293
@@ -325,7 +324,7 @@ shadow_enabled = true
omni_range = 16.104
[node name="OmniLight3D8" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 69.5671, 1.72011, -39.7846)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.2056, 1.72011, -31.2535)
light_color = Color(0.288422, 0.532296, 0.224511, 1)
light_energy = 1.875
light_cull_mask = 4294967293
@@ -333,7 +332,7 @@ shadow_enabled = true
omni_range = 16.104
[node name="OmniLight3D9" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 73.0404, 1.72011, -38.604)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.6789, 1.72011, -30.0729)
light_color = Color(0.288422, 0.532296, 0.224511, 1)
light_energy = 1.875
light_cull_mask = 4294967293
@@ -341,7 +340,7 @@ shadow_enabled = true
omni_range = 16.104
[node name="OmniLight3D10" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 73.3483, 1.72011, -31.7259)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.9868, 1.72011, -23.1948)
light_color = Color(0.288422, 0.532296, 0.224511, 1)
light_energy = 1.875
light_cull_mask = 4294967293
@@ -349,7 +348,7 @@ shadow_enabled = true
omni_range = 16.104
[node name="OmniLight3D" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 69.9855, 0.166375, -34.501)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.624, 0.166375, -25.9699)
light_color = Color(0.288422, 0.532296, 0.224511, 1)
light_energy = 1.875
light_cull_mask = 4294967293
@@ -358,5 +357,5 @@ omni_range = 7.598
omni_attenuation = 1.969
[node name="FogVolume" type="FogVolume" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 70.1695, -2.75744, -33.8206)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.808, -2.75744, -25.2895)
size = Vector3(32.3798, 5.64899, 29.6947)

View File

@@ -97,10 +97,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.1836, 0, 15.8193)
script = ExtResource("2_fedas")
[node name="A1-Balcony2" parent="." instance=ExtResource("2_ybo5h")]
transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 1.18503, -8.69354, -1.29919)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.18503, -8.69354, -1.29919)
[node name="Model" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
visible = false
[node name="OmniLight3D" type="OmniLight3D" parent="Model"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0243759, 1.6988, -1.89605)
@@ -120,6 +121,7 @@ draw_pass_1 = SubResource("QuadMesh_sasor")
[node name="Collision" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
visible = false
[node name="StaticBody3D" type="StaticBody3D" parent="Collision"]
@@ -227,6 +229,7 @@ shape = SubResource("BoxShape3D_mefsp")
[node name="Spawn Points" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
visible = false
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
@@ -248,6 +251,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.346, -0.5, -3.546)
[node name="Room" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0)
visible = false
[node name="Room" type="Area3D" parent="Room"]
unique_name_in_owner = true
@@ -260,10 +264,12 @@ shape = SubResource("BoxShape3D_1up8d")
[node name="FogVolume" type="FogVolume" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.171951, -9.55431, 0.18298)
visible = false
size = Vector3(39.9, 16.6792, 34.6)
[node name="Minimap" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.171951, -10.2003, -1.80546)
visible = false
[node name="Minimap" type="MeshInstance3D" parent="Minimap"]
unique_name_in_owner = true

View File

@@ -30,7 +30,7 @@ _limits = [-2.0, 2.0, 0.0, 1.0]
_data = [Vector2(0.00358423, 0.230769), 0.0, 0.0, 0, 0, Vector2(0.982079, -1.03846), 0.0, 0.0, 0, 0]
point_count = 2
[sub_resource type="CurveTexture" id="CurveTexture_312b8"]
[sub_resource type="CurveTexture" id="CurveTexture_fgt65"]
curve = SubResource("Curve_umqhi")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_307bl"]
@@ -41,12 +41,12 @@ angle_min = -245.3
angle_max = 417.9
orbit_velocity_min = -0.0269999
orbit_velocity_max = 0.0400001
orbit_velocity_curve = SubResource("CurveTexture_312b8")
orbit_velocity_curve = SubResource("CurveTexture_fgt65")
gravity = Vector3(0, -0.07, 0)
scale_min = 0.0
scale_max = 0.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jig7d"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5m2h2"]
transparency = 1
cull_mode = 2
shading_mode = 0
@@ -55,7 +55,7 @@ albedo_texture = ExtResource("5_5m2h2")
billboard_mode = 2
[sub_resource type="QuadMesh" id="QuadMesh_lyv8e"]
material = SubResource("StandardMaterial3D_jig7d")
material = SubResource("StandardMaterial3D_5m2h2")
size = Vector2(0.1, 0.1)
subdivide_width = 1
subdivide_depth = 1
@@ -65,7 +65,7 @@ transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -8.509, -3.41755, -8.60795)
script = ExtResource("1_5m2h2")
[node name="A1-Jumpscare" parent="." instance=ExtResource("2_umqhi")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.0246, 0, 7.9943)
transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 11.5401, 0, 7.30243)
[node name="Collision" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.0246, 2, 7.9943)
@@ -105,7 +105,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.0246, 0, 7.9943)
[node name="Minimap" type="MeshInstance3D" parent="Minimap"]
unique_name_in_owner = true
visible = false
layers = 2
mesh = SubResource("PlaneMesh_lyv8e")
surface_material_override/0 = SubResource("StandardMaterial3D_woljn")

View File

@@ -1,7 +1,142 @@
[gd_scene load_steps=2 format=3 uid="uid://b8u3sfhexlhfu"]
[gd_scene load_steps=17 format=3 uid="uid://b8u3sfhexlhfu"]
[ext_resource type="PackedScene" uid="uid://cvajnig5nw537" path="res://src/map/dungeon/models/Area 1/WaterCircle/A1-WateryCircle.glb" id="1_1t1ov"]
[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="2_yramv"]
[ext_resource type="Shader" uid="uid://blrcjqdo7emhs" path="res://src/map/overworld/Models/water.gdshader" id="3_k4n66"]
[ext_resource type="CompressedTexture2DArray" uid="uid://c0kjnbpgaa6bs" path="res://src/map/assets/caustics.png" id="4_qjvxm"]
[ext_resource type="Texture2D" uid="uid://cbsdc4uthojov" path="res://src/map/assets/waternormal2.jpg" id="5_j6fpi"]
[sub_resource type="Curve" id="Curve_vo6nb"]
_limits = [-2.0, 2.0, 0.0, 1.0]
_data = [Vector2(0.00358423, 0.230769), 0.0, 0.0, 0, 0, Vector2(0.982079, -1.03846), 0.0, 0.0, 0, 0]
point_count = 2
[sub_resource type="CurveTexture" id="CurveTexture_312b8"]
curve = SubResource("Curve_vo6nb")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_hsxad"]
lifetime_randomness = 0.05
emission_shape = 3
emission_box_extents = Vector3(22.2, 22.505, 22)
angle_min = -245.3
angle_max = 417.9
orbit_velocity_min = -0.0269999
orbit_velocity_max = 0.0400001
orbit_velocity_curve = SubResource("CurveTexture_312b8")
gravity = Vector3(0, -0.07, 0)
scale_min = 0.0
scale_max = 0.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jig7d"]
transparency = 1
cull_mode = 2
shading_mode = 0
albedo_color = Color(1, 1, 1, 0.0862745)
albedo_texture = ExtResource("2_yramv")
billboard_mode = 2
[sub_resource type="QuadMesh" id="QuadMesh_fel6n"]
material = SubResource("StandardMaterial3D_jig7d")
size = Vector2(0.1, 0.1)
subdivide_width = 1
subdivide_depth = 1
[sub_resource type="FastNoiseLite" id="FastNoiseLite_d8mjt"]
noise_type = 3
frequency = 0.051
fractal_type = 0
domain_warp_enabled = true
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_goigl"]
seamless = true
noise = SubResource("FastNoiseLite_d8mjt")
[sub_resource type="FastNoiseLite" id="FastNoiseLite_7im4w"]
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_8c3x1"]
seamless = true
noise = SubResource("FastNoiseLite_7im4w")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ou4jy"]
render_priority = 0
shader = ExtResource("3_k4n66")
shader_parameter/wave_1 = Vector4(0.3, 4, 0.2, 0.6)
shader_parameter/wave_2 = Vector4(-0.26, -0.19, 0.01, 0.47)
shader_parameter/wave_3 = Vector4(-7.67, 5.63, 0.1, 0.38)
shader_parameter/wave_4 = Vector4(-0.42, -1.63, 0.1, 0.28)
shader_parameter/wave_5 = Vector4(1.66, 0.07, 0.15, 1.81)
shader_parameter/wave_6 = Vector4(1.2, 1.14, 0.01, 0.33)
shader_parameter/wave_7 = Vector4(-1.6, 7.3, 0.11, 0.73)
shader_parameter/wave_8 = Vector4(-0.42, -1.63, 0.15, 1.52)
shader_parameter/time_factor = 2.5
shader_parameter/noise_zoom = 2.0
shader_parameter/noise_amp = 1.0
shader_parameter/base_water_color = Color(0, 0.592828, 0.515505, 1)
shader_parameter/fresnel_water_color = Color(0.457416, 0.678852, 0.519402, 1)
shader_parameter/deep_water_color = Color(0.732793, 0.968719, 0.655931, 1)
shader_parameter/shallow_water_color = Color(0.406848, 0.699941, 0.470216, 1)
shader_parameter/beers_law = 0.495
shader_parameter/depth_offset = -1.2
shader_parameter/near = 7.0
shader_parameter/far = 10000.0
shader_parameter/edge_texture_scale = 3.5
shader_parameter/edge_texture_offset = 1.0
shader_parameter/edge_texture_speed = 0.1
shader_parameter/edge_foam_intensity = 2.0
shader_parameter/edge_fade_start = -3.0
shader_parameter/edge_fade_end = 6.6
shader_parameter/peak_height_threshold = 1.0
shader_parameter/peak_color = Vector3(1, 1, 1)
shader_parameter/peak_intensity = 1.0
shader_parameter/foam_intensity = 1.0
shader_parameter/foam_scale = 1.0
shader_parameter/metallic = 0.6
shader_parameter/roughness = 0.54
shader_parameter/uv_scale_text_a = 0.1
shader_parameter/uv_speed_text_a = Vector2(1.18, 1.52)
shader_parameter/uv_scale_text_b = 0.6
shader_parameter/uv_speed_text_b = Vector2(0.15, 0.1)
shader_parameter/normal_strength = 1.0
shader_parameter/uv_sampler_scale = 0.3
shader_parameter/blend_factor = 0.03
shader_parameter/perturbation_strength = 1.0
shader_parameter/perturbation_time = 0.3
shader_parameter/normalmap_a = ExtResource("5_j6fpi")
shader_parameter/normalmap_b = SubResource("NoiseTexture2D_goigl")
shader_parameter/uv_sampler = SubResource("NoiseTexture2D_8c3x1")
shader_parameter/caustic_sampler = ExtResource("4_qjvxm")
shader_parameter/num_caustic_layers = 1.0
shader_parameter/caustic_distortion_strength = 0.001
[sub_resource type="PlaneMesh" id="PlaneMesh_wbtug"]
lightmap_size_hint = Vector2i(1003, 753)
material = SubResource("ShaderMaterial_ou4jy")
uv2_padding = 3.49
size = Vector2(33.455, 31.71)
subdivide_width = 100
subdivide_depth = 100
[node name="A1CircleRoom" type="Node3D"]
[node name="A1-WateryCircle" parent="." instance=ExtResource("1_1t1ov")]
[node name="GPUParticles3D2" type="GPUParticles3D" parent="."]
transform = Transform3D(0.464, 0, 0, 0, 0.227, 0, 0, 0, 0.462, -0.206923, -1.16501, -0.808931)
amount = 20
lifetime = 41.19
local_coords = true
process_material = SubResource("ParticleProcessMaterial_hsxad")
draw_pass_1 = SubResource("QuadMesh_fel6n")
[node name="OmniLight3D" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.116278, 2.29578, -0.0767513)
light_energy = 1.375
shadow_enabled = true
omni_range = 14.008
omni_attenuation = 1.157
[node name="Top Water" type="MeshInstance3D" parent="."]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.169727, -3.1, 0.0638962)
mesh = SubResource("PlaneMesh_wbtug")
skeleton = NodePath("../..")

View File

@@ -1,7 +1,120 @@
[gd_scene load_steps=2 format=3 uid="uid://d2fbbjlkiqlao"]
[gd_scene load_steps=14 format=3 uid="uid://d2fbbjlkiqlao"]
[ext_resource type="PackedScene" uid="uid://c72vrk43ky2y0" path="res://src/map/dungeon/models/Area 1/Gallery/A1Gallery.glb" id="1_4yixp"]
[ext_resource type="Shader" uid="uid://dj3ut2w0lnwq2" path="res://src/map/map shaders/Overworld God Rays.gdshader" id="2_5pjpw"]
[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="3_wk80w"]
[sub_resource type="Gradient" id="Gradient_w4hfg"]
[sub_resource type="GradientTexture2D" id="GradientTexture2D_wbbo3"]
gradient = SubResource("Gradient_w4hfg")
[sub_resource type="FastNoiseLite" id="FastNoiseLite_sh6pj"]
noise_type = 3
frequency = 0.0769
domain_warp_enabled = true
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_d1qcb"]
noise = SubResource("FastNoiseLite_sh6pj")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_q8qa6"]
render_priority = 0
shader = ExtResource("2_5pjpw")
shader_parameter/alpha = 0.848
shader_parameter/rim_power = 1.507
shader_parameter/texture_emission = SubResource("NoiseTexture2D_d1qcb")
shader_parameter/gradient = SubResource("GradientTexture2D_wbbo3")
shader_parameter/emission = Color(1, 1, 1, 1)
shader_parameter/emission_energy = 0.33
shader_parameter/uv1_scale = Vector3(5, 0, 0)
shader_parameter/uv1_offset = Vector3(0, 1, 0)
[sub_resource type="Curve" id="Curve_y6syt"]
_limits = [-2.0, 2.0, 0.0, 1.0]
_data = [Vector2(0.00358423, 0.230769), 0.0, 0.0, 0, 0, Vector2(0.982079, -1.03846), 0.0, 0.0, 0, 0]
point_count = 2
[sub_resource type="CurveTexture" id="CurveTexture_k51ab"]
curve = SubResource("Curve_y6syt")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_y0fmo"]
lifetime_randomness = 0.05
emission_shape = 3
emission_box_extents = Vector3(22.2, 22.505, 22)
angle_min = -245.3
angle_max = 417.9
orbit_velocity_min = -0.0269999
orbit_velocity_max = 0.0400001
orbit_velocity_curve = SubResource("CurveTexture_k51ab")
gravity = Vector3(0, -0.07, 0)
scale_min = 0.0
scale_max = 0.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_23rrv"]
transparency = 1
cull_mode = 2
shading_mode = 0
albedo_color = Color(1, 1, 1, 0.0862745)
albedo_texture = ExtResource("3_wk80w")
billboard_mode = 2
[sub_resource type="QuadMesh" id="QuadMesh_sxgxx"]
material = SubResource("StandardMaterial3D_23rrv")
size = Vector2(0.1, 0.1)
subdivide_width = 1
subdivide_depth = 1
[node name="GalleryA1" type="Node3D"]
[node name="A1Gallery" parent="." instance=ExtResource("1_4yixp")]
[node name="FogVolume" type="FogVolume" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0433044, 9.99786, 4.00772)
size = Vector3(3.72614, 8.79425, 24.0038)
[node name="OmniLight3D" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.768, -5.27914)
light_energy = 4.394
light_indirect_energy = 1.772
light_specular = 0.0
shadow_enabled = true
omni_range = 10.2
[node name="OmniLight3D2" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.768, 1.33011)
light_energy = 4.394
light_indirect_energy = 1.772
light_specular = 0.0
shadow_enabled = true
omni_range = 10.2
[node name="OmniLight3D3" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.768, 6.69178)
light_energy = 4.394
light_indirect_energy = 1.772
light_specular = 0.0
shadow_enabled = true
omni_range = 10.2
[node name="OmniLight3D4" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.768, 11.0079)
light_energy = 4.394
light_indirect_energy = 1.772
light_specular = 0.0
shadow_enabled = true
omni_range = 10.2
[node name="Altar Godrays" type="CSGCylinder3D" parent="."]
transform = Transform3D(0.238656, -0.489364, -20.1776, -0.180127, 20.1781, -0.491485, 20.1828, 0.185877, 0.234199, -0.00122181, 7.10086, 1.28416)
radius = 0.0800781
height = 0.955955
cone = true
material = SubResource("ShaderMaterial_q8qa6")
[node name="GPUParticles3D2" type="GPUParticles3D" parent="."]
transform = Transform3D(0.864, 0, 0, 0, 1.107, 0, 0, 0, 2.557, 0.110992, 2.59235, 4.00648)
amount = 20
lifetime = 41.19
local_coords = true
process_material = SubResource("ParticleProcessMaterial_y0fmo")
draw_pass_1 = SubResource("QuadMesh_sxgxx")

View File

@@ -1,7 +1,83 @@
[gd_scene load_steps=2 format=3 uid="uid://boonyo0b1q1ad"]
[gd_scene load_steps=8 format=3 uid="uid://boonyo0b1q1ad"]
[ext_resource type="PackedScene" uid="uid://dw56jlwkmqktu" path="res://src/map/dungeon/models/Area 2/Donut/A2 Donut.glb" id="1_8nndw"]
[ext_resource type="PackedScene" uid="uid://bqvkbpfsuu0d4" path="res://src/map/dungeon/models/Area 2/Donut/A2 Donut.glb" id="1_8nndw"]
[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="1_ewwkl"]
[sub_resource type="Curve" id="Curve_v0m5w"]
_limits = [-2.0, 2.0, 0.0, 1.0]
_data = [Vector2(0.00358423, 0.230769), 0.0, 0.0, 0, 0, Vector2(0.982079, -1.03846), 0.0, 0.0, 0, 0]
point_count = 2
[sub_resource type="CurveTexture" id="CurveTexture_gxo8h"]
curve = SubResource("Curve_v0m5w")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_roqqs"]
lifetime_randomness = 0.05
emission_shape = 3
emission_box_extents = Vector3(22.2, 22.505, 22)
angle_min = -245.3
angle_max = 417.9
orbit_velocity_min = -0.0269999
orbit_velocity_max = 0.0400001
orbit_velocity_curve = SubResource("CurveTexture_gxo8h")
gravity = Vector3(0, -0.07, 0)
scale_min = 0.0
scale_max = 0.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7m5cm"]
transparency = 1
cull_mode = 2
shading_mode = 0
albedo_color = Color(1, 1, 1, 0.0862745)
albedo_texture = ExtResource("1_ewwkl")
billboard_mode = 2
[sub_resource type="QuadMesh" id="QuadMesh_gmwua"]
material = SubResource("StandardMaterial3D_7m5cm")
size = Vector2(0.1, 0.1)
subdivide_width = 1
subdivide_depth = 1
[node name="40_DonutGallery" type="Node3D"]
[node name="GPUParticles3D2" type="GPUParticles3D" parent="."]
transform = Transform3D(5.169, 0, 0, 0, 2.932, 0, 0, 0, 5.667, 0.112471, 4.29823, -0.0744419)
amount = 20
lifetime = 41.19
local_coords = true
process_material = SubResource("ParticleProcessMaterial_roqqs")
draw_pass_1 = SubResource("QuadMesh_gmwua")
[node name="OmniLight3D" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.26678, -23.6828)
omni_range = 11.2655
[node name="OmniLight3D2" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9.09179, 11.647)
light_energy = 4.963
shadow_enabled = true
omni_range = 17.759
[node name="OmniLight3D3" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9.09179, -11.6382)
light_energy = 4.963
shadow_enabled = true
omni_range = 17.759
[node name="OmniLight3D4" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.3707, 9.09179, 0.127988)
light_energy = 4.963
shadow_enabled = true
omni_range = 17.759
[node name="OmniLight3D5" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.0628, 9.09179, 0.127988)
light_energy = 4.963
shadow_enabled = true
omni_range = 17.759
[node name="FogVolume" type="FogVolume" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00845337, 15.2848, -6.46941)
size = Vector3(35.5961, 7.12933, 48.7726)
[node name="A2 Donut" parent="." instance=ExtResource("1_8nndw")]

View File

@@ -5,3 +5,25 @@
[node name="40_DonutGallery" type="Node3D"]
[node name="A2 Circular Water Room" parent="." instance=ExtResource("1_wyllr")]
[node name="FogVolume" type="FogVolume" parent="A2 Circular Water Room"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0890198, -27.6868, 0.0737915)
size = Vector3(27.5767, 24.041, 28.1017)
[node name="FogVolume2" type="FogVolume" parent="A2 Circular Water Room"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0890198, 20.9393, 0.0737915)
size = Vector3(27.5767, 11.1167, 28.1017)
[node name="SpotLight3D" type="SpotLight3D" parent="."]
transform = Transform3D(0.955335, -1.29178e-08, 0.295525, -0.295525, -4.1759e-08, 0.955335, 0, -1, -4.37114e-08, 5.51394, 14.0044, 0)
light_energy = 9.242
shadow_enabled = true
shadow_opacity = 0.93
spot_range = 48.914
[node name="OmniLight3D" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 8.403, 0)
light_energy = 1.762
shadow_enabled = true
omni_range = 17.759
omni_attenuation = 0.81