Reorganization refactor

src/editor_utils.rs → src/editor/editor_plugin.rs

@@ -1,12 +1,8 @@
 use godot::engine::{EditorCommandPalette, EditorPlugin, IEditorPlugin, PopupMenu};
 use godot::prelude::*;
 
-use crate::game_globals::CoreGlobals;
-use crate::serialization::SquigglesSerialized;
-
-pub fn register_editor_elements() {}
-
-pub fn unregister_editor_elements() {}
+use crate::scene::game_globals::CoreGlobals;
+use crate::scene::serialization::SquigglesSerialized;
 
 #[derive(GodotClass)]
 #[class(tool, editor_plugin, init, base=EditorPlugin)]

src/editor/mod.rs

@@ -0,0 +1 @@
+pub mod editor_plugin;

src/lib.rs

@@ -4,39 +4,23 @@
 use godot::prelude::*;
 
 // module specifications
-pub mod camera;
-pub mod editor_plugin;
-pub mod editor_utils;
-pub mod error_handling;
-pub mod game_globals;
-pub mod game_settings;
-pub mod godot_replacements;
-pub mod input;
-pub mod interaction;
-pub mod serialization;
-pub mod signals;
-pub mod state_machine;
-pub mod utility_nodes;
-pub mod vfx_stack;
+pub mod editor;
+pub mod scene;
 
 // extension loading
 struct SquigglesCore;
 
 #[gdextension]
 unsafe impl ExtensionLibrary for SquigglesCore {
     fn on_level_init(level: InitLevel) {
-        match level {
-            InitLevel::Scene => editor_plugin::register_engine_elements(),
-            InitLevel::Editor => editor_utils::register_editor_elements(),
-            _ => (),
+        if level == InitLevel::Scene {
+            scene::editor_plugin::register_engine_elements();
         }
     }
 
     fn on_level_deinit(level: InitLevel) {
-        match level {
-            InitLevel::Scene => editor_plugin::unregister_engine_elements(),
-            InitLevel::Editor => editor_utils::unregister_editor_elements(),
-            _ => (),
+        if level == InitLevel::Scene {
+            scene::editor_plugin::unregister_engine_elements();
         }
     }
 }

src/editor_plugin.rs → src/scene/editor_plugin.rs

@@ -1,7 +1,7 @@
 use godot::{engine::*, prelude::*};
 use once_cell::sync::Lazy;
 
-use crate::game_globals::CoreGlobals;
+use crate::scene::game_globals::CoreGlobals;
 
 pub static SINGLETON_CORE_GLOBALS: Lazy<StringName> = Lazy::new(|| StringName::from("CoreGlobals"));
 

src/game_globals.rs → src/scene/game_globals.rs

@@ -5,10 +5,10 @@ use godot::{
 };
 
 use crate::{
-    camera::{CameraBrain3D, CAMERA_BRAIN_GROUP},
-    editor_plugin::SINGLETON_CORE_GLOBALS,
-    game_settings::SquigglesCoreConfig,
-    serialization::SquigglesSerialized,
+    scene::camera::{CameraBrain3D, CAMERA_BRAIN_GROUP},
+    scene::editor_plugin::SINGLETON_CORE_GLOBALS,
+    scene::game_settings::SquigglesCoreConfig,
+    scene::serialization::SquigglesSerialized,
 };
 
 const PROJECT_SETTINGS_NAMESPACE: &str = "addons/squiggles_core/";

src/game_settings/audio.rs → src/scene/game_settings/audio.rs

@@ -1,4 +1,4 @@
-use crate::serialization::{SaveDataBuilder, SquigglesSerialized};
+use crate::scene::serialization::{SaveDataBuilder, SquigglesSerialized};
 use godot::prelude::*;
 
 #[derive(GodotClass)]

src/game_settings/controls.rs → src/scene/game_settings/controls.rs

@@ -11,7 +11,7 @@ use godot::{
 use num_derive::FromPrimitive;
 use num_traits::{FromPrimitive, ToPrimitive};
 
-use crate::serialization::{SaveDataBuilder, SquigglesSerialized};
+use crate::scene::serialization::{SaveDataBuilder, SquigglesSerialized};
 
 #[derive(FromPrimitive)]
 enum MappingsStyle {

src/game_settings/graphics.rs → src/scene/game_settings/graphics.rs

@@ -3,7 +3,7 @@ use godot::{
     prelude::*,
 };
 
-use crate::serialization::{SaveDataBuilder, SquigglesSerialized};
+use crate::scene::serialization::{SaveDataBuilder, SquigglesSerialized};
 
 #[derive(GodotClass)]
 #[class(tool, base=Resource)]

src/game_settings/mod.rs → src/scene/game_settings/mod.rs

@@ -1,6 +1,6 @@
 use godot::prelude::*;
 
-use crate::{serialization::SquigglesSerialized, vfx_stack::vfx_stack_resource::VFXStack};
+use crate::scene::{serialization::SquigglesSerialized, vfx_stack::vfx_stack_resource::VFXStack};
 
 use self::{
     audio::GameAudioSettings, controls::GameControlsSettings, gameplay::GameGameplaySettings,

src/godot_replacements/custom_world_environment.rs → src/scene/godot_replacements/custom_world_environment.rs

@@ -3,7 +3,7 @@ use godot::{
     prelude::*,
 };
 
-use crate::game_globals::CoreGlobals;
+use crate::scene::game_globals::CoreGlobals;
 
 #[derive(GodotClass)]
 #[class(init, base=WorldEnvironment)]

src/scene/mod.rs

@@ -0,0 +1,14 @@
+pub mod camera;
+pub mod editor_plugin;
+pub mod error_handling;
+pub mod game_globals;
+pub mod game_settings;
+pub mod godot_replacements;
+pub mod input;
+pub mod interaction;
+pub mod procedural_meshes;
+pub mod serialization;
+pub mod signals;
+pub mod state_machine;
+pub mod utility_nodes;
+pub mod vfx_stack;

src/scene/procedural_meshes/mod.rs

@@ -0,0 +1 @@
+pub mod spline_mesh;

src/scene/procedural_meshes/spline_mesh.rs

@@ -0,0 +1,66 @@
+// use godot::{
+//     engine::{ArrayMesh, IMeshInstance3D, Mesh, MeshDataTool, MeshInstance3D, Path3D},
+//     prelude::*,
+// };
+
+// #[derive(GodotClass)]
+// #[class(init, base=MeshInstance3D)]
+// pub struct SplineMesh {
+//     #[export]
+//     spline: Option<Gd<Path3D>>,
+//     #[export]
+//     target_mesh: Option<Gd<Mesh>>,
+//     #[base]
+//     base: Base<MeshInstance3D>,
+// }
+
+// #[godot_api]
+// impl IMeshInstance3D for SplineMesh {}
+
+// #[godot_api]
+// impl SplineMesh {
+//     #[func]
+//     pub fn generate_mesh(&mut self) {
+//         self.ensure_array_mesh();
+//         let Some(generic_mesh) = self.base.get_mesh() else {
+//             return;
+//         };
+//         let array_mesh_cast: Result<Gd<ArrayMesh>, _> = generic_mesh.try_cast();
+//         let Ok(mut array_mesh) = array_mesh_cast else {
+//             return;
+//         };
+//         let Some(spline) = self.spline.clone() else {
+//             return;
+//         };
+//         let Some(spline) = spline.get_curve() else {
+//             return;
+//         };
+//         let Some(target) = self.target_mesh.clone() else {
+//             return;
+//         };
+//         array_mesh.clear_surfaces();
+
+//         let interval = spline.get_bake_interval();
+//         let length = spline.get_baked_length();
+//         let points = spline.get_baked_points();
+//         let tilts = spline.get_baked_tilts();
+//         let ups = spline.get_baked_up_vectors();
+//         let data = MeshDataTool::new();
+//         for (index, value) in points.as_slice().iter().enumerate() {
+//             let tilt = tilts.as_slice()[index];
+//             let up = ups.as_slice()[index];
+//         }
+//     }
+
+//     fn ensure_array_mesh(&mut self) {
+//         if self.base.get_mesh().is_none() {
+//             self.base.set_mesh(ArrayMesh::new().upcast());
+//             return;
+//         }
+//         let arr_cast: Result<Gd<ArrayMesh>, _> = self.base.get_mesh().unwrap().try_cast();
+//         let Ok(_) = arr_cast else {
+//             self.base.set_mesh(ArrayMesh::new().upcast());
+//             return;
+//         };
+//     }
+// }

src/vfx_stack/vfx_quad.rs → src/scene/vfx_stack/vfx_quad.rs

@@ -3,7 +3,7 @@ use godot::{
     prelude::*,
 };
 
-use crate::game_globals::CoreGlobals;
+use crate::scene::game_globals::CoreGlobals;
 
 use super::vfx_stack_resource::VFXStack;
 

src/vfx_stack/vfx_stack_resource.rs → src/scene/vfx_stack/vfx_stack_resource.rs

@@ -1,6 +1,6 @@
 use godot::{engine::ShaderMaterial, prelude::*};
 
-use crate::signals::emit;
+use crate::scene::signals::emit;
 
 #[derive(GodotClass)]
 #[class(init, base=Resource)]