move mods around

Author: Bromeon

godot-core/src/builtin/basis.rs renamed to godot-core/src/builtin/matrices/basis.rs

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) godot-rust; Bromeon and contributors.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+mod basis;
+mod projection;
+mod transform2d;
+mod transform3d;
+
+pub use basis::*;
+pub use projection::*;
+pub use transform2d::*;
+pub use transform3d::*;

godot-core/src/builtin/matrices/mod.rs

@@ -10,10 +10,10 @@ use std::ops::Mul;
 use godot_ffi as sys;
 use sys::{ffi_methods, ExtVariantType, GodotFfi};
 
-use super::{Aabb, Rect2, Vector3};
 use crate::builtin::math::{ApproxEq, GlamConv, GlamType};
 use crate::builtin::{
-    inner, real, Plane, RMat4, RealConv, Transform3D, Vector2, Vector4, Vector4Axis,
+    inner, real, Aabb, Plane, RMat4, RealConv, Rect2, Transform3D, Vector2, Vector3, Vector4,
+    Vector4Axis,
 };
 
 /// A 4x4 matrix used for 3D projective transformations.

godot-core/src/builtin/projection.rs renamed to godot-core/src/builtin/matrices/projection.rs

@@ -28,22 +28,19 @@ pub mod __prelude_reexport {
     use super::*;
 
     pub use aabb::*;
-    pub use basis::*;
     pub use callable::*;
     pub use collections::containers::*;
     pub use color::*;
     pub use color_hsv::*;
+    pub use matrices::*;
     pub use plane::*;
-    pub use projection::*;
     pub use quaternion::*;
     pub use real_inner::*;
     pub use rect2::*;
     pub use rect2i::*;
     pub use rid::*;
     pub use signal::*;
     pub use string::{Encoding, GString, NodePath, StringName};
-    pub use transform2d::*;
-    pub use transform3d::*;
     pub use variant::*;
     pub use vectors::*;
 
@@ -61,23 +58,21 @@ pub mod __prelude_reexport {
 
 // #[doc(hidden)]
 // pub mod __sidecar_reexport {
-    pub use crate::gen::builtin_classes::*;
+pub use crate::gen::builtin_classes::*;
 
-    // Special case for gstring + string_name modules, which have also manually-defined symbols.
+// Special case for gstring + string_name modules, which have also manually-defined symbols.
 
-    /// Manual symbols and default extenders for builtin type [`GString`].
-    pub mod gstring {
-        pub use crate::builtin::string::{ExGStringFind, ExGStringSplit};
-        pub use crate::gen::builtin_classes::gstring::*;
-    }
+/// Manual symbols and default extenders for builtin type [`GString`].
+pub mod gstring {
+    pub use crate::builtin::string::{ExGStringFind, ExGStringSplit};
+    pub use crate::gen::builtin_classes::gstring::*;
+}
 
-    /// Manual symbols and default extenders for builtin type [`StringName`].
-    pub mod string_name {
-        pub use crate::builtin::string::{
-            ExStringNameFind, ExStringNameSplit, TransientStringNameOrd,
-        };
-        pub use crate::gen::builtin_classes::string_name::*;
-    }
+/// Manual symbols and default extenders for builtin type [`StringName`].
+pub mod string_name {
+    pub use crate::builtin::string::{ExStringNameFind, ExStringNameSplit, TransientStringNameOrd};
+    pub use crate::gen::builtin_classes::string_name::*;
+}
 // }
 
 pub use __prelude_reexport::*;
@@ -92,7 +87,6 @@ pub mod iter {
     pub use super::collections::iterators::*;
 }
 
-
 pub(crate) mod meta_reexport {
     pub use super::collections::PackedArrayElement;
 }
@@ -105,22 +99,19 @@ mod macros;
 
 // Other modules
 mod aabb;
-mod basis;
 mod callable;
 mod collections;
 mod color;
 mod color_constants; // After color, so that constants are listed after methods in docs (alphabetic ensures that).
 mod color_hsv;
+mod matrices;
 mod plane;
-mod projection;
 mod quaternion;
 mod rect2;
 mod rect2i;
 mod rid;
 mod signal;
 mod string;
-mod transform2d;
-mod transform3d;
 mod variant;
 mod vectors;