Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed Scenes/NoteManager/Assets/Arrow_Outline.png
Binary file not shown.
Binary file added Scenes/NoteManager/Assets/BottomNoteOutline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Scenes/NoteManager/Assets/BottomNoteOutline.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bh68528ekvjbk"
path="res://.godot/imported/BottomNoteOutline.png-dc150bdd190bb985754ca1468a3ef9c6.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Scenes/NoteManager/Assets/BottomNoteOutline.png"
dest_files=["res://.godot/imported/BottomNoteOutline.png-dc150bdd190bb985754ca1468a3ef9c6.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Scenes/NoteManager/Assets/LeftNoteOutline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Scenes/NoteManager/Assets/LeftNoteOutline.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://s84c7d50wjvn"
path="res://.godot/imported/LeftNoteOutline.png-3862cf3f2ce1e27b8968108f0bab1d60.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Scenes/NoteManager/Assets/LeftNoteOutline.png"
dest_files=["res://.godot/imported/LeftNoteOutline.png-3862cf3f2ce1e27b8968108f0bab1d60.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file removed Scenes/NoteManager/Assets/New_Arrow.png
Binary file not shown.
Binary file added Scenes/NoteManager/Assets/Note.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

importer="texture"
type="CompressedTexture2D"
uid="uid://hfxynr5jdgsp"
path="res://.godot/imported/New_Arrow.png-b9cc790fe65b856a0cee80c6a83cb011.ctex"
uid="uid://2jj65hqoi8su"
path="res://.godot/imported/Note.png-2e674f71d2a373c4546b38b47d74eb69.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Scenes/NoteManager/Assets/New_Arrow.png"
dest_files=["res://.godot/imported/New_Arrow.png-b9cc790fe65b856a0cee80c6a83cb011.ctex"]
source_file="res://Scenes/NoteManager/Assets/Note.png"
dest_files=["res://.godot/imported/Note.png-2e674f71d2a373c4546b38b47d74eb69.ctex"]

[params]

Expand Down
Binary file added Scenes/NoteManager/Assets/NoteWIthOutline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Scenes/NoteManager/Assets/NoteWIthOutline.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://coav3xvksq4jy"
path="res://.godot/imported/NoteWIthOutline.png-00b7213af7b9958e4dcd747d842ce073.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Scenes/NoteManager/Assets/NoteWIthOutline.png"
dest_files=["res://.godot/imported/NoteWIthOutline.png-00b7213af7b9958e4dcd747d842ce073.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Scenes/NoteManager/Assets/RightNoteOutline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Scenes/NoteManager/Assets/RightNoteOutline.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dslb58tkhgroj"
path="res://.godot/imported/RightNoteOutline.png-2ceb3dbfbab26c238d24a42d793fe330.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Scenes/NoteManager/Assets/RightNoteOutline.png"
dest_files=["res://.godot/imported/RightNoteOutline.png-2ceb3dbfbab26c238d24a42d793fe330.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Scenes/NoteManager/Assets/TopNoteOutline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

importer="texture"
type="CompressedTexture2D"
uid="uid://cgq2ar3pdmkac"
path="res://.godot/imported/Arrow_Outline.png-dbc89009df5f433f3228bbd1180824d6.ctex"
uid="uid://br6xfjuq6c2nk"
path="res://.godot/imported/TopNoteOutline.png-9589b0c47ba2f4dac012050482888434.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Scenes/NoteManager/Assets/Arrow_Outline.png"
dest_files=["res://.godot/imported/Arrow_Outline.png-dbc89009df5f433f3228bbd1180824d6.ctex"]
source_file="res://Scenes/NoteManager/Assets/TopNoteOutline.png"
dest_files=["res://.godot/imported/TopNoteOutline.png-9589b0c47ba2f4dac012050482888434.ctex"]

[params]

Expand Down
9 changes: 3 additions & 6 deletions Scenes/NoteManager/HoldArrow.tscn
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
[gd_scene load_steps=5 format=3 uid="uid://b3owchvgq1l87"]
[gd_scene load_steps=4 format=3 uid="uid://b3owchvgq1l87"]

[ext_resource type="Texture2D" uid="uid://hfxynr5jdgsp" path="res://Scenes/NoteManager/Assets/New_Arrow.png" id="1_nn8ao"]
[ext_resource type="Texture2D" uid="uid://2jj65hqoi8su" path="res://Scenes/NoteManager/Assets/Note.png" id="1_el0uw"]
[ext_resource type="Script" uid="uid://ci5tt447bivmk" path="res://Scenes/NoteManager/Scripts/HoldArrow.cs" id="2_hehcu"]
[ext_resource type="Texture2D" uid="uid://cgq2ar3pdmkac" path="res://Scenes/NoteManager/Assets/Arrow_Outline.png" id="3_pvvea"]
[ext_resource type="Texture2D" uid="uid://dbnvl0gbhl5b4" path="res://Scenes/NoteManager/Assets/Arrow_Trail.png" id="4_xgcwb"]

[node name="Right-arrow" type="Sprite2D" node_paths=PackedStringArray("_trail", "OutlineSprite", "IconSprite")]
z_index = 2
rotation = 3.14159
texture = ExtResource("1_nn8ao")
texture = ExtResource("1_el0uw")
script = ExtResource("2_hehcu")
_trail = NodePath("CometTail/TrailRemote/Trail")
OutlineSprite = NodePath("Outline")
IconSprite = NodePath("Icon")

[node name="Outline" type="Sprite2D" parent="."]
texture = ExtResource("3_pvvea")

[node name="Icon" type="Sprite2D" parent="."]

Expand Down
8 changes: 3 additions & 5 deletions Scenes/NoteManager/NoteArrow.tscn
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
[gd_scene load_steps=4 format=3 uid="uid://ck3bfqy30rjbq"]
[gd_scene load_steps=3 format=3 uid="uid://ck3bfqy30rjbq"]

[ext_resource type="Texture2D" uid="uid://hfxynr5jdgsp" path="res://Scenes/NoteManager/Assets/New_Arrow.png" id="1_wq1hy"]
[ext_resource type="Texture2D" uid="uid://2jj65hqoi8su" path="res://Scenes/NoteManager/Assets/Note.png" id="1_t5o3d"]
[ext_resource type="Script" uid="uid://cfdthf532wby7" path="res://Scenes/NoteManager/Scripts/NoteArrow.cs" id="2_lbl4b"]
[ext_resource type="Texture2D" uid="uid://cgq2ar3pdmkac" path="res://Scenes/NoteManager/Assets/Arrow_Outline.png" id="3_5g4ja"]

[node name="Right-arrow" type="Sprite2D" node_paths=PackedStringArray("OutlineSprite", "IconSprite")]
texture = ExtResource("1_wq1hy")
texture = ExtResource("1_t5o3d")
script = ExtResource("2_lbl4b")
OutlineSprite = NodePath("Outline")
IconSprite = NodePath("Icon")

[node name="Outline" type="Sprite2D" parent="."]
texture = ExtResource("3_5g4ja")

[node name="Icon" type="Sprite2D" parent="."]
52 changes: 28 additions & 24 deletions Scenes/NoteManager/NoteManager.tscn
Original file line number Diff line number Diff line change
@@ -1,61 +1,65 @@
[gd_scene load_steps=7 format=3 uid="uid://bn8txx53xlguw"]
[gd_scene load_steps=10 format=3 uid="uid://bn8txx53xlguw"]

[ext_resource type="Script" uid="uid://bok6bnyemsgck" path="res://Scenes/NoteManager/Scripts/InputHandler.cs" id="1_2oeuf"]
[ext_resource type="Texture2D" uid="uid://hfxynr5jdgsp" path="res://Scenes/NoteManager/Assets/New_Arrow.png" id="2_pb1qk"]
[ext_resource type="Texture2D" uid="uid://2jj65hqoi8su" path="res://Scenes/NoteManager/Assets/Note.png" id="2_shvru"]
[ext_resource type="Script" uid="uid://coukobemtvmah" path="res://Scenes/NoteManager/Scripts/NoteChecker.cs" id="3_0cioe"]
[ext_resource type="Texture2D" uid="uid://cgq2ar3pdmkac" path="res://Scenes/NoteManager/Assets/Arrow_Outline.png" id="4_3mttx"]
[ext_resource type="Texture2D" uid="uid://br6xfjuq6c2nk" path="res://Scenes/NoteManager/Assets/TopNoteOutline.png" id="4_adgij"]
[ext_resource type="Texture2D" uid="uid://b0tvsewgnf2x7" path="res://icon.svg" id="4_foklt"]
[ext_resource type="PackedScene" uid="uid://bcf6vs4aqoxr5" path="res://Scenes/ChartViewport/HitParticles.tscn" id="5_jv1tr"]
[ext_resource type="Texture2D" uid="uid://s84c7d50wjvn" path="res://Scenes/NoteManager/Assets/LeftNoteOutline.png" id="7_hm3i3"]
[ext_resource type="Texture2D" uid="uid://dslb58tkhgroj" path="res://Scenes/NoteManager/Assets/RightNoteOutline.png" id="9_osoy2"]
[ext_resource type="Texture2D" uid="uid://bh68528ekvjbk" path="res://Scenes/NoteManager/Assets/BottomNoteOutline.png" id="11_ymppf"]

[node name="noteManager" type="Node2D"]
script = ExtResource("1_2oeuf")

[node name="noteCheckers" type="Node2D" parent="."]

[node name="arrowLeft" type="Sprite2D" parent="noteCheckers"]
position = Vector2(0, 29)
rotation = 3.14159
texture = ExtResource("2_pb1qk")
[node name="arrowLeft" type="Sprite2D" parent="noteCheckers" node_paths=PackedStringArray("Outline")]
position = Vector2(0, 27)
texture = ExtResource("2_shvru")
script = ExtResource("3_0cioe")
Outline = NodePath("Outline")

[node name="Outline" type="Sprite2D" parent="noteCheckers/arrowLeft"]
modulate = Color(0, 0, 0, 1)
texture = ExtResource("4_3mttx")
self_modulate = Color(0.45, 0.45, 0.45, 1)
texture = ExtResource("4_adgij")

[node name="HitParticles" parent="noteCheckers/arrowLeft" instance=ExtResource("5_jv1tr")]

[node name="arrowUp" type="Sprite2D" parent="noteCheckers"]
[node name="arrowUp" type="Sprite2D" parent="noteCheckers" node_paths=PackedStringArray("Outline")]
position = Vector2(0, 68)
rotation = -1.5708
texture = ExtResource("2_pb1qk")
texture = ExtResource("2_shvru")
script = ExtResource("3_0cioe")
Outline = NodePath("Outline")

[node name="Outline" type="Sprite2D" parent="noteCheckers/arrowUp"]
modulate = Color(0, 0, 0, 1)
texture = ExtResource("4_3mttx")
self_modulate = Color(0.45, 0.45, 0.45, 1)
texture = ExtResource("7_hm3i3")

[node name="HitParticles" parent="noteCheckers/arrowUp" instance=ExtResource("5_jv1tr")]

[node name="arrowDown" type="Sprite2D" parent="noteCheckers"]
[node name="arrowDown" type="Sprite2D" parent="noteCheckers" node_paths=PackedStringArray("Outline")]
position = Vector2(0, 112)
rotation = 1.5708
texture = ExtResource("2_pb1qk")
texture = ExtResource("2_shvru")
script = ExtResource("3_0cioe")
Outline = NodePath("Outline")

[node name="Outline" type="Sprite2D" parent="noteCheckers/arrowDown"]
modulate = Color(0, 0, 0, 1)
texture = ExtResource("4_3mttx")
self_modulate = Color(0.45, 0.45, 0.45, 1)
texture = ExtResource("9_osoy2")

[node name="HitParticles" parent="noteCheckers/arrowDown" instance=ExtResource("5_jv1tr")]

[node name="arrowRight" type="Sprite2D" parent="noteCheckers"]
position = Vector2(0, 151)
texture = ExtResource("2_pb1qk")
[node name="arrowRight" type="Sprite2D" parent="noteCheckers" node_paths=PackedStringArray("Outline")]
position = Vector2(0, 153)
texture = ExtResource("2_shvru")
script = ExtResource("3_0cioe")
Outline = NodePath("Outline")

[node name="Outline" type="Sprite2D" parent="noteCheckers/arrowRight"]
modulate = Color(0, 0, 0, 1)
texture = ExtResource("4_3mttx")
self_modulate = Color(0.45, 0.45, 0.45, 1)
texture = ExtResource("11_ymppf")

[node name="HitParticles" parent="noteCheckers/arrowRight" instance=ExtResource("5_jv1tr")]

Expand Down
2 changes: 1 addition & 1 deletion Scenes/NoteManager/Scripts/InputHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void FeedbackEffect(ArrowType arrow, Timing timed)
switch (timed)
{
case Timing.Perfect:
particleAmount = 10;
particleAmount = 30;
break;
case Timing.Good:
particleAmount = 7;
Expand Down
2 changes: 1 addition & 1 deletion Scenes/NoteManager/Scripts/NoteArrow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public virtual void Init(CheckerData parentChecker, ArrowData arrowData, double
_beatTime = beatTime;

Position = new Vector2(GetNewPosX(), parentChecker.Node.GlobalPosition.Y);
RotationDegrees = parentChecker.Node.RotationDegrees;
OutlineSprite.Texture = parentChecker.Node.Outline.Texture;
IconSprite.Texture = arrowData.NoteRef.Texture;
IconSprite.Rotation = -Rotation;
OutlineSprite.Modulate = parentChecker.Color;
Expand Down
11 changes: 7 additions & 4 deletions Scenes/NoteManager/Scripts/NoteChecker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ public partial class NoteChecker : Sprite2D
private float _fadeTime = 2.0f;
public HitParticles Particles;

[Export]
public Sprite2D Outline;

public override void _Process(double delta)
{
SelfModulate = _isPressed
? Modulate.Lerp(_color, _fadeTime)
: SelfModulate.Lerp(
Modulate = _isPressed
? SelfModulate.Lerp(_color.Lightened(.5f), _fadeTime)
: Modulate.Lerp(
new Color(_color.R * 0.5f, _color.G * 0.5f, _color.B * 0.5f, 1),
(float)delta * _fadeTime
);
Expand All @@ -30,6 +33,6 @@ public void SetColor(Color color)
_color = color;
Particles = GetNode<HitParticles>("HitParticles");
Particles.Modulate = color;
SelfModulate = new Color(_color.R * 0.5f, _color.G * 0.5f, _color.B * 0.5f, 1);
Modulate = new Color(_color.R * 0.5f, _color.G * 0.5f, _color.B * 0.5f, 1);
}
}
Loading
Loading