From cfb4aa874bbc95ac732e1793766f73dae50fbc0a Mon Sep 17 00:00:00 2001 From: Bryce Date: Fri, 1 Aug 2025 17:11:56 -0700 Subject: [PATCH] cleanup --- test_cutscene2.gd => cutscene_from_file.gd | 2 +- ..._cutscene2.tscn => cutscene_from_file.tscn | 5 +- example_cutscene.tscn | 102 ------------------ main.tscn | 3 - ...resource_cutscene.gd => manual_cutscene.gd | 0 ...urce_cutscene.tscn => manual_cutscene.tscn | 4 +- a.tres => sample_cutscene.tres | 0 7 files changed, 6 insertions(+), 110 deletions(-) rename test_cutscene2.gd => cutscene_from_file.gd (98%) rename test_cutscene2.tscn => cutscene_from_file.tscn (78%) delete mode 100644 example_cutscene.tscn delete mode 100644 main.tscn rename test_resource_cutscene.gd => manual_cutscene.gd (100%) rename test_resource_cutscene.tscn => manual_cutscene.tscn (82%) rename a.tres => sample_cutscene.tres (100%) diff --git a/test_cutscene2.gd b/cutscene_from_file.gd similarity index 98% rename from test_cutscene2.gd rename to cutscene_from_file.gd index b5920a1..d4defe4 100644 --- a/test_cutscene2.gd +++ b/cutscene_from_file.gd @@ -33,7 +33,7 @@ func setup_cutscene() -> void: cutscene_manager.connect("action_completed", _on_action_completed) # Create a cutscene resource with the same sequence as the original example - var cutscene_resource = preload("res://a.tres") + var cutscene_resource = preload("res://sample_cutscene.tres") # Generate actions from the resource var generator = CutsceneGenerator.new() diff --git a/test_cutscene2.tscn b/cutscene_from_file.tscn similarity index 78% rename from test_cutscene2.tscn rename to cutscene_from_file.tscn index 1e25c0d..72bc300 100644 --- a/test_cutscene2.tscn +++ b/cutscene_from_file.tscn @@ -1,12 +1,13 @@ [gd_scene load_steps=2 format=3 uid="uid://bb0vnntvwbuff"] -[ext_resource type="Script" path="res://test_cutscene2.gd" id="1_6nibr"] +[ext_resource type="Script" path="res://cutscene_from_file.gd" id="1_1icvi"] [node name="Node2D" type="Node2D"] -script = ExtResource("1_6nibr") +script = ExtResource("1_1icvi") [node name="Character1" type="Node2D" parent="."] position = Vector2(100, 100) +script = ExtResource("1_1icvi") [node name="Polygon2D" type="Polygon2D" parent="Character1"] polygon = PackedVector2Array(33, -74, -67, 4, -20, 33, 45, 2) diff --git a/example_cutscene.tscn b/example_cutscene.tscn deleted file mode 100644 index 7d1bb5b..0000000 --- a/example_cutscene.tscn +++ /dev/null @@ -1,102 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://bi2c4ph8txa4y"] - -[sub_resource type="GDScript" id="GDScript_e7tbc"] -script/source = "extends Node2D - -# Example cutscene using the cutscene editor plugin - -# Character nodes -@onready var character1: Node2D = $Character1 -@onready var character2: Node2D = $Character2 - -# Cutscene manager -var cutscene_manager: CutsceneManager - -func _ready() -> void: - # Initialize the cutscene system - setup_cutscene() - - # Start the cutscene after a short delay to see the initial positions - var start_timer = Timer.new() - start_timer.wait_time = 1.0 - start_timer.one_shot = true - start_timer.connect(\"timeout\", start_cutscene) - add_child(start_timer) - start_timer.start() - -func setup_cutscene() -> void: - # Create the cutscene manager - cutscene_manager = CutsceneManager.new() - add_child(cutscene_manager) - - # Connect to cutscene signals - cutscene_manager.connect(\"cutscene_started\", _on_cutscene_started) - cutscene_manager.connect(\"cutscene_completed\", _on_cutscene_completed) - cutscene_manager.connect(\"action_started\", _on_action_started) - cutscene_manager.connect(\"action_completed\", _on_action_completed) - - # Create the action sequence as described in requirements - - # 1. & 2. Characters move simultaneously - var parallel_moves = [ - MoveAction.new(character1, Vector2(234, 591), 100.0), # Character1 moves - MoveAction.new(character2, Vector2(912, 235), 100.0) # Character2 moves - ] - cutscene_manager.add_parallel_actions(parallel_moves) - - # 3. Character2 turns to face Character1 - var turn_action = TurnAction.new(character2, character1, 1.0) - cutscene_manager.add_action(turn_action) - - # 4. Character2 says dialogue - var dialogue_action = DialogueAction.new(character2, \"Hello there, friend!\", 2.0) - cutscene_manager.add_action(dialogue_action) - - # 5. Character1 plays shocked animation (simulated with a wait since we don't have an actual animation) - var animation_action = WaitAction.new(1.0) # Simulate animation with wait - cutscene_manager.add_action(animation_action) - - # Add a final dialogue from character1 - var final_dialogue = DialogueAction.new(character1, \"That was surprising!\", 2.0) - cutscene_manager.add_action(final_dialogue) - -func start_cutscene() -> void: - print(\"Starting cutscene...\") - cutscene_manager.start() - -func _on_cutscene_started() -> void: - print(\"Cutscene started!\") - -func _on_cutscene_completed() -> void: - print(\"Cutscene completed!\") - print(\"Final positions:\") - print(\"Character1: %s\" % character1.position) - print(\"Character2: %s\" % character2.position) - -func _on_action_started(action: Action) -> void: - print(\"Action started: %s\" % action.name) - -func _on_action_completed(action: Action) -> void: - print(\"Action completed: %s\" % action.name) - -# Clean up when the node is removed -func _exit_tree() -> void: - if cutscene_manager: - cutscene_manager.queue_free() -" - -[node name="ExampleCutscene" type="Node2D"] -script = SubResource("GDScript_e7tbc") - -[node name="Character1" type="Node2D" parent="."] -position = Vector2(234, 591) - -[node name="Polygon2D" type="Polygon2D" parent="Character1"] -polygon = PackedVector2Array(-5, -19, -27, 2, 2, 15, 15, 6, 9, -19) - -[node name="Character2" type="Node2D" parent="."] -position = Vector2(912, 235) -rotation = 2.60138 - -[node name="Polygon2D2" type="Polygon2D" parent="Character2"] -polygon = PackedVector2Array(10, -25, -43, 1, -14, 40, 48, 13) diff --git a/main.tscn b/main.tscn deleted file mode 100644 index 16f0b7a..0000000 --- a/main.tscn +++ /dev/null @@ -1,3 +0,0 @@ -[gd_scene format=3 uid="uid://demmcscpj7vjy"] - -[node name="Node2D" type="Node2D"] diff --git a/test_resource_cutscene.gd b/manual_cutscene.gd similarity index 100% rename from test_resource_cutscene.gd rename to manual_cutscene.gd diff --git a/test_resource_cutscene.tscn b/manual_cutscene.tscn similarity index 82% rename from test_resource_cutscene.tscn rename to manual_cutscene.tscn index a423584..0fb2490 100644 --- a/test_resource_cutscene.tscn +++ b/manual_cutscene.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=2 format=3 uid="uid://vlh0eb7qn72o"] -[ext_resource type="Script" path="res://test_resource_cutscene.gd" id="1"] +[ext_resource type="Script" path="res://manual_cutscene.gd" id="1_8eld7"] [node name="Node2D" type="Node2D"] -script = ExtResource("1") +script = ExtResource("1_8eld7") [node name="Character1" type="Node2D" parent="."] position = Vector2(100, 100) diff --git a/a.tres b/sample_cutscene.tres similarity index 100% rename from a.tres rename to sample_cutscene.tres