scripting: remove ReflectedLuaTableProxy and slightly modify ReflectLuaProxy to replace it

lyra-scripting/elua

@@ -1 +1 @@
-Subproject commit 2fe5dca6c4337f1528e4671d1f79464481739c61
+Subproject commit 9b542fb523a3dc5d2eb77b246136111ad8bc4dd2

lyra-scripting/src/lua/dynamic_iter.rs

@@ -156,9 +156,6 @@ impl ReflectedIterator {
     pub fn next_lua<'a>(&mut self, lua: &'a elua::State) -> Option<ReflectedRow<'a>> {
         use elua::AsLua;
 
-        use super::ReflectedLuaTableProxy;
-
-
         let n = self.dyn_view.next();
         
         if let Some(row) = n {
@@ -176,15 +173,11 @@ impl ReflectedIterator {
                 
                 let reg_type = reflected_components.get_type(id)
                     .expect("Requested type was not found in TypeRegistry");
-                let value = if let Some(proxy) = reg_type.get_data::<ReflectLuaProxy>() {
+                let proxy = reg_type.get_data::<ReflectLuaProxy>()
-                    (proxy.fn_as_uservalue)(lua, d.ptr).unwrap()
+                    // TODO: properly handle this error
-                        .as_lua(lua).unwrap()
+                    .expect("Type does not have ReflectLuaProxy as a TypeData");
-                } else if let Some(proxy) = reg_type.get_data::<ReflectedLuaTableProxy>() {
+                let value = (proxy.fn_as_lua)(lua, d.ptr.cast()).unwrap()
-                    (proxy.fn_as_table)(lua, d.ptr.cast()).unwrap()
+                    .as_lua(lua).unwrap();
-                        .as_lua(lua).unwrap()
-                } else {
-                    panic!("Type does not have ReflectLuaProxy or ReflectedLuaTableProxy as a TypeData");
-                };
 
                 dynamic_row.push(ReflectedItem {
                     comp_ptr: d.ptr,

lyra-scripting/src/lua/mod.rs

@@ -23,16 +23,16 @@ pub use system::*;
 use std::{any::TypeId, sync::Mutex};
 
 use lyra_ecs::{
-    Component, ComponentInfo, DynamicBundle, World
+    Component, ComponentInfo, World
 };
-use lyra_reflect::{FromType, Reflect, TypeRegistry};
+use lyra_reflect::{Reflect, TypeRegistry};
 
 pub type LuaContext = Mutex<elua::State>;
 
 pub const FN_NAME_INTERNAL_REFLECT_TYPE: &str = "__lyra_internal_reflect_type";
 pub const FN_NAME_INTERNAL_REFLECT: &str = "__lyra_internal_reflect";
 
-use crate::{ScriptBorrow, ScriptDynamicBundle};
+use crate::ScriptBorrow;
 
 /// A trait used for registering a Lua type with the world.
 pub trait RegisterLuaType {
@@ -64,8 +64,7 @@ impl RegisterLuaType for World {
         let type_id = TypeId::of::<T>();
 
         let reg_type = registry.get_type_or_default(type_id);
-        reg_type.add_data(<ReflectLuaProxy as FromType<T>>::from_type());
+        reg_type.add_data(ReflectLuaProxy::from_lua_proxy::<T>());
-        //reg_type.add_data(<ReflectedComponent as FromType<T>>::from_type());
     }
 
     fn register_lua_wrapper<'a, W>(&mut self)
@@ -75,7 +74,7 @@ impl RegisterLuaType for World {
         let mut registry = self.get_resource_mut::<TypeRegistry>();
 
         let reg_type = registry.get_type_or_default(W::wrapped_type_id());
-        reg_type.add_data(<ReflectLuaProxy as FromType<W>>::from_type());
+        reg_type.add_data(ReflectLuaProxy::from_lua_proxy::<W>());
     }
 
     fn register_lua_table_proxy<'a, T, C>(&mut self)
@@ -85,15 +84,16 @@ impl RegisterLuaType for World {
     {
         let mut registry = self.get_resource_mut::<TypeRegistry>();
 
-        let type_id = TypeId::of::<T>();
         let reg_type = registry.get_type_or_default(TypeId::of::<C>());
-        reg_type.add_data(<ReflectedLuaTableProxy as FromType<T>>::from_type());
+        reg_type.add_data(ReflectLuaProxy::from_table_proxy::<T>());
+        /* let reg_type = registry.get_type_or_default(TypeId::of::<C>());
+        reg_type.add_data(<ReflectedLuaTableProxy as FromType<T>>::from_type()); */
         drop(registry);
 
         let mut lookup = self.get_resource_or_else::<LuaTableProxyLookup, _>(LuaTableProxyLookup::default);
         lookup.typeid_from_name.insert(T::table_name(), TypeId::of::<C>());
         
-        let mut info = ComponentInfo::new::<C>();
+        let info = ComponentInfo::new::<C>();
         lookup.comp_info_from_name.insert(T::table_name(), info);
     }
 }
@@ -122,7 +122,7 @@ impl elua::Userdata for ScriptBorrow {
         "ScriptBorrow".to_string()
     }
 
-    fn build<'a>(state: &elua::State, builder: &mut elua::UserdataBuilder<'a, Self>) -> elua::Result<()> {
+    fn build<'a>(_: &elua::State, _: &mut elua::UserdataBuilder<'a, Self>) -> elua::Result<()> {
         Ok(())
     }
 }

lyra-scripting/src/lua/providers/ecs.rs

@@ -10,7 +10,7 @@ impl ScriptApiProvider for LyraEcsApiProvider {
         world.register_lua_wrapper::<LuaDeltaTime>();
     }
 
-    fn expose_api(&mut self, data: &ScriptData, ctx: &mut Self::ScriptContext) -> Result<(), crate::ScriptError> {
+    fn expose_api(&mut self, _: &ScriptData, ctx: &mut Self::ScriptContext) -> Result<(), crate::ScriptError> {
         let ctx = ctx.lock().unwrap();
 
         let globals = ctx.globals()?;
@@ -22,11 +22,11 @@ impl ScriptApiProvider for LyraEcsApiProvider {
         Ok(())
     }
 
-    fn setup_script(&mut self, data: &crate::ScriptData, ctx: &mut Self::ScriptContext) -> Result<(), crate::ScriptError> {
+    fn setup_script(&mut self, _: &crate::ScriptData, _: &mut Self::ScriptContext) -> Result<(), crate::ScriptError> {
         Ok(())
     }
 
-    fn update_script_environment(&mut self, world: crate::ScriptWorldPtr, data: &crate::ScriptData, ctx: &mut Self::ScriptContext) -> Result<(), crate::ScriptError> {
+    fn update_script_environment(&mut self, _: crate::ScriptWorldPtr, _: &crate::ScriptData, _: &mut Self::ScriptContext) -> Result<(), crate::ScriptError> {
         Ok(())
     }
 }

lyra-scripting/src/lua/providers/math.rs

@@ -1,6 +1,6 @@
-use elua::{TableProxy, Userdata};
+use elua::TableProxy;
 use lyra_ecs::World;
-use lyra_game::math::{self, Quat, Transform, Vec3};
+use lyra_game::math::{Quat, Transform, Vec3};
 use crate::ScriptData;
 use crate::lua::RegisterLuaType;
 
@@ -42,11 +42,11 @@ impl ScriptApiProvider for LyraMathApiProvider {
         Ok(())
     }
 
-    fn setup_script(&mut self, data: &crate::ScriptData, ctx: &mut Self::ScriptContext) -> Result<(), crate::ScriptError> {
+    fn setup_script(&mut self, _: &crate::ScriptData, _: &mut Self::ScriptContext) -> Result<(), crate::ScriptError> {
         Ok(())
     }
 
-    fn update_script_environment(&mut self, world: crate::ScriptWorldPtr, data: &crate::ScriptData, ctx: &mut Self::ScriptContext) -> Result<(), crate::ScriptError> {
+    fn update_script_environment(&mut self, _: crate::ScriptWorldPtr, _: &crate::ScriptData, _: &mut Self::ScriptContext) -> Result<(), crate::ScriptError> {
         Ok(())
     }
 }

lyra-scripting/src/lua/providers/util.rs

@@ -1,6 +1,6 @@
 use std::sync::{Mutex, Arc};
 
-use tracing::{debug_span, debug, span, Level};
+use tracing::{debug_span, debug};
 
 use crate::{ScriptApiProvider, ScriptData};
 
@@ -51,7 +51,7 @@ impl ScriptApiProvider for UtilityApiProvider {
                             }
                         },
                         elua::Value::None => "None".to_string(),
-                        elua::Value::Multi(v) => {
+                        elua::Value::Multi(_) => {
                             return Err(elua::Error::runtime("unable to get string representation of ValueVec"));
                         },
                     },

lyra-scripting/src/lua/proxy.rs

@@ -1,8 +1,8 @@
 use std::{any::TypeId, collections::HashMap, ptr::NonNull};
 
-use elua::{FromLua, TableProxy};
+use elua::{FromLua, TableProxy, AsLua};
 use lyra_ecs::{ComponentInfo, DynamicBundle};
-use lyra_reflect::{Reflect, FromType};
+use lyra_reflect::Reflect;
 
 use crate::{ScriptBorrow, ScriptDynamicBundle};
 
@@ -18,12 +18,12 @@ pub trait LuaProxy {
     fn as_lua_value<'lua>(
         lua: &'lua elua::State,
         this: &dyn Reflect,
-    ) -> elua::Result<elua::AnyUserdata<'lua>>;
+    ) -> elua::Result<elua::Value<'lua>>;
 
     fn apply(
         lua: &elua::State,
         this: &mut dyn Reflect,
-        apply: &elua::AnyUserdata,
+        value: &elua::Value,
     ) -> elua::Result<()>;
 }
 
@@ -34,18 +34,21 @@ where
     fn as_lua_value<'lua>(
         lua: &'lua elua::State,
         this: &dyn Reflect,
-    ) -> elua::Result<elua::AnyUserdata<'lua>> {
+    ) -> elua::Result<elua::Value<'lua>> {
         let this = this.as_any().downcast_ref::<T>().unwrap();
         lua.create_userdata(this.clone())
+            .and_then(|ud| ud.as_lua(lua))
     }
 
     fn apply(
         _: &elua::State,
         this: &mut dyn Reflect,
-        apply: &elua::AnyUserdata,
+        apply: &elua::Value,
     ) -> elua::Result<()> {
         let this = this.as_any_mut().downcast_mut::<T>().unwrap();
-        let apply = apply.as_ref::<T>()?;
+        let apply = apply.as_userdata()
+            .expect("Somehow a non-userdata Lua Value was provided to a LuaProxy")
+            .as_ref::<T>()?;
 
         *this = apply.clone();
 
@@ -60,59 +63,26 @@ pub struct LuaTableProxyLookup {
     pub(crate) comp_info_from_name: HashMap<String, ComponentInfo>,
 }
 
-/// A struct used for converting types that implement `TableProxy` to and from Lua.
+/// A struct used for Proxying types to and from Lua.
 #[derive(Clone)]
-pub struct ReflectedLuaTableProxy {
+pub struct ReflectLuaProxy {
-    pub table_name: String,
+    pub fn_as_lua:
-    pub fn_as_table:
+        for<'a> fn(lua: &'a elua::State, this_ptr: NonNull<()>) -> elua::Result<elua::Value<'a>>,
-        for<'a> fn(lua: &'a elua::State, this_ptr: NonNull<()>) -> elua::Result<elua::Table<'a>>,
     pub fn_apply: for<'a> fn(
         lua: &'a elua::State,
         this_ptr: NonNull<()>,
-        table: &'a elua::Table<'a>,
+        value: &'a elua::Value<'a>,
     ) -> elua::Result<()>,
 }
 
