From 30d0365ae11673261d96ac10f146fbb7481e8e9c Mon Sep 17 00:00:00 2001 From: Marco Date: Mon, 24 Feb 2025 14:36:30 +0100 Subject: [PATCH] Fix paths --- Scenes/Actors/ForceField_Horizontal.tscn | 16 +++++----------- Scenes/{fragola.cs => Fragola.cs} | 0 Scenes/fragola.tscn | 4 ++-- Shaders/scanlines_static.tres | 1 - 4 files changed, 7 insertions(+), 14 deletions(-) rename Scenes/{fragola.cs => Fragola.cs} (100%) diff --git a/Scenes/Actors/ForceField_Horizontal.tscn b/Scenes/Actors/ForceField_Horizontal.tscn index 90e131c4..1a913840 100644 --- a/Scenes/Actors/ForceField_Horizontal.tscn +++ b/Scenes/Actors/ForceField_Horizontal.tscn @@ -1,23 +1,18 @@ -[gd_scene load_steps=26 format=3 uid="uid://b0gpbkxdfbnjh"] +[gd_scene load_steps=25 format=3 uid="uid://b0gpbkxdfbnjh"] [ext_resource type="Script" uid="uid://b2bpqbfeqi4ge" path="res://Scripts/Activables/ForceField.cs" id="1_yxhr6"] [ext_resource type="Texture2D" uid="uid://gc24sjyj47x6" path="res://Sprites/Actors/ForceFieldHorizontal.png" id="2_12wxm"] [ext_resource type="Shader" uid="uid://0ruey5bjl7mh" path="res://Shaders/Blink.gdshader" id="2_q7pky"] [ext_resource type="Shader" uid="uid://cjdl1m3psohju" path="res://Shaders/scanlines_static.tres" id="2_qbobr"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_yl7re"] -resource_local_to_scene = true +[sub_resource type="ShaderMaterial" id="ShaderMaterial_fipgw"] shader = ExtResource("2_q7pky") shader_parameter/blink_color = Color(0, 0, 0, 1) shader_parameter/blink_intensity = 0.0 shader_parameter/teleport_progress = 0.0 shader_parameter/scanline_density = 50.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_u04tu"] -resource_local_to_scene = true -shader = ExtResource("2_qbobr") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_tnfy3"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_yl7re"] shader = ExtResource("2_qbobr") [sub_resource type="AtlasTexture" id="AtlasTexture_gecst"] @@ -158,13 +153,12 @@ size = Vector2(32, 32) collision_layer = 64 collision_mask = 154 script = ExtResource("1_yxhr6") -TurnOffMaterial = SubResource("ShaderMaterial_yl7re") -ActiveMaterial = SubResource("ShaderMaterial_u04tu") +TurnOffMaterial = SubResource("ShaderMaterial_fipgw") +ActiveMaterial = SubResource("ShaderMaterial_yl7re") metadata/_edit_group_ = true [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] modulate = Color(1, 1, 1, 0.784314) -material = SubResource("ShaderMaterial_tnfy3") sprite_frames = SubResource("SpriteFrames_h2s1d") animation = &"Closed" diff --git a/Scenes/fragola.cs b/Scenes/Fragola.cs similarity index 100% rename from Scenes/fragola.cs rename to Scenes/Fragola.cs diff --git a/Scenes/fragola.tscn b/Scenes/fragola.tscn index e761c470..7fb1031f 100644 --- a/Scenes/fragola.tscn +++ b/Scenes/fragola.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=12 format=3 uid="uid://rp4jhx0tuh24"] [ext_resource type="Texture2D" uid="uid://cy5usvdeabi0t" path="res://Sprites/fragola.png" id="1_5wy11"] -[ext_resource type="Script" uid="uid://xggagp2afklr" path="res://Scenes/fragola.cs" id="1_773fi"] +[ext_resource type="Script" path="res://Scenes/Fragola.cs" id="1_nyu4m"] [sub_resource type="AtlasTexture" id="AtlasTexture_j6kkb"] atlas = ExtResource("1_5wy11") @@ -72,7 +72,7 @@ collision_layer = 4 collision_mask = 11 mass = 0.03 gravity_scale = 0.0 -script = ExtResource("1_773fi") +script = ExtResource("1_nyu4m") metadata/_edit_group_ = true [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] diff --git a/Shaders/scanlines_static.tres b/Shaders/scanlines_static.tres index 4907f619..2c1274c0 100644 --- a/Shaders/scanlines_static.tres +++ b/Shaders/scanlines_static.tres @@ -34,7 +34,6 @@ source = 5 input_name = "time" [resource] -resource_local_to_scene = true code = "shader_type canvas_item; render_mode blend_mix;