From afa270d8149ba189f9af4370fc76a082b7eb2216 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Wed, 28 May 2025 15:03:08 -0700 Subject: [PATCH] clean up some junk files --- Models/{ => 3-Stage}/3stHelen.glb | Bin Models/{ => 3-Stage}/3stHelen.glb.import | 6 ++-- Models/{ => 3-Stage}/3stHelen_beak.png | Bin Models/{ => 3-Stage}/3stHelen_beak.png.import | 8 ++--- Models/{ => 3-Stage}/3stHelen_shoes.png | Bin .../{ => 3-Stage}/3stHelen_shoes.png.import | 8 ++--- Models/{ => HelenHouse}/HelenHouse-Room.glb | Bin .../HelenHouse-Room.glb.import | 6 ++-- Models/{ => HelenHouse}/HelenHouse-Stage.glb | Bin .../HelenHouse-Stage.glb.import | 6 ++-- Scenes/Stages/HelenHouse.tscn | 6 ++-- Scripts/HelenHouseFlyout.gd | 30 ------------------ Scripts/HelenHouseFlyout.gd.uid | 1 - 13 files changed, 20 insertions(+), 51 deletions(-) rename Models/{ => 3-Stage}/3stHelen.glb (100%) rename Models/{ => 3-Stage}/3stHelen.glb.import (76%) rename Models/{ => 3-Stage}/3stHelen_beak.png (100%) rename Models/{ => 3-Stage}/3stHelen_beak.png.import (61%) rename Models/{ => 3-Stage}/3stHelen_shoes.png (100%) rename Models/{ => 3-Stage}/3stHelen_shoes.png.import (60%) rename Models/{ => HelenHouse}/HelenHouse-Room.glb (100%) rename Models/{ => HelenHouse}/HelenHouse-Room.glb.import (74%) rename Models/{ => HelenHouse}/HelenHouse-Stage.glb (100%) rename Models/{ => HelenHouse}/HelenHouse-Stage.glb.import (74%) delete mode 100644 Scripts/HelenHouseFlyout.gd delete mode 100644 Scripts/HelenHouseFlyout.gd.uid diff --git a/Models/3stHelen.glb b/Models/3-Stage/3stHelen.glb similarity index 100% rename from Models/3stHelen.glb rename to Models/3-Stage/3stHelen.glb diff --git a/Models/3stHelen.glb.import b/Models/3-Stage/3stHelen.glb.import similarity index 76% rename from Models/3stHelen.glb.import rename to Models/3-Stage/3stHelen.glb.import index 1daebe8..29ea8c8 100644 --- a/Models/3stHelen.glb.import +++ b/Models/3-Stage/3stHelen.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://f0fkcs7erhop" -path="res://.godot/imported/3stHelen.glb-c3541fdb7863c3136dcc986fabbb06be.scn" +path="res://.godot/imported/3stHelen.glb-09c973ef19734a7d77b0f363ef6fade1.scn" [deps] -source_file="res://Models/3stHelen.glb" -dest_files=["res://.godot/imported/3stHelen.glb-c3541fdb7863c3136dcc986fabbb06be.scn"] +source_file="res://Models/3-Stage/3stHelen.glb" +dest_files=["res://.godot/imported/3stHelen.glb-09c973ef19734a7d77b0f363ef6fade1.scn"] [params] diff --git a/Models/3stHelen_beak.png b/Models/3-Stage/3stHelen_beak.png similarity index 100% rename from Models/3stHelen_beak.png rename to Models/3-Stage/3stHelen_beak.png diff --git a/Models/3stHelen_beak.png.import b/Models/3-Stage/3stHelen_beak.png.import similarity index 61% rename from Models/3stHelen_beak.png.import rename to Models/3-Stage/3stHelen_beak.png.import index 9de2456..8788f58 100644 --- a/Models/3stHelen_beak.png.import +++ b/Models/3-Stage/3stHelen_beak.png.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://bprmuf7jpffy3" -path.s3tc="res://.godot/imported/3stHelen_beak.png-da72f62ca7ac7e5bf5593b4d1be3a7ee.s3tc.ctex" -path.etc2="res://.godot/imported/3stHelen_beak.png-da72f62ca7ac7e5bf5593b4d1be3a7ee.etc2.ctex" +path.s3tc="res://.godot/imported/3stHelen_beak.png-093e64b7512180691d5a4d9b4796c163.s3tc.ctex" +path.etc2="res://.godot/imported/3stHelen_beak.png-093e64b7512180691d5a4d9b4796c163.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/3stHelen_beak.png" -dest_files=["res://.godot/imported/3stHelen_beak.png-da72f62ca7ac7e5bf5593b4d1be3a7ee.s3tc.ctex", "res://.godot/imported/3stHelen_beak.png-da72f62ca7ac7e5bf5593b4d1be3a7ee.etc2.ctex"] +source_file="res://Models/3-Stage/3stHelen_beak.png" +dest_files=["res://.godot/imported/3stHelen_beak.png-093e64b7512180691d5a4d9b4796c163.s3tc.ctex", "res://.godot/imported/3stHelen_beak.png-093e64b7512180691d5a4d9b4796c163.etc2.ctex"] [params] diff --git a/Models/3stHelen_shoes.png b/Models/3-Stage/3stHelen_shoes.png similarity index 100% rename from Models/3stHelen_shoes.png rename to Models/3-Stage/3stHelen_shoes.png diff --git a/Models/3stHelen_shoes.png.import b/Models/3-Stage/3stHelen_shoes.png.import similarity index 60% rename from Models/3stHelen_shoes.png.import rename to Models/3-Stage/3stHelen_shoes.png.import index 65f1332..ade3f95 100644 --- a/Models/3stHelen_shoes.png.import +++ b/Models/3-Stage/3stHelen_shoes.png.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://cm8h5o5urcvym" -path.s3tc="res://.godot/imported/3stHelen_shoes.png-97c060c3fc3442bff6f75c94bc90506a.s3tc.ctex" -path.etc2="res://.godot/imported/3stHelen_shoes.png-97c060c3fc3442bff6f75c94bc90506a.etc2.ctex" +path.s3tc="res://.godot/imported/3stHelen_shoes.png-61154e88a8b3c30e2bfb4db457818ce0.s3tc.ctex" +path.etc2="res://.godot/imported/3stHelen_shoes.png-61154e88a8b3c30e2bfb4db457818ce0.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/3stHelen_shoes.png" -dest_files=["res://.godot/imported/3stHelen_shoes.png-97c060c3fc3442bff6f75c94bc90506a.s3tc.ctex", "res://.godot/imported/3stHelen_shoes.png-97c060c3fc3442bff6f75c94bc90506a.etc2.ctex"] +source_file="res://Models/3-Stage/3stHelen_shoes.png" +dest_files=["res://.godot/imported/3stHelen_shoes.png-61154e88a8b3c30e2bfb4db457818ce0.s3tc.ctex", "res://.godot/imported/3stHelen_shoes.png-61154e88a8b3c30e2bfb4db457818ce0.etc2.ctex"] [params] diff --git a/Models/HelenHouse-Room.glb b/Models/HelenHouse/HelenHouse-Room.glb similarity index 100% rename from Models/HelenHouse-Room.glb rename to Models/HelenHouse/HelenHouse-Room.glb diff --git a/Models/HelenHouse-Room.glb.import b/Models/HelenHouse/HelenHouse-Room.glb.import similarity index 74% rename from Models/HelenHouse-Room.glb.import rename to Models/HelenHouse/HelenHouse-Room.glb.import index 04f457c..ec642f8 100644 --- a/Models/HelenHouse-Room.glb.import +++ b/Models/HelenHouse/HelenHouse-Room.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://bhoeqcsdb0fx2" -path="res://.godot/imported/HelenHouse-Room.glb-d94c54c0b353197dae218f85f4b80b38.scn" +path="res://.godot/imported/HelenHouse-Room.glb-d039721f5e781fffec7d16cd58395499.scn" [deps] -source_file="res://Models/HelenHouse-Room.glb" -dest_files=["res://.godot/imported/HelenHouse-Room.glb-d94c54c0b353197dae218f85f4b80b38.scn"] +source_file="res://Models/HelenHouse/HelenHouse-Room.glb" +dest_files=["res://.godot/imported/HelenHouse-Room.glb-d039721f5e781fffec7d16cd58395499.scn"] [params] diff --git a/Models/HelenHouse-Stage.glb b/Models/HelenHouse/HelenHouse-Stage.glb similarity index 100% rename from Models/HelenHouse-Stage.glb rename to Models/HelenHouse/HelenHouse-Stage.glb diff --git a/Models/HelenHouse-Stage.glb.import b/Models/HelenHouse/HelenHouse-Stage.glb.import similarity index 74% rename from Models/HelenHouse-Stage.glb.import rename to Models/HelenHouse/HelenHouse-Stage.glb.import index bc8c55e..43b6dd4 100644 --- a/Models/HelenHouse-Stage.glb.import +++ b/Models/HelenHouse/HelenHouse-Stage.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://btvomf1ayoypu" -path="res://.godot/imported/HelenHouse-Stage.glb-cec5fe70b1f2a888ac5fe9fa252e083f.scn" +path="res://.godot/imported/HelenHouse-Stage.glb-3682deea9f5a1b3381bc9010b144dd14.scn" [deps] -source_file="res://Models/HelenHouse-Stage.glb" -dest_files=["res://.godot/imported/HelenHouse-Stage.glb-cec5fe70b1f2a888ac5fe9fa252e083f.scn"] +source_file="res://Models/HelenHouse/HelenHouse-Stage.glb" +dest_files=["res://.godot/imported/HelenHouse-Stage.glb-3682deea9f5a1b3381bc9010b144dd14.scn"] [params] diff --git a/Scenes/Stages/HelenHouse.tscn b/Scenes/Stages/HelenHouse.tscn index 641471d..e7ab03b 100644 --- a/Scenes/Stages/HelenHouse.tscn +++ b/Scenes/Stages/HelenHouse.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=3 uid="uid://btre5j66mpchy"] -[ext_resource type="PackedScene" uid="uid://f0fkcs7erhop" path="res://Models/3stHelen.glb" id="1_s1mol"] +[ext_resource type="PackedScene" uid="uid://f0fkcs7erhop" path="res://Models/3-Stage/3stHelen.glb" id="1_s1mol"] [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="2_odcb6"] -[ext_resource type="PackedScene" uid="uid://bhoeqcsdb0fx2" path="res://Models/HelenHouse-Room.glb" id="3_e7oou"] -[ext_resource type="PackedScene" uid="uid://btvomf1ayoypu" path="res://Models/HelenHouse-Stage.glb" id="4_e2vvs"] +[ext_resource type="PackedScene" uid="uid://bhoeqcsdb0fx2" path="res://Models/HelenHouse/HelenHouse-Room.glb" id="3_e7oou"] +[ext_resource type="PackedScene" uid="uid://btvomf1ayoypu" path="res://Models/HelenHouse/HelenHouse-Stage.glb" id="4_e2vvs"] [sub_resource type="Environment" id="Environment_axk5g"] ambient_light_source = 1 diff --git a/Scripts/HelenHouseFlyout.gd b/Scripts/HelenHouseFlyout.gd deleted file mode 100644 index 7dbd69e..0000000 --- a/Scripts/HelenHouseFlyout.gd +++ /dev/null @@ -1,30 +0,0 @@ -extends Control - -signal movement_in(movement, rate) -signal movement_out(movement, rate) - - - -func _ready() -> void: - #var animatronic = get_node("../SubViewport/HelenHouse/Helen") - #movement_in.connect(animatronic._movement_in) - #movement_out.connect(animatronic._movement_out) - movement_in.connect(self._movement_in) - movement_out.connect(self._movement_out) - -func _input(event: InputEvent) -> void: - if (event.is_action_pressed("cycle_camera_angle")): - cam_index += 1 - get_node("../SubViewport/HelenHouse/Camera " + str((cam_index % 2)+1)).current = true - -func _movement_in(movement, _rate): - get_node("Movements/IndicatorLights/" + movement).turn_on(); - -func _movement_out(movement, _rate): - get_node("Movements/IndicatorLights/" + movement).turn_off(); - -func _on_angle_1_button_pressed() -> void: - get_node("../SubViewport/HelenHouse/Camera 1").current = true - -func _on_angle_2_button_pressed() -> void: - get_node("../SubViewport/HelenHouse/Camera 2").current = true diff --git a/Scripts/HelenHouseFlyout.gd.uid b/Scripts/HelenHouseFlyout.gd.uid deleted file mode 100644 index c95620b..0000000 --- a/Scripts/HelenHouseFlyout.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://bh512bgpm0kj7