-impl<'a, T> FromType<T> for ReflectedLuaTableProxy
+impl ReflectLuaProxy {
+    /// Create from a type that implements LuaProxy (among some other required traits)
+    pub fn from_lua_proxy<'a, T>() -> Self
     where 
-    T: TableProxy
+        T: Reflect + LuaProxy
     {
-    fn from_type() -> Self {
         Self {
-            table_name: T::table_name(),
+            fn_as_lua: |lua, this| -> elua::Result<elua::Value> {
-            fn_as_table: |lua, this| -> elua::Result<elua::Table> {
-                let this = unsafe { this.cast::<T>().as_ref() };
-                this.as_table(lua)
-            },
-            fn_apply: |lua, ptr, table| {
-                let this = unsafe { ptr.cast::<T>().as_mut() };
-                let tbl = T::from_table(lua, table.clone())?;
-                *this = tbl;
-                Ok(())
-            },
-        }
-    }
-}
-
-/// A struct used for converting types that implement `LuaProxy` to and from Lua.
-#[derive(Clone)]
-pub struct ReflectLuaProxy {
-    pub fn_as_uservalue:
-        for<'a> fn(lua: &'a elua::State, this_ptr: NonNull<u8>) -> elua::Result<elua::AnyUserdata<'a>>,
-    pub fn_apply: for<'a> fn(
-        lua: &'a elua::State,
-        this_ptr: NonNull<u8>,
-        apply: &'a elua::AnyUserdata<'a>,
-    ) -> elua::Result<()>,
-}
-
-impl<'a, T> FromType<T> for ReflectLuaProxy
-where
-    T: Reflect + LuaProxy + Clone + elua::FromLua<'a> + elua::Userdata
-{
-    fn from_type() -> Self {
-        Self {
-            fn_as_uservalue: |lua, this| -> elua::Result<elua::AnyUserdata> {
                 let this = unsafe { this.cast::<T>().as_ref() };
                 <T as LuaProxy>::as_lua_value(lua, this)
             },
@@ -122,6 +92,29 @@ where
             },
         }
     }
