Skip to content

Commit d19f173

Browse files
Node restructuring and make noteManager
1 parent 375ae0f commit d19f173

4 files changed

Lines changed: 64 additions & 47 deletions

File tree

scenes/main.tscn

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,64 @@
1-
[gd_scene load_steps=5 format=3 uid="uid://diq2m6va1x52k"]
1+
[gd_scene load_steps=6 format=3 uid="uid://diq2m6va1x52k"]
22

33
[ext_resource type="Texture2D" uid="uid://bucvj4fquqpkr" path="res://scripts/noteSystem/assets/right-arrow.png" id="1_7tfja"]
4-
[ext_resource type="Script" path="res://scripts/NoteManager.cs" id="1_it331"]
4+
[ext_resource type="Script" path="res://scripts/Main.cs" id="1_it331"]
55
[ext_resource type="Script" path="res://scripts/noteSystem/NoteChecker.cs" id="3_3bwsh"]
6+
[ext_resource type="Script" path="res://scripts/noteSystem/NoteManager.cs" id="3_hu33e"]
67
[ext_resource type="Texture2D" uid="uid://b0tvsewgnf2x7" path="res://icon.svg" id="4_j3yyc"]
78

89
[node name="Main" type="Node2D"]
910
script = ExtResource("1_it331")
1011

11-
[node name="arrowUp" type="Sprite2D" parent="."]
12+
[node name="ui" type="Node2D" parent="."]
13+
14+
[node name="dividers" type="Node2D" parent="ui"]
15+
16+
[node name="DivA" type="Sprite2D" parent="ui/dividers"]
17+
modulate = Color(0, 0, 0, 1)
18+
position = Vector2(320, 210)
19+
scale = Vector2(5.10938, 0.041)
20+
texture = ExtResource("4_j3yyc")
21+
22+
[node name="DivB" type="Sprite2D" parent="ui/dividers"]
23+
modulate = Color(0, 0, 0, 1)
24+
position = Vector2(318, 255)
25+
scale = Vector2(5.10938, 0.041)
26+
texture = ExtResource("4_j3yyc")
27+
28+
[node name="DivC" type="Sprite2D" parent="ui/dividers"]
29+
modulate = Color(0, 0, 0, 1)
30+
position = Vector2(317, 314)
31+
scale = Vector2(5.10938, 0.041)
32+
texture = ExtResource("4_j3yyc")
33+
34+
[node name="noteManager" type="Node2D" parent="."]
35+
script = ExtResource("3_hu33e")
36+
37+
[node name="noteCheckers" type="Node2D" parent="noteManager"]
38+
39+
[node name="arrowUp" type="Sprite2D" parent="noteManager/noteCheckers"]
1240
position = Vector2(33, 179)
1341
rotation = -1.5708
1442
scale = Vector2(0.1, 0.1)
1543
texture = ExtResource("1_7tfja")
1644
script = ExtResource("3_3bwsh")
1745

18-
[node name="arrowLeft" type="Sprite2D" parent="."]
46+
[node name="arrowLeft" type="Sprite2D" parent="noteManager/noteCheckers"]
1947
position = Vector2(33, 233)
2048
rotation = 3.14159
2149
scale = Vector2(0.1, 0.1)
2250
texture = ExtResource("1_7tfja")
2351
script = ExtResource("3_3bwsh")
2452

25-
[node name="arrowDown" type="Sprite2D" parent="."]
53+
[node name="arrowDown" type="Sprite2D" parent="noteManager/noteCheckers"]
2654
position = Vector2(33, 285)
2755
rotation = 1.5708
2856
scale = Vector2(0.1, 0.1)
2957
texture = ExtResource("1_7tfja")
3058
script = ExtResource("3_3bwsh")
3159

32-
[node name="arrowRight" type="Sprite2D" parent="."]
60+
[node name="arrowRight" type="Sprite2D" parent="noteManager/noteCheckers"]
3361
position = Vector2(33, 336)
3462
scale = Vector2(0.1, 0.1)
3563
texture = ExtResource("1_7tfja")
3664
script = ExtResource("3_3bwsh")
37-
38-
[node name="DivA" type="Sprite2D" parent="."]
39-
modulate = Color(0, 0, 0, 1)
40-
position = Vector2(320, 210)
41-
scale = Vector2(5.10938, 0.041)
42-
texture = ExtResource("4_j3yyc")
43-
44-
[node name="DivB" type="Sprite2D" parent="."]
45-
modulate = Color(0, 0, 0, 1)
46-
position = Vector2(318, 255)
47-
scale = Vector2(5.10938, 0.041)
48-
texture = ExtResource("4_j3yyc")
49-
50-
[node name="DivC" type="Sprite2D" parent="."]
51-
modulate = Color(0, 0, 0, 1)
52-
position = Vector2(317, 314)
53-
scale = Vector2(5.10938, 0.041)
54-
texture = ExtResource("4_j3yyc")

