change core functions to script functions

Author: makspll

assets/scripts/bevy_api.lua

@@ -15,8 +15,8 @@ function on_event()
     print(script)
     print(world)
 
-    print(world:hello(entity, entity))
-    print(world:test_vec({entity, entity})[1])
+    -- print(world:hello(entity, entity))
+    -- print(world:test_vec({entity, entity})[1])
 
 
     local my_component_type = world:get_type_by_name("MyComponent")
@@ -34,6 +34,7 @@ function on_event()
     print(comp.option_usize)
     print("\nvec")
     -- print(table_to_string(comp.vec_of_usize))
+    print(comp.vec_of_usize)
     comp.vec_of_usize = {42,69,72}
     comp.vec_of_usize[1] = 612312312
     print(table_to_string(comp.vec_of_usize))

crates/bevy_mod_scripting_core/src/bindings/function/from.rs

@@ -32,6 +32,13 @@ impl FromScript for ScriptValue {
     }
 }
 
+impl FromScript for () {
+    type This<'w> = Self;
+    fn from_script(value: ScriptValue, _world: WorldGuard) -> Result<Self, InteropError> {
+        Ok(())
+    }
+}
+
 macro_rules! impl_from_with_downcast {
     ($($ty:ty),*) => {
         $(

crates/bevy_mod_scripting_core/src/bindings/function/into.rs

@@ -23,6 +23,12 @@ impl IntoScript for ScriptValue {
     }
 }
 
+impl IntoScript for () {
+    fn into_script(self, _world: WorldGuard) -> Result<ScriptValue, InteropError> {
+        Ok(ScriptValue::Unit)
+    }
+}
+
 macro_rules! impl_into_with_downcast {
     ($variant:tt as $cast:ty [$($ty:ty),*]) => {
         $(

crates/bevy_mod_scripting_functions/src/core.rs

@@ -66,30 +66,34 @@ impl Plugin for CoreFunctionsPlugin {
 
 fn register_world_functions(reg: &mut FunctionRegistry) -> Result<(), FunctionRegistrationError> {
     NamespaceBuilder::<WorldCallbackAccess>::new(reg)
-        .overwrite_script_function("hello", |b: Ref<Entity>, c: Mut<Entity>| None::<usize>)
-        .overwrite(
-            "test_vec",
-            |s: WorldCallbackAccess, entities: Vec<Entity>| entities,
-        )
-        .overwrite("spawn", |s: WorldCallbackAccess| s.spawn())
-        .overwrite(
+        // .overwrite_script_function("hello", |b: Ref<Entity>, c: Mut<Entity>| None::<usize>)
+        // .overwrite(
+        //     "test_vec",
+        //     |s: WorldCallbackAccess, entities: Vec<Entity>| entities,
+        // )
+        .overwrite_script_function("spawn", |s: WorldCallbackAccess| Val(s.spawn()))
+        .overwrite_script_function(
             "get_type_by_name",
-            |world: WorldCallbackAccess, type_name: String| world.get_type_by_name(type_name),
+            |world: WorldCallbackAccess, type_name: String| {
+                world.get_type_by_name(type_name).map(Val)
+            },
         )
-        .overwrite(
+        .overwrite_script_function(
             "get_component",
-            |world: WorldCallbackAccess, entity: Entity, registration: ScriptTypeRegistration| {
+            |world: WorldCallbackAccess,
+             entity: Val<Entity>,
+             registration: Val<ScriptTypeRegistration>| {
                 let s: ScriptValue = registration
                     .component_id()
-                    .and_then(|id| world.get_component(entity, id).transpose())
+                    .and_then(|id| world.get_component(*entity, id).transpose())
                     .into();
                 s
             },
         )
-        .overwrite("exit", |s: WorldCallbackAccess| s.exit());
+        .overwrite_script_function("exit", |s: WorldCallbackAccess| s.exit());
 
     NamespaceBuilder::<ReflectReference>::new(reg)
-        .overwrite(
+        .overwrite_script_function(
             "get",
             |world: WorldCallbackAccess, self_: ScriptValue, key: ScriptValue| {
                 if let ScriptValue::Reference(mut r) = self_ {
@@ -103,7 +107,7 @@ fn register_world_functions(reg: &mut FunctionRegistry) -> Result<(), FunctionRe
                 }
             },
         )
-        .overwrite(
+        .overwrite_script_function(
             "get_1_indexed",
             |world: WorldCallbackAccess, self_: ScriptValue, key: ScriptValue| {
                 if let ScriptValue::Reference(mut r) = self_ {
@@ -118,7 +122,7 @@ fn register_world_functions(reg: &mut FunctionRegistry) -> Result<(), FunctionRe
                 }
             },
         )
-        .overwrite(
+        .overwrite_script_function(
             "set",
             |world: WorldCallbackAccess,
              self_: ScriptValue,
@@ -151,7 +155,7 @@ fn register_world_functions(reg: &mut FunctionRegistry) -> Result<(), FunctionRe
                 ScriptValue::Unit
             },
         )
-        .overwrite(
+        .overwrite_script_function(
             "set_1_indexed",
             |world: WorldCallbackAccess,
              self_: ScriptValue,