muskit/WacK
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add filtering to swipe arrow mask

Browse Source
This commit is contained in:
muskit
2023-10-08 20:10:30 -07:00
parent 880fcde99a
commit 1f179d6a79
4 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Shaders/SwipeArrow.tres
+14 -5
View File
@@ -1,4 +1,4 @@
[gd_resource type="VisualShader" load_steps=21 format=3 uid="uid://dm5rgp78v61ha"]
[gd_resource type="VisualShader" load_steps=22 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"]
@@ -27,6 +27,7 @@ operator = 2
[sub_resource type="VisualShaderNodeTexture" id="VisualShaderNodeTexture_70igk"]
expanded_output_ports = [0]
source = 5
texture = ExtResource("2_p52jd")
[sub_resource type="VisualShaderNodeFloatOp" id="VisualShaderNodeFloatOp_d62au"]
@@ -70,6 +71,11 @@ default_value = Color(0, 1, 0, 1)
[sub_resource type="VisualShaderNodeMix" id="VisualShaderNodeMix_l1lmq"]
[sub_resource type="VisualShaderNodeTexture2DParameter" id="VisualShaderNodeTexture2DParameter_anrqj"]
parameter_name = "mask"
color_default = 2
texture_filter = 4
[sub_resource type="VisualShaderNodeVectorOp" id="VisualShaderNodeVectorOp_13pou"]
default_input_values = [0, Quaternion(0, 0, 0, 0), 1, Quaternion(0, 0, 0, 0)]
op_type = 2
@@ -87,7 +93,7 @@ render_mode blend_mix;
uniform vec4 Color : source_color = vec4(0.000000, 1.000000, 0.000000, 1.000000);
uniform float scrollMultiplier = 1;
uniform sampler2D arrow : filter_linear, repeat_enable;
uniform sampler2D tex_frg_16;
uniform sampler2D mask : hint_default_transparent, filter_linear_mipmap;
@@ -143,8 +149,9 @@ void fragment() {
vec4 n_out10p0 = n_out11p0 + n_out29p0;
vec4 n_out16p0;
// Texture2D:16
vec4 n_out16p0 = texture(tex_frg_16, UV);
n_out16p0 = texture(mask, UV);
float n_out16p1 = n_out16p0.r;
float n_out16p2 = n_out16p0.g;
float n_out16p3 = n_out16p0.b;
@@ -178,7 +185,7 @@ void fragment() {
}
"
graph_offset = Vector2(-853.68, 15.6841)
graph_offset = Vector2(-894.996, 674.464)
mode = 1
flags/light_only = false
nodes/fragment/0/position = Vector2(1500, 460)
@@ -218,4 +225,6 @@ nodes/fragment/28/node = SubResource("VisualShaderNodeFloatParameter_k4kjf")
nodes/fragment/28/position = Vector2(-1520, 580)
nodes/fragment/29/node = SubResource("VisualShaderNodeColorParameter_u0ner")
nodes/fragment/29/position = Vector2(-380, -260)
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, 20, 0, 22, 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, 24, 0, 22, 2, 23, 0, 27, 0, 27, 0, 24, 1, 28, 0, 27, 1, 29, 0, 13, 0, 29, 0, 10, 1, 14, 3, 17, 0)
nodes/fragment/30/node = SubResource("VisualShaderNodeTexture2DParameter_anrqj")
nodes/fragment/30/position = Vector2(-520, 480)
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, 20, 0, 22, 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, 24, 0, 22, 2, 23, 0, 27, 0, 27, 0, 24, 1, 28, 0, 27, 1, 29, 0, 13, 0, 29, 0, 10, 1, 14, 3, 17, 0, 30, 0, 16, 2)
Things/TunnelObjects/Notes/NoteSwipeCCW.tscn
+4 -19
View File
@@ -1,18 +1,8 @@
[gd_scene load_steps=7 format=3 uid="uid://bcindeb5bakb3"]
[gd_scene load_steps=4 format=3 uid="uid://bcindeb5bakb3"]
[ext_resource type="Script" path="res://Scripts/Things/TunnelObjects/THNotePlay.cs" id="1_e4xxi"]
[ext_resource type="Texture2D" uid="uid://cfm2r0ha81eum" path="res://_Assets/Textures/Notes/SwipeCCW.png" id="2_yb0qd"]
[ext_resource type="Shader" uid="uid://dm5rgp78v61ha" path="res://Shaders/SwipeArrow.tres" id="3_k16x0"]
[ext_resource type="Texture2D" uid="uid://cmaq66vbi80ug" path="res://_Assets/Textures/Notes/SlideArrow_Texture.png" id="4_rv322"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_hasp1"]
shader = ExtResource("3_k16x0")
shader_parameter/Color = Color(0, 1, 0, 1)
shader_parameter/scrollMultiplier = 1.0
shader_parameter/arrow = ExtResource("4_rv322")
[sub_resource type="GradientTexture1D" id="GradientTexture1D_afqg4"]
width = 1
[ext_resource type="PackedScene" uid="uid://jn0eb8txbjro" path="res://Things/TunnelObjects/Notes/SwipeArrow.tscn" id="3_smdjm"]
[node name="NoteSwipeCCW" type="Control" node_paths=PackedStringArray("noteBase")]
layout_mode = 3
@@ -35,10 +25,5 @@ texture = ExtResource("2_yb0qd")
patch_margin_left = 12
patch_margin_right = 12
[node name="Control" type="TextureRect" parent="."]
material = SubResource("ShaderMaterial_hasp1")
offset_top = -64.0
offset_right = 150.0
offset_bottom = 136.0
rotation = -1.5708
texture = SubResource("GradientTexture1D_afqg4")
[node name="Control" parent="." instance=ExtResource("3_smdjm")]
layout_mode = 0
Things/TunnelObjects/Notes/NoteSwipeCW.tscn
+3 -1
View File
@@ -1,15 +1,17 @@
[gd_scene load_steps=7 format=3 uid="uid://wk634bobe32k"]
[gd_scene load_steps=8 format=3 uid="uid://wk634bobe32k"]
[ext_resource type="Script" path="res://Scripts/Things/TunnelObjects/THNotePlay.cs" id="1_aasqx"]
[ext_resource type="Texture2D" uid="uid://rrwjokjt4jb8" path="res://_Assets/Textures/Notes/SwipeCW.png" id="2_ttxox"]
[ext_resource type="Shader" uid="uid://dm5rgp78v61ha" path="res://Shaders/SwipeArrow.tres" id="3_de2t7"]
[ext_resource type="Texture2D" uid="uid://cmaq66vbi80ug" path="res://_Assets/Textures/Notes/SlideArrow_Texture.png" id="4_v0t51"]
[ext_resource type="Texture2D" uid="uid://kjoqem41xatr" path="res://_Assets/Textures/Notes/SlideArrow_Mask.png" id="5_dafyh"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_kk13m"]
shader = ExtResource("3_de2t7")
shader_parameter/Color = Color(1, 0.235294, 0, 1)
shader_parameter/scrollMultiplier = 1.0
shader_parameter/arrow = ExtResource("4_v0t51")
shader_parameter/mask = ExtResource("5_dafyh")
[sub_resource type="GradientTexture1D" id="GradientTexture1D_fa8y1"]
width = 1
Things/TunnelObjects/Notes/SwipeArrow.tscn
+22
View File
@@ -0,0 +1,22 @@
[gd_scene load_steps=6 format=3 uid="uid://jn0eb8txbjro"]
[ext_resource type="Shader" uid="uid://dm5rgp78v61ha" path="res://Shaders/SwipeArrow.tres" id="1_3a7c4"]
[ext_resource type="Texture2D" uid="uid://cmaq66vbi80ug" path="res://_Assets/Textures/Notes/SlideArrow_Texture.png" id="2_nviet"]
[ext_resource type="Texture2D" uid="uid://kjoqem41xatr" path="res://_Assets/Textures/Notes/SlideArrow_Mask.png" id="3_qcc22"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_hasp1"]
shader = ExtResource("1_3a7c4")
shader_parameter/Color = Color(0, 1, 0, 1)
shader_parameter/scrollMultiplier = 2.0
shader_parameter/arrow = ExtResource("2_nviet")
shader_parameter/mask = ExtResource("3_qcc22")
[sub_resource type="GradientTexture1D" id="GradientTexture1D_afqg4"]
width = 1
[node name="Control" type="TextureRect"]
material = SubResource("ShaderMaterial_hasp1")
offset_right = 275.0
offset_bottom = 1920.0
rotation = -1.5708
texture = SubResource("GradientTexture1D_afqg4")