Browse Source

Embed WorldEnvironement scene into the main one

Benjamin Navarro 5 years ago
parent
commit
5bdd178d85

+ 50 - 44
viewport/dynamic_split_screen/SplitScreen.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=59 format=2]
 
-[ext_resource path="res://WorldEnvironment.tscn" type="PackedScene" id=1]
+[ext_resource path="res://default_env.tres" type="Environment" id=1]
 [ext_resource path="res://CameraController.gd" type="Script" id=2]
 [ext_resource path="res://SplitScreen.shader" type="Shader" id=3]
 [ext_resource path="res://icon.png" type="Texture" id=4]
@@ -38,136 +38,142 @@ size = Vector2( 200, 200 )
 [sub_resource type="BoxShape" id=9]
 
 [sub_resource type="SpatialMaterial" id=10]
-albedo_color = Color( 0.216745, 0.554409, 0.314699, 1 )
+albedo_color = Color( 0.0163026, 0.114588, 0.818035, 1 )
 
 [sub_resource type="CubeMesh" id=11]
 
 [sub_resource type="SpatialMaterial" id=12]
-albedo_color = Color( 0.305405, 0.88821, 0.395714, 1 )
+albedo_color = Color( 0.442023, 0.852067, 0.785551, 1 )
 
 [sub_resource type="SpatialMaterial" id=13]
-albedo_color = Color( 0.51251, 0.338898, 0.955708, 1 )
+albedo_color = Color( 0.133977, 0.584249, 0.0821372, 1 )
 
 [sub_resource type="SpatialMaterial" id=14]
-albedo_color = Color( 0.226943, 0.905497, 0.613352, 1 )
+albedo_color = Color( 0.395405, 0.147314, 0.511854, 1 )
 
 [sub_resource type="SpatialMaterial" id=15]
-albedo_color = Color( 0.981949, 0.643245, 0.544702, 1 )
+albedo_color = Color( 0.358208, 0.341966, 0.750179, 1 )
 
 [sub_resource type="SpatialMaterial" id=16]
-albedo_color = Color( 0.866943, 0.814262, 0.0451389, 1 )
+albedo_color = Color( 0.0385181, 0.653927, 0.576283, 1 )
 
 [sub_resource type="SpatialMaterial" id=17]
-albedo_color = Color( 0.644941, 0.278132, 0.847472, 1 )
+albedo_color = Color( 0.443924, 0.573921, 0.930779, 1 )
 
 [sub_resource type="SpatialMaterial" id=18]
-albedo_color = Color( 0.195857, 0.55957, 0.975027, 1 )
+albedo_color = Color( 0.128483, 0.778405, 0.110868, 1 )
 
 [sub_resource type="SpatialMaterial" id=19]
-albedo_color = Color( 0.962396, 0.768307, 0.272148, 1 )
+albedo_color = Color( 0.543521, 0.0840736, 0.594072, 1 )
 
 [sub_resource type="SpatialMaterial" id=20]
-albedo_color = Color( 0.0218338, 0.630367, 0.701396, 1 )
+albedo_color = Color( 0.352389, 0.490206, 0.798489, 1 )
 
 [sub_resource type="SpatialMaterial" id=21]
-albedo_color = Color( 0.730764, 0.468268, 0.954273, 1 )
+albedo_color = Color( 0.822321, 0.472029, 0.983391, 1 )
 
 [sub_resource type="SpatialMaterial" id=22]
-albedo_color = Color( 0.136579, 0.540391, 0.852438, 1 )
+albedo_color = Color( 0.583607, 0.676134, 0.544426, 1 )
 
 [sub_resource type="SpatialMaterial" id=23]
-albedo_color = Color( 0.148986, 0.774603, 0.599427, 1 )
+albedo_color = Color( 0.649951, 0.0237741, 0.247833, 1 )
 
 [sub_resource type="SpatialMaterial" id=24]
