From fe40630617676a7183e443637e0d8e6e441b659e Mon Sep 17 00:00:00 2001 From: msk <15199219+muskit@users.noreply.github.com> Date: Sun, 17 Sep 2023 01:43:12 -0700 Subject: [PATCH] small cleanup in hold note handling --- Scenes/Play.tscn | 8 ++------ Scripts/Scenes/Play.cs | 18 +++++++----------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Scenes/Play.tscn b/Scenes/Play.tscn index d7ce79c..18fecb5 100644 --- a/Scenes/Play.tscn +++ b/Scenes/Play.tscn @@ -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="PackedScene" uid="uid://cyetvgmwnoy8l" path="res://Things/HitLine.tscn" id="2_8g6gv"] @@ -55,12 +55,8 @@ shading_mode = 0 albedo_texture = SubResource("ViewportTexture_ln6xl") uv1_scale = Vector3(-1, 1, 1) -[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_1ouek"] -blend_mode = 3 - [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_5ymar"] blend_mode = 3 -light_mode = 1 [sub_resource type="Gradient" id="Gradient_ahp1v"] 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"] transparent_bg = true handle_input_locally = false +screen_space_aa = 1 size = Vector2i(1920, 1920) render_target_update_mode = 4 [node name="Holds Scroll" type="Control" parent="ViewportView/2D Viewport/Viewport Control/Holds ViewportView/Holds Viewport"] -material = SubResource("CanvasItemMaterial_1ouek") layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 diff --git a/Scripts/Scenes/Play.cs b/Scripts/Scenes/Play.cs index 426f145..00c62fa 100644 --- a/Scripts/Scenes/Play.cs +++ b/Scripts/Scenes/Play.cs @@ -93,7 +93,6 @@ namespace WacK.Scenes private void RealizeHolds(NoteHold note) { - GD.Print($"Creating hold point that has {note.points.Count} segments"); List verts = new(note.points.Count*2 + 2); // HoldStart's pos @@ -101,25 +100,22 @@ namespace WacK.Scenes // ascending -- "left" side 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)); - GD.Print($"{verts.Count} verts recorded"); } - // descending + // descending -- "right" side 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)); } - // 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)); - GD.Print($"Created {verts.Count} verts"); - var p2d = new Polygon2D - { - Polygon = verts.ToArray(), - Antialiased = true + var p2d = new Polygon2D + { + Polygon = verts.ToArray(), + Antialiased = true, + Modulate = new Color("#FFFFFFD0") }; - GD.Print($"Created Polygon with {p2d.Polygon.Count()} verts"); scrollDisplay.AddChild(p2d); }