scripts/Main.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System;
2+
using Godot;
3+
using static NoteManager;
4+
5+
public partial class Main : Node2D
6+
{
7+
private NoteManager _noteManager;
8+
9+
public override void _Ready()
10+
{
11+
_noteManager = GetNode<NoteManager>("noteManager");
12+
_noteManager.CreateNote(ArrowType.Down);
13+
}
14+
15+
public override void _Process(double delta)
16+
{
17+
//have a tiny chance of spanning a note in a row every frame. For testing purposes.
18+
if (GD.Randf() >= 0.02f)
19+
return;
20+
var randomLane = (ArrowType)
21+
GD.RandRange(0, ArrowType.GetValues(typeof(ArrowType)).Length - 1);
22+
_noteManager.CreateNote(randomLane);
23+
}
24+
}
Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private void InitializeArrowCheckers()
3030
{
3131
color = Colors.Green,
3232
key = "arrowUp",
33-
node = GetNode<NoteChecker>("arrowUp"),
33+
node = GetNode<NoteChecker>("noteCheckers/arrowUp"),
3434
}
3535
},
3636
{
@@ -39,7 +39,7 @@ private void InitializeArrowCheckers()
3939
{
4040
color = Colors.Aqua,
4141
key = "arrowDown",
42-
node = GetNode<NoteChecker>("arrowDown"),
42+
node = GetNode<NoteChecker>("noteCheckers/arrowDown"),
4343
}
4444
},
4545
{
@@ -48,7 +48,7 @@ private void InitializeArrowCheckers()
4848
{
4949
color = Colors.HotPink,
5050
key = "arrowLeft",
51-
node = GetNode<NoteChecker>("arrowLeft"),
51+
node = GetNode<NoteChecker>("noteCheckers/arrowLeft"),
5252
}
5353
},
5454
{
@@ -57,7 +57,7 @@ private void InitializeArrowCheckers()
5757
{
5858
color = Colors.Red,
5959
key = "arrowRight",
60-
node = GetNode<NoteChecker>("arrowRight"),
60+
node = GetNode<NoteChecker>("noteCheckers/arrowRight"),
6161
}
6262
},
6363
};
@@ -72,26 +72,9 @@ private void InitializeArrowCheckers()
7272
public override void _Ready()
7373
{
7474
InitializeArrowCheckers();
75-
76-
CreateNote(ArrowType.Up);
77-
CreateNote(ArrowType.Down);
78-
CreateNote(ArrowType.Left);
79-
CreateNote(ArrowType.Right);
8075
}
8176

8277
public override void _Process(double delta)
83-
{
84-
HandleInput();
85-
86-
//have a 20% chance of creating a note in a random lane
87-
if (GD.Randf() >= 0.02f)
88-
return;
89-
var randomLane = (ArrowType)
90-
GD.RandRange(0, ArrowType.GetValues(typeof(ArrowType)).Length - 1);
91-
CreateNote(randomLane);
92-
}
93-
94-
private void HandleInput()
9578
{
9679
foreach (var arrow in _arrows)
9780
{
@@ -106,7 +89,7 @@ private void HandleInput()
10689
}
10790
}
10891

109-
private void CreateNote(ArrowType arrow)
92+
public void CreateNote(ArrowType arrow)
11093
{
11194
CreateNote(_arrows[arrow]);
11295
}

scripts/noteSystem/note.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=3 format=3 uid="uid://oax3qu72soro"]
1+
[gd_scene load_steps=3 format=3 uid="uid://ck3bfqy30rjbq"]
22

33
[ext_resource type="Texture2D" uid="uid://bucvj4fquqpkr" path="res://scripts/noteSystem/assets/right-arrow.png" id="1_kubiy"]
44
[ext_resource type="Script" path="res://scripts/noteSystem/Note.cs" id="2_gpd2w"]

0 commit comments

Comments
 (0)