fix hold long builder's left overflow condition
This commit is contained in:
+23
-3
@@ -1,4 +1,4 @@
|
|||||||
[gd_scene load_steps=19 format=3 uid="uid://bqh00ot0csqmk"]
|
[gd_scene load_steps=20 format=3 uid="uid://bqh00ot0csqmk"]
|
||||||
|
|
||||||
[ext_resource type="Script" path="res://Scripts/Scenes/Play/Play.cs" id="1_asytu"]
|
[ext_resource type="Script" path="res://Scripts/Scenes/Play/Play.cs" id="1_asytu"]
|
||||||
[ext_resource type="PackedScene" uid="uid://cyetvgmwnoy8l" path="res://Things/Background.tscn" id="2_8g6gv"]
|
[ext_resource type="PackedScene" uid="uid://cyetvgmwnoy8l" path="res://Things/Background.tscn" id="2_8g6gv"]
|
||||||
@@ -64,7 +64,7 @@ uv1_offset = Vector3(0, -0.001, 0)
|
|||||||
[sub_resource type="ViewportTexture" id="ViewportTexture_w20vk"]
|
[sub_resource type="ViewportTexture" id="ViewportTexture_w20vk"]
|
||||||
viewport_path = NodePath("Mask")
|
viewport_path = NodePath("Mask")
|
||||||
|
|
||||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_1aow1"]
|
[sub_resource type="ShaderMaterial" id="ShaderMaterial_tc5ib"]
|
||||||
resource_local_to_scene = true
|
resource_local_to_scene = true
|
||||||
shader = ExtResource("3_rjbyl")
|
shader = ExtResource("3_rjbyl")
|
||||||
shader_parameter/mask = SubResource("ViewportTexture_w20vk")
|
shader_parameter/mask = SubResource("ViewportTexture_w20vk")
|
||||||
@@ -83,6 +83,9 @@ width = 1920
|
|||||||
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_27qpl"]
|
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_27qpl"]
|
||||||
blend_mode = 1
|
blend_mode = 1
|
||||||
|
|
||||||
|
[sub_resource type="ViewportTexture" id="ViewportTexture_30ok6"]
|
||||||
|
viewport_path = NodePath("2D Viewport")
|
||||||
|
|
||||||
[node name="Play" type="Node" node_paths=PackedStringArray("bgmController", "sfxController", "noteDisplay", "scrollDisplay", "background", "mainViewport", "leftViewport", "rightViewport")]
|
[node name="Play" type="Node" node_paths=PackedStringArray("bgmController", "sfxController", "noteDisplay", "scrollDisplay", "background", "mainViewport", "leftViewport", "rightViewport")]
|
||||||
script = ExtResource("1_asytu")
|
script = ExtResource("1_asytu")
|
||||||
bgmController = NodePath("AudioStreamPlayer BGM")
|
bgmController = NodePath("AudioStreamPlayer BGM")
|
||||||
@@ -162,7 +165,7 @@ anchor_mode = 0
|
|||||||
editor_draw_screen = false
|
editor_draw_screen = false
|
||||||
|
|
||||||
[node name="Background" parent="2D Viewport/Viewport Control" instance=ExtResource("2_8g6gv")]
|
[node name="Background" parent="2D Viewport/Viewport Control" instance=ExtResource("2_8g6gv")]
|
||||||
material = SubResource("ShaderMaterial_1aow1")
|
material = SubResource("ShaderMaterial_tc5ib")
|
||||||
layout_mode = 1
|
layout_mode = 1
|
||||||
offset_top = -1920.0
|
offset_top = -1920.0
|
||||||
offset_right = 1920.0
|
offset_right = 1920.0
|
||||||
@@ -277,7 +280,24 @@ script = ExtResource("4_c2dke")
|
|||||||
script = ExtResource("5_owrd5")
|
script = ExtResource("5_owrd5")
|
||||||
|
|
||||||
[node name="Dev Area" type="Control" parent="."]
|
[node name="Dev Area" type="Control" parent="."]
|
||||||
|
visible = false
|
||||||
layout_mode = 3
|
layout_mode = 3
|
||||||
anchors_preset = 0
|
anchors_preset = 0
|
||||||
offset_right = 1920.0
|
offset_right = 1920.0
|
||||||
offset_bottom = 1920.0
|
offset_bottom = 1920.0
|
||||||
|
|
||||||
|
[node name="TexturePreview" type="TextureRect" parent="."]
|
||||||
|
visible = false
|
||||||
|
anchors_preset = 8
|
||||||
|
anchor_left = 0.5
|
||||||
|
anchor_top = 0.5
|
||||||
|
anchor_right = 0.5
|
||||||
|
anchor_bottom = 0.5
|
||||||
|
offset_left = -480.0
|
||||||
|
offset_top = -480.0
|
||||||
|
offset_right = 480.0
|
||||||
|
offset_bottom = 480.0
|
||||||
|
grow_horizontal = 2
|
||||||
|
grow_vertical = 2
|
||||||
|
texture = SubResource("ViewportTexture_30ok6")
|
||||||
|
expand_mode = 1
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ namespace WacK.Scenes
|
|||||||
|
|
||||||
foreach (var e in l)
|
foreach (var e in l)
|
||||||
{
|
{
|
||||||
GD.Print($"Passed event {e.type} at {t}");
|
// GD.Print($"Passed event {e.type} at {t}");
|
||||||
switch (e.type)
|
switch (e.type)
|
||||||
{
|
{
|
||||||
case NoteEventType.BGAdd:
|
case NoteEventType.BGAdd:
|
||||||
@@ -167,9 +167,25 @@ namespace WacK.Scenes
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
eventNextIdx++;
|
eventNextIdx++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
while (playNextIdx < chart.playNotes.Count && time >= chart.playNotes.Keys[playNextIdx])
|
||||||
|
{
|
||||||
|
var t = chart.playNotes.Keys[playNextIdx];
|
||||||
|
var l = chart.playNotes[t];
|
||||||
|
|
||||||
|
foreach (var e in l)
|
||||||
|
{
|
||||||
|
GD.Print($"Passed {e.type} at {e.measureBeat}");
|
||||||
|
switch (e.type)
|
||||||
|
{
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
++playNextIdx;
|
||||||
|
}
|
||||||
|
|
||||||
// set scroll
|
// set scroll
|
||||||
var nPos = noteDisplay.Position;
|
var nPos = noteDisplay.Position;
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ namespace WacK.Things.TunnelObjects
|
|||||||
{
|
{
|
||||||
holdData = noteData;
|
holdData = noteData;
|
||||||
BuildLongThing(holdScroll);
|
BuildLongThing(holdScroll);
|
||||||
|
GD.Print($"Building long at {holdData.measureBeat}----------------");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create longThing in segments.
|
// Create longThing in segments.
|
||||||
@@ -88,7 +89,7 @@ namespace WacK.Things.TunnelObjects
|
|||||||
};
|
};
|
||||||
segment.AddChild(subSegment);
|
segment.AddChild(subSegment);
|
||||||
}
|
}
|
||||||
if (originFinalPos < 0 || destinationFinalPos < 0)
|
if (origin.pos < 0 || destPosNearest < 0)
|
||||||
{
|
{
|
||||||
GD.Print("overflowed to the left!");
|
GD.Print("overflowed to the left!");
|
||||||
var subSegment = new Polygon2D
|
var subSegment = new Polygon2D
|
||||||
|
|||||||
Reference in New Issue
Block a user