jaroslaw/bevy_scriptum
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

args wip

Browse source
This commit is contained in:
Jaroslaw Konik 2025-05-13 22:42:39 +02:00
parent 008771bb15
commit b498da957d
4 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -33,6 +33,7 @@ mlua = { version = "0.9.8", features = [
], optional = true }
magnus = { version = "0.7.1", optional = true, features = ["embed"] }
crossbeam-channel = "0.5.15"
rb-sys = "0.9.114"
[[example]]
name = "call_function_from_rust_rhai"

3
assets/tests/ruby/rust_function_gets_called_from_script_with_param.rb Normal file
View file

@ -0,0 +1,3 @@
def test_func
rust_func(5)
end

19
src/callback.rs
View file

@ -110,11 +110,20 @@ macro_rules! impl_tuple {
inner_system.initialize(world);
let system_fn = move |args: In<Vec<RN::Value>>, world: &mut World| {
let mut runtime = world.get_resource_mut::<RN>().expect("No runtime resource");
let args = runtime.with_engine_mut(move |engine| {
(
$($t::from_runtime_value_with_engine(args.get($idx).expect(&format!("Failed to get function argument for index {}", $idx)).clone(), engine), )+
)
});
let args = if RN::is_current_thread() {
runtime.with_engine_mut(move |engine| {
(
$($t::from_runtime_value_with_engine(args.get($idx).expect(&format!("Failed to get function argument for index {}", $idx)).clone(), engine), )+
)
})
} else {
runtime.with_engine_thread_mut(move |engine| {
(
$($t::from_runtime_value_with_engine(args.get($idx).expect(&format!("Failed to get function argument for index {}", $idx)).clone(), engine), )+
)
})
};
let result = inner_system.run(args, world);
inner_system.apply_deferred(world);
let mut runtime = world.get_resource_mut::<RN>().expect("No runtime resource");

13
src/runtimes/ruby.rs
View file

@ -2,6 +2,7 @@
// TODO: make sure ruby is statically linked
use std::{
collections::HashMap,
ffi::{c_void, CString},
sync::{Arc, Condvar, LazyLock, Mutex},
thread::{self, JoinHandle},
};
@ -13,6 +14,7 @@ use bevy::{
};
use magnus::Ruby;
use magnus::{function, prelude::*};
use rb_sys::rb_define_global_function;
use serde::Deserialize;
use crate::{
@ -207,7 +209,7 @@ impl Runtime for RubyRuntime {
let mut callbacks = RUBY_CALLBACKS.lock().unwrap();
callbacks.insert(name.clone(), Box::new(f));
fn callback() -> magnus::Value {
unsafe extern "C" fn callback(_rb_self: magnus::Value) -> magnus::Value {
let ruby = magnus::Ruby::get().unwrap();
let method_name: magnus::value::StaticSymbol =
ruby.class_object().funcall("__method__", ()).unwrap();
@ -222,7 +224,14 @@ impl Runtime for RubyRuntime {
.as_ref()
.unwrap()
.execute(Box::new(move |ruby| {
ruby.define_global_function(&name, function!(callback, 0));
let name = CString::new(name).unwrap();
unsafe {
rb_define_global_function(
name.as_ptr(),
std::mem::transmute(callback as *mut c_void),
1,
);
}
RubyValue(())
}));