Merge branch 'main' into dynamic-queries-example

makspll · Sep 8, 2024 · 9c954ee · 9c954ee
2 parents 5d775dc + 26f9869
commit 9c954ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/clippy.toml b/clippy.toml
@@ -1 +1,2 @@
-type-complexity-threshold=1000
+type-complexity-threshold = 1000
+too-many-arguments-threshold = 999
diff --git a/crates/bevy_mod_scripting_core/src/hosts.rs b/crates/bevy_mod_scripting_core/src/hosts.rs
@@ -12,6 +12,7 @@ use crate::{
     error::ScriptError,
     event::{ScriptEvent, ScriptLoaded},
     world::WorldPointer,
+    ScriptErrorEvent,
 };
 
 /// Describes the target set of scripts this event should
@@ -358,6 +359,7 @@ impl<T: Asset> Script<T> {
         providers: &mut APIProviders<H>,
         contexts: &mut ScriptContexts<H::ScriptContext>,
         event_writer: &mut EventWriter<ScriptLoaded>,
+        error_writer: &mut EventWriter<ScriptErrorEvent>,
     ) {
         debug!("reloading script {}", script.id);
 
@@ -374,6 +376,7 @@ impl<T: Asset> Script<T> {
                 providers,
                 contexts,
                 event_writer,
+                error_writer,
             );
         } else {
             // remove old context
@@ -392,6 +395,7 @@ impl<T: Asset> Script<T> {
         providers: &mut APIProviders<H>,
         contexts: &mut ScriptContexts<H::ScriptContext>,
         event_writer: &mut EventWriter<ScriptLoaded>,
+        error_writer: &mut EventWriter<ScriptErrorEvent>,
     ) {
         let fd = ScriptData {
             sid: new_script.id(),
@@ -424,6 +428,7 @@ impl<T: Asset> Script<T> {
                 // this script will now never execute, unless manually reloaded
                 // but contexts are left in a valid state
                 contexts.insert_context(fd, None);
+                error_writer.send(ScriptErrorEvent { error: e });
             }
         }
     }

diff --git a/crates/bevy_mod_scripting_core/src/systems.rs b/crates/bevy_mod_scripting_core/src/systems.rs
@@ -33,6 +33,7 @@ pub fn script_add_synchronizer<H: ScriptHost + 'static>(
     script_assets: Res<Assets<H::ScriptAsset>>,
     mut contexts: ResMut<ScriptContexts<H::ScriptContext>>,
     mut event_writer: EventWriter<ScriptLoaded>,
+    mut error_writer: EventWriter<ScriptErrorEvent>,
 ) {
     debug!("Handling addition/modification of scripts");
 
@@ -47,6 +48,7 @@ pub fn script_add_synchronizer<H: ScriptHost + 'static>(
                     &mut providers,
                     &mut contexts,
                     &mut event_writer,
+                    &mut error_writer,
                 )
             })
         } else {
@@ -84,6 +86,7 @@ pub fn script_add_synchronizer<H: ScriptHost + 'static>(
                     &mut providers,
                     &mut contexts,
                     &mut event_writer,
+                    &mut error_writer,
                 )
             }
         }
@@ -120,6 +123,7 @@ pub fn script_hot_reload_handler<H: ScriptHost>(
     mut providers: ResMut<APIProviders<H>>,
     mut contexts: ResMut<ScriptContexts<H::ScriptContext>>,
     mut event_writer: EventWriter<ScriptLoaded>,
+    mut error_writer: EventWriter<ScriptErrorEvent>,
 ) {
     for e in events.read() {
         let (handle, created) = match e {
@@ -147,6 +151,7 @@ pub fn script_hot_reload_handler<H: ScriptHost>(
                         &mut providers,
                         &mut contexts,
                         &mut event_writer,
+                        &mut error_writer,
                     );
                 }
             }