refactor: move core bevy stuff into new bevy_integration module

Author: technobaboo

src/core/bevy_channel.rs src/bevy_int/bevy_channel.rssrc/core/bevy_channel.rs renamed to src/bevy_int/bevy_channel.rs

@@ -0,0 +1,3 @@
+pub mod bevy_channel;
+pub mod color;
+pub mod entity_handle;

src/core/color.rs src/bevy_int/color.rssrc/core/color.rs renamed to src/bevy_int/color.rs

@@ -1,8 +1,5 @@
-pub mod bevy_channel;
 pub mod client;
 pub mod client_state;
-pub mod color;
-pub mod entity_handle;
 pub mod scenegraph;
 
 pub use stardust_xr_server_foundation::*;

src/core/entity_handle.rs src/bevy_int/entity_handle.rssrc/core/entity_handle.rs renamed to src/bevy_int/entity_handle.rs

@@ -2,6 +2,7 @@
 #![allow(clippy::empty_docs)]
 #![allow(clippy::too_many_arguments)]
 #![allow(clippy::type_complexity)]
+mod bevy_int;
 mod core;
 mod nodes;
 mod objects;
@@ -38,6 +39,7 @@ use bevy::scene::ScenePlugin;
 use bevy::window::{CompositeAlphaMode, PresentMode};
 use bevy::winit::{WakeUp, WinitPlugin};
 use bevy_dmabuf::import::DmabufImportPlugin;
+use bevy_int::entity_handle::EntityHandlePlugin;
 use bevy_mod_openxr::action_set_attaching::OxrActionAttachingPlugin;
 use bevy_mod_openxr::action_set_syncing::OxrActionSyncingPlugin;
 use bevy_mod_openxr::add_xr_plugins;
@@ -53,7 +55,6 @@ use bevy_mod_xr::camera::XrProjection;
 use bevy_mod_xr::session::{XrFirst, XrHandleEvents, XrSessionPlugin};
 use clap::Parser;
 use core::client::{Client, tick_internal_client};
-use core::entity_handle::EntityHandlePlugin;
 use core::task;
 use directories::ProjectDirs;
 use nodes::audio::AudioNodePlugin;

src/bevy_int/mod.rs

@@ -1,8 +1,8 @@
 use super::spatial::SpatialNode;
 use super::{Aspect, AspectIdentifier, Node};
+use crate::bevy_int::entity_handle::EntityHandle;
 use crate::core::Id;
 use crate::core::client::Client;
-use crate::core::entity_handle::EntityHandle;
 use crate::core::error::Result;
 use crate::core::registry::Registry;
 use crate::core::resource::get_resource_file;

src/core/mod.rs

@@ -1,10 +1,8 @@
 use super::{Line, LinesAspect};
 use crate::{
 	BevyMaterial,
-	core::{
-		client::Client, color::ColorConvert, entity_handle::EntityHandle, error::Result,
-		registry::Registry,
-	},
+	bevy_int::{color::ColorConvert, entity_handle::EntityHandle},
+	core::{client::Client, error::Result, registry::Registry},
 	nodes::{Node, drawable::LinePoint, spatial::Spatial},
 };
 use bevy::{

src/main.rs

@@ -1,32 +1,42 @@
 use super::{MODEL_PART_ASPECT_ALIAS_INFO, MaterialParameter, ModelAspect, ModelPartAspect};
-use crate::BevyMaterial;
-use crate::core::Id;
-use crate::core::bevy_channel::{BevyChannel, BevyChannelReader};
-use crate::core::client::Client;
-use crate::core::color::ColorConvert as _;
-use crate::core::entity_handle::EntityHandle;
-use crate::core::error::Result;
-use crate::core::registry::Registry;
-use crate::core::resource::get_resource_file;
-use crate::nodes::Node;
-use crate::nodes::alias::{Alias, AliasList};
-use crate::nodes::spatial::{Spatial, SpatialNode};
-use bevy::asset::{load_internal_asset, weak_handle};
-use bevy::gltf::GltfLoaderSettings;
-use bevy::pbr::{ExtendedMaterial, MaterialExtension};
-use bevy::prelude::*;
-use bevy::render::primitives::Aabb;
-use bevy::render::render_resource::{AsBindGroup, ShaderRef};
+use crate::{
+	BevyMaterial,
+	bevy_int::{
+		bevy_channel::{BevyChannel, BevyChannelReader},
+		color::ColorConvert as _,
+		entity_handle::EntityHandle,
+	},
+	core::{Id, client::Client, error::Result, registry::Registry, resource::get_resource_file},
+	nodes::{
+		Node,
+		alias::{Alias, AliasList},
+		spatial::{Spatial, SpatialNode},
+	},
+};
+use bevy::{
+	asset::{load_internal_asset, weak_handle},
+	gltf::GltfLoaderSettings,
+	pbr::{ExtendedMaterial, MaterialExtension},
+	prelude::*,
+	render::{
+		primitives::Aabb,
+		render_resource::{AsBindGroup, ShaderRef},
+	},
+};
 use color_eyre::eyre::eyre;
 use parking_lot::Mutex;
 use rustc_hash::{FxHashMap, FxHasher};
 use stardust_xr_server_foundation::bail;
 use stardust_xr_wire::values::ResourceID;
-use std::ffi::OsStr;
-use std::hash::{Hash, Hasher};
-use std::path::PathBuf;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, OnceLock, Weak};
+use std::{
+	ffi::OsStr,
+	hash::{Hash, Hasher},
+	path::PathBuf,
+	sync::{
+		Arc, OnceLock, Weak,
+		atomic::{AtomicBool, Ordering},
+	},
+};
 use tokio::sync::Notify;
 
 static LOAD_MODEL: BevyChannel<(Arc<Model>, PathBuf)> = BevyChannel::new();

src/nodes/audio.rs

@@ -1,14 +1,11 @@
 use crate::{
 	BevyMaterial,
-	core::{
+	bevy_int::{
 		bevy_channel::{BevyChannel, BevyChannelReader},
-		client::Client,
 		color::ColorConvert,
 		entity_handle::EntityHandle,
-		error::Result,
-		registry::Registry,
-		resource::get_resource_file,
 	},
+	core::{client::Client, error::Result, registry::Registry, resource::get_resource_file},
 	nodes::{
 		Node,
 		drawable::{TextFit, XAlign},