-albedo_color = Color( 0.232976, 0.129002, 0.0511244, 1 )
+albedo_color = Color( 0.353433, 0.617191, 0.257219, 1 )
 
 [sub_resource type="SpatialMaterial" id=25]
-albedo_color = Color( 0.209617, 0.264843, 0.776664, 1 )
+albedo_color = Color( 0.906253, 0.193018, 0.0109898, 1 )
 
 [sub_resource type="SpatialMaterial" id=26]
-albedo_color = Color( 0.0224221, 0.0494852, 0.371403, 1 )
+albedo_color = Color( 0.36634, 0.452803, 0.191172, 1 )
 
 [sub_resource type="SpatialMaterial" id=27]
-albedo_color = Color( 0.0372276, 0.959928, 0.183207, 1 )
+albedo_color = Color( 0.349107, 0.206072, 0.887825, 1 )
 
 [sub_resource type="SpatialMaterial" id=28]
-albedo_color = Color( 0.0966038, 0.326089, 0.233914, 1 )
+albedo_color = Color( 0.843479, 0.273944, 0.505478, 1 )
 
 [sub_resource type="SpatialMaterial" id=29]
-albedo_color = Color( 0.187928, 0.614021, 0.219056, 1 )
+albedo_color = Color( 0.264661, 0.38266, 0.480852, 1 )
 
 [sub_resource type="SpatialMaterial" id=30]
-albedo_color = Color( 0.259084, 0.601876, 0.565821, 1 )
+albedo_color = Color( 0.687662, 0.696755, 0.680426, 1 )
 
 [sub_resource type="SpatialMaterial" id=31]
-albedo_color = Color( 0.744452, 0.6155, 0.965371, 1 )
+albedo_color = Color( 0.814134, 0.00935292, 0.638229, 1 )
 
 [sub_resource type="SpatialMaterial" id=32]
-albedo_color = Color( 0.221543, 0.129975, 0.25152, 1 )
+albedo_color = Color( 0.384184, 0.377533, 0.0302155, 1 )
 
 [sub_resource type="SpatialMaterial" id=33]
-albedo_color = Color( 0.407034, 0.063434, 0.826022, 1 )
+albedo_color = Color( 0.184496, 0.339946, 0.324298, 1 )
 
 [sub_resource type="SpatialMaterial" id=34]
-albedo_color = Color( 0.0889729, 0.967076, 0.249959, 1 )
+albedo_color = Color( 0.194326, 0.60499, 0.171343, 1 )
 
 [sub_resource type="SpatialMaterial" id=35]
-albedo_color = Color( 0.465289, 0.573838, 0.598849, 1 )
+albedo_color = Color( 0.508901, 0.490152, 0.30141, 1 )
 
 [sub_resource type="SpatialMaterial" id=36]
-albedo_color = Color( 0.123197, 0.184637, 0.0637491, 1 )
+albedo_color = Color( 0.624739, 0.704332, 0.00355822, 1 )
 
 [sub_resource type="SpatialMaterial" id=37]
-albedo_color = Color( 0.469645, 0.682699, 0.462456, 1 )
+albedo_color = Color( 0.0771367, 0.774939, 0.45235, 1 )
 
 [sub_resource type="SpatialMaterial" id=38]
-albedo_color = Color( 0.235117, 0.164501, 0.804043, 1 )
+albedo_color = Color( 0.399716, 0.336696, 0.825879, 1 )
 
 [sub_resource type="SpatialMaterial" id=39]
-albedo_color = Color( 0.788222, 0.277863, 0.795143, 1 )
+albedo_color = Color( 0.856053, 0.924137, 0.107357, 1 )
 
 [sub_resource type="SpatialMaterial" id=40]
-albedo_color = Color( 0.0942122, 0.253081, 0.456666, 1 )
+albedo_color = Color( 0.127189, 0.0391242, 0.264593, 1 )
 
 [sub_resource type="SpatialMaterial" id=41]
