From 7af4d281b900828224152a8cab71e567035570c3 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Mon, 3 Feb 2020 02:05:41 -0500 Subject: [PATCH] Update 2D lighting demos Just renaming things, these contain no script. --- 2d/light2d_as_mask/lightmask.tscn | 18 ++-- .../{bg.png => background.png} | Bin .../{bg.png.import => background.png.import} | 6 +- 2d/lights_and_shadows/light_shadows.tscn | 90 +++++++++--------- 4 files changed, 57 insertions(+), 57 deletions(-) rename 2d/lights_and_shadows/{bg.png => background.png} (100%) rename 2d/lights_and_shadows/{bg.png.import => background.png.import} (70%) diff --git a/2d/light2d_as_mask/lightmask.tscn b/2d/light2d_as_mask/lightmask.tscn index 93cd4f5e..f290bdce 100644 --- a/2d/light2d_as_mask/lightmask.tscn +++ b/2d/light2d_as_mask/lightmask.tscn @@ -10,7 +10,7 @@ light_mode = 2 length = 4.0 loop = true tracks/0/type = "value" -tracks/0/path = NodePath("light1:position") +tracks/0/path = NodePath("Light1:position") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false @@ -22,7 +22,7 @@ tracks/0/keys = { "values": [ Vector2( 601.028, 242.639 ), Vector2( 318.649, 327.353 ), Vector2( 381.263, 130.915 ), Vector2( 462.294, 389.968 ) ] } tracks/1/type = "value" -tracks/1/path = NodePath("light2:position") +tracks/1/path = NodePath("Light2:position") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/imported = false @@ -34,7 +34,7 @@ tracks/1/keys = { "values": [ Vector2( 196.528, 185.139 ), Vector2( 135.142, 454.013 ), Vector2( 638.105, 334.923 ), Vector2( 331.375, 101.653 ) ] } tracks/2/type = "value" -tracks/2/path = NodePath("light3:position") +tracks/2/path = NodePath("Light3:position") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/imported = false @@ -46,7 +46,7 @@ tracks/2/keys = { "values": [ Vector2( 442.528, 411.139 ), Vector2( 635.283, 236.8 ), Vector2( 216.215, 396.815 ), Vector2( 682.96, 294.708 ) ] } -[node name="lightmask_demo" type="Control"] +[node name="Lightmask" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 size_flags_horizontal = 2 @@ -55,7 +55,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="burano" type="TextureRect" parent="."] +[node name="Burano" type="TextureRect" parent="."] material = SubResource( 1 ) margin_right = 800.0 margin_bottom = 600.0 @@ -63,22 +63,22 @@ size_flags_horizontal = 2 size_flags_vertical = 2 texture = ExtResource( 1 ) -[node name="light1" type="Light2D" parent="."] +[node name="Light1" type="Light2D" parent="."] position = Vector2( 601.028, 242.639 ) texture = ExtResource( 2 ) mode = 2 -[node name="light2" type="Light2D" parent="."] +[node name="Light2" type="Light2D" parent="."] position = Vector2( 196.528, 185.139 ) texture = ExtResource( 2 ) mode = 2 -[node name="light3" type="Light2D" parent="."] +[node name="Light3" type="Light2D" parent="."] position = Vector2( 442.528, 411.139 ) texture = ExtResource( 2 ) mode = 2 -[node name="anim" type="AnimationPlayer" parent="."] +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "maskmotion" anims/maskmotion = SubResource( 2 ) diff --git a/2d/lights_and_shadows/bg.png b/2d/lights_and_shadows/background.png similarity index 100% rename from 2d/lights_and_shadows/bg.png rename to 2d/lights_and_shadows/background.png diff --git a/2d/lights_and_shadows/bg.png.import b/2d/lights_and_shadows/background.png.import similarity index 70% rename from 2d/lights_and_shadows/bg.png.import rename to 2d/lights_and_shadows/background.png.import index 370cc07f..5fa42254 100644 --- a/2d/lights_and_shadows/bg.png.import +++ b/2d/lights_and_shadows/background.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/bg.png-24bff804693ee063127ad100e04c5185.stex" +path="res://.import/background.png-98289422cd7d93003950872a7b97021f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://bg.png" -dest_files=[ "res://.import/bg.png-24bff804693ee063127ad100e04c5185.stex" ] +source_file="res://background.png" +dest_files=[ "res://.import/background.png-98289422cd7d93003950872a7b97021f.stex" ] [params] diff --git a/2d/lights_and_shadows/light_shadows.tscn b/2d/lights_and_shadows/light_shadows.tscn index e96d810f..d6ff6293 100644 --- a/2d/lights_and_shadows/light_shadows.tscn +++ b/2d/lights_and_shadows/light_shadows.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=12 format=2] -[ext_resource path="res://bg.png" type="Texture" id=1] +[ext_resource path="res://background.png" type="Texture" id=1] [ext_resource path="res://caster.png" type="Texture" id=2] [ext_resource path="res://light.png" type="Texture" id=3] [ext_resource path="res://spot.png" type="Texture" id=4] @@ -65,124 +65,124 @@ tracks/0/keys = { "values": [ Vector2( 692.078, 29.8849 ), Vector2( 309.606, 31.5551 ), Vector2( 40.7064, 238.658 ), Vector2( 685.397, 282.082 ) ] } -[node name="base" type="Node2D"] +[node name="LightShadows" type="Node2D"] -[node name="ambient" type="CanvasModulate" parent="."] +[node name="Ambient" type="CanvasModulate" parent="."] color = Color( 0.27451, 0.27451, 0.27451, 1 ) -[node name="bg" type="Sprite" parent="."] +[node name="Background" type="Sprite" parent="."] position = Vector2( 401.251, 301.906 ) scale = Vector2( 128, 128 ) texture = ExtResource( 1 ) -[node name="casters" type="Node2D" parent="."] +[node name="Casters" type="Node2D" parent="."] -[node name="shadow_caster" type="Sprite" parent="casters"] +[node name="ShadowCaster" type="Sprite" parent="Casters"] position = Vector2( 95.2909, 85.3186 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster"] occluder = SubResource( 1 ) -[node name="shadow_caster1" type="Sprite" parent="casters"] +[node name="ShadowCaster1" type="Sprite" parent="Casters"] position = Vector2( 200.291, 313.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster1"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster1"] occluder = SubResource( 1 ) -[node name="shadow_caster2" type="Sprite" parent="casters"] +[node name="ShadowCaster2" type="Sprite" parent="Casters"] position = Vector2( 76.2909, 405.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster2"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster2"] occluder = SubResource( 1 ) -[node name="shadow_caster3" type="Sprite" parent="casters"] +[node name="ShadowCaster3" type="Sprite" parent="Casters"] position = Vector2( 348.291, 206.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster3"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster3"] occluder = SubResource( 1 ) -[node name="shadow_caster4" type="Sprite" parent="casters"] +[node name="ShadowCaster4" type="Sprite" parent="Casters"] position = Vector2( 239.291, 48.3186 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster4"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster4"] occluder = SubResource( 1 ) -[node name="shadow_caster5" type="Sprite" parent="casters"] +[node name="ShadowCaster5" type="Sprite" parent="Casters"] position = Vector2( 140.291, 561.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster5"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster5"] occluder = SubResource( 1 ) -[node name="shadow_caster6" type="Sprite" parent="casters"] +[node name="ShadowCaster6" type="Sprite" parent="Casters"] position = Vector2( 392.291, 499.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster6"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster6"] occluder = SubResource( 1 ) -[node name="shadow_caster7" type="Sprite" parent="casters"] +[node name="ShadowCaster7" type="Sprite" parent="Casters"] position = Vector2( 735.291, 552.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster7"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster7"] occluder = SubResource( 1 ) -[node name="shadow_caster8" type="Sprite" parent="casters"] +[node name="ShadowCaster8" type="Sprite" parent="Casters"] position = Vector2( 661.291, 371.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster8"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster8"] occluder = SubResource( 1 ) -[node name="shadow_caster9" type="Sprite" parent="casters"] +[node name="ShadowCaster9" type="Sprite" parent="Casters"] position = Vector2( 567.291, 574.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster9"] +[node name="occluder" type="LightOccluder2D" parent="Casters/ShadowCaster9"] occluder = SubResource( 1 ) -[node name="shadow_caster10" type="Sprite" parent="casters"] +[node name="ShadowCaster10" type="Sprite" parent="Casters"] position = Vector2( 420.291, 350.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster10"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster10"] occluder = SubResource( 1 ) -[node name="shadow_caster11" type="Sprite" parent="casters"] +[node name="ShadowCaster11" type="Sprite" parent="Casters"] position = Vector2( 463.291, 106.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster11"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster11"] occluder = SubResource( 1 ) -[node name="shadow_caster12" type="Sprite" parent="casters"] +[node name="ShadowCaster12" type="Sprite" parent="Casters"] position = Vector2( 621.291, 78.3186 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster12"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster12"] occluder = SubResource( 1 ) -[node name="shadow_caster13" type="Sprite" parent="casters"] +[node name="ShadowCaster13" type="Sprite" parent="Casters"] position = Vector2( 761.291, 240.319 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster13"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster13"] occluder = SubResource( 1 ) -[node name="shadow_caster14" type="Sprite" parent="casters"] +[node name="ShadowCaster14" type="Sprite" parent="Casters"] position = Vector2( 771.291, 29.3186 ) texture = ExtResource( 2 ) -[node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster14"] +[node name="Occluder" type="LightOccluder2D" parent="Casters/ShadowCaster14"] occluder = SubResource( 1 ) -[node name="red_light" type="Light2D" parent="."] +[node name="RedLight" type="Light2D" parent="."] position = Vector2( 159.289, 452.441 ) texture = ExtResource( 3 ) color = Color( 1, 0.446392, 0.0576646, 1 ) @@ -191,16 +191,16 @@ shadow_gradient_length = 1.3 shadow_filter = 3 shadow_filter_smooth = 11.1 -[node name="blob" type="Sprite" parent="red_light"] +[node name="Blob" type="Sprite" parent="RedLight"] material = SubResource( 2 ) texture = ExtResource( 4 ) -[node name="anim" type="AnimationPlayer" parent="red_light"] +[node name="AnimationPlayer" type="AnimationPlayer" parent="RedLight"] autoplay = "motion" anims/motion = SubResource( 3 ) anims/motion2 = SubResource( 4 ) -[node name="green_light" type="Light2D" parent="."] +[node name="GreenLight" type="Light2D" parent="."] position = Vector2( 753.756, 314.336 ) texture = ExtResource( 3 ) color = Color( 0.49247, 0.878537, 0.409146, 1 ) @@ -209,17 +209,17 @@ shadow_gradient_length = 1.2 shadow_filter = 3 shadow_filter_smooth = 7.1 -[node name="blob" type="Sprite" parent="green_light"] +[node name="blob" type="Sprite" parent="GreenLight"] material = SubResource( 5 ) texture = ExtResource( 4 ) -[node name="anim" type="AnimationPlayer" parent="green_light"] +[node name="AnimationPlayer" type="AnimationPlayer" parent="GreenLight"] autoplay = "m2" anims/m2 = SubResource( 4 ) anims/motion = SubResource( 3 ) -[node name="blue_light" type="Light2D" parent="."] -position = Vector2( 692.078, 29.8849 ) +[node name="BlueLight" type="Light2D" parent="."] +position = Vector2( 692.078, 31.1773 ) texture = ExtResource( 3 ) color = Color( 0.396752, 0.446392, 0.929792, 1 ) shadow_enabled = true @@ -227,11 +227,11 @@ shadow_gradient_length = 1.4 shadow_filter = 3 shadow_filter_smooth = 5.3 -[node name="blob" type="Sprite" parent="blue_light"] +[node name="blob" type="Sprite" parent="BlueLight"] material = SubResource( 6 ) texture = ExtResource( 4 ) -[node name="anim" type="AnimationPlayer" parent="blue_light"] +[node name="AnimationPlayer" type="AnimationPlayer" parent="BlueLight"] autoplay = "motion3" anims/motion = SubResource( 3 ) anims/motion2 = SubResource( 4 )