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

refactor

Browse source
This commit is contained in:
Jaroslaw Konik 2025-05-26 07:00:00 +02:00
parent da759a7e0b
commit 10985ca777
1 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/runtimes/ruby.rs
View file

@ -324,6 +324,25 @@ impl RubyRuntime {
.expect("No Ruby thread") .expect("No Ruby thread")
.execute(Box::new(move |mut ruby| f(&mut ruby))) .execute(Box::new(move |mut ruby| f(&mut ruby)))
} }
fn with_current_entity<T>(ruby: &Ruby, entity: Entity, f: impl FnOnce() -> T) -> T {
let var = ruby
.class_object()
.const_get::<_, RModule>("Bevy")
.expect("Failed to get Bevy module")
.const_get::<_, RClass>("Entity")
.expect("Failed to get Entity class");
var.ivar_set("_current", BevyEntity(entity))
.expect("Failed to set current entity handle");
let result = f();
var.ivar_set("_current", ruby.qnil().as_value())
.expect("Failed to unset current entity handle");
result
}
} }
impl Runtime for RubyRuntime { impl Runtime for RubyRuntime {
@ -372,23 +391,10 @@ impl Runtime for RubyRuntime {
) -> Result<Self::ScriptData, crate::ScriptingError> { ) -> Result<Self::ScriptData, crate::ScriptingError> {
let script = script.0.clone(); let script = script.0.clone();
self.execute_in_thread(Box::new(move |ruby: &Ruby| { self.execute_in_thread(Box::new(move |ruby: &Ruby| {
// TODO: refactor Self::with_current_entity(ruby, entity, || {
let var = ruby ruby.eval::<magnus::value::Value>(&script)
.class_object() .map_err(|e| <magnus::Error as Into<ScriptingError>>::into(e))
.const_get::<_, RModule>("Bevy") })?;
.expect("Failed to get Bevy module")
.const_get::<_, RClass>("Entity")
.expect("Failed to get Entity class");
var.ivar_set("_current", BevyEntity(entity))
.expect("Failed to set current entity handle");
ruby.eval::<magnus::value::Value>(&script)
.map_err(|e| <magnus::Error as Into<ScriptingError>>::into(e))?;
var.ivar_set("_current", ruby.qnil().as_value())
.expect("Failed to unset current entity handle");
Ok::<Self::ScriptData, ScriptingError>(RubyScriptData) Ok::<Self::ScriptData, ScriptingError>(RubyScriptData)
})) }))
} }
@ -457,23 +463,15 @@ impl Runtime for RubyRuntime {
) -> Result<Self::Value, crate::ScriptingError> { ) -> Result<Self::Value, crate::ScriptingError> {
let name = name.to_string(); let name = name.to_string();
self.execute_in_thread(Box::new(move |ruby: &Ruby| { self.execute_in_thread(Box::new(move |ruby: &Ruby| {
// TOOD: refactor let return_value = Self::with_current_entity(ruby, entity, || {
let var = ruby let args: Vec<_> = args
.class_object() .parse(ruby)
.const_get::<_, RModule>("Bevy") .into_iter()
.unwrap() .map(|a| ruby.get_inner(a.0))
.const_get::<_, RClass>("Entity") .collect();
.unwrap();
var.ivar_set("_current", BevyEntity(entity)).unwrap();
let args: Vec<_> = args ruby.class_object().funcall(name, args.as_slice())
.parse(ruby) })?;
.into_iter()
.map(|a| ruby.get_inner(a.0))
.collect();
let return_value: magnus::Value = ruby.class_object().funcall(name, args.as_slice())?;
var.ivar_set("_current", ruby.qnil().as_value()).unwrap();
Ok(RubyValue::new(return_value)) Ok(RubyValue::new(return_value))
})) }))