Compare commits
1 Commits
superclass
...
raw-pointe
Author | SHA1 | Date | |
---|---|---|---|
00b2edb2a1 |
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -318,7 +318,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "roblox_emulator"
|
||||
version = "0.2.0"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"glam",
|
||||
"mlua",
|
||||
|
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "roblox_emulator"
|
||||
version = "0.2.0"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
repository = "https://git.itzana.me/StrafesNET/roblox_emulator"
|
||||
license = "MIT OR Apache-2.0"
|
||||
|
@ -2,14 +2,12 @@ use rbx_dom_weak::{types::Ref,WeakDom};
|
||||
|
||||
pub fn class_is_a(class:&str,superclass:&str)->bool{
|
||||
class==superclass
|
||||
||{
|
||||
let db=rbx_reflection_database::get();
|
||||
match (db.classes.get(class),db.classes.get(superclass)){
|
||||
(Some(class),Some(superclass))=>db.superclasses_iter(class)
|
||||
.any(|cls|core::ptr::addr_eq(cls,superclass)),
|
||||
_=>false
|
||||
}
|
||||
}
|
||||
||rbx_reflection_database::get().classes.get(class)
|
||||
.is_some_and(|descriptor|
|
||||
descriptor.superclass.as_ref().is_some_and(|class_super|
|
||||
class_is_a(class_super,superclass)
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
#[repr(transparent)]
|
||||
@ -30,7 +28,7 @@ impl Context{
|
||||
class_is_a(instance.class.as_ref(),superclass)
|
||||
).map(|instance|instance.referent())
|
||||
}
|
||||
pub fn scripts(&self)->Vec<crate::runner::instance::Script>{
|
||||
self.superclass_iter("LuaSourceContainer").map(crate::runner::instance::Script::new).collect()
|
||||
pub fn scripts(&self)->Vec<crate::script::Script>{
|
||||
self.superclass_iter("LuaSourceContainer").map(crate::script::Script::new).collect()
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,9 @@
|
||||
pub mod script;
|
||||
pub mod context;
|
||||
|
||||
pub mod runner;
|
||||
|
||||
pub type Result<T>=core::result::Result<T,script::Error>;
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
|
@ -43,9 +43,9 @@ impl mlua::UserData for CFrame{
|
||||
}
|
||||
impl<'lua> mlua::FromLua<'lua> for CFrame{
|
||||
fn from_lua(value:mlua::prelude::LuaValue<'lua>,_lua:&'lua mlua::prelude::Lua)->mlua::prelude::LuaResult<Self>{
|
||||
match value{
|
||||
mlua::Value::UserData(ud)=>ud.take()?,
|
||||
other=>Err(mlua::Error::runtime(format!("Expected CFrame got {:?}",other))),
|
||||
match value {
|
||||
mlua::Value::UserData(ud) => Ok(*ud.borrow::<Self>()?),
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,15 +1,36 @@
|
||||
use rbx_types::Ref;
|
||||
use rbx_dom_weak::WeakDom;
|
||||
|
||||
use super::vector3::Vector3;
|
||||
|
||||
// LMAO look at this function!
|
||||
fn dom<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut WeakDom)->mlua::Result<T>)->mlua::Result<T>{
|
||||
let mut dom=lua.app_data_mut::<&'static mut WeakDom>().ok_or(mlua::Error::runtime("DataModel missing"))?;
|
||||
f(&mut *dom)
|
||||
pub struct Instance{
|
||||
referent:rbx_types::Ref,
|
||||
}
|
||||
|
||||
fn coerce_float32(value:&mlua::Value)->Option<f32>{
|
||||
impl From<crate::script::Script> for Instance{
|
||||
fn from(value:crate::script::Script)->Self{
|
||||
Self{referent:value.script}
|
||||
}
|
||||
}
|
||||
|
||||
impl Instance{
|
||||
pub const fn new(referent:rbx_types::Ref)->Self{
|
||||
Self{referent}
|
||||
}
|
||||
pub fn get<'a>(&'a self,dom:&'a WeakDom)->mlua::Result<&'a rbx_dom_weak::Instance>{
|
||||
dom.get_by_ref(self.referent).ok_or(mlua::Error::runtime("Instance missing"))
|
||||
}
|
||||
pub fn get_mut<'a>(&'a self,dom:&'a mut WeakDom)->mlua::Result<&'a mut rbx_dom_weak::Instance>{
|
||||
dom.get_by_ref_mut(self.referent).ok_or(mlua::Error::runtime("Instance missing"))
|
||||
}
|
||||
}
|
||||
|
||||
// LMAO look at this function!
|
||||
fn dom<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut WeakDom)->mlua::Result<T>)->mlua::Result<T>{
|
||||
let dom=*lua.app_data_mut::<*mut WeakDom>().ok_or(mlua::Error::runtime("DataModel missing"))?;
|
||||
f(unsafe{&mut *dom})
|
||||
}
|
||||
|
||||
fn coerce_float(value:&mlua::Value)->Option<f32>{
|
||||
match value{
|
||||
&mlua::Value::Integer(i)=>Some(i as f32),
|
||||
&mlua::Value::Number(f)=>Some(f as f32),
|
||||
@ -17,75 +38,8 @@ fn coerce_float32(value:&mlua::Value)->Option<f32>{
|
||||
}
|
||||
}
|
||||
|
||||
fn get_full_name(dom:&rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance)->String{
|
||||
let mut full_name=instance.name.clone();
|
||||
let mut pref=instance.parent();
|
||||
while let Some(parent)=dom.get_by_ref(pref){
|
||||
full_name.insert(0,'.');
|
||||
full_name.insert_str(0,parent.name.as_str());
|
||||
pref=parent.parent();
|
||||
}
|
||||
full_name
|
||||
}
|
||||
|
||||
trait Referent{
|
||||
fn referent(&self)->Ref;
|
||||
fn get<'a>(&self,dom:&'a WeakDom)->mlua::Result<&'a rbx_dom_weak::Instance>{
|
||||
dom.get_by_ref(self.referent()).ok_or(mlua::Error::runtime("Instance missing"))
|
||||
}
|
||||
fn get_mut<'a>(&self,dom:&'a mut WeakDom)->mlua::Result<&'a mut rbx_dom_weak::Instance>{
|
||||
dom.get_by_ref_mut(self.referent()).ok_or(mlua::Error::runtime("Instance missing"))
|
||||
}
|
||||
}
|
||||
|
||||
macro_rules! class{
|
||||
($class:ident)=>{
|
||||
pub struct $class{
|
||||
referent:Ref,
|
||||
}
|
||||
impl $class{
|
||||
pub const fn new(referent:Ref)->Self{
|
||||
Self{referent}
|
||||
}
|
||||
}
|
||||
impl Referent for $class{
|
||||
fn referent(&self)->Ref{
|
||||
self.referent
|
||||
}
|
||||
}
|
||||
impl<'lua> mlua::FromLua<'lua> for $class{
|
||||
fn from_lua(value:mlua::Value<'lua>,_lua:&'lua mlua::Lua)->mlua::Result<Self>{
|
||||
match value{
|
||||
mlua::Value::UserData(ud)=>ud.take(),
|
||||
other=>Err(mlua::Error::runtime(format!("Expected {} got {:?}",stringify!($class),other))),
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
macro_rules! class_composition{
|
||||
($class:ident,($($superclass:ident),*))=>{
|
||||
impl mlua::UserData for $class{
|
||||
fn add_fields<'lua,F:mlua::UserDataFields<'lua,Self>>(fields:&mut F){
|
||||
$(
|
||||
$superclass::composition_add_fields(fields);
|
||||
)*
|
||||
}
|
||||
fn add_methods<'lua,M:mlua::UserDataMethods<'lua,Self>>(methods:&mut M){
|
||||
$(
|
||||
$superclass::composition_add_methods(methods);
|
||||
)*
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
class!(Instance);
|
||||
class_composition!(Instance,(Instance));
|
||||
|
||||
impl Instance{
|
||||
fn composition_add_fields<'lua,T:Referent,F:mlua::UserDataFields<'lua,T>>(fields:&mut F){
|
||||
impl mlua::UserData for Instance{
|
||||
fn add_fields<'lua,F:mlua::UserDataFields<'lua,Self>>(fields:&mut F){
|
||||
fields.add_field_method_get("Parent",|lua,this|{
|
||||
dom(lua,|dom|{
|
||||
let instance=this.get(dom)?;
|
||||
@ -94,26 +48,13 @@ impl Instance{
|
||||
});
|
||||
fields.add_field_method_set("Parent",|lua,this,val:Self|{
|
||||
dom(lua,|dom|{
|
||||
dom.transfer_within(this.referent(),val.referent);
|
||||
Ok(())
|
||||
})
|
||||
});
|
||||
fields.add_field_method_get("Name",|lua,this|{
|
||||
dom(lua,|dom|{
|
||||
let instance=this.get(dom)?;
|
||||
Ok(instance.name.clone())
|
||||
})
|
||||
});
|
||||
fields.add_field_method_set("Name",|lua,this,val:String|{
|
||||
dom(lua,move|dom|{
|
||||
let instance=this.get_mut(dom)?;
|
||||
//Why does this need to be cloned?
|
||||
instance.name=val.clone();
|
||||
dom.transfer_within(this.referent,val.referent);
|
||||
Ok(())
|
||||
})
|
||||
});
|
||||
}
|
||||
fn composition_add_methods<'lua,T:Referent,M:mlua::UserDataMethods<'lua,T>>(methods:&mut M){
|
||||
|
||||
fn add_methods<'lua,M:mlua::UserDataMethods<'lua,Self>>(methods:&mut M){
|
||||
methods.add_method("GetChildren",|lua,this,_:()|
|
||||
dom(lua,|dom|{
|
||||
let instance=this.get(dom)?;
|
||||
@ -129,7 +70,7 @@ impl Instance{
|
||||
methods.add_method("GetDescendants",|lua,this,_:()|
|
||||
dom(lua,|dom|{
|
||||
let children:Vec<_>=dom
|
||||
.descendants_of(this.referent())
|
||||
.descendants_of(this.referent)
|
||||
.map(|instance|
|
||||
Instance::new(instance.referent())
|
||||
)
|
||||
@ -145,19 +86,17 @@ impl Instance{
|
||||
);
|
||||
methods.add_meta_function(mlua::MetaMethod::NewIndex,|lua,(this,index,value):(Self,mlua::String,mlua::Value)|
|
||||
dom(lua,|dom|{
|
||||
//println!("__newindex t={this:?} i={index:?} v={value:?}");
|
||||
let instance=this.get_mut(dom)?;
|
||||
let index_str=index.to_str()?;
|
||||
let db=rbx_reflection_database::get();
|
||||
let class=db.classes.get(instance.class.as_str()).ok_or(mlua::Error::runtime("Class missing"))?;
|
||||
let property=db.find_default_property(class,index_str).ok_or(mlua::Error::runtime(format!("Property '{index_str}' missing on class '{}'",class.name)))?;
|
||||
let class=rbx_reflection_database::get().classes.get(instance.class.as_str()).ok_or(mlua::Error::runtime("Class missing"))?;
|
||||
let property=class.default_properties.get(index_str).ok_or(mlua::Error::runtime(format!("Property '{index_str}' missing on class '{}'",class.name)))?;
|
||||
match property{
|
||||
rbx_types::Variant::Vector3(_)=>{
|
||||
let typed_value:Vector3=value.as_userdata().ok_or(mlua::Error::runtime("Expected Userdata"))?.take()?;
|
||||
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Vector3(typed_value.into()));
|
||||
},
|
||||
rbx_types::Variant::Float32(_)=>{
|
||||
let typed_value:f32=coerce_float32(&value).ok_or(mlua::Error::runtime("Expected f32"))?;
|
||||
let typed_value:f32=coerce_float(&value).ok_or(mlua::Error::runtime("Expected f32"))?;
|
||||
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Float32(typed_value));
|
||||
},
|
||||
other=>println!("Unimplemented property type: {other:?}"),
|
||||
@ -168,41 +107,11 @@ impl Instance{
|
||||
}
|
||||
}
|
||||
|
||||
class!(DataModel);
|
||||
class_composition!(DataModel,(Instance,DataModel));
|
||||
impl DataModel{
|
||||
fn composition_add_fields<'lua,T:Referent,F:mlua::UserDataFields<'lua,T>>(fields:&mut F){
|
||||
}
|
||||
fn composition_add_methods<'lua,T,M:mlua::UserDataMethods<'lua,T>>(methods:&mut M){
|
||||
methods.add_method("GetService",|lua,this,service:String|
|
||||
dom(lua,|dom|{
|
||||
match service.as_str(){
|
||||
//"Lighting"=>Ok(Lighting::new()),
|
||||
other=>Err::<(),_>(mlua::Error::runtime("Service '{other}' not supported")),
|
||||
}
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class!(Lighting);
|
||||
class_composition!(Lighting,(Instance));
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum GetScriptError{
|
||||
NoScript,
|
||||
NoSource,
|
||||
}
|
||||
|
||||
class!(Script);
|
||||
class_composition!(Script,(Instance));
|
||||
impl Script{
|
||||
pub fn get_name_source(&self,context:&crate::context::Context)->Result<(String,String),GetScriptError>{
|
||||
let instance=context.dom.get_by_ref(self.referent).ok_or(GetScriptError::NoScript)?;
|
||||
let source=match instance.properties.get("Source").ok_or(GetScriptError::NoSource)?{
|
||||
rbx_dom_weak::types::Variant::String(s)=>s.clone(),
|
||||
_=>Err(GetScriptError::NoSource)?,
|
||||
};
|
||||
Ok((get_full_name(&context.dom,instance),source))
|
||||
impl<'lua> mlua::FromLua<'lua> for Instance{
|
||||
fn from_lua(value:mlua::prelude::LuaValue<'lua>,_lua:&'lua mlua::prelude::Lua)->mlua::prelude::LuaResult<Self>{
|
||||
match value{
|
||||
mlua::Value::UserData(ud)=>ud.take(),
|
||||
other=>Err(mlua::Error::runtime(format!("Expected Instance got {:?}",other))),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2,6 +2,6 @@ mod runner;
|
||||
|
||||
mod cframe;
|
||||
mod vector3;
|
||||
pub mod instance;
|
||||
mod instance;
|
||||
|
||||
pub use runner::Runner;
|
||||
|
@ -8,19 +8,16 @@ pub struct Runner{
|
||||
}
|
||||
#[derive(Debug)]
|
||||
pub enum Error{
|
||||
Lua{
|
||||
source:String,
|
||||
error:mlua::Error
|
||||
},
|
||||
Script(super::instance::GetScriptError),
|
||||
Lua(mlua::Error),
|
||||
Script(crate::script::Error),
|
||||
/// If the lua.remove_app_data function fails
|
||||
RemoveAppData,
|
||||
}
|
||||
impl Error{
|
||||
pub fn print(self){
|
||||
match self{
|
||||
Self::Lua{source,error:mlua::Error::RuntimeError(s)}=>{
|
||||
println!("lua error: {s}\nsource:{source}");
|
||||
Self::Lua(mlua::Error::RuntimeError(s))=>{
|
||||
println!("lua error: {s}");
|
||||
},
|
||||
other=>println!("{:?}",other),
|
||||
}
|
||||
@ -79,16 +76,16 @@ impl Runner{
|
||||
init(&runner.lua)?;
|
||||
Ok(runner)
|
||||
}
|
||||
pub fn run_script(&self,script:super::instance::Script,context:&mut Context)->Result<(),Error>{
|
||||
let (name,source)=script.get_name_source(context).map_err(Error::Script)?;
|
||||
self.lua.globals().set("script",script).map_err(|error|Error::Lua{source:source.clone(),error})?;
|
||||
pub fn run_script(&self,script:crate::script::Script,context:&mut Context)->Result<(),Error>{
|
||||
let yoink=script.name_source(context);
|
||||
//this makes set_app_data shut up about the lifetime
|
||||
self.lua.set_app_data::<&'static mut rbx_dom_weak::WeakDom>(unsafe{core::mem::transmute(&mut context.dom)});
|
||||
let r=self.lua.load(source.as_str())
|
||||
self.lua.set_app_data::<*mut rbx_dom_weak::WeakDom>(&mut context.dom);
|
||||
let (name,source)=yoink.map_err(Error::Script)?;
|
||||
self.lua.globals().set("script",super::instance::Instance::from(script)).map_err(Error::Lua)?;
|
||||
self.lua.load(source)
|
||||
.set_name(name)
|
||||
.exec().map_err(|error|Error::Lua{source,error});
|
||||
self.lua.remove_app_data::<&'static mut rbx_dom_weak::WeakDom>();
|
||||
r?;
|
||||
.exec().map_err(Error::Lua)?;
|
||||
self.lua.remove_app_data::<*mut rbx_dom_weak::WeakDom>();
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
37
src/script.rs
Normal file
37
src/script.rs
Normal file
@ -0,0 +1,37 @@
|
||||
use rbx_dom_weak::types::Ref;
|
||||
|
||||
use crate::context::Context;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum Error{
|
||||
NoScript,
|
||||
NoSource,
|
||||
}
|
||||
|
||||
fn get_full_name(dom:&rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance)->String{
|
||||
let mut full_name=instance.name.clone();
|
||||
let mut pref=instance.parent();
|
||||
while let Some(parent)=dom.get_by_ref(pref){
|
||||
full_name.insert(0,'.');
|
||||
full_name.insert_str(0,parent.name.as_str());
|
||||
pref=parent.parent();
|
||||
}
|
||||
full_name
|
||||
}
|
||||
|
||||
pub struct Script{
|
||||
pub(crate)script:Ref,
|
||||
}
|
||||
impl Script{
|
||||
pub const fn new(script:Ref)->Self{
|
||||
Self{script}
|
||||
}
|
||||
pub fn name_source(&self,context:&Context)->Result<(String,String),Error>{
|
||||
let instance=context.dom.get_by_ref(self.script).ok_or(Error::NoScript)?;
|
||||
let source=match instance.properties.get("Source").ok_or(Error::NoSource)?{
|
||||
rbx_dom_weak::types::Variant::String(s)=>s.clone(),
|
||||
_=>Err(Error::NoSource)?,
|
||||
};
|
||||
Ok((get_full_name(&context.dom,instance),source))
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user