diff --git a/assets/materials/gray.tres b/assets/materials/gray.tres new file mode 100644 index 0000000..8f0b982 --- /dev/null +++ b/assets/materials/gray.tres @@ -0,0 +1,38 @@ +[gd_resource type="ShaderMaterial" load_steps=3 format=2] + +[sub_resource type="VisualShaderNodeColorConstant" id=1] +constant = Color( 0.117188, 0.0709553, 0.0709553, 1 ) + +[sub_resource type="VisualShader" id=2] +code = "shader_type spatial; +render_mode specular_schlick_ggx; + + + + +void vertex() { +// Output:0 + +} + +void fragment() { +// Color:3 + vec3 n_out3p0 = vec3(0.117188, 0.070955, 0.070955); + float n_out3p1 = 1.000000; + +// Output:0 + ALBEDO = n_out3p0; + +} + +void light() { +// Output:0 + +} +" +nodes/fragment/3/node = SubResource( 1 ) +nodes/fragment/3/position = Vector2( 0, 140 ) +nodes/fragment/connections = PoolIntArray( 3, 0, 0, 0 ) + +[resource] +shader = SubResource( 2 ) diff --git a/scenes/levels/WarCraft.tscn b/scenes/levels/WarCraft.tscn index 6927eed..6edff63 100644 --- a/scenes/levels/WarCraft.tscn +++ b/scenes/levels/WarCraft.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=17 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] @@ -11,27 +11,72 @@ [ext_resource path="res://assets/props/godet/godet.gltf" type="PackedScene" id=9] [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] + +[sub_resource type="CubeMesh" id=3] [sub_resource type="PanoramaSky" id=1] panorama = ExtResource( 4 ) [sub_resource type="Environment" id=2] -background_mode = 2 +background_mode = 3 background_sky = SubResource( 1 ) background_energy = 0.6 ambient_light_color = Color( 0.266667, 0.14902, 0.0627451, 1 ) +tonemap_mode = 2 +glow_enabled = true + +[sub_resource type="GIProbeData" id=4] +bounds = AABB( -10, -10, -10, 20, 20, 20 ) +cell_size = 0.15625 +to_cell_xform = Transform( 6.4, 0, 0, 0, 6.4, 0, 0, 0, 6.4, 64, 64, 64 ) +dynamic_data = PoolIntArray( 0, 8, 128, 128, 128, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4132, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 8355711, 0 ) +dynamic_range = 4 +bias = 1.5 +normal_bias = 0.0 +propagation = 0.7 +interior = true [node name="Warcraft" type="Spatial"] script = ExtResource( 6 ) -[node name="rock floor" parent="." instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 2.253 ) - -[node name="rock floor2" parent="." instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, -3.747 ) - [node name="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 = 50.0 + +[node name="Building" type="Spatial" parent="."] + +[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 ) +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 ) +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 ) +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 ) +material/0 = ExtResource( 12 ) + +[node name="rock floor4" parent="Building" instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7, 0, -3.747 ) + +[node name="rock floor2" parent="Building" instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, -3.747 ) + +[node name="rock floor" parent="Building" instance=ExtResource( 1 )] +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="."] @@ -47,6 +92,12 @@ transform = Transform( 0.712873, -0.0851354, -0.696107, 0.03751, 0.995812, -0.08 [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 )] +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 )] +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 )] transform = Transform( 0.656257, 0, 0.754538, 0, 1, 0, -0.754538, 0, 0.656257, -0.888955, 0.0130518, 1.64328 ) @@ -65,6 +116,18 @@ transform = Transform( -0.017264, 0, 1.15546, 0, 1.15559, 0, -1.15546, 0, -0.017 [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="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="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="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="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="Lighting" type="Spatial" parent="."] [node name="Red Color Left" type="SpotLight" parent="Lighting"] @@ -77,7 +140,7 @@ transform = Transform( -0.728997, 0.597286, -0.334384, 0.0537007, 0.536893, 0.84 light_color = Color( 0.8, 0.835294, 1, 1 ) [node name="Sun" type="DirectionalLight" parent="Lighting"] -transform = Transform( -0.919434, 0.313904, -0.236865, 0.0166148, 0.632807, 0.774131, 0.392893, 0.707827, -0.58704, 0, 1.62188, 0 ) +transform = Transform( -0.777664, -0.478466, 0.407809, 0.0166148, 0.632807, 0.774131, -0.62846, 0.60879, -0.484162, 0, 1.62188, 0 ) light_color = Color( 0.501961, 0.67451, 1, 1 ) light_energy = 1.2 shadow_enabled = true @@ -86,14 +149,7 @@ shadow_contact = 0.3 [node name="WorldEnvironment" type="WorldEnvironment" parent="Lighting"] environment = SubResource( 2 ) -[node name="godet" parent="." instance=ExtResource( 9 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.335421, 0.919755, 0.78371 ) - -[node name="growler" parent="." instance=ExtResource( 8 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.339821, 0.892944, 0.290052 ) - -[node name="wood parchment" parent="." instance=ExtResource( 11 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.467955, 0.966845, 0.740728 ) - -[node name="candlestick" parent="." instance=ExtResource( 10 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.128144, 1.12137, -0.213012 ) +[node name="GIProbe" type="GIProbe" parent="Lighting"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 0, 0 ) +interior = true +data = SubResource( 4 )