diff --git a/2d/dodge_the_creeps/default_env.tres b/2d/dodge_the_creeps/default_env.tres deleted file mode 100644 index 20207a4a..00000000 --- a/2d/dodge_the_creeps/default_env.tres +++ /dev/null @@ -1,7 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/2d/dodge_the_creeps/project.godot b/2d/dodge_the_creeps/project.godot index cca5481e..da8edc5d 100644 --- a/2d/dodge_the_creeps/project.godot +++ b/2d/dodge_the_creeps/project.godot @@ -64,7 +64,3 @@ move_down={ , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null) ] } - -[rendering] - -environment/default_environment="res://default_env.tres" diff --git a/2d/finite_state_machine/default_env.tres b/2d/finite_state_machine/default_env.tres deleted file mode 100644 index d37b59de..00000000 --- a/2d/finite_state_machine/default_env.tres +++ /dev/null @@ -1,13 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/2d/finite_state_machine/project.godot b/2d/finite_state_machine/project.godot index 878e072c..43eeb48c 100644 --- a/2d/finite_state_machine/project.godot +++ b/2d/finite_state_machine/project.godot @@ -101,4 +101,3 @@ attack={ [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/2d/gd_paint/default_env.tres b/2d/gd_paint/default_env.tres deleted file mode 100644 index dfe62abb..00000000 --- a/2d/gd_paint/default_env.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 -sun_energy = 16.0 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/2d/gd_paint/project.godot b/2d/gd_paint/project.godot index f128e9c1..6859e203 100644 --- a/2d/gd_paint/project.godot +++ b/2d/gd_paint/project.godot @@ -36,4 +36,3 @@ singletons=[ ] [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/2d/navigation_astar/default_env.tres b/2d/navigation_astar/default_env.tres deleted file mode 100644 index d37b59de..00000000 --- a/2d/navigation_astar/default_env.tres +++ /dev/null @@ -1,13 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/2d/navigation_astar/project.godot b/2d/navigation_astar/project.godot index f76559f0..e3eb6d69 100644 --- a/2d/navigation_astar/project.godot +++ b/2d/navigation_astar/project.godot @@ -37,4 +37,3 @@ click={ [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/2d/role_playing_game/default_env.tres b/2d/role_playing_game/default_env.tres deleted file mode 100644 index dfe62abb..00000000 --- a/2d/role_playing_game/default_env.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 -sun_energy = 16.0 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/2d/role_playing_game/project.godot b/2d/role_playing_game/project.godot index 047cd596..dcf427f3 100644 --- a/2d/role_playing_game/project.godot +++ b/2d/role_playing_game/project.godot @@ -67,4 +67,3 @@ ui_down={ [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/2d/sprite_shaders/default_env.tres b/2d/sprite_shaders/default_env.tres deleted file mode 100644 index d37b59de..00000000 --- a/2d/sprite_shaders/default_env.tres +++ /dev/null @@ -1,13 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/2d/sprite_shaders/project.godot b/2d/sprite_shaders/project.godot index 0b8d104a..fa2ad244 100644 --- a/2d/sprite_shaders/project.godot +++ b/2d/sprite_shaders/project.godot @@ -29,4 +29,3 @@ window/stretch/aspect="expand" [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/3d/material_testers/models/godot_ball.dae.import b/3d/material_testers/models/godot_ball.dae.import index 12f5c3da..8b73f1e6 100644 --- a/3d/material_testers/models/godot_ball.dae.import +++ b/3d/material_testers/models/godot_ball.dae.import @@ -24,6 +24,7 @@ meshes/ensure_tangents=true meshes/storage=false meshes/light_baking=0 meshes/lightmap_texel_size=0.1 +skins/use_named_skins=true external_files/store_in_subdir=true animation/import=true animation/fps=15 diff --git a/3d/material_testers/models/test_bed/test_bed.glb.import b/3d/material_testers/models/test_bed/test_bed.glb.import index 6e3ef5ee..7ecf9b65 100644 --- a/3d/material_testers/models/test_bed/test_bed.glb.import +++ b/3d/material_testers/models/test_bed/test_bed.glb.import @@ -24,6 +24,7 @@ meshes/ensure_tangents=true meshes/storage=0 meshes/light_baking=0 meshes/lightmap_texel_size=0.1 +skins/use_named_skins=true external_files/store_in_subdir=false animation/import=true animation/fps=15 diff --git a/3d/material_testers/models/test_bed/test_bed.tscn b/3d/material_testers/models/test_bed/test_bed.tscn index 70a4320a..4dbad232 100644 --- a/3d/material_testers/models/test_bed/test_bed.tscn +++ b/3d/material_testers/models/test_bed/test_bed.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://models/test_bed/small_material.tres" type="Material" id=2] [ext_resource path="res://models/test_bed/large_material.tres" type="Material" id=3] -[node name="TestBed" index="0" instance=ExtResource( 1 )] +[node name="TestBed" instance=ExtResource( 1 )] [node name="SmallPart" parent="." index="0"] material/0 = ExtResource( 2 ) diff --git a/3d/physics_tests/default_env.tres b/3d/physics_tests/default_env.tres deleted file mode 100644 index 4f63af59..00000000 --- a/3d/physics_tests/default_env.tres +++ /dev/null @@ -1,3 +0,0 @@ -[gd_resource type="Environment" format=2] - -[resource] diff --git a/3d/physics_tests/project.godot b/3d/physics_tests/project.godot index 36a2a233..576bd7ee 100644 --- a/3d/physics_tests/project.godot +++ b/3d/physics_tests/project.godot @@ -65,4 +65,3 @@ restart_test={ [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/3d/truck_town/default_env.tres b/3d/truck_town/default_env.tres index 80160d64..a5ef16ab 100644 --- a/3d/truck_town/default_env.tres +++ b/3d/truck_town/default_env.tres @@ -1,13 +1,8 @@ [gd_resource type="Environment" load_steps=2 format=2] [sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.482353, 0.784314, 0.94902, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.193604, 0.40625, 0.33859, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 -sun_energy = 16.0 +ground_bottom_color = Color( 0.192157, 0.407843, 0.337255, 1 ) +ground_horizon_color = Color( 0.839216, 0.917647, 0.980392, 1 ) [resource] background_mode = 2 diff --git a/audio/device_changer/default_env.tres b/audio/device_changer/default_env.tres deleted file mode 100644 index dfe62abb..00000000 --- a/audio/device_changer/default_env.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 -sun_energy = 16.0 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/audio/device_changer/project.godot b/audio/device_changer/project.godot index aca4f641..5ce7e0d8 100644 --- a/audio/device_changer/project.godot +++ b/audio/device_changer/project.godot @@ -100,4 +100,3 @@ ui_end={ [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/audio/mic_record/default_env.tres b/audio/mic_record/default_env.tres deleted file mode 100644 index 83a97ca5..00000000 --- a/audio/mic_record/default_env.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.647059, 0.839216, 0.945098, 1 ) -sky_horizon_color = Color( 0.839216, 0.917647, 0.980392, 1 ) -ground_bottom_color = Color( 0.156863, 0.184314, 0.211765, 1 ) -ground_horizon_color = Color( 0.423529, 0.396078, 0.372549, 1 ) - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/audio/mic_record/project.godot b/audio/mic_record/project.godot index 14bdd766..d26281cc 100644 --- a/audio/mic_record/project.godot +++ b/audio/mic_record/project.godot @@ -35,4 +35,3 @@ window/stretch/aspect="expand" [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/loading/multiple_threads_loading/default_env.tres b/loading/multiple_threads_loading/default_env.tres deleted file mode 100644 index 0f8c7120..00000000 --- a/loading/multiple_threads_loading/default_env.tres +++ /dev/null @@ -1,18 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -radiance_size = 4 -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 -sun_energy = 16.0 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) -fog_height_min = 0.0 -fog_height_max = 100.0 -ssao_quality = 0 diff --git a/loading/multiple_threads_loading/project.godot b/loading/multiple_threads_loading/project.godot index 33453c02..9b3048ef 100644 --- a/loading/multiple_threads_loading/project.godot +++ b/loading/multiple_threads_loading/project.godot @@ -24,4 +24,3 @@ config/icon="res://icon.png" [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/misc/2.5d/default_env.tres b/misc/2.5d/default_env.tres deleted file mode 100644 index 20207a4a..00000000 --- a/misc/2.5d/default_env.tres +++ /dev/null @@ -1,7 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/misc/2.5d/project.godot b/misc/2.5d/project.godot index 822c50b8..1f19ff6c 100644 --- a/misc/2.5d/project.godot +++ b/misc/2.5d/project.godot @@ -196,4 +196,3 @@ exit={ [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/misc/multitouch_view/default_env.tres b/misc/multitouch_view/default_env.tres deleted file mode 100644 index d37b59de..00000000 --- a/misc/multitouch_view/default_env.tres +++ /dev/null @@ -1,13 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/misc/multitouch_view/project.godot b/misc/multitouch_view/project.godot index 06c0a402..6a623187 100644 --- a/misc/multitouch_view/project.godot +++ b/misc/multitouch_view/project.godot @@ -36,4 +36,3 @@ pointing/emulate_touch_from_mouse=true quality/driver/driver_name="GLES2" environment/default_clear_color=Color( 0.113725, 0.133333, 0.196078, 1 ) -environment/default_environment="res://default_env.tres" diff --git a/misc/os_test/default_env.tres b/misc/os_test/default_env.tres deleted file mode 100644 index 20207a4a..00000000 --- a/misc/os_test/default_env.tres +++ /dev/null @@ -1,7 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/misc/os_test/project.godot b/misc/os_test/project.godot index 93fe302f..fe8137bd 100644 --- a/misc/os_test/project.godot +++ b/misc/os_test/project.godot @@ -34,4 +34,3 @@ window/stretch/aspect="expand" quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false -environment/default_environment="res://default_env.tres" diff --git a/misc/sensors/cube_6.png.import b/misc/sensors/cube_6.png.import index fea8a691..9ba0470e 100644 --- a/misc/sensors/cube_6.png.import +++ b/misc/sensors/cube_6.png.import @@ -4,6 +4,10 @@ importer="texture" type="StreamTexture" path.s3tc="res://.import/cube_6.png-0b954e2c88c21596044fe6448711988e.s3tc.stex" path.etc2="res://.import/cube_6.png-0b954e2c88c21596044fe6448711988e.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} [deps] diff --git a/misc/sensors/default_env.tres b/misc/sensors/default_env.tres index 4b7cb0ac..20207a4a 100644 --- a/misc/sensors/default_env.tres +++ b/misc/sensors/default_env.tres @@ -1,14 +1,7 @@ [gd_resource type="Environment" load_steps=2 format=2] [sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 [resource] background_mode = 2 background_sky = SubResource( 1 ) - diff --git a/misc/sensors/icon.png.import b/misc/sensors/icon.png.import index 45ee6af7..96cbf462 100644 --- a/misc/sensors/icon.png.import +++ b/misc/sensors/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/misc/sensors/main.tscn b/misc/sensors/main.tscn index 483f9a15..91b38b56 100644 --- a/misc/sensors/main.tscn +++ b/misc/sensors/main.tscn @@ -130,4 +130,3 @@ material/0 = SubResource( 8 ) [node name="DirectionalLight" type="DirectionalLight" parent="."] transform = Transform( 0.884838, -0.329433, 0.329449, 0, 0.707124, 0.707089, -0.4659, -0.625659, 0.62569, 0, 4.69444, 0 ) - diff --git a/mono/2.5d/default_env.tres b/mono/2.5d/default_env.tres deleted file mode 100644 index 20207a4a..00000000 --- a/mono/2.5d/default_env.tres +++ /dev/null @@ -1,7 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/mono/2.5d/project.godot b/mono/2.5d/project.godot index abbca6f8..5c9d7391 100644 --- a/mono/2.5d/project.godot +++ b/mono/2.5d/project.godot @@ -173,4 +173,3 @@ exit={ [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/mono/dodge_the_creeps/default_env.tres b/mono/dodge_the_creeps/default_env.tres deleted file mode 100644 index 83a97ca5..00000000 --- a/mono/dodge_the_creeps/default_env.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.647059, 0.839216, 0.945098, 1 ) -sky_horizon_color = Color( 0.839216, 0.917647, 0.980392, 1 ) -ground_bottom_color = Color( 0.156863, 0.184314, 0.211765, 1 ) -ground_horizon_color = Color( 0.423529, 0.396078, 0.372549, 1 ) - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/mono/dodge_the_creeps/project.godot b/mono/dodge_the_creeps/project.godot index 7d2529c6..f3a67af5 100644 --- a/mono/dodge_the_creeps/project.godot +++ b/mono/dodge_the_creeps/project.godot @@ -64,7 +64,3 @@ move_down={ , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null) ] } - -[rendering] - -environment/default_environment="res://default_env.tres" diff --git a/networking/websocket_multiplayer/default_env.tres b/networking/websocket_multiplayer/default_env.tres deleted file mode 100644 index dfe62abb..00000000 --- a/networking/websocket_multiplayer/default_env.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 -sun_energy = 16.0 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/networking/websocket_multiplayer/project.godot b/networking/websocket_multiplayer/project.godot index 8c540e7b..516f1ec9 100644 --- a/networking/websocket_multiplayer/project.godot +++ b/networking/websocket_multiplayer/project.godot @@ -22,4 +22,3 @@ config/icon="res://icon.png" [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/viewport/2d_in_3d/2D_in_3D.tscn b/viewport/2d_in_3d/2D_in_3D.tscn index 7e4e5a88..f702f798 100644 --- a/viewport/2d_in_3d/2D_in_3D.tscn +++ b/viewport/2d_in_3d/2D_in_3D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://2D_in_3D.gd" type="Script" id=1] [ext_resource path="res://pong.gd" type="Script" id=2] @@ -20,30 +20,6 @@ func e(): roughness = 0.7 script = SubResource( 2 ) -[sub_resource type="ProceduralSky" id=4] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 - -[sub_resource type="GDScript" id=5] -script/source = "tool -extends Object -func e(): - return .4 -" - -[sub_resource type="Environment" id=6] -background_mode = 2 -background_sky = SubResource( 4 ) -background_color = Color( 0.445312, 0.445312, 0.445312, 1 ) -ambient_light_color = Color( 0.511719, 0.511719, 0.511719, 1 ) -ambient_light_sky_contribution = 0.4 -ssao_blur = 1 -script = SubResource( 5 ) - [sub_resource type="CubeMesh" id=7] [sub_resource type="SpatialMaterial" id=8] @@ -76,9 +52,6 @@ transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, -1, -2 ) mesh = SubResource( 1 ) material/0 = SubResource( 3 ) -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource( 6 ) - [node name="Pillar" type="Spatial" parent="."] transform = Transform( 0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -3, -0.2, -4 ) diff --git a/viewport/2d_in_3d/default_env.tres b/viewport/2d_in_3d/default_env.tres index dd375181..5c1269e4 100644 --- a/viewport/2d_in_3d/default_env.tres +++ b/viewport/2d_in_3d/default_env.tres @@ -1,12 +1,6 @@ [gd_resource type="Environment" load_steps=2 format=2] [sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 [resource] background_mode = 2 diff --git a/viewport/3d_in_2d/default_env.tres b/viewport/3d_in_2d/default_env.tres deleted file mode 100644 index 7e078d2d..00000000 --- a/viewport/3d_in_2d/default_env.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.34375, 0.287406, 0.167847, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) -ssao_blur = 1 diff --git a/viewport/3d_in_2d/project.godot b/viewport/3d_in_2d/project.godot index ace8230d..32a31b76 100644 --- a/viewport/3d_in_2d/project.godot +++ b/viewport/3d_in_2d/project.godot @@ -28,7 +28,3 @@ window/stretch/aspect="expand" [gdnative] singletons=[ ] - -[rendering] - -environment/default_environment="res://default_env.tres" diff --git a/viewport/dynamic_split_screen/SplitScreen.tscn b/viewport/dynamic_split_screen/SplitScreen.tscn index 951a0523..4d77984b 100644 --- a/viewport/dynamic_split_screen/SplitScreen.tscn +++ b/viewport/dynamic_split_screen/SplitScreen.tscn @@ -38,132 +38,132 @@ size = Vector2( 200, 200 ) [sub_resource type="BoxShape" id=9] [sub_resource type="SpatialMaterial" id=10] -albedo_color = Color( 0.0163026, 0.114588, 0.818035, 1 ) +albedo_color = Color( 0.986259, 0.925681, 0.86168, 1 ) [sub_resource type="CubeMesh" id=11] [sub_resource type="SpatialMaterial" id=12] -albedo_color = Color( 0.442023, 0.852067, 0.785551, 1 ) +albedo_color = Color( 0.0157246, 0.614518, 0.655769, 1 ) [sub_resource type="SpatialMaterial" id=13] -albedo_color = Color( 0.133977, 0.584249, 0.0821372, 1 ) +albedo_color = Color( 0.763619, 0.81656, 0.8189, 1 ) [sub_resource type="SpatialMaterial" id=14] -albedo_color = Color( 0.395405, 0.147314, 0.511854, 1 ) +albedo_color = Color( 0.838479, 0.225506, 0.7848, 1 ) [sub_resource type="SpatialMaterial" id=15] -albedo_color = Color( 0.358208, 0.341966, 0.750179, 1 ) +albedo_color = Color( 0.306646, 0.197984, 0.175443, 1 ) [sub_resource type="SpatialMaterial" id=16] -albedo_color = Color( 0.0385181, 0.653927, 0.576283, 1 ) +albedo_color = Color( 0.051961, 0.476168, 0.381371, 1 ) [sub_resource type="SpatialMaterial" id=17] -albedo_color = Color( 0.443924, 0.573921, 0.930779, 1 ) +albedo_color = Color( 0.817832, 0.686439, 0.434, 1 ) [sub_resource type="SpatialMaterial" id=18] -albedo_color = Color( 0.128483, 0.778405, 0.110868, 1 ) +albedo_color = Color( 0.646348, 0.679158, 0.870667, 1 ) [sub_resource type="SpatialMaterial" id=19] -albedo_color = Color( 0.543521, 0.0840736, 0.594072, 1 ) +albedo_color = Color( 0.876495, 0.921738, 0.526445, 1 ) [sub_resource type="SpatialMaterial" id=20] -albedo_color = Color( 0.352389, 0.490206, 0.798489, 1 ) +albedo_color = Color( 0.308703, 0.873857, 0.0555805, 1 ) [sub_resource type="SpatialMaterial" id=21] -albedo_color = Color( 0.822321, 0.472029, 0.983391, 1 ) +albedo_color = Color( 0.643844, 0.83117, 0.845126, 1 ) [sub_resource type="SpatialMaterial" id=22] -albedo_color = Color( 0.583607, 0.676134, 0.544426, 1 ) +albedo_color = Color( 0.355191, 0.82697, 0.732479, 1 ) [sub_resource type="SpatialMaterial" id=23] -albedo_color = Color( 0.649951, 0.0237741, 0.247833, 1 ) +albedo_color = Color( 0.55911, 0.179656, 0.231, 1 ) [sub_resource type="SpatialMaterial" id=24] -albedo_color = Color( 0.353433, 0.617191, 0.257219, 1 ) +albedo_color = Color( 0.851414, 0.687831, 0.558395, 1 ) [sub_resource type="SpatialMaterial" id=25] -albedo_color = Color( 0.906253, 0.193018, 0.0109898, 1 ) +albedo_color = Color( 0.641439, 0.29455, 0.0790996, 1 ) [sub_resource type="SpatialMaterial" id=26] -albedo_color = Color( 0.36634, 0.452803, 0.191172, 1 ) +albedo_color = Color( 0.913605, 0.527365, 0.0273088, 1 ) [sub_resource type="SpatialMaterial" id=27] -albedo_color = Color( 0.349107, 0.206072, 0.887825, 1 ) +albedo_color = Color( 0.624077, 0.38607, 0.437502, 1 ) [sub_resource type="SpatialMaterial" id=28] -albedo_color = Color( 0.843479, 0.273944, 0.505478, 1 ) +albedo_color = Color( 0.131713, 0.338535, 0.755734, 1 ) [sub_resource type="SpatialMaterial" id=29] -albedo_color = Color( 0.264661, 0.38266, 0.480852, 1 ) +albedo_color = Color( 0.276686, 0.333996, 0.828323, 1 ) [sub_resource type="SpatialMaterial" id=30] -albedo_color = Color( 0.687662, 0.696755, 0.680426, 1 ) +albedo_color = Color( 0.541099, 0.438874, 0.712908, 1 ) [sub_resource type="SpatialMaterial" id=31] -albedo_color = Color( 0.814134, 0.00935292, 0.638229, 1 ) +albedo_color = Color( 0.380535, 0.803732, 0.209771, 1 ) [sub_resource type="SpatialMaterial" id=32] -albedo_color = Color( 0.384184, 0.377533, 0.0302155, 1 ) +albedo_color = Color( 0.126314, 0.709734, 0.0164386, 1 ) [sub_resource type="SpatialMaterial" id=33] -albedo_color = Color( 0.184496, 0.339946, 0.324298, 1 ) +albedo_color = Color( 0.49361, 0.468504, 0.157615, 1 ) [sub_resource type="SpatialMaterial" id=34] -albedo_color = Color( 0.194326, 0.60499, 0.171343, 1 ) +albedo_color = Color( 0.274165, 0.942253, 0.849562, 1 ) [sub_resource type="SpatialMaterial" id=35] -albedo_color = Color( 0.508901, 0.490152, 0.30141, 1 ) +albedo_color = Color( 0.347486, 0.584437, 0.225516, 1 ) [sub_resource type="SpatialMaterial" id=36] -albedo_color = Color( 0.624739, 0.704332, 0.00355822, 1 ) +albedo_color = Color( 0.225798, 0.311725, 0.309325, 1 ) [sub_resource type="SpatialMaterial" id=37] -albedo_color = Color( 0.0771367, 0.774939, 0.45235, 1 ) +albedo_color = Color( 0.842594, 0.892209, 0.0356995, 1 ) [sub_resource type="SpatialMaterial" id=38] -albedo_color = Color( 0.399716, 0.336696, 0.825879, 1 ) +albedo_color = Color( 0.92367, 0.171486, 0.408749, 1 ) [sub_resource type="SpatialMaterial" id=39] -albedo_color = Color( 0.856053, 0.924137, 0.107357, 1 ) +albedo_color = Color( 0.336233, 0.653918, 0.387106, 1 ) [sub_resource type="SpatialMaterial" id=40] -albedo_color = Color( 0.127189, 0.0391242, 0.264593, 1 ) +albedo_color = Color( 0.607486, 0.479636, 0.586784, 1 ) [sub_resource type="SpatialMaterial" id=41] -albedo_color = Color( 0.424077, 0.60127, 0.504344, 1 ) +albedo_color = Color( 0.927793, 0.626894, 0.208025, 1 ) [sub_resource type="SpatialMaterial" id=42] -albedo_color = Color( 0.30571, 0.480934, 0.532849, 1 ) +albedo_color = Color( 0.575574, 0.410205, 0.327027, 1 ) [sub_resource type="SpatialMaterial" id=43] -albedo_color = Color( 0.892993, 0.368143, 0.294531, 1 ) +albedo_color = Color( 0.0871603, 0.700764, 0.28863, 1 ) [sub_resource type="SpatialMaterial" id=44] -albedo_color = Color( 0.871162, 0.297536, 0.598131, 1 ) +albedo_color = Color( 0.866886, 0.35821, 0.682459, 1 ) [sub_resource type="SpatialMaterial" id=45] -albedo_color = Color( 0.00162285, 0.940276, 0.765143, 1 ) +albedo_color = Color( 0.255698, 0.875034, 0.425944, 1 ) [sub_resource type="SpatialMaterial" id=46] -albedo_color = Color( 0.827975, 0.106024, 0.433734, 1 ) +albedo_color = Color( 0.28945, 0.951987, 0.343104, 1 ) [sub_resource type="SpatialMaterial" id=47] -albedo_color = Color( 0.82613, 0.553719, 0.978482, 1 ) +albedo_color = Color( 0.243248, 0.0532221, 0.411054, 1 ) [sub_resource type="SpatialMaterial" id=48] -albedo_color = Color( 0.0476994, 0.153394, 0.0724453, 1 ) +albedo_color = Color( 0.362858, 0.765753, 0.257076, 1 ) [sub_resource type="SpatialMaterial" id=49] -albedo_color = Color( 0.102562, 0.788223, 0.515108, 1 ) +albedo_color = Color( 0.0804409, 0.255526, 0.951721, 1 ) [sub_resource type="SpatialMaterial" id=50] -albedo_color = Color( 0.663143, 0.185048, 0.580067, 1 ) +albedo_color = Color( 0.0437972, 0.745342, 0.18698, 1 ) [sub_resource type="SpatialMaterial" id=51] -albedo_color = Color( 0.905171, 0.0303818, 0.0867862, 1 ) +albedo_color = Color( 0.770645, 0.287346, 0.739309, 1 ) [sub_resource type="SpatialMaterial" id=52] -albedo_color = Color( 0.318201, 0.572828, 0.773561, 1 ) +albedo_color = Color( 0.791675, 0.946163, 0.317723, 1 ) [node name="World" type="Spatial"] diff --git a/viewport/dynamic_split_screen/default_env.tres b/viewport/dynamic_split_screen/default_env.tres index 24c391c0..84746c00 100644 --- a/viewport/dynamic_split_screen/default_env.tres +++ b/viewport/dynamic_split_screen/default_env.tres @@ -1,15 +1,8 @@ [gd_resource type="Environment" load_steps=2 format=2] [sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.211765, 0.313726, 0.552941, 1 ) -sky_horizon_color = Color( 0.545098, 0.686275, 0.811765, 1 ) -sky_curve = 0.131768 -sky_energy = 5.52 -ground_bottom_color = Color( 0.545098, 0.686275, 0.811765, 1 ) -ground_horizon_color = Color( 0.545098, 0.686275, 0.811765, 1 ) -ground_energy = 5.52 -sun_angle_max = 30.0 -sun_energy = 40.0 +ground_bottom_color = Color( 0.839216, 0.917647, 0.980392, 1 ) +ground_horizon_color = Color( 0.839216, 0.917647, 0.980392, 1 ) [resource] background_mode = 2 diff --git a/viewport/gui_in_3d/default_env.tres b/viewport/gui_in_3d/default_env.tres index 52a021e6..d19fff9f 100644 --- a/viewport/gui_in_3d/default_env.tres +++ b/viewport/gui_in_3d/default_env.tres @@ -1,12 +1,6 @@ [gd_resource type="Environment" load_steps=3 format=2] [sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0375977, 0.322787, 0.6875, 1 ) -sky_horizon_color = Color( 0.262024, 0.533321, 0.621094, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 [sub_resource type="GDScript" id=2] script/source = "tool diff --git a/viewport/screen_capture/default_env.tres b/viewport/screen_capture/default_env.tres deleted file mode 100644 index dd375181..00000000 --- a/viewport/screen_capture/default_env.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) -ssao_blur = 1 diff --git a/viewport/screen_capture/project.godot b/viewport/screen_capture/project.godot index 336691f2..23933074 100644 --- a/viewport/screen_capture/project.godot +++ b/viewport/screen_capture/project.godot @@ -36,4 +36,3 @@ singletons=[ ] [rendering] quality/driver/driver_name="GLES2" -environment/default_environment="res://default_env.tres" diff --git a/visual_script/circle_pop/default_env.tres b/visual_script/circle_pop/default_env.tres deleted file mode 100644 index dfe62abb..00000000 --- a/visual_script/circle_pop/default_env.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 -sun_energy = 16.0 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/visual_script/circle_pop/project.godot b/visual_script/circle_pop/project.godot index 29d6588a..bd54ca2a 100644 --- a/visual_script/circle_pop/project.godot +++ b/visual_script/circle_pop/project.godot @@ -30,4 +30,3 @@ singletons=[ ] quality/driver/driver_name="GLES2" environment/default_clear_color=Color( 0.113725, 0.133333, 0.196078, 1 ) -environment/default_environment="res://default_env.tres" diff --git a/visual_script/multitouch_view/default_env.tres b/visual_script/multitouch_view/default_env.tres deleted file mode 100644 index dfe62abb..00000000 --- a/visual_script/multitouch_view/default_env.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] -sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) -sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) -sky_curve = 0.25 -ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) -ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) -ground_curve = 0.01 -sun_energy = 16.0 - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/visual_script/multitouch_view/project.godot b/visual_script/multitouch_view/project.godot index ac9d8988..0b6aecfe 100644 --- a/visual_script/multitouch_view/project.godot +++ b/visual_script/multitouch_view/project.godot @@ -37,4 +37,3 @@ pointing/emulate_touch_from_mouse=true quality/driver/driver_name="GLES2" environment/default_clear_color=Color( 0.113725, 0.133333, 0.196078, 1 ) -environment/default_environment="res://default_env.tres"