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

small cleanup in hold note handling

Browse Source
This commit is contained in:
msk
2023-09-17 01:43:12 -07:00
parent a63c0ec3dc
commit fe40630617
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scenes/Play.tscn
+2 -6
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=14 format=3 uid="uid://bqh00ot0csqmk"] [gd_scene load_steps=13 format=3 uid="uid://bqh00ot0csqmk"]
[ext_resource type="Script" path="res://Scripts/Scenes/Play.cs" id="1_d6iv3"] [ext_resource type="Script" path="res://Scripts/Scenes/Play.cs" id="1_d6iv3"]
[ext_resource type="PackedScene" uid="uid://cyetvgmwnoy8l" path="res://Things/HitLine.tscn" id="2_8g6gv"] [ext_resource type="PackedScene" uid="uid://cyetvgmwnoy8l" path="res://Things/HitLine.tscn" id="2_8g6gv"]
@@ -55,12 +55,8 @@ shading_mode = 0
albedo_texture = SubResource("ViewportTexture_ln6xl") albedo_texture = SubResource("ViewportTexture_ln6xl")
uv1_scale = Vector3(-1, 1, 1) uv1_scale = Vector3(-1, 1, 1)
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_1ouek"]
blend_mode = 3
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_5ymar"] [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_5ymar"]
blend_mode = 3 blend_mode = 3
light_mode = 1
[sub_resource type="Gradient" id="Gradient_ahp1v"] [sub_resource type="Gradient" id="Gradient_ahp1v"]
offsets = PackedFloat32Array(0, 0.548295, 1) offsets = PackedFloat32Array(0, 0.548295, 1)
@@ -152,11 +148,11 @@ offset_bottom = 1920.0
[node name="Holds Viewport" type="SubViewport" parent="ViewportView/2D Viewport/Viewport Control/Holds ViewportView"] [node name="Holds Viewport" type="SubViewport" parent="ViewportView/2D Viewport/Viewport Control/Holds ViewportView"]
transparent_bg = true transparent_bg = true
handle_input_locally = false handle_input_locally = false
screen_space_aa = 1
size = Vector2i(1920, 1920) size = Vector2i(1920, 1920)
render_target_update_mode = 4 render_target_update_mode = 4
[node name="Holds Scroll" type="Control" parent="ViewportView/2D Viewport/Viewport Control/Holds ViewportView/Holds Viewport"] [node name="Holds Scroll" type="Control" parent="ViewportView/2D Viewport/Viewport Control/Holds ViewportView/Holds Viewport"]
material = SubResource("CanvasItemMaterial_1ouek")
layout_mode = 3 layout_mode = 3
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
Scripts/Scenes/Play.cs
+7 -11
View File
@@ -93,7 +93,6 @@ namespace WacK.Scenes
private void RealizeHolds(NoteHold note) private void RealizeHolds(NoteHold note)
{ {
GD.Print($"Creating hold point that has {note.points.Count} segments");
List<Vector2> verts = new(note.points.Count*2 + 2); List<Vector2> verts = new(note.points.Count*2 + 2);
// HoldStart's pos // HoldStart's pos
@@ -101,25 +100,22 @@ namespace WacK.Scenes
// ascending -- "left" side // ascending -- "left" side
foreach (var (t, n) in note.points) foreach (var (t, n) in note.points)
{ {
GD.Print($"{t}: {n.position}+{n.size}");
verts.Add(new Vector2((float)n.position * 1920/60, t * -PIXELS_PER_SECOND)); verts.Add(new Vector2((float)n.position * 1920/60, t * -PIXELS_PER_SECOND));
GD.Print($"{verts.Count} verts recorded");
} }
// descending // descending -- "right" side
foreach (var (t, n) in note.points.Reverse()) foreach (var (t, n) in note.points.Reverse())
{ {
verts.Add(new Vector2((float)((int)n.position + (int)n.size) * 1920/60, t * -PIXELS_PER_SECOND)); verts.Add(new Vector2((float)((int)n.position + (int)n.size) * 1920/60, t * -PIXELS_PER_SECOND));
} }
// HoldStart's end // HoldStart's pos + size
verts.Add(new Vector2((float)((int)note.position + (int)note.size) * 1920/60, (float)note.time * -PIXELS_PER_SECOND)); verts.Add(new Vector2((float)((int)note.position + (int)note.size) * 1920/60, (float)note.time * -PIXELS_PER_SECOND));
GD.Print($"Created {verts.Count} verts"); var p2d = new Polygon2D
var p2d = new Polygon2D {
{ Polygon = verts.ToArray(),
Polygon = verts.ToArray(), Antialiased = true,
Antialiased = true Modulate = new Color("#FFFFFFD0")
}; };
GD.Print($"Created Polygon with {p2d.Polygon.Count()} verts");
scrollDisplay.AddChild(p2d); scrollDisplay.AddChild(p2d);
} }