scripting: update for elua and new wip support for teal

examples/testbed/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 
 [dependencies]
 lyra-engine = { path = "../../", version = "0.0.1", features = ["lua_scripting"] }
+lyra-scripting = { path = "../../lyra-scripting", features = ["lua", "teal"] }
 #lyra-ecs = { path = "../../lyra-ecs"}
 anyhow = "1.0.75"
 async-std = "1.12.0"

lyra-scripting/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2021"
 [features]
 default = ["lua"]
 lua = ["dep:elua"]
+teal = ["lua", "elua/teal"]
 
 [dependencies]
 lyra-scripting-derive = { path = "lyra-scripting-derive" }

lyra-scripting/elua

@@ -1 +1 @@
-Subproject commit 936ea606343dbcf5321b4b988de65daf8769ff3f
+Subproject commit feb93f2b4ed7063e4fba366377b039ba4f9026ef

lyra-scripting/lyra-scripting-derive/src/lib.rs

@@ -670,7 +670,7 @@ pub fn wrap_math_vec_copy(input: proc_macro::TokenStream) -> proc_macro::TokenSt
                 stringify!(#type_name).to_string()
             }
 
-            fn build<'a>(_: &elua::State, builder: &mut elua::UserdataBuilder<'a, Self>) -> elua::Result<()> {
+            fn build<'a>(builder: &mut elua::UserdataBuilder<'a, Self>) {
                 #(#field_get_set_pairs)*
 
                 #matrix_wrapper_fields
@@ -694,8 +694,6 @@ pub fn wrap_math_vec_copy(input: proc_macro::TokenStream) -> proc_macro::TokenSt
                 #vec_wrapper_methods
                 
                 #custom_methods
-
-                Ok(())
             }
         }
 

lyra-scripting/src/lua/mod.rs

@@ -174,9 +174,7 @@ impl elua::Userdata for ScriptBorrow {
         "ScriptBorrow".to_string()
     }
 
-    fn build<'a>(_: &elua::State, _: &mut elua::UserdataBuilder<'a, Self>) -> elua::Result<()> {
+    fn build<'a>(_: &mut elua::UserdataBuilder<'a, Self>) { }
-        Ok(())
-    }
 }
 
 /// Helper function used for reflecting userdata as a ScriptBorrow

lyra-scripting/src/lua/proxy.rs

@@ -163,7 +163,7 @@ impl elua::Userdata for ScriptDynamicBundle {
         "Bundle".to_string()
     }
 
-    fn build<'a>(_: &elua::State, builder: &mut elua::UserdataBuilder<'a, Self>) -> elua::Result<()> {
+    fn build<'a>(builder: &mut elua::UserdataBuilder<'a, Self>) {
         builder
             .function("new", |_, ()| Ok(ScriptDynamicBundle(DynamicBundle::new())))
             .method_mut("push", |_, this, comp: elua::AnyUserdata| {
@@ -175,7 +175,5 @@ impl elua::Userdata for ScriptDynamicBundle {
 
                 Ok(())
             });
-
-        Ok(())
     }
 }

lyra-scripting/src/lua/world.rs

@@ -25,15 +25,10 @@ impl elua::Userdata for ScriptEntity {
         "Entity".to_string()
     }
 
-    fn build<'a>(
+    fn build<'a>(builder: &mut elua::userdata::UserdataBuilder<'a, Self>) {
-        _: &elua::State,
-        builder: &mut elua::userdata::UserdataBuilder<'a, Self>,
-    ) -> elua::Result<()> {
         builder.meta_method(elua::MetaMethod::ToString, |_, this, ()| {
             Ok(format!("{:?}", this.0))
         });
-
-        Ok(())
     }
 }
 
@@ -58,10 +53,7 @@ impl elua::Userdata for ScriptWorldPtr {
         "World".to_string()
     }
 
-    fn build<'a>(
+    fn build<'a>(builder: &mut elua::UserdataBuilder<'a, Self>) {
-        _: &elua::State,
-        builder: &mut elua::UserdataBuilder<'a, Self>,
-    ) -> elua::Result<()> {
         builder
             .method_mut("spawn", |_, this, vals: elua::ValueVec| {
                 let world = this.as_mut();
@@ -312,7 +304,5 @@ impl elua::Userdata for ScriptWorldPtr {
 
                 Ok(LuaResHandle::from(handle))
             });
-
-        Ok(())
     }
 }

lyra-scripting/src/lua/wrappers/input_actions.rs

@@ -15,7 +15,7 @@ impl elua::Userdata for LuaActionHandler {
         "ActionHandler".to_string()
     }
 
-    fn build<'a>(_: &elua::State, builder: &mut elua::UserdataBuilder<'a, Self>) -> elua::Result<()> {
+    fn build<'a>(builder: &mut elua::UserdataBuilder<'a, Self>) {
         builder.function("new", |_, table: elua::Table| {
             let mut handler = ActionHandler::new();
 
@@ -146,7 +146,6 @@ impl elua::Userdata for LuaActionHandler {
             Ok(ScriptBorrow::from_resource::<ActionHandler>(None))
         });
 
-        Ok(())
     }
 }
 

lyra-scripting/src/lua/wrappers/model_comp.rs

@@ -20,7 +20,7 @@ impl elua::Userdata for LuaModelComponent {
         "ModelComponent".to_string()
     }
 
-    fn build<'a>(_: &elua::State, builder: &mut elua::UserdataBuilder<'a, Self>) -> elua::Result<()> {
+    fn build<'a>(builder: &mut elua::UserdataBuilder<'a, Self>) {
         builder
         .function("new", |_, model: Ref<LuaResHandle>| {
             let res = model.0.clone();
@@ -48,8 +48,6 @@ impl elua::Userdata for LuaModelComponent {
         .method(FN_NAME_INTERNAL_REFLECT, |_, this, ()| {
             Ok(ScriptBorrow::from_component(Some(this.0.clone())))
         });
-
-        Ok(())
     }
 }
 

lyra-scripting/src/lua/wrappers/res_handle.rs

@@ -30,7 +30,7 @@ impl elua::Userdata for LuaResHandle {
         "Handle".to_string()
     }
 
-    fn build<'a>(_: &elua::State, builder: &mut elua::UserdataBuilder<'a, Self>) -> elua::Result<()> {
+    fn build<'a>(builder: &mut elua::UserdataBuilder<'a, Self>) {
         builder.field_getter("path", |_, this| Ok(this.path()));
         builder.field_getter("version", |_, this| Ok(this.version()));
         builder.field_getter("uuid", |_, this| Ok(this.uuid().to_string()));
@@ -62,8 +62,6 @@ impl elua::Userdata for LuaResHandle {
                 }
             }
         });
-
-        Ok(())
     }
 }