feat: hello_net

mrchantey · Jul 3, 2024 · ed280e0 · ed280e0
1 parent 5dbf0b0
commit ed280e0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/crates/beet_examples/examples/basics/scenes/hello_net.rs b/crates/beet_examples/examples/basics/scenes/hello_net.rs
@@ -7,8 +7,8 @@ pub fn hello_net(mut commands: Commands) {
 		.spawn((SequenceSelector::default(), Running))
 		.with_children(|parent| {
 			parent.spawn((
-				LogOnRun::new("Send: AppLoaded"),
-				TriggerOnRun(AppLoaded),
+				LogOnRun::new("Send: AppReady"),
+				TriggerOnRun(AppReady),
 			));
 		});
 	commands.spawn((

diff --git a/crates/beet_examples/src/net/example_replicate_plugin.rs b/crates/beet_examples/src/net/example_replicate_plugin.rs
@@ -10,21 +10,12 @@ impl Plugin for ExampleReplicatePlugin {
 		app.add_plugins((ReplicatePlugin, CommonEventsPlugin))
 			.add_event::<OnUserMessage>()
 			.replicate_event_incoming::<OnUserMessage>()
-			.add_plugins(ActionPlugin::<InsertOnTrigger<OnUserMessage,Running>>::default())
-
-			.add_event::<AppLoaded>()
-			.replicate_event_outgoing::<AppLoaded>()
-			.add_plugins(ActionPlugin::<TriggerOnRun<AppLoaded>>::default());
+			.add_plugins(ActionPlugin::<InsertOnTrigger<OnUserMessage,Running>>::default());
 	}
 }
 
-
 /// User messages received either internally or externally
 #[derive(
 	Debug, Clone, Deref, DerefMut, Serialize, Deserialize, Event, Reflect,
 )]
 pub struct OnUserMessage(pub String);
-
-/// Sent from this bevy app to web ui etc to notify that assets etc have loaded.
-#[derive(Debug, Clone, Serialize, Deserialize, Event, Reflect)]
-pub struct AppLoaded;
diff --git a/crates/beet_net/src/replication/common_events.rs b/crates/beet_net/src/replication/common_events.rs
@@ -1,19 +1,21 @@
 use super::AppExtReplicate;
+use beet_ecs::prelude::*;
 use bevy::prelude::*;
 use serde::Deserialize;
 use serde::Serialize;
 
 
-/// Signal that this app is fully loaded, usually once assets are ready.
-#[derive(Debug, Clone, Serialize, Deserialize, Event)]
+/// Sent from this app, usually once assets are ready.
+#[derive(Debug, Clone, Serialize, Deserialize, Event, Reflect)]
 pub struct AppReady;
 
 pub struct CommonEventsPlugin;
 
 impl Plugin for CommonEventsPlugin {
 	fn build(&self, app: &mut App) {
 		app.add_event::<AppReady>()
-			.replicate_event_outgoing::<AppReady>();
+			.replicate_event_outgoing::<AppReady>()
+			.add_plugins(ActionPlugin::<TriggerOnRun<AppReady>>::default());
 		// .add_systems(Startup, ready);
 	}
 }

diff --git a/examples/fetch.rs b/examples/fetch.rs
@@ -110,7 +110,7 @@ fn setup_fox(
 					parent
 						.spawn((
 							Name::new("Idle Or Fetch"),
-							TriggerOnRun(AppLoaded),
+							TriggerOnRun(AppReady),
 							TargetAgent(agent),
 							ScoreSelector::default(),
 							// ScoreSelector::consuming(),

diff --git a/index.html b/index.html
@@ -20,10 +20,18 @@
 
 <body>
 	<script>
+
+		const regIds = {
+			// keep in sync with common_events.rs
+			appReady: 0,
+			// keep in sync with example_replicate_plugin.rs
+			onUserMessage: 1
+		}
+
 		function sendUserMessage(message) {
 			const detail = JSON.stringify([{
 				SendEvent: {
-					reg_id: 0,//the first registered id, OnUserMessage
+					reg_id: regIds.onUserMessage,
 					payload: {
 						Json: JSON.stringify(message)
 					}