From ed335f6fddf5de036290a14d7659ea08127a728d Mon Sep 17 00:00:00 2001 From: hiina Date: Fri, 14 Feb 2025 15:43:06 -0700 Subject: [PATCH] reorganize stuff --- project.godot | 2 +- scenes/{ => collisions}/particle_test.gdshader | 0 .../{ => collisions}/proxy_collision_detector.gd | 0 .../proxy_collision_detector.tscn | 2 +- scenes/{ => manipulator}/manipulator.gd | 0 scenes/{ => manipulator}/manipulator.tscn | 2 +- scenes/{ => manipulator}/manipulatorsphere.tres | 0 .../{ => manipulator}/visual_attractor_sphere.gd | 0 .../visual_attractor_sphere.tscn | 4 ++-- .../performance_settings.gd | 0 .../performance_settings_menu.gd | 0 .../performance_settings_menu.tscn | 2 +- .../{ => performance_settings}/voxel_gi_toggle.gd | 0 scenes/player_rig.tscn | 7 ------- ...itle_scene.GPUParticlesCollisionSDF3D_data.exr | Bin ...ene.GPUParticlesCollisionSDF3D_data.exr.import | 6 +++--- .../title_scene.VoxelGI_data.res | Bin scenes/{ => title_scene}/title_scene.tscn | 14 +++++++------- 18 files changed, 16 insertions(+), 23 deletions(-) rename scenes/{ => collisions}/particle_test.gdshader (100%) rename scenes/{ => collisions}/proxy_collision_detector.gd (100%) rename scenes/{ => collisions}/proxy_collision_detector.tscn (81%) rename scenes/{ => manipulator}/manipulator.gd (100%) rename scenes/{ => manipulator}/manipulator.tscn (94%) rename scenes/{ => manipulator}/manipulatorsphere.tres (100%) rename scenes/{ => manipulator}/visual_attractor_sphere.gd (100%) rename scenes/{ => manipulator}/visual_attractor_sphere.tscn (80%) rename scenes/{ => performance_settings}/performance_settings.gd (100%) rename scenes/{ => performance_settings}/performance_settings_menu.gd (100%) rename scenes/{ => performance_settings}/performance_settings_menu.tscn (97%) rename scenes/{ => performance_settings}/voxel_gi_toggle.gd (100%) delete mode 100644 scenes/player_rig.tscn rename scenes/{ => title_scene}/title_scene.GPUParticlesCollisionSDF3D_data.exr (100%) rename scenes/{ => title_scene}/title_scene.GPUParticlesCollisionSDF3D_data.exr.import (69%) rename scenes/{ => title_scene}/title_scene.VoxelGI_data.res (100%) rename scenes/{ => title_scene}/title_scene.tscn (95%) diff --git a/project.godot b/project.godot index d888355..f08b2ed 100644 --- a/project.godot +++ b/project.godot @@ -21,7 +21,7 @@ config/icon="res://icon.png" XRToolsUserSettings="*res://addons/godot-xr-tools/user_settings/user_settings.gd" XRToolsRumbleManager="*res://addons/godot-xr-tools/rumble/rumble_manager.gd" DebugCam="*res://addons/debug_camera/scripts/DebugCamAutoload.gd" -PerformanceSettingsSingleton="*res://scenes/performance_settings.gd" +PerformanceSettingsSingleton="*res://scenes/performance_settings/performance_settings.gd" [editor] diff --git a/scenes/particle_test.gdshader b/scenes/collisions/particle_test.gdshader similarity index 100% rename from scenes/particle_test.gdshader rename to scenes/collisions/particle_test.gdshader diff --git a/scenes/proxy_collision_detector.gd b/scenes/collisions/proxy_collision_detector.gd similarity index 100% rename from scenes/proxy_collision_detector.gd rename to scenes/collisions/proxy_collision_detector.gd diff --git a/scenes/proxy_collision_detector.tscn b/scenes/collisions/proxy_collision_detector.tscn similarity index 81% rename from scenes/proxy_collision_detector.tscn rename to scenes/collisions/proxy_collision_detector.tscn index ba6ad3a..bb9816b 100644 --- a/scenes/proxy_collision_detector.tscn +++ b/scenes/collisions/proxy_collision_detector.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://rsrnbs08nv1n"] -[ext_resource type="Script" path="res://scenes/proxy_collision_detector.gd" id="1_ijo8k"] +[ext_resource type="Script" path="res://scenes/collisions/proxy_collision_detector.gd" id="1_ijo8k"] [sub_resource type="Environment" id="Environment_gp8a6"] background_mode = 1 diff --git a/scenes/manipulator.gd b/scenes/manipulator/manipulator.gd similarity index 100% rename from scenes/manipulator.gd rename to scenes/manipulator/manipulator.gd diff --git a/scenes/manipulator.tscn b/scenes/manipulator/manipulator.tscn similarity index 94% rename from scenes/manipulator.tscn rename to scenes/manipulator/manipulator.tscn index ae238c1..7ff62b1 100644 --- a/scenes/manipulator.tscn +++ b/scenes/manipulator/manipulator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://bifpsyvpcem3a"] -[ext_resource type="Script" path="res://scenes/manipulator.gd" id="1_g7g3k"] +[ext_resource type="Script" path="res://scenes/manipulator/manipulator.gd" id="1_g7g3k"] [ext_resource type="PackedScene" uid="uid://c25yxb0vt53vc" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_left.tscn" id="2_nqt0c"] [ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="3_luhd1"] diff --git a/scenes/manipulatorsphere.tres b/scenes/manipulator/manipulatorsphere.tres similarity index 100% rename from scenes/manipulatorsphere.tres rename to scenes/manipulator/manipulatorsphere.tres diff --git a/scenes/visual_attractor_sphere.gd b/scenes/manipulator/visual_attractor_sphere.gd similarity index 100% rename from scenes/visual_attractor_sphere.gd rename to scenes/manipulator/visual_attractor_sphere.gd diff --git a/scenes/visual_attractor_sphere.tscn b/scenes/manipulator/visual_attractor_sphere.tscn similarity index 80% rename from scenes/visual_attractor_sphere.tscn rename to scenes/manipulator/visual_attractor_sphere.tscn index ce29d52..0b212be 100644 --- a/scenes/visual_attractor_sphere.tscn +++ b/scenes/manipulator/visual_attractor_sphere.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://ccmx5v2601k8q"] -[ext_resource type="Script" path="res://scenes/visual_attractor_sphere.gd" id="1_62tkw"] -[ext_resource type="Shader" uid="uid://dilr5r6k3ik7t" path="res://scenes/manipulatorsphere.tres" id="2_1iign"] +[ext_resource type="Script" path="res://scenes/manipulator/visual_attractor_sphere.gd" id="1_62tkw"] +[ext_resource type="Shader" uid="uid://dilr5r6k3ik7t" path="res://scenes/manipulator/manipulatorsphere.tres" id="2_1iign"] [sub_resource type="SphereMesh" id="SphereMesh_56y52"] radius = 1.0 diff --git a/scenes/performance_settings.gd b/scenes/performance_settings/performance_settings.gd similarity index 100% rename from scenes/performance_settings.gd rename to scenes/performance_settings/performance_settings.gd diff --git a/scenes/performance_settings_menu.gd b/scenes/performance_settings/performance_settings_menu.gd similarity index 100% rename from scenes/performance_settings_menu.gd rename to scenes/performance_settings/performance_settings_menu.gd diff --git a/scenes/performance_settings_menu.tscn b/scenes/performance_settings/performance_settings_menu.tscn similarity index 97% rename from scenes/performance_settings_menu.tscn rename to scenes/performance_settings/performance_settings_menu.tscn index e30b0ad..ebadf60 100644 --- a/scenes/performance_settings_menu.tscn +++ b/scenes/performance_settings/performance_settings_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://cyd8poa47ir2i"] -[ext_resource type="Script" path="res://scenes/performance_settings_menu.gd" id="1_20qfm"] +[ext_resource type="Script" path="res://scenes/performance_settings/performance_settings_menu.gd" id="1_20qfm"] [node name="PerformanceSettingsMenu" type="Node2D"] script = ExtResource("1_20qfm") diff --git a/scenes/voxel_gi_toggle.gd b/scenes/performance_settings/voxel_gi_toggle.gd similarity index 100% rename from scenes/voxel_gi_toggle.gd rename to scenes/performance_settings/voxel_gi_toggle.gd diff --git a/scenes/player_rig.tscn b/scenes/player_rig.tscn deleted file mode 100644 index 0e57b72..0000000 --- a/scenes/player_rig.tscn +++ /dev/null @@ -1,7 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://4aglyx1y67kh"] - -[ext_resource type="PackedScene" uid="uid://7uc6tf2tvn1k" path="res://scenes/xr_origin_3d.tscn" id="1_42h7e"] - -[node name="PlayerRig" type="Node3D"] - -[node name="XROrigin3D" parent="." instance=ExtResource("1_42h7e")] diff --git a/scenes/title_scene.GPUParticlesCollisionSDF3D_data.exr b/scenes/title_scene/title_scene.GPUParticlesCollisionSDF3D_data.exr similarity index 100% rename from scenes/title_scene.GPUParticlesCollisionSDF3D_data.exr rename to scenes/title_scene/title_scene.GPUParticlesCollisionSDF3D_data.exr diff --git a/scenes/title_scene.GPUParticlesCollisionSDF3D_data.exr.import b/scenes/title_scene/title_scene.GPUParticlesCollisionSDF3D_data.exr.import similarity index 69% rename from scenes/title_scene.GPUParticlesCollisionSDF3D_data.exr.import rename to scenes/title_scene/title_scene.GPUParticlesCollisionSDF3D_data.exr.import index a6aa0ab..56d8283 100644 --- a/scenes/title_scene.GPUParticlesCollisionSDF3D_data.exr.import +++ b/scenes/title_scene/title_scene.GPUParticlesCollisionSDF3D_data.exr.import @@ -3,15 +3,15 @@ importer="3d_texture" type="CompressedTexture3D" uid="uid://c6uya54wegrle" -path="res://.godot/imported/title_scene.GPUParticlesCollisionSDF3D_data.exr-565c568c16b38957e36f9d809ba1cd69.ctex3d" +path="res://.godot/imported/title_scene.GPUParticlesCollisionSDF3D_data.exr-8dccd3fe02ba2b919514487dd8c172de.ctex3d" metadata={ "vram_texture": false } [deps] -source_file="res://scenes/title_scene.GPUParticlesCollisionSDF3D_data.exr" -dest_files=["res://.godot/imported/title_scene.GPUParticlesCollisionSDF3D_data.exr-565c568c16b38957e36f9d809ba1cd69.ctex3d"] +source_file="res://scenes/title_scene/title_scene.GPUParticlesCollisionSDF3D_data.exr" +dest_files=["res://.godot/imported/title_scene.GPUParticlesCollisionSDF3D_data.exr-8dccd3fe02ba2b919514487dd8c172de.ctex3d"] [params] diff --git a/scenes/title_scene.VoxelGI_data.res b/scenes/title_scene/title_scene.VoxelGI_data.res similarity index 100% rename from scenes/title_scene.VoxelGI_data.res rename to scenes/title_scene/title_scene.VoxelGI_data.res diff --git a/scenes/title_scene.tscn b/scenes/title_scene/title_scene.tscn similarity index 95% rename from scenes/title_scene.tscn rename to scenes/title_scene/title_scene.tscn index 1f436e0..fda5e75 100644 --- a/scenes/title_scene.tscn +++ b/scenes/title_scene/title_scene.tscn @@ -5,19 +5,19 @@ [ext_resource type="PackedScene" uid="uid://clc5dre31iskm" path="res://addons/godot-xr-tools/xr/start_xr.tscn" id="3_hdcpx"] [ext_resource type="Environment" uid="uid://c1yf8e4qr42hr" path="res://scenes/environment.tres" id="3_v4538"] [ext_resource type="PackedScene" uid="uid://57q7hhomocdh" path="res://addons/godot-xr-tools/objects/world_grab_area.tscn" id="4_nruf2"] -[ext_resource type="VoxelGIData" uid="uid://bxphdae7hohsh" path="res://scenes/title_scene.VoxelGI_data.res" id="5_ebg1r"] -[ext_resource type="CompressedTexture3D" uid="uid://c6uya54wegrle" path="res://scenes/title_scene.GPUParticlesCollisionSDF3D_data.exr" id="6_l378m"] -[ext_resource type="PackedScene" uid="uid://rsrnbs08nv1n" path="res://scenes/proxy_collision_detector.tscn" id="7_1kkxh"] -[ext_resource type="Script" path="res://scenes/voxel_gi_toggle.gd" id="7_4p11s"] +[ext_resource type="VoxelGIData" uid="uid://bxphdae7hohsh" path="res://scenes/title_scene/title_scene.VoxelGI_data.res" id="5_ebg1r"] +[ext_resource type="CompressedTexture3D" uid="uid://c6uya54wegrle" path="res://scenes/title_scene/title_scene.GPUParticlesCollisionSDF3D_data.exr" id="6_l378m"] +[ext_resource type="PackedScene" uid="uid://rsrnbs08nv1n" path="res://scenes/collisions/proxy_collision_detector.tscn" id="7_1kkxh"] +[ext_resource type="Script" path="res://scenes/performance_settings/voxel_gi_toggle.gd" id="7_4p11s"] [ext_resource type="PackedScene" uid="uid://c20kawop2lrv" path="res://assets/Arcane Source 2.glb" id="8_h17hj"] [ext_resource type="Script" path="res://scenes/target.gd" id="11_7oif6"] [ext_resource type="AudioStream" uid="uid://dnwh2iqwi86ku" path="res://assets/04 bass.ogg" id="12_8dki8"] [ext_resource type="AudioStream" uid="uid://cv0f1tu5pac60" path="res://assets/02 midpiano.ogg" id="13_6bsa0"] [ext_resource type="PackedScene" uid="uid://clujaf3u776a3" path="res://addons/godot-xr-tools/objects/viewport_2d_in_3d.tscn" id="13_ab6mb"] [ext_resource type="AudioStream" uid="uid://cqb1bo72232vs" path="res://assets/03 highpiano.ogg" id="14_8b4v6"] -[ext_resource type="PackedScene" uid="uid://cyd8poa47ir2i" path="res://scenes/performance_settings_menu.tscn" id="14_s5dwy"] -[ext_resource type="PackedScene" uid="uid://bifpsyvpcem3a" path="res://scenes/manipulator.tscn" id="17_uqqr1"] -[ext_resource type="PackedScene" uid="uid://ccmx5v2601k8q" path="res://scenes/visual_attractor_sphere.tscn" id="18_qmvne"] +[ext_resource type="PackedScene" uid="uid://cyd8poa47ir2i" path="res://scenes/performance_settings/performance_settings_menu.tscn" id="14_s5dwy"] +[ext_resource type="PackedScene" uid="uid://bifpsyvpcem3a" path="res://scenes/manipulator/manipulator.tscn" id="17_uqqr1"] +[ext_resource type="PackedScene" uid="uid://ccmx5v2601k8q" path="res://scenes/manipulator/visual_attractor_sphere.tscn" id="18_qmvne"] [ext_resource type="Script" path="res://scenes/ambient_particles.gd" id="19_er8ew"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lvd12"]