-albedo_color = Color( 0.0998086, 0.737287, 0.515344, 1 )
+albedo_color = Color( 0.424077, 0.60127, 0.504344, 1 )
 
 [sub_resource type="SpatialMaterial" id=42]
-albedo_color = Color( 0.620311, 0.528745, 0.951548, 1 )
+albedo_color = Color( 0.30571, 0.480934, 0.532849, 1 )
 
 [sub_resource type="SpatialMaterial" id=43]
-albedo_color = Color( 0.541709, 0.766032, 0.988409, 1 )
+albedo_color = Color( 0.892993, 0.368143, 0.294531, 1 )
 
 [sub_resource type="SpatialMaterial" id=44]
-albedo_color = Color( 0.785747, 0.313991, 0.736685, 1 )
+albedo_color = Color( 0.871162, 0.297536, 0.598131, 1 )
 
 [sub_resource type="SpatialMaterial" id=45]
-albedo_color = Color( 0.0437973, 0.646887, 0.219997, 1 )
+albedo_color = Color( 0.00162285, 0.940276, 0.765143, 1 )
 
 [sub_resource type="SpatialMaterial" id=46]
-albedo_color = Color( 0.808976, 0.0676796, 0.934931, 1 )
+albedo_color = Color( 0.827975, 0.106024, 0.433734, 1 )
 
 [sub_resource type="SpatialMaterial" id=47]
-albedo_color = Color( 0.134101, 0.976648, 0.791346, 1 )
+albedo_color = Color( 0.82613, 0.553719, 0.978482, 1 )
 
 [sub_resource type="SpatialMaterial" id=48]
-albedo_color = Color( 0.458938, 0.139997, 0.381802, 1 )
+albedo_color = Color( 0.0476994, 0.153394, 0.0724453, 1 )
 
 [sub_resource type="SpatialMaterial" id=49]
-albedo_color = Color( 0.86859, 0.814611, 0.772643, 1 )
+albedo_color = Color( 0.102562, 0.788223, 0.515108, 1 )
 
 [sub_resource type="SpatialMaterial" id=50]
-albedo_color = Color( 0.0747827, 0.917116, 0.0636354, 1 )
+albedo_color = Color( 0.663143, 0.185048, 0.580067, 1 )
 
 [sub_resource type="SpatialMaterial" id=51]
-albedo_color = Color( 0.000703006, 0.0199452, 0.405719, 1 )
+albedo_color = Color( 0.905171, 0.0303818, 0.0867862, 1 )
 
 [sub_resource type="SpatialMaterial" id=52]
-albedo_color = Color( 0.238211, 0.205605, 0.980387, 1 )
+albedo_color = Color( 0.318201, 0.572828, 0.773561, 1 )
 
 [node name="World" type="Spatial"]
 
-[node name="WorldEnvironment" parent="." instance=ExtResource( 1 )]
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = ExtResource( 1 )
+
+[node name="DirectionalLight" type="DirectionalLight" parent="WorldEnvironment"]
+transform = Transform( 1, 0, 0, 0, -0.818651, 0.574291, 0, -0.574291, -0.818651, 0, 70.567, -72.3668 )
+shadow_enabled = true
+shadow_color = Color( 0.6, 0.6, 0.6, 1 )
 
 [node name="Cameras" type="Spatial" parent="."]
 script = ExtResource( 2 )

+ 0 - 11
viewport/dynamic_split_screen/WorldEnvironment.tscn

@@ -1,11 +0,0 @@
-[gd_scene load_steps=2 format=2]
-
-[ext_resource path="res://default_env.tres" type="Environment" id=1]
-
-[node name="WorldEnvironment" type="WorldEnvironment"]
-environment = ExtResource( 1 )
-
-[node name="DirectionalLight" type="DirectionalLight" parent="."]
-transform = Transform( 1, 0, 0, 0, -0.818651, 0.574291, 0, -0.574291, -0.818651, 0, 70.567, -72.3668 )
-shadow_enabled = true
-shadow_color = Color( 0.6, 0.6, 0.6, 1 )