diff --git a/Scenes/spherizeShader.tscn b/Scenes/spherizeShader.tscn index 8be8b2d..102a062 100644 --- a/Scenes/spherizeShader.tscn +++ b/Scenes/spherizeShader.tscn @@ -1,24 +1,38 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://resources/textures/lightCircle.png" type="Texture" id=1] +[ext_resource path="res://Resources/Textures/light.png" type="Texture" id=1] [ext_resource path="res://Resources/spherizeShader.tres" type="Material" id=2] [sub_resource type="GDScript" id=1] -script/source = "extends Sprite +script/source = "extends BackBufferCopy var duration=3 var strength=0.00033 func _ready(): - $twnStrength.interpolate_property(self.material,\"shader_param/strength\",strength,0,duration,Tween.TRANS_QUINT,Tween.EASE_OUT) - $twnStrength.interpolate_property(self,\"modulate:a\",0.8,0,duration,Tween.TRANS_QUINT,Tween.EASE_OUT) + $twnStrength.interpolate_property($sprite.material,\"shader_param/strength\",strength,0,duration,Tween.TRANS_QUINT,Tween.EASE_OUT) + $twnStrength.interpolate_property($sprite,\"modulate:a\",0.8,0,duration,Tween.TRANS_QUINT,Tween.EASE_OUT) $twnStrength.start() -func _on_twnStrength_tween_all_completed():self.queue_free() +func _on_twnStrength_tween_all_completed(): + self.queue_free() +# +#extends Sprite +#var duration=3 +#var strength=0.00033 +#func _ready(): +# $twnStrength.interpolate_property(self.material,\"shader_param/strength\",strength,0,duration,Tween.TRANS_QUINT,Tween.EASE_OUT) +# $twnStrength.interpolate_property(self,\"modulate:a\",0.8,0,duration,Tween.TRANS_QUINT,Tween.EASE_OUT) +# $twnStrength.start() +#func _on_twnStrength_tween_all_completed(): +# self.queue_free() +# " -[node name="spriteShader" type="Sprite"] +[node name="spriteShader" type="BackBufferCopy"] +copy_mode = 2 +script = SubResource( 1 ) + +[node name="sprite" type="Sprite" parent="."] material = ExtResource( 2 ) texture = ExtResource( 1 ) -normal_map = ExtResource( 1 ) -script = SubResource( 1 ) [node name="twnStrength" type="Tween" parent="."] [connection signal="tween_all_completed" from="twnStrength" to="." method="_on_twnStrength_tween_all_completed"] diff --git a/Scenes/spotlight.tscn b/Scenes/spotlight.tscn index e53f68d..d990643 100644 --- a/Scenes/spotlight.tscn +++ b/Scenes/spotlight.tscn @@ -3,7 +3,6 @@ [ext_resource path="res://Resources/MoreTextures/lights.png" type="Texture" id=1] [sub_resource type="GDScript" id=1] - resource_name = "spotlight_normal" script/source = "extends Node2D @@ -14,45 +13,20 @@ func _ready(): func _process(delta): for body in $area_2d.get_overlapping_bodies(): if body.is_in_group('Player'): - global.reload_stage()" -_sections_unfolded = [ "Resource" ] + global.reload_stage() +" [node name="spotlight" type="Polygon2D"] - -polygon = PoolVector2Array( -16.2602, 72.8509, 14.1519, 73.1745, 0, 0 ) -uv = PoolVector2Array( ) color = Color( 0.807843, 0.678431, 0.45098, 0.25 ) -vertex_colors = PoolColorArray( 0, 0, 0, 0.25, 0, 0, 0, 0.25 ) -offset = Vector2( 0, 0 ) antialiased = true -texture = null -texture_offset = Vector2( 0, 0 ) -texture_scale = Vector2( 1, 1 ) -texture_rotation_degrees = 0.0 -invert_enable = false -invert_border = 100.0 +polygon = PoolVector2Array( -16.2602, 72.8509, 14.1519, 73.1745, 0, 0 ) +vertex_colors = PoolColorArray( 0, 0, 0, 0.25, 0, 0, 0, 0.25 ) script = SubResource( 1 ) -_sections_unfolded = [ "Texture", "Transform" ] - -[node name="sprite" type="Sprite" parent="." index="0"] +[node name="sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) hframes = 2 -_sections_unfolded = [ "Animation", "Transform" ] - -[node name="area_2d" type="Area2D" parent="." index="1"] - -input_pickable = true -gravity_vec = Vector2( 0, 1 ) -gravity = 98.0 -linear_damp = 0.1 -angular_damp = 1.0 -audio_bus_override = false -audio_bus_name = "Master" - -[node name="collision_polygon_2d" type="CollisionPolygon2D" parent="area_2d" index="0"] - -build_mode = 0 -polygon = PoolVector2Array( ) +[node name="area_2d" type="Area2D" parent="."] +[node name="collision_polygon_2d" type="CollisionPolygon2D" parent="area_2d"] diff --git a/Scenes/spotlight_on_rails.tscn b/Scenes/spotlight_on_rails.tscn index 2f34dfc..bc03b41 100644 --- a/Scenes/spotlight_on_rails.tscn +++ b/Scenes/spotlight_on_rails.tscn @@ -15,7 +15,8 @@ func _ready(): func _on_twn_offset_tween_completed(object, key): self.target_offset=0 if spotlight_on_rails.unit_offset>0.9 else 1 - _ready()" + _ready() +" [sub_resource type="GDScript" id=2] script/source = "extends Node2D @@ -30,7 +31,8 @@ func _process(delta): if body.is_in_group('Player'): global.reload_stage() # get_tree().reload_current_scene() #@Make a better gameover -# self.modulate.r=30" +# self.modulate.r=30 +" [node name="spotlight_on_rails" type="Path2D"] curve = null diff --git a/Scenes/stages/0.tscn b/Scenes/stages/0.tscn index d010ffa..7921d78 100644 --- a/Scenes/stages/0.tscn +++ b/Scenes/stages/0.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://Scenes/bg_layer.tscn" type="PackedScene" id=1] [ext_resource path="res://Scenes/twn_stagefadein.tscn" type="PackedScene" id=2] @@ -11,7 +11,9 @@ [ext_resource path="res://Scenes/str_stagename.tscn" type="PackedScene" id=9] [ext_resource path="res://Scenes/grass.tscn" type="PackedScene" id=10] [ext_resource path="res://Scenes/vine.tscn" type="PackedScene" id=11] +[ext_resource path="res://Scenes/spherizeShader.tscn" type="PackedScene" id=12] [ext_resource path="res://Resources/SFX/Laser_shoot 6.wav" type="AudioStream" id=13] +[ext_resource path="res://Resources/spherizeShader.tres" type="Material" id=14] [sub_resource type="GDScript" id=1] script/source = "extends TileMap @@ -93,6 +95,7 @@ next_level = ExtResource( 6 ) position = Vector2( 72, 72 ) [node name="diver_down" type="Node2D" parent="stage"] +material = ExtResource( 14 ) position = Vector2( 280, 56 ) [node name="diver" type="Label" parent="stage/diver_down"] @@ -158,3 +161,6 @@ position = Vector2( 120, 40 ) [node name="snd_debug" type="AudioStreamPlayer" parent="."] stream = ExtResource( 13 ) bus = "sfx" + +[node name="spriteShader" parent="." instance=ExtResource( 12 )] +position = Vector2( 164.211, 93.6844 ) diff --git a/project.godot b/project.godot index 889d6c1..706cd37 100644 --- a/project.godot +++ b/project.godot @@ -130,5 +130,6 @@ name_casing=1 [rendering] +quality/driver/driver_name="GLES2" environment/default_clear_color=Color( 0.09375, 0.09375, 0.09375, 1 ) environment/default_environment="res://default_env.tres"