src/callback.rs

@@ -77,8 +77,16 @@ where
             let result = inner_system.run((), world);
             inner_system.apply_deferred(world);
             let mut runtime = world.get_resource_mut::<R>().expect("No runtime resource");
-            runtime
+
-                .with_engine_mut(move |engine| Out::into_runtime_value_with_engine(result, engine))
+            if R::is_current_thread() {
+                runtime.with_engine_mut(move |engine| {
+                    Out::into_runtime_value_with_engine(result, engine)
+                })
+            } else {
+                runtime.with_engine_thread_mut(move |engine| {
+                    Out::into_runtime_value_with_engine(result, engine)
+                })
+            }
         };
         let system = IntoSystem::into_system(system_fn);
         CallbackSystem {
@@ -110,9 +118,15 @@ macro_rules! impl_tuple {
                     let result = inner_system.run(args, world);
                     inner_system.apply_deferred(world);
                     let mut runtime = world.get_resource_mut::<RN>().expect("No runtime resource");
+                    if RN::is_current_thread() {
                         runtime.with_engine_mut(move |engine| {
                             Out::into_runtime_value_with_engine(result, engine)
                         })
+                    } else {
+                        runtime.with_engine_thread_mut(move |engine| {
+                            Out::into_runtime_value_with_engine(result, engine)
+                        })
+                    }
                 };
                 let system = IntoSystem::into_system(system_fn);
                 CallbackSystem {

src/lib.rs

@@ -300,10 +300,12 @@ pub trait Runtime: Resource + Default {
     type Value: Send + Clone;
     type RawEngine;
 
+    fn is_current_thread() -> bool;
+
     /// Provides mutable reference to raw scripting engine instance.
     /// Can be used to directly interact with an interpreter to use interfaces
     /// that bevy_scriptum does not provided adapters for.
-    fn with_engine_mut<T: Send + 'static>(
+    fn with_engine_thread_mut<T: Send + 'static>(
         &mut self,
         f: impl FnOnce(&mut Self::RawEngine) -> T + Send + 'static,
     ) -> T;
@@ -311,11 +313,21 @@ pub trait Runtime: Resource + Default {
     /// Provides immutable reference to raw scripting engine instance.
     /// Can be used to directly interact with an interpreter to use interfaces
     /// that bevy_scriptum does not provided adapters for.
-    fn with_engine<T: Send + 'static>(
+    fn with_engine_thread<T: Send + 'static>(
         &self,
         f: impl FnOnce(&Self::RawEngine) -> T + Send + 'static,
     ) -> T;
 
+    /// Provides mutable reference to raw scripting engine instance.
+    /// Can be used to directly interact with an interpreter to use interfaces
+    /// that bevy_scriptum does not provided adapters for.
+    fn with_engine_mut<T>(&mut self, f: impl FnOnce(&mut Self::RawEngine) -> T) -> T;
+
+    /// Provides immutable reference to raw scripting engine instance.
+    /// Can be used to directly interact with an interpreter to use interfaces
+    /// that bevy_scriptum does not provided adapters for.
+    fn with_engine<T>(&self, f: impl FnOnce(&Self::RawEngine) -> T) -> T;
+
     fn eval(
         &self,
         script: &Self::ScriptAsset,

src/runtimes/lua.rs

@@ -257,6 +257,24 @@ impl Runtime for LuaRuntime {
         let engine = self.engine.lock().unwrap();
         f(&engine)
     }
+
+    fn with_engine_thread_mut<T: Send + 'static>(
+        &mut self,
+        f: impl FnOnce(&mut Self::RawEngine) -> T + Send + 'static,
+    ) -> T {
+        todo!()
+    }
+
+    fn with_engine_thread<T: Send + 'static>(
+        &self,
+        f: impl FnOnce(&Self::RawEngine) -> T + Send + 'static,
+    ) -> T {
+        todo!()
+    }
+
+    fn is_current_thread() -> bool {
+        true
+    }
 }
 
 impl<'a, T: IntoLuaMulti<'a>> IntoRuntimeValueWithEngine<'a, T, LuaRuntime> for T {

src/runtimes/rhai.rs

@@ -160,6 +160,24 @@ impl Runtime for RhaiRuntime {
     fn with_engine<T>(&self, f: impl FnOnce(&Self::RawEngine) -> T) -> T {
         f(&self.engine)
     }
+
+    fn with_engine_thread_mut<T: Send + 'static>(
+        &mut self,
+        f: impl FnOnce(&mut Self::RawEngine) -> T + Send + 'static,
+    ) -> T {
+        todo!()
+    }
+
+    fn with_engine_thread<T: Send + 'static>(
+        &self,
+        f: impl FnOnce(&Self::RawEngine) -> T + Send + 'static,
+    ) -> T {
+        todo!()
+    }
+
+    fn is_current_thread() -> bool {
+        true
+    }
 }
 
 impl Default for RhaiRuntime {

src/runtimes/ruby.rs

@@ -136,7 +136,7 @@ impl Runtime for RubyRuntime {
 
     type RawEngine = magnus::Ruby;
 
-    fn with_engine_mut<T: Send + 'static>(
+    fn with_engine_thread_mut<T: Send + 'static>(
         &mut self,
         f: impl FnOnce(&mut Self::RawEngine) -> T + Send + 'static,
     ) -> T {
@@ -146,7 +146,7 @@ impl Runtime for RubyRuntime {
             .execute_in(Box::new(move |mut ruby| f(&mut ruby)))
     }
 
-    fn with_engine<T: Send + 'static>(
+    fn with_engine_thread<T: Send + 'static>(
         &self,
         f: impl FnOnce(&Self::RawEngine) -> T + Send + 'static,
     ) -> T {
@@ -156,6 +156,14 @@ impl Runtime for RubyRuntime {
             .execute_in(Box::new(move |ruby| f(&ruby)))
     }
 
+    fn with_engine_mut<T>(&mut self, f: impl FnOnce(&mut Self::RawEngine) -> T) -> T {
+        unimplemented!();
+    }
+
+    fn with_engine<T>(&self, f: impl FnOnce(&Self::RawEngine) -> T) -> T {
+        unimplemented!();
+    }
+
     fn eval(
         &self,
         script: &Self::ScriptAsset,
@@ -256,6 +264,10 @@ impl Runtime for RubyRuntime {
     ) -> Result<Self::Value, crate::ScriptingError> {
         todo!()
     }
+
+    fn is_current_thread() -> bool {
+        false
+    }
 }
 
 pub mod prelude {

tests/tests.rs

@@ -495,7 +495,7 @@ mod ruby_tests {
         fn assert_state_key_value_i64(world: &World, _entity_id: Entity, key: &str, value: i64) {
             let runtime = world.get_resource::<RubyRuntime>().unwrap();
             let key = key.to_string();
-            runtime.with_engine(move |engine| {
+            runtime.with_engine_thread(move |engine| {
                 let state: magnus::value::Value = engine.class_object().const_get("STATE").unwrap();
                 let res: i64 = state.funcall_public("[]", (key,)).unwrap();
                 assert_eq!(res, value)