From 470c035c1790aad13045f62f417f847738095147 Mon Sep 17 00:00:00 2001 From: muskit <15199219+muskit@users.noreply.github.com> Date: Tue, 10 Oct 2023 23:50:16 -0700 Subject: [PATCH] fix swipearrow shader parameter --- Scripts/Things/TunnelObjects/SwipeArrow.cs | 1 - Shaders/SwipeArrow.tres | 23 ++++++++-------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Scripts/Things/TunnelObjects/SwipeArrow.cs b/Scripts/Things/TunnelObjects/SwipeArrow.cs index 40302d1..6a727aa 100644 --- a/Scripts/Things/TunnelObjects/SwipeArrow.cs +++ b/Scripts/Things/TunnelObjects/SwipeArrow.cs @@ -3,7 +3,6 @@ using System; namespace WacK.Things.TunnelObjects { - [Tool] public partial class SwipeArrow : Control { diff --git a/Shaders/SwipeArrow.tres b/Shaders/SwipeArrow.tres index 6d2a78f..477d052 100644 --- a/Shaders/SwipeArrow.tres +++ b/Shaders/SwipeArrow.tres @@ -1,4 +1,4 @@ -[gd_resource type="VisualShader" load_steps=30 format=3 uid="uid://dm5rgp78v61ha"] +[gd_resource type="VisualShader" load_steps=29 format=3 uid="uid://dm5rgp78v61ha"] [ext_resource type="Texture2D" uid="uid://cmaq66vbi80ug" path="res://_Assets/Textures/Notes/SlideArrow_Texture.png" id="1_cj2ec"] [ext_resource type="Texture2D" uid="uid://kjoqem41xatr" path="res://_Assets/Textures/Notes/SlideArrow_Mask.png" id="2_p52jd"] @@ -64,11 +64,6 @@ parameter_name = "scrollMultiplier" default_value_enabled = true default_value = 1.0 -[sub_resource type="VisualShaderNodeColorParameter" id="VisualShaderNodeColorParameter_u0ner"] -parameter_name = "ArrowColor" -default_value_enabled = true -default_value = Color(0, 1, 0, 1) - [sub_resource type="VisualShaderNodeMix" id="VisualShaderNodeMix_l1lmq"] [sub_resource type="VisualShaderNodeTexture2DParameter" id="VisualShaderNodeTexture2DParameter_anrqj"] @@ -81,7 +76,7 @@ default_input_values = [0, 1.0, 1, 0.0, 2, 0.0] op_type = 0 [sub_resource type="VisualShaderNodeBooleanParameter" id="VisualShaderNodeBooleanParameter_3hrni"] -parameter_name = "isCwShape" +parameter_name = "isCw" default_value_enabled = true [sub_resource type="VisualShaderNodeVectorFunc" id="VisualShaderNodeVectorFunc_sy3w3"] @@ -122,7 +117,7 @@ operator = 2 code = "shader_type canvas_item; render_mode blend_mix; -uniform bool isCwShape = false; +uniform bool isCw = false; uniform float TileMult = 6; uniform float scrollMultiplier = 1; uniform sampler2D arrow : filter_linear, repeat_enable; @@ -132,7 +127,7 @@ uniform sampler2D mask : hint_default_transparent, filter_linear_mipmap; void fragment() { // BooleanParameter:35 - bool n_out35p0 = isCwShape; + bool n_out35p0 = isCw; // ColorConstant:40 @@ -248,7 +243,7 @@ void fragment() { } " -graph_offset = Vector2(-1381.11, -324.544) +graph_offset = Vector2(-1902.01, -337.623) mode = 1 flags/light_only = false nodes/fragment/0/position = Vector2(1500, 460) @@ -263,7 +258,7 @@ nodes/fragment/10/position = Vector2(560, -80) nodes/fragment/11/node = SubResource("VisualShaderNodeVectorOp_3pdfb") nodes/fragment/11/position = Vector2(280, -160) nodes/fragment/13/node = SubResource("VisualShaderNodeVectorOp_eesut") -nodes/fragment/13/position = Vector2(-20, -260) +nodes/fragment/13/position = Vector2(60, -260) nodes/fragment/14/node = SubResource("VisualShaderNodeTexture_2u62d") nodes/fragment/14/position = Vector2(-60, 120) nodes/fragment/15/node = SubResource("VisualShaderNodeFloatOp_nqoll") @@ -286,8 +281,6 @@ nodes/fragment/27/node = SubResource("VisualShaderNodeFloatOp_jbtne") nodes/fragment/27/position = Vector2(-1260, 600) nodes/fragment/28/node = SubResource("VisualShaderNodeFloatParameter_k4kjf") nodes/fragment/28/position = Vector2(-1560, 640) -nodes/fragment/29/node = SubResource("VisualShaderNodeColorParameter_u0ner") -nodes/fragment/29/position = Vector2(-380, -260) nodes/fragment/30/node = SubResource("VisualShaderNodeTexture2DParameter_anrqj") nodes/fragment/30/position = Vector2(-520, 480) nodes/fragment/32/node = SubResource("VisualShaderNodeVectorCompose_3w723") @@ -301,9 +294,9 @@ nodes/fragment/37/position = Vector2(-1020, -20) nodes/fragment/38/node = SubResource("VisualShaderNodeFloatParameter_2lm10") nodes/fragment/38/position = Vector2(-1380, 280) nodes/fragment/39/node = SubResource("VisualShaderNodeSwitch_2ma3x") -nodes/fragment/39/position = Vector2(-420, -220) +nodes/fragment/39/position = Vector2(-400, -240) nodes/fragment/40/node = SubResource("VisualShaderNodeColorConstant_e28fg") nodes/fragment/40/position = Vector2(-740, -260) nodes/fragment/41/node = SubResource("VisualShaderNodeColorConstant_uf0bo") nodes/fragment/41/position = Vector2(-800, -120) -nodes/fragment/connections = PackedInt32Array(7, 0, 8, 0, 11, 0, 10, 0, 10, 0, 7, 0, 13, 0, 11, 0, 15, 0, 7, 1, 16, 1, 17, 1, 16, 3, 15, 1, 16, 2, 3, 2, 8, 0, 0, 0, 22, 0, 14, 0, 3, 0, 8, 1, 17, 0, 0, 1, 14, 1, 11, 1, 14, 1, 15, 0, 14, 2, 3, 0, 26, 0, 14, 2, 27, 0, 24, 1, 28, 0, 27, 1, 29, 0, 13, 0, 29, 0, 10, 1, 14, 3, 17, 0, 30, 0, 16, 2, 23, 0, 27, 0, 32, 0, 22, 1, 24, 0, 22, 2, 20, 0, 36, 0, 35, 0, 37, 0, 37, 0, 22, 0, 37, 0, 16, 0, 38, 0, 32, 1, 36, 0, 37, 1, 20, 0, 37, 2, 35, 0, 39, 0, 40, 0, 39, 1, 41, 0, 39, 2, 39, 0, 13, 0, 39, 0, 10, 1) +nodes/fragment/connections = PackedInt32Array(7, 0, 8, 0, 11, 0, 10, 0, 10, 0, 7, 0, 13, 0, 11, 0, 15, 0, 7, 1, 16, 1, 17, 1, 16, 3, 15, 1, 16, 2, 3, 2, 8, 0, 0, 0, 22, 0, 14, 0, 3, 0, 8, 1, 17, 0, 0, 1, 14, 1, 11, 1, 14, 1, 15, 0, 14, 2, 3, 0, 26, 0, 14, 2, 27, 0, 24, 1, 28, 0, 27, 1, 14, 3, 17, 0, 30, 0, 16, 2, 23, 0, 27, 0, 32, 0, 22, 1, 24, 0, 22, 2, 20, 0, 36, 0, 35, 0, 37, 0, 37, 0, 22, 0, 37, 0, 16, 0, 38, 0, 32, 1, 36, 0, 37, 1, 20, 0, 37, 2, 35, 0, 39, 0, 40, 0, 39, 1, 41, 0, 39, 2, 39, 0, 13, 0, 39, 0, 10, 1)