refactor: example plugins

crates/beet_examples/examples/build_scenes.rs

@@ -93,7 +93,7 @@ impl SceneItem {
 		app.add_plugins((
 			utils::MostDefaultPlugins,
 			DefaultBeetPlugins::default(),
-			ExamplePlugins,
+			ExamplePluginTypesFull,
 		))
 		.finish();
 

crates/beet_examples/src/plugins/example_default_plugins.rs

@@ -1,9 +1,15 @@
 #[cfg(any(target_arch = "wasm32", feature = "tokio"))]
 use crate::beet::prelude::*;
+use crate::prelude::load_scenes_from_args;
 use bevy::asset::AssetMetaCheck;
+use bevy::input::common_conditions::input_toggle_active;
 use bevy::prelude::*;
+use bevy_inspector_egui::quick::WorldInspectorPlugin;
 use forky_bevy::systems::close_on_esc;
 
+
+/// Default plugins and a couple of extra bells
+/// and whistles for ui apps
 #[derive(Default)]
 pub struct ExampleDefaultPlugins;
 
@@ -21,7 +27,7 @@ impl Plugin for ExampleDefaultPlugins {
 		#[cfg(feature = "tokio")]
 		app.add_transport(NativeWsClient::new(DEFAULT_SOCKET_URL).unwrap());
 
-		app.add_plugins(
+		app.add_plugins((
 			DefaultPlugins
 				.set(WindowPlugin {
 					primary_window: Some(Window {
@@ -38,8 +44,12 @@ impl Plugin for ExampleDefaultPlugins {
 					..default()
 				})
 				.build(),
-		)
-		.add_systems(Update, close_on_esc);
+			WorldInspectorPlugin::default()
+				.run_if(input_toggle_active(false, KeyCode::Tab)),
+		))
+		.add_systems(Startup, load_scenes_from_args)
+		.add_systems(Update, close_on_esc)
+		/*-*/;
 	}
 }
 

crates/beet_examples/src/plugins/example_plugin_group.rs

@@ -1,85 +1,60 @@
 use crate::beet::prelude::*;
 use crate::prelude::*;
-use bevy::app::PluginGroupBuilder;
-use bevy::input::common_conditions::input_toggle_active;
 use bevy::prelude::*;
-use bevy_inspector_egui::quick::WorldInspectorPlugin;
-
-
-/// Kitchen sink plugin, this is all you need for
-/// ### Rendering
-/// - text
-/// - 2d
-/// - 3d
-/// ### Beet
-/// - steering
-/// - machine learning
-///
-pub struct ExamplePluginFull;
 
-impl Plugin for ExamplePluginFull {
+/// Some types, and ui elements
+pub struct ExamplePluginBasics;
+
+impl Plugin for ExamplePluginBasics {
 	fn build(&self, app: &mut App) {
-		app.add_plugins((
+		app
+    .add_plugins((
 			ExampleDefaultPlugins,
-			WorldInspectorPlugin::default()
-				.run_if(input_toggle_active(false, KeyCode::Tab)),
-			DefaultBeetPlugins,
-			ExamplePlugins,
+			ExamplePluginTypesBasic,
 		))
-		.add_systems(Startup, load_scenes_from_args);
+	/*-*/;
 	}
 }
-/// Just the essentials, no machine learning
-pub struct ExamplePluginBasics;
 
-impl Plugin for ExamplePluginBasics {
+/// All types and ui elements
+pub struct ExamplePluginFull;
+
+impl Plugin for ExamplePluginFull {
+	fn build(&self, app: &mut App) {
+		app.add_plugins((ExampleDefaultPlugins, ExamplePluginTypesFull));
+	}
+}
+
+
+pub struct ExamplePluginTypesBasic;
+
+impl Plugin for ExamplePluginTypesBasic {
 	fn build(&self, app: &mut App) {
 		app.add_plugins((
-			ExampleDefaultPlugins,
 			DefaultBeetPlugins,
 			BeetDebugPluginBase,
 			BeetDebugPluginStdout,
-			ExampleBasePlugin,
 			Example2dPlugin,
 			Example3dPlugin,
 			UiTerminalPlugin,
 			ExampleReplicatePlugin,
 			BundlePlaceholderPlugin,
 		))
-		.add_systems(Startup, load_scenes_from_args);
+		.register_type::<Collectable>();
 	}
 }
+pub struct ExamplePluginTypesFull;
 
-pub struct ExampleBasePlugin;
-
-impl Plugin for ExampleBasePlugin {
+impl Plugin for ExamplePluginTypesFull {
 	fn build(&self, app: &mut App) {
-		app
-		.register_type::<Collectable>()
-	/*-*/;
-	}
-}
-
-#[derive(Default)]
-pub struct ExamplePlugins;
-
-impl PluginGroup for ExamplePlugins {
-	fn build(self) -> PluginGroupBuilder {
-		PluginGroupBuilder::start::<Self>()
-			.add(BeetDebugPluginBase)
-			.add(BeetDebugPluginStdout)
-			.add(ExampleBasePlugin)
-			.add(Example2dPlugin)
-			.add(Example3dPlugin)
-			.add(UiTerminalPlugin)
-			.add(ExampleReplicatePlugin)
-			.add(BundlePlaceholderPlugin)
-			.add(ExampleMlPlugin)
-			.add(FrozenLakePlugin)
+		app.add_plugins((
+			ExamplePluginTypesBasic,
+			ExampleMlPlugin,
+			FrozenLakePlugin,
+		));
 	}
 }
 
-
 pub struct ExampleMlPlugin;
 
 impl Plugin for ExampleMlPlugin {

crates/beet_examples/src/plugins/mod.rs

@@ -1,12 +1,6 @@
 pub mod example_default_plugins;
 #[allow(unused_imports)]
 pub use self::example_default_plugins::*;
-pub mod example_plugin_2d;
-#[allow(unused_imports)]
-pub use self::example_plugin_2d::*;
-pub mod example_plugin_3d;
-#[allow(unused_imports)]
-pub use self::example_plugin_3d::*;
 pub mod example_plugin_group;
 #[allow(unused_imports)]
 pub use self::example_plugin_group::*;