From b97000a680dd040e15e803b645177f39ce4c6f41 Mon Sep 17 00:00:00 2001 From: VAILLANT Jeremy Date: Sun, 9 May 2021 18:53:03 +0200 Subject: [PATCH 1/3] Update scene, add fog post process, and update 1er plan --- scenes/levels/WarCraft.tscn | 143 ++++++++++++++++++++++++------------ 1 file changed, 96 insertions(+), 47 deletions(-) diff --git a/scenes/levels/WarCraft.tscn b/scenes/levels/WarCraft.tscn index 1bda09d..389ed33 100644 --- a/scenes/levels/WarCraft.tscn +++ b/scenes/levels/WarCraft.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=19 format=2] [ext_resource path="res://assets/props/rock floor/rock floor.gltf" type="PackedScene" id=1] [ext_resource path="res://assets/props/table/table.gltf" type="PackedScene" id=2] @@ -12,18 +12,33 @@ [ext_resource path="res://assets/props/candle/candlestick.gltf" type="PackedScene" id=10] [ext_resource path="res://assets/props/parchment/wood parchment.gltf" type="PackedScene" id=11] [ext_resource path="res://assets/materials/gray.tres" type="Material" id=12] +[ext_resource path="res://assets/props/parchment/paper parchment.gltf" type="PackedScene" id=13] +[ext_resource path="res://assets/props/candle/candle top.gltf" type="PackedScene" id=14] -[sub_resource type="CubeMesh" id=3] +[sub_resource type="CubeMesh" id=1] -[sub_resource type="PanoramaSky" id=1] +[sub_resource type="PanoramaSky" id=2] panorama = ExtResource( 4 ) -[sub_resource type="Environment" id=2] +[sub_resource type="Environment" id=3] background_mode = 3 -background_sky = SubResource( 1 ) +background_sky = SubResource( 2 ) +background_color = Color( 0.188235, 0.133333, 0.133333, 1 ) background_energy = 0.6 -ambient_light_color = Color( 0.266667, 0.14902, 0.0627451, 1 ) +ambient_light_color = Color( 0.694118, 0.168627, 0.67451, 1 ) +ambient_light_energy = 1.55 +ambient_light_sky_contribution = 0.5 +fog_enabled = true +fog_color = Color( 0.562167, 0.29, 1, 0.941176 ) +fog_depth_begin = 0.0 +fog_depth_end = 60.0 +fog_depth_curve = 1.10957 +fog_height_enabled = true +fog_height_min = 2.0 +fog_height_max = -20.0 +fog_height_curve = 0.965936 tonemap_mode = 2 +ss_reflections_enabled = true dof_blur_far_enabled = true dof_blur_far_distance = 2.0 glow_enabled = true @@ -42,7 +57,7 @@ interior = true [node name="Warcraft" type="Spatial"] script = ExtResource( 6 ) -[node name="Camera" type="Camera" parent="."] +[node name="Main Camera" type="Camera" parent="."] transform = Transform( 0.160708, -0.339306, 0.926846, 0, 0.939052, 0.343774, -0.987002, -0.0552473, 0.150913, 1.62519, 1.61928, 0.658554 ) fov = 38.5632 far = 60.0 @@ -51,22 +66,22 @@ far = 60.0 [node name="MeshInstance" type="MeshInstance" parent="Building"] transform = Transform( 5.45383, 0, 0, 0, 2.05553, 0, 0, 0, 0.347932, -3.44218, 1.54814, 5.15637 ) -mesh = SubResource( 3 ) +mesh = SubResource( 1 ) material/0 = ExtResource( 12 ) [node name="MeshInstance4" type="MeshInstance" parent="Building"] transform = Transform( 5.45383, 0, 0, 0, -8.98502e-08, 0.347932, 0, -5.54994, -4.10632e-08, -3.44218, 3.54814, 0.156369 ) -mesh = SubResource( 3 ) +mesh = SubResource( 1 ) material/0 = ExtResource( 12 ) [node name="MeshInstance2" type="MeshInstance" parent="Building"] transform = Transform( 5.45383, 0, 0, 0, 2.05553, 0, 0, 0, 0.347932, -3.44218, 1.54814, -4.11673 ) -mesh = SubResource( 3 ) +mesh = SubResource( 1 ) material/0 = ExtResource( 12 ) [node name="MeshInstance3" type="MeshInstance" parent="Building"] transform = Transform( -2.38394e-07, 0, -0.347932, 0, 2.05553, 0, 5.45383, 0, -1.52086e-08, -8.44218, 1.54814, 0.883272 ) -mesh = SubResource( 3 ) +mesh = SubResource( 1 ) material/0 = ExtResource( 12 ) [node name="rock floor4" parent="Building" instance=ExtResource( 1 )] @@ -81,61 +96,89 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 2.253 ) [node name="rock floor3" parent="Building" instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7, 0, 2.253 ) -[node name="Props Table" type="Spatial" parent="."] - -[node name="book3" parent="Props Table" instance=ExtResource( 5 )] -transform = Transform( 0.259561, 0, 0.965727, 0.03751, 0.999245, -0.0100817, -0.964998, 0.0388413, 0.259365, 0.18091, 0.89617, -0.217671 ) - -[node name="book4" parent="Props Table" instance=ExtResource( 5 )] -transform = Transform( 0.970684, -0.0388311, -0.237202, 0.0301257, 0.998737, -0.0402167, 0.238464, 0.0318918, 0.970628, 0.18091, 0.97011, -0.217671 ) - -[node name="book5" parent="Props Table" instance=ExtResource( 5 )] -transform = Transform( 0.712873, -0.0851354, -0.696107, 0.03751, 0.995812, -0.0833766, 0.70029, 0.0333259, 0.71308, 0.180416, 1.04419, -0.217477 ) - -[node name="table" parent="Props Table" instance=ExtResource( 2 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.082685, 0.0325576, 0.290515 ) - -[node name="table2" parent="Props Table" instance=ExtResource( 2 )] +[node name="BG Table Right" parent="." instance=ExtResource( 2 )] transform = Transform( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, -2.16642, 0.0325576, -2.03108 ) -[node name="table3" parent="Props Table" instance=ExtResource( 2 )] +[node name="BG Table Left" parent="." instance=ExtResource( 2 )] transform = Transform( -0.958482, 0, -0.285153, 0, 1, 0, 0.285153, 0, -0.958482, -2.78053, 0.0325576, 2.20978 ) -[node name="stool b" parent="Props Table" instance=ExtResource( 3 )] +[node name="Main Scene Props" type="Spatial" parent="."] + +[node name="book3" parent="Main Scene Props" instance=ExtResource( 5 )] +transform = Transform( 0.259561, 0, 0.965727, 0.0582327, 0.99818, -0.0156514, -0.963969, 0.0602995, 0.259089, 0.13025, 0.92072, -0.458817 ) + +[node name="book4" parent="Main Scene Props/book3" instance=ExtResource( 5 )] +transform = Transform( 0.0229642, -0.00339183, -0.999731, 0.0393653, 0.999223, -0.00248598, 0.998961, -0.0392976, 0.0230802, 0.00279957, 0.066205, -0.000443451 ) + +[node name="book5" parent="Main Scene Props/book3/book4" instance=ExtResource( 5 )] +transform = Transform( 0.86032, -0.0497817, -0.507318, 0.0471006, 0.998725, -0.0181282, 0.507573, -0.00829894, 0.861568, 0.00110053, 0.0706179, -0.00503531 ) + +[node name="candlestick" parent="Main Scene Props/book3/book4/book5" instance=ExtResource( 10 )] +transform = Transform( 1.0529, 0.0554018, 1.03432, -0.125744, 1.4708, 0.049222, -1.02814, -0.123146, 1.05321, 0.0432135, 0.0688529, -0.083811 ) + +[node name="candle top" parent="Main Scene Props/book3/book4/book5/candlestick" instance=ExtResource( 14 )] +transform = Transform( 1.16981, 0, 0, 0, 1.63542, 0, 0, 0, 1.16981, 0, 0.125719, 0 ) + +[node name="OmniLight" type="OmniLight" parent="Main Scene Props/book3/book4/book5/candlestick/candle top"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0731977, 0 ) +light_color = Color( 0.960784, 0.611765, 0.00784314, 1 ) + +[node name="table" parent="Main Scene Props" instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.082685, 0.0325576, 0.290515 ) + +[node name="stool b" parent="Main Scene Props" instance=ExtResource( 3 )] transform = Transform( -0.232037, 0, -0.972707, 0, 1, 0, 0.972707, 0, -0.232037, -2.91873, 0.0130518, 0.702275 ) -[node name="stool b5" parent="Props Table" instance=ExtResource( 3 )] +[node name="stool b5" parent="Main Scene Props" instance=ExtResource( 3 )] transform = Transform( 0.770013, 0, -0.638029, 0, 1, 0, 0.638029, 0, 0.770013, -4.33166, 0.013052, 1.08363 ) -[node name="stool b4" parent="Props Table" instance=ExtResource( 3 )] +[node name="stool b4" parent="Main Scene Props" instance=ExtResource( 3 )] transform = Transform( 0.656257, 0, 0.754538, 0, 1, 0, -0.754538, 0, 0.656257, -0.888955, 0.0130518, 1.64328 ) -[node name="stool b2" parent="Props Table" instance=ExtResource( 3 )] +[node name="stool b2" parent="Main Scene Props" instance=ExtResource( 3 )] transform = Transform( 0.892389, 0, -0.451267, 0, 1, 0, 0.451267, 0, 0.892389, 1.35966, 0.013052, 1.23435 ) -[node name="stool b3" parent="Props Table" instance=ExtResource( 3 )] +[node name="stool b3" parent="Main Scene Props" instance=ExtResource( 3 )] transform = Transform( 0.839193, 0, 0.543834, 0, 1, 0, -0.543834, 0, 0.839193, 0.474083, 0.013052, -1.39025 ) -[node name="book" parent="Props Table" instance=ExtResource( 5 )] +[node name="book" parent="Main Scene Props" instance=ExtResource( 5 )] transform = Transform( 0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, 0, 0.923053, 1 ) -[node name="book2" parent="Props Table" instance=ExtResource( 5 )] -transform = Transform( -0.017264, 0, 1.15546, 0, 1.15559, 0, -1.15546, 0, -0.017264, 0, 0.998191, 1 ) +[node name="book2" parent="Main Scene Props/book" instance=ExtResource( 5 )] +transform = Transform( 0.992026, 0, 0.592682, 0, 1.15559, 0, -0.592682, 0, 0.992026, 0, 0.075138, 0 ) -[node name="dagger" parent="Props Table" instance=ExtResource( 7 )] -transform = Transform( 0.304848, 0, 0.952401, 0, 1, 0, -0.952401, 0, 0.304848, 0.156181, 0.946243, 0.369848 ) +[node name="book4" parent="Main Scene Props" instance=ExtResource( 5 )] +transform = Transform( 0.121753, 0.000848586, -0.99256, -0.0631162, 0.997982, -0.00688895, 0.990551, 0.0634853, 0.121561, 0.491102, 0.902354, -0.103352 ) -[node name="godet" parent="Props Table" instance=ExtResource( 9 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.335421, 0.919755, 0.78371 ) +[node name="dagger" parent="Main Scene Props" instance=ExtResource( 7 )] +transform = Transform( -0.347902, -0.0140785, 0.937425, -0.0256771, 0.999655, 0.00548365, -0.937179, -0.0221626, -0.348143, 0.336322, 0.942123, 0.562509 ) -[node name="growler" parent="Props Table" instance=ExtResource( 8 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.339821, 0.892944, 0.290052 ) +[node name="godet" parent="Main Scene Props" instance=ExtResource( 9 )] +transform = Transform( 0.706057, 0, -0.708155, 0, 1, 0, 0.708155, 0, 0.706057, -0.112722, 0.901657, 0.00149509 ) -[node name="wood parchment" parent="Props Table" instance=ExtResource( 11 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.467955, 0.966845, 0.740728 ) +[node name="godet4" parent="Main Scene Props" instance=ExtResource( 9 )] +transform = Transform( 0.757895, 0, 0.652376, 0, 1, 0, -0.652376, 0, 0.757895, -0.28474, 0.905096, 0.78228 ) -[node name="candlestick" parent="Props Table" instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.128144, 1.12137, -0.213012 ) +[node name="godet5" parent="Main Scene Props" instance=ExtResource( 9 )] +transform = Transform( 0.886172, -0.463214, 0.0114893, -0.0309068, -0.0343508, 0.998932, -0.462324, -0.885581, -0.0447572, -0.0863596, 0.96815, 0.743407 ) + +[node name="godet2" parent="Main Scene Props" instance=ExtResource( 9 )] +transform = Transform( 0.690251, 0, 0.72357, 0, 1, 0, -0.72357, 0, 0.690251, -0.333186, 0.901657, 0.177792 ) + +[node name="godet3" parent="Main Scene Props" instance=ExtResource( 9 )] +transform = Transform( 0.875311, 0.480987, 0.0498184, 0.0206958, 0.0656668, -0.997627, -0.483117, 0.874265, 0.0475244, -0.191043, 0.95253, 0.11484 ) + +[node name="growler" parent="Main Scene Props" instance=ExtResource( 8 )] +transform = Transform( 0.0876426, 0, -0.996152, 0, 1, 0, 0.996152, 0, 0.0876426, -0.316595, 0.905106, -0.0726386 ) + +[node name="wood parchment" parent="Main Scene Props" instance=ExtResource( 11 )] +transform = Transform( 0.796076, 0.00917861, -0.605127, 0, 0.999885, 0.0151663, 0.605197, -0.0120736, 0.795984, 0.543255, 0.957499, 0.755328 ) + +[node name="paper parchment" parent="Main Scene Props/wood parchment" instance=ExtResource( 13 )] +transform = Transform( 1, 6.51926e-09, -5.06639e-07, -4.65661e-09, 1, 9.31323e-09, 2.98023e-08, 8.3819e-09, 1, -0.262178, -0.0549548, -2.98023e-08 ) + +[node name="wood parchment2" parent="Main Scene Props" instance=ExtResource( 11 )] +transform = Transform( -0.596381, 0.0184557, 0.802489, 0.0225364, 0.999726, -0.00624354, -0.802385, 0.0143617, -0.596634, 0.281044, 0.958449, -0.253034 ) [node name="Lighting" type="Spatial" parent="."] @@ -143,6 +186,8 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.128144, 1.12137, -0.213012 ) transform = Transform( 0.885702, -0.222818, 0.407289, 0, 0.877297, 0.479948, -0.464255, -0.425091, 0.777023, 0.848516, 1.5034, 2.26553 ) light_color = Color( 1, 0, 0.0862745, 1 ) light_energy = 2.0 +shadow_enabled = true +shadow_contact = 1.0 [node name="Blue Color Right" type="SpotLight" parent="Lighting"] transform = Transform( -0.728997, 0.597286, -0.334384, 0.0537007, 0.536893, 0.84194, 0.682407, 0.595815, -0.423468, -0.540161, 1.80711, -0.561909 ) @@ -151,24 +196,28 @@ light_color = Color( 0.8, 0.835294, 1, 1 ) [node name="Blue Color Right2" type="SpotLight" parent="Lighting"] transform = Transform( -0.721569, 0.418156, -0.5518, -0.680158, -0.577006, 0.452161, -0.129319, 0.701576, 0.700762, -6.73766, 1.80711, 4.06785 ) light_color = Color( 0.8, 0.835294, 1, 1 ) +light_energy = 0.4 +light_specular = 0.23 spot_range = 8.1 spot_angle = 55.8 [node name="Blue Color Right3" type="SpotLight" parent="Lighting"] transform = Transform( -0.0148584, -0.60583, -0.795456, -0.680158, -0.577006, 0.452161, -0.732915, 0.547754, -0.403486, -6.73766, 1.80711, -3.64447 ) light_color = Color( 0.8, 0.835294, 1, 1 ) +light_energy = 0.4 +light_specular = 0.3 spot_range = 8.1 spot_angle = 55.8 [node name="Sun" type="DirectionalLight" parent="Lighting"] transform = Transform( -0.777664, -0.348191, 0.523451, 0.0166148, 0.820946, 0.570764, -0.62846, 0.45256, -0.632636, 0, 1.62188, 0 ) light_color = Color( 0.501961, 0.67451, 1, 1 ) -light_energy = 1.2 +light_energy = 2.0 shadow_enabled = true shadow_contact = 0.3 [node name="WorldEnvironment" type="WorldEnvironment" parent="Lighting"] -environment = SubResource( 2 ) +environment = SubResource( 3 ) [node name="GIProbe" type="GIProbe" parent="Lighting"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 0, 0 ) From 44c48075a4fdae67f14d6438a59088df90f37f92 Mon Sep 17 00:00:00 2001 From: VAILLANT Jeremy Date: Sun, 9 May 2021 19:04:12 +0200 Subject: [PATCH 2/3] Update populate, add more props --- scenes/levels/WarCraft.tscn | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/scenes/levels/WarCraft.tscn b/scenes/levels/WarCraft.tscn index 389ed33..0e292e5 100644 --- a/scenes/levels/WarCraft.tscn +++ b/scenes/levels/WarCraft.tscn @@ -97,11 +97,29 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 2.253 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7, 0, 2.253 ) [node name="BG Table Right" parent="." instance=ExtResource( 2 )] -transform = Transform( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, -2.16642, 0.0325576, -2.03108 ) +transform = Transform( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, -2.16251, 0.02855, -2.03036 ) + +[node name="growler" parent="BG Table Right" instance=ExtResource( 8 )] +transform = Transform( 0.428226, 0, -0.903672, 0, 1, 0, 0.903672, 0, 0.428226, 0.260769, 0.871669, 0.248644 ) + +[node name="godet" parent="BG Table Right" instance=ExtResource( 9 )] +transform = Transform( 0.869771, 0, 0.493456, 0, 1, 0, -0.493456, 0, 0.869771, 0.124298, 0.856545, -0.0234158 ) + +[node name="godet2" parent="BG Table Right" instance=ExtResource( 9 )] +transform = Transform( -0.236782, -0.0445638, 0.970541, -0.0267146, 0.998868, 0.039347, -0.971196, -0.0166109, -0.237705, 0.291462, 0.865107, 0.00160384 ) [node name="BG Table Left" parent="." instance=ExtResource( 2 )] transform = Transform( -0.958482, 0, -0.285153, 0, 1, 0, 0.285153, 0, -0.958482, -2.78053, 0.0325576, 2.20978 ) +[node name="growler" parent="BG Table Left" instance=ExtResource( 8 )] +transform = Transform( -0.958482, 0, 0.285153, 0, 1, 0, -0.285153, 0, -0.958482, 0, 0.862568, 0 ) + +[node name="godet" parent="BG Table Left" instance=ExtResource( 9 )] +transform = Transform( -0.958482, -0.0136413, 0.284827, 0, 0.998855, 0.0478387, -0.285153, 0.0458525, -0.957385, -0.0769448, 0.856716, -0.25378 ) + +[node name="godet2" parent="BG Table Left" instance=ExtResource( 9 )] +transform = Transform( -0.958482, 0.0116327, 0.284916, 0, 0.999168, -0.0407945, -0.285153, -0.0391008, -0.957684, -0.17328, 0.869693, 0.189056 ) + [node name="Main Scene Props" type="Spatial" parent="."] [node name="book3" parent="Main Scene Props" instance=ExtResource( 5 )] From 2fdbb361c347b3ebb1e82d52d8e427da108af2fa Mon Sep 17 00:00:00 2001 From: VAILLANT Jeremy Date: Sun, 9 May 2021 19:14:19 +0200 Subject: [PATCH 3/3] Tweak light rendering, try to push the background light --- scenes/levels/WarCraft.tscn | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scenes/levels/WarCraft.tscn b/scenes/levels/WarCraft.tscn index 0e292e5..f9ddf06 100644 --- a/scenes/levels/WarCraft.tscn +++ b/scenes/levels/WarCraft.tscn @@ -80,7 +80,7 @@ mesh = SubResource( 1 ) material/0 = ExtResource( 12 ) [node name="MeshInstance3" type="MeshInstance" parent="Building"] -transform = Transform( -2.38394e-07, 0, -0.347932, 0, 2.05553, 0, 5.45383, 0, -1.52086e-08, -8.44218, 1.54814, 0.883272 ) +transform = Transform( -2.38394e-07, 0, -0.347932, 0, 2.05553, 0, 5.45383, 0, -1.52086e-08, -8.4425, 1.54516, 0.872685 ) mesh = SubResource( 1 ) material/0 = ExtResource( 12 ) @@ -213,17 +213,15 @@ light_color = Color( 0.8, 0.835294, 1, 1 ) [node name="Blue Color Right2" type="SpotLight" parent="Lighting"] transform = Transform( -0.721569, 0.418156, -0.5518, -0.680158, -0.577006, 0.452161, -0.129319, 0.701576, 0.700762, -6.73766, 1.80711, 4.06785 ) -light_color = Color( 0.8, 0.835294, 1, 1 ) -light_energy = 0.4 +light_color = Color( 0.905882, 0.862745, 0.72549, 1 ) light_specular = 0.23 spot_range = 8.1 spot_angle = 55.8 [node name="Blue Color Right3" type="SpotLight" parent="Lighting"] -transform = Transform( -0.0148584, -0.60583, -0.795456, -0.680158, -0.577006, 0.452161, -0.732915, 0.547754, -0.403486, -6.73766, 1.80711, -3.64447 ) -light_color = Color( 0.8, 0.835294, 1, 1 ) -light_energy = 0.4 -light_specular = 0.3 +transform = Transform( 0.0552331, -0.60583, -0.793675, -0.717326, -0.577006, 0.390522, -0.694545, 0.547754, -0.466447, -6.73826, 1.80435, -3.64354 ) +light_color = Color( 0.905882, 0.862745, 0.72549, 1 ) +light_specular = 0.64 spot_range = 8.1 spot_angle = 55.8