+
+    pub fn from_table_proxy<T>() -> Self
+    where
+        T: TableProxy
+    {
+        Self {
+            fn_as_lua: |lua, this| -> elua::Result<elua::Value> {
+                let this = unsafe { this.cast::<T>().as_ref() };
+                this.as_table(lua)
+                    .and_then(|t| t.as_lua(lua))
+            },
+            fn_apply: |lua, ptr, value| {
+                let this = unsafe { ptr.cast::<T>().as_mut() };
+                let table = value.as_table()
+                    .expect("Somehow a non-Table Lua Value was provided to a TableProxy");
+                let new_val = T::from_table(lua, table.clone())?;
+
+                *this = new_val;
+                
+                Ok(())
+            },
+        }
+    }
 }
 
 impl<'lua> elua::FromLua<'lua> for ScriptDynamicBundle {

lyra-scripting/src/lua/script.rs

@@ -1,7 +1,6 @@
 use std::sync::Mutex;
 
-use elua::{AsLua, StdLibraries, StdLibrary};
+use elua::{AsLua, StdLibrary};
-use tracing::{debug, trace};
 
 use crate::{ScriptHost, ScriptError, ScriptWorldPtr, ScriptEntity};
 

lyra-scripting/src/lua/world.rs

@@ -1,11 +1,11 @@
-use std::{any::Any, ptr::NonNull, sync::Arc};
+use std::{ptr::NonNull, sync::Arc};
 
 use elua::AsLua;
 use lyra_ecs::query::dynamic::QueryDynamicType;
 use lyra_reflect::{TypeRegistry, ReflectWorldExt, RegisteredType};
 use crate::{ScriptWorldPtr, ScriptEntity, ScriptDynamicBundle, ScriptBorrow};
 
-use super::{reflect_user_data, DynamicViewIter, LuaTableProxyLookup, ReflectLuaProxy, ReflectedIterator, ReflectedLuaTableProxy, FN_NAME_INTERNAL_REFLECT, FN_NAME_INTERNAL_REFLECT_TYPE};
+use super::{reflect_user_data, DynamicViewIter, LuaTableProxyLookup, ReflectLuaProxy, ReflectedIterator, FN_NAME_INTERNAL_REFLECT_TYPE};
 
 impl<'lua> elua::FromLua<'lua> for ScriptEntity {
     fn from_lua(_: &'lua elua::State, value: elua::Value<'lua>) -> elua::Result<Self> {
@@ -22,7 +22,7 @@ impl elua::Userdata for ScriptEntity {
         "Entity".to_string()
     }
 
-    fn build<'a>(state: &elua::State, builder: &mut elua::userdata::UserdataBuilder<'a, Self>) -> elua::Result<()> {
+    fn build<'a>(_: &elua::State, builder: &mut elua::userdata::UserdataBuilder<'a, Self>) -> elua::Result<()> {
         builder.meta_method(elua::MetaMethod::ToString, |_, this, ()| {
             Ok(format!("{:?}", this.0))
         });
@@ -38,7 +38,7 @@ pub enum WorldError {
 }
 
 impl<'a> elua::FromLua<'a> for ScriptWorldPtr {
-    fn from_lua(lua: &'a elua::State, val: elua::Value<'a>) -> elua::Result<Self> {
+    fn from_lua(_: &'a elua::State, val: elua::Value<'a>) -> elua::Result<Self> {
         match val {
             elua::Value::Userdata(ud) => Ok(ud.as_ref::<Self>()?.clone()),
             elua::Value::Nil => Err(elua::Error::type_mismatch("ScriptWorldPtr", "Nil")),
@@ -52,7 +52,7 @@ impl elua::Userdata for ScriptWorldPtr {
         "World".to_string()
     }
 
-    fn build<'a>(state: &elua::State, builder: &mut elua::UserdataBuilder<'a, Self>) -> elua::Result<()> {
+    fn build<'a>(_: &elua::State, builder: &mut elua::UserdataBuilder<'a, Self>) -> elua::Result<()> {
         builder
             .method_mut("spawn", |_, this, bundle: ScriptDynamicBundle| {
                 let world = this.as_mut();
@@ -73,7 +73,7 @@ impl elua::Userdata for ScriptWorldPtr {
                 for (idx, comp) in queries.into_iter().enumerate() {
                     match comp {
                         elua::Value::Table(t) => {
-                            let name: String = t.get("__name")?;
+                            let name: String = t.get(elua::MetaMethod::Name)?;
 
                             let lookup = world.get_resource::<LuaTableProxyLookup>();
                             let info = lookup.comp_info_from_name.get(&name)
@@ -115,9 +115,9 @@ impl elua::Userdata for ScriptWorldPtr {
 
                 while let Some(row) = reflected_iter.next_lua(lua) {
                     let r = row.row.into_iter()
-                        .map(|r| (r.comp_val, r.comp_ptr))
+                        .map(|r| (r.comp_val, r.comp_ptr.cast::<()>()))
                         .collect::<Vec<_>>();
-                    let (values, ptrs) = itertools::multiunzip::<(Vec<elua::Value>, Vec<NonNull<u8>>), _>(r);
+                    let (values, ptrs) = itertools::multiunzip::<(Vec<elua::Value>, Vec<NonNull<()>>), _>(r);
                     let mult_val = elua::ValueVec::from(values);
                     let res: elua::ValueVec = system.exec(mult_val)?;
 
@@ -129,20 +129,29 @@ impl elua::Userdata for ScriptWorldPtr {
                             has_ticked = true;
                         }
 
-                        for (i, comp) in res.into_iter().enumerate() {
+                        for (comp, ptr) in res.into_iter().zip(ptrs) {
-                            let ptr = ptrs[i];
+                            let lua_typeid = match &comp {
-
-                            match comp {
                                 elua::Value::Userdata(ud) => {
-                                    let lua_comp = reflect_user_data(&ud);
+                                    let lua_comp = reflect_user_data(ud);
                                     let refl_comp = lua_comp.reflect_branch.as_component_unchecked();
-                                    let lua_typeid = refl_comp.info.type_id.as_rust();
+                                    refl_comp.info.type_id.as_rust()
+                                },
+                                elua::Value::Table(tbl) => {
+                                    let name: String = tbl.get(elua::MetaMethod::Name)?;
+
+                                    let lookup = world.get_resource::<LuaTableProxyLookup>();
+                                    *lookup.typeid_from_name.get(&name).unwrap()
+                                },
+                                _ => {
+                                    panic!("A userdata or table value was not returned!"); // TODO: Handle properly
+                                }
+                            };
 
                             // update the component tick
                             let world = unsafe { this.inner.as_mut() };
                             let arch = world.entity_archetype_mut(row.entity).unwrap();
                             let idx = arch.entities().get(&row.entity).unwrap().clone();
-                                    let c = arch.get_column_mut(refl_comp.type_id.into()).unwrap();
+                            let c = arch.get_column_mut(lua_typeid.into()).unwrap();
                             c.entity_ticks[idx.0 as usize] = current;
 
                             // apply the new component data
@@ -150,34 +159,10 @@ impl elua::Userdata for ScriptWorldPtr {
                             let reg_type = reg.get_type(lua_typeid).unwrap();
                             
                             let proxy = reg_type.get_data::<ReflectLuaProxy>()
+                                // this should actually be safe since the ReflectedIterator
+                                // attempts to get the type data before it is tried here
                                 .expect("Type does not have ReflectLuaProxy as a TypeData");
-                                    (proxy.fn_apply)(lua, ptr, &ud)?;
+                            (proxy.fn_apply)(lua, ptr, &comp)?;
-                                },
-                                elua::Value::Table(tbl) => {
-                                    let name: String = tbl.get("__name")?;
-
-                                    let lookup = world.get_resource::<LuaTableProxyLookup>();
-                                    let tyid = lookup.typeid_from_name.get(&name).unwrap();
-
-                                    // update the component tick
-                                    let world = unsafe { this.inner.as_mut() };
-                                    let arch = world.entity_archetype_mut(row.entity).unwrap();
-                                    let idx = arch.entities().get(&row.entity).unwrap().clone();
-                                    let c = arch.get_column_mut(tyid.clone().into()).unwrap();
-                                    c.entity_ticks[idx.0 as usize] = current;
-
-                                    // apply the new component data
-                                    let reg = this.as_ref().get_resource::<TypeRegistry>();
-                                    let reg_type = reg.get_type(*tyid).unwrap();
-                                    
-                                    let proxy = reg_type.get_data::<ReflectedLuaTableProxy>()
-                                        .expect("Type does not have ReflectLuaProxy as a TypeData");
-                                    (proxy.fn_apply)(lua, ptr.cast(), &tbl)?;
-                                },
-                                _ => {
-                                    panic!("A userdata or table value was not returned!");
-                                }
-                            }
                         }
                     } else {
                         let msg = format!("Too many arguments were returned from the World view!
@@ -200,7 +185,7 @@ impl elua::Userdata for ScriptWorldPtr {
                     let proxy = reg_type.get_data::<ReflectLuaProxy>()
                         .expect("Type does not have ReflectLuaProxy as a TypeData");
 
-                    (proxy.fn_as_uservalue)(lua, res_ptr)
+                    (proxy.fn_as_lua)(lua, res_ptr.cast())
                         .and_then(|ud| ud.as_lua(lua))
                 } else {
                     // if the resource is not found in the world, return nil