Compare commits
25 Commits
virtual-pr
...
master
Author | SHA1 | Date | |
---|---|---|---|
3797d226e4 | |||
1e7814488e | |||
fd2aa19949 | |||
24701dc5fe | |||
d7d24cc64c | |||
bd38c6f1e4 | |||
6f0749f827 | |||
a6eb5e184c | |||
210832c737 | |||
da169ade70 | |||
bffc5bb8f1 | |||
f8f659e8ce | |||
135103364d | |||
368ce7da9e | |||
13621022e1 | |||
03e9d989f8 | |||
5ddb3dacfd | |||
8950bcbf02 | |||
9c1807ec76 | |||
752ad6bd95 | |||
9898c53de8 | |||
4ce6fb2155 | |||
b672c1360d | |||
25577211b2 | |||
fe91de5668 |
2
.cargo/config.toml
Normal file
2
.cargo/config.toml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[registries.strafesnet]
|
||||||
|
index = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -402,7 +402,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "roblox_emulator"
|
name = "roblox_emulator"
|
||||||
version = "0.4.4"
|
version = "0.4.7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"glam",
|
"glam",
|
||||||
"mlua",
|
"mlua",
|
||||||
|
@ -1,12 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "roblox_emulator"
|
name = "roblox_emulator"
|
||||||
version = "0.4.4"
|
version = "0.4.7"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
repository = "https://git.itzana.me/StrafesNET/roblox_emulator"
|
repository = "https://git.itzana.me/StrafesNET/roblox_emulator"
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT OR Apache-2.0"
|
||||||
description = "Run embedded Luau scripts which manipulate the DOM."
|
description = "Run embedded Luau scripts which manipulate the DOM."
|
||||||
authors = ["Rhys Lloyd <krakow20@gmail.com>"]
|
authors = ["Rhys Lloyd <krakow20@gmail.com>"]
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default=["run-service"]
|
||||||
|
run-service=[]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
glam = "0.29.0"
|
glam = "0.29.0"
|
||||||
mlua = { version = "0.10.0-beta", features = ["luau"] }
|
mlua = { version = "0.10.0-beta", features = ["luau"] }
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
pub mod runner;
|
pub mod runner;
|
||||||
pub mod context;
|
pub mod context;
|
||||||
|
#[cfg(feature="run-service")]
|
||||||
|
pub(crate) mod scheduler;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests;
|
mod tests;
|
||||||
|
31
src/runner/color_sequence.rs
Normal file
31
src/runner/color_sequence.rs
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
#[derive(Clone,Copy)]
|
||||||
|
pub struct ColorSequence{}
|
||||||
|
impl ColorSequence{
|
||||||
|
pub const fn new()->Self{
|
||||||
|
Self{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl Into<rbx_types::ColorSequence> for ColorSequence{
|
||||||
|
fn into(self)->rbx_types::ColorSequence{
|
||||||
|
rbx_types::ColorSequence{
|
||||||
|
keypoints:Vec::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
||||||
|
let number_sequence_table=lua.create_table()?;
|
||||||
|
|
||||||
|
number_sequence_table.raw_set("new",
|
||||||
|
lua.create_function(|_,_:mlua::MultiValue|
|
||||||
|
Ok(ColorSequence::new())
|
||||||
|
)?
|
||||||
|
)?;
|
||||||
|
|
||||||
|
globals.set("ColorSequence",number_sequence_table)?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
impl mlua::UserData for ColorSequence{}
|
||||||
|
type_from_lua_userdata!(ColorSequence);
|
@ -4,11 +4,12 @@ use mlua::{FromLua,FromLuaMulti,IntoLua,IntoLuaMulti};
|
|||||||
use rbx_types::Ref;
|
use rbx_types::Ref;
|
||||||
use rbx_dom_weak::{InstanceBuilder,WeakDom};
|
use rbx_dom_weak::{InstanceBuilder,WeakDom};
|
||||||
|
|
||||||
use super::vector3::Vector3;
|
use crate::runner::vector3::Vector3;
|
||||||
|
|
||||||
pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
||||||
//class functions store
|
//class functions store
|
||||||
lua.set_app_data(ClassFunctions::default());
|
lua.set_app_data(ClassMethodsStore::default());
|
||||||
|
lua.set_app_data(InstanceValueStore::default());
|
||||||
|
|
||||||
let instance_table=lua.create_table()?;
|
let instance_table=lua.create_table()?;
|
||||||
|
|
||||||
@ -16,7 +17,7 @@ pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
|||||||
instance_table.raw_set("new",
|
instance_table.raw_set("new",
|
||||||
lua.create_function(|lua,(class_name,parent):(mlua::String,Option<Instance>)|{
|
lua.create_function(|lua,(class_name,parent):(mlua::String,Option<Instance>)|{
|
||||||
let class_name_str=&*class_name.to_str()?;
|
let class_name_str=&*class_name.to_str()?;
|
||||||
let parent=parent.ok_or(mlua::Error::runtime("Nil Parent not yet supported"))?;
|
let parent=parent.ok_or_else(||mlua::Error::runtime("Nil Parent not yet supported"))?;
|
||||||
dom_mut(lua,|dom|{
|
dom_mut(lua,|dom|{
|
||||||
//TODO: Nil instances
|
//TODO: Nil instances
|
||||||
Ok(Instance::new(dom.insert(parent.referent,InstanceBuilder::new(class_name_str))))
|
Ok(Instance::new(dom.insert(parent.referent,InstanceBuilder::new(class_name_str))))
|
||||||
@ -30,14 +31,10 @@ pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
|||||||
}
|
}
|
||||||
|
|
||||||
// LMAO look at this function!
|
// LMAO look at this function!
|
||||||
fn dom_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut WeakDom)->mlua::Result<T>)->mlua::Result<T>{
|
pub fn dom_mut<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"))?;
|
let mut dom=lua.app_data_mut::<&'static mut WeakDom>().ok_or_else(||mlua::Error::runtime("DataModel missing"))?;
|
||||||
f(&mut *dom)
|
f(&mut *dom)
|
||||||
}
|
}
|
||||||
fn class_functions_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut ClassFunctions)->mlua::Result<T>)->mlua::Result<T>{
|
|
||||||
let mut cf=lua.app_data_mut::<ClassFunctions>().ok_or(mlua::Error::runtime("ClassFunctions missing"))?;
|
|
||||||
f(&mut *cf)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn coerce_float32(value:&mlua::Value)->Option<f32>{
|
fn coerce_float32(value:&mlua::Value)->Option<f32>{
|
||||||
match value{
|
match value{
|
||||||
@ -92,10 +89,10 @@ impl Instance{
|
|||||||
Self{referent}
|
Self{referent}
|
||||||
}
|
}
|
||||||
pub fn get<'a>(&self,dom:&'a WeakDom)->mlua::Result<&'a rbx_dom_weak::Instance>{
|
pub 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"))
|
dom.get_by_ref(self.referent).ok_or_else(||mlua::Error::runtime("Instance missing"))
|
||||||
}
|
}
|
||||||
pub fn get_mut<'a>(&self,dom:&'a mut WeakDom)->mlua::Result<&'a mut rbx_dom_weak::Instance>{
|
pub 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"))
|
dom.get_by_ref_mut(self.referent).ok_or_else(||mlua::Error::runtime("Instance missing"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
type_from_lua_userdata!(Instance);
|
type_from_lua_userdata!(Instance);
|
||||||
@ -128,7 +125,7 @@ impl mlua::UserData for Instance{
|
|||||||
})
|
})
|
||||||
});
|
});
|
||||||
fields.add_field_method_set("Parent",|lua,this,val:Option<Instance>|{
|
fields.add_field_method_set("Parent",|lua,this,val:Option<Instance>|{
|
||||||
let parent=val.ok_or(mlua::Error::runtime("Nil Parent not yet supported"))?;
|
let parent=val.ok_or_else(||mlua::Error::runtime("Nil Parent not yet supported"))?;
|
||||||
dom_mut(lua,|dom|{
|
dom_mut(lua,|dom|{
|
||||||
dom.transfer_within(this.referent,parent.referent);
|
dom.transfer_within(this.referent,parent.referent);
|
||||||
Ok(())
|
Ok(())
|
||||||
@ -234,7 +231,7 @@ impl mlua::UserData for Instance{
|
|||||||
let instance=this.get(dom)?;
|
let instance=this.get(dom)?;
|
||||||
//println!("__index t={} i={index:?}",instance.name);
|
//println!("__index t={} i={index:?}",instance.name);
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get();
|
||||||
let class=db.classes.get(instance.class.as_str()).ok_or(mlua::Error::runtime("Class missing"))?;
|
let class=db.classes.get(instance.class.as_str()).ok_or_else(||mlua::Error::runtime("Class missing"))?;
|
||||||
//Find existing property
|
//Find existing property
|
||||||
match instance.properties.get(index_str)
|
match instance.properties.get(index_str)
|
||||||
.cloned()
|
.cloned()
|
||||||
@ -256,26 +253,36 @@ impl mlua::UserData for Instance{
|
|||||||
Some(rbx_types::Variant::Float32(val))=>return val.into_lua(lua),
|
Some(rbx_types::Variant::Float32(val))=>return val.into_lua(lua),
|
||||||
Some(rbx_types::Variant::Float64(val))=>return val.into_lua(lua),
|
Some(rbx_types::Variant::Float64(val))=>return val.into_lua(lua),
|
||||||
Some(rbx_types::Variant::Ref(val))=>return Instance::new(val).into_lua(lua),
|
Some(rbx_types::Variant::Ref(val))=>return Instance::new(val).into_lua(lua),
|
||||||
Some(rbx_types::Variant::CFrame(cf))=>return Into::<super::cframe::CFrame>::into(cf).into_lua(lua),
|
Some(rbx_types::Variant::CFrame(cf))=>return Into::<crate::runner::cframe::CFrame>::into(cf).into_lua(lua),
|
||||||
Some(rbx_types::Variant::Vector3(v))=>return Into::<super::vector3::Vector3>::into(v).into_lua(lua),
|
Some(rbx_types::Variant::Vector3(v))=>return Into::<crate::runner::vector3::Vector3>::into(v).into_lua(lua),
|
||||||
None=>(),
|
None=>(),
|
||||||
other=>return Err(mlua::Error::runtime(format!("Instance.__index Unsupported property type instance={} index={index_str} value={other:?}",instance.name))),
|
other=>return Err(mlua::Error::runtime(format!("Instance.__index Unsupported property type instance={} index={index_str} value={other:?}",instance.name))),
|
||||||
}
|
}
|
||||||
//find a function with a matching name
|
//find a function with a matching name
|
||||||
if let Some(function)=class_functions_mut(lua,|cf|{
|
if let Some(function)=class_methods_store_mut(lua,|cf|{
|
||||||
let mut iter=SuperClassIter{
|
let mut iter=SuperClassIter{
|
||||||
database:db,
|
database:db,
|
||||||
descriptor:Some(class),
|
descriptor:Some(class),
|
||||||
};
|
};
|
||||||
iter.find_map(|class|
|
iter.find_map(|class|{
|
||||||
cf.get_or_create_class_methods(&class.name)
|
let mut class_methods=cf.get_or_create_class_methods(&class.name)?;
|
||||||
.and_then(|mut class_methods|
|
class_methods.get_or_create_function(lua,index_str)
|
||||||
class_methods.get_or_create_function(lua,index_str).transpose()
|
.transpose()
|
||||||
)
|
}).transpose()
|
||||||
).transpose()
|
|
||||||
})?{
|
})?{
|
||||||
return function.into_lua(lua);
|
return function.into_lua(lua);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//find or create an associated userdata object
|
||||||
|
if let Some(value)=instance_value_store_mut(lua,|ivs|{
|
||||||
|
//TODO: walk class tree somehow
|
||||||
|
match ivs.get_or_create_instance_values(&instance){
|
||||||
|
Some(mut instance_values)=>instance_values.get_or_create_value(lua,index_str),
|
||||||
|
None=>Ok(None)
|
||||||
|
}
|
||||||
|
})?{
|
||||||
|
return value.into_lua(lua);
|
||||||
|
}
|
||||||
//find a child with a matching name
|
//find a child with a matching name
|
||||||
find_first_child(dom,instance,index_str)
|
find_first_child(dom,instance,index_str)
|
||||||
.map(|instance|Instance::new(instance.referent()))
|
.map(|instance|Instance::new(instance.referent()))
|
||||||
@ -288,19 +295,19 @@ impl mlua::UserData for Instance{
|
|||||||
//println!("__newindex t={} i={index:?} v={value:?}",instance.name);
|
//println!("__newindex t={} i={index:?} v={value:?}",instance.name);
|
||||||
let index_str=&*index.to_str()?;
|
let index_str=&*index.to_str()?;
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get();
|
||||||
let class=db.classes.get(instance.class.as_str()).ok_or(mlua::Error::runtime("Class missing"))?;
|
let class=db.classes.get(instance.class.as_str()).ok_or_else(||mlua::Error::runtime("Class missing"))?;
|
||||||
let mut iter=SuperClassIter{
|
let mut iter=SuperClassIter{
|
||||||
database:db,
|
database:db,
|
||||||
descriptor:Some(class),
|
descriptor:Some(class),
|
||||||
};
|
};
|
||||||
let property=iter.find_map(|cls|cls.properties.get(index_str)).ok_or(mlua::Error::runtime(format!("Property '{index_str}' missing on class '{}'",class.name)))?;
|
let property=iter.find_map(|cls|cls.properties.get(index_str)).ok_or_else(||mlua::Error::runtime(format!("Property '{index_str}' missing on class '{}'",class.name)))?;
|
||||||
match &property.data_type{
|
match &property.data_type{
|
||||||
rbx_reflection::DataType::Value(rbx_types::VariantType::Vector3)=>{
|
rbx_reflection::DataType::Value(rbx_types::VariantType::Vector3)=>{
|
||||||
let typed_value:Vector3=value.as_userdata().ok_or(mlua::Error::runtime("Expected Userdata"))?.take()?;
|
let typed_value:Vector3=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected Userdata"))?.borrow()?;
|
||||||
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Vector3(typed_value.into()));
|
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Vector3(typed_value.into()));
|
||||||
},
|
},
|
||||||
rbx_reflection::DataType::Value(rbx_types::VariantType::Float32)=>{
|
rbx_reflection::DataType::Value(rbx_types::VariantType::Float32)=>{
|
||||||
let typed_value:f32=coerce_float32(&value).ok_or(mlua::Error::runtime("Expected f32"))?;
|
let typed_value:f32=coerce_float32(&value).ok_or_else(||mlua::Error::runtime("Expected f32"))?;
|
||||||
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Float32(typed_value));
|
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Float32(typed_value));
|
||||||
},
|
},
|
||||||
rbx_reflection::DataType::Enum(enum_name)=>{
|
rbx_reflection::DataType::Enum(enum_name)=>{
|
||||||
@ -308,11 +315,11 @@ impl mlua::UserData for Instance{
|
|||||||
&mlua::Value::Integer(int)=>Ok(rbx_types::Enum::from_u32(int as u32)),
|
&mlua::Value::Integer(int)=>Ok(rbx_types::Enum::from_u32(int as u32)),
|
||||||
&mlua::Value::Number(num)=>Ok(rbx_types::Enum::from_u32(num as u32)),
|
&mlua::Value::Number(num)=>Ok(rbx_types::Enum::from_u32(num as u32)),
|
||||||
mlua::Value::String(s)=>{
|
mlua::Value::String(s)=>{
|
||||||
let e=db.enums.get(enum_name).ok_or(mlua::Error::runtime("Database DataType Enum name does not exist"))?;
|
let e=db.enums.get(enum_name).ok_or_else(||mlua::Error::runtime("Database DataType Enum name does not exist"))?;
|
||||||
Ok(rbx_types::Enum::from_u32(*e.items.get(&*s.to_str()?).ok_or(mlua::Error::runtime("Invalid enum item"))?))
|
Ok(rbx_types::Enum::from_u32(*e.items.get(&*s.to_str()?).ok_or_else(||mlua::Error::runtime("Invalid enum item"))?))
|
||||||
},
|
},
|
||||||
mlua::Value::UserData(any_user_data)=>{
|
mlua::Value::UserData(any_user_data)=>{
|
||||||
let e:super::r#enum::Enum=any_user_data.take()?;
|
let e:crate::runner::r#enum::Enum=*any_user_data.borrow()?;
|
||||||
Ok(e.into())
|
Ok(e.into())
|
||||||
},
|
},
|
||||||
_=>Err(mlua::Error::runtime("Expected Enum")),
|
_=>Err(mlua::Error::runtime("Expected Enum")),
|
||||||
@ -320,17 +327,25 @@ impl mlua::UserData for Instance{
|
|||||||
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Enum(typed_value));
|
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Enum(typed_value));
|
||||||
},
|
},
|
||||||
rbx_reflection::DataType::Value(rbx_types::VariantType::Color3)=>{
|
rbx_reflection::DataType::Value(rbx_types::VariantType::Color3)=>{
|
||||||
let typed_value:super::color3::Color3=value.as_userdata().ok_or(mlua::Error::runtime("Expected Color3"))?.take()?;
|
let typed_value:crate::runner::color3::Color3=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected Color3"))?.borrow()?;
|
||||||
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Color3(typed_value.into()));
|
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Color3(typed_value.into()));
|
||||||
},
|
},
|
||||||
rbx_reflection::DataType::Value(rbx_types::VariantType::Bool)=>{
|
rbx_reflection::DataType::Value(rbx_types::VariantType::Bool)=>{
|
||||||
let typed_value=value.as_boolean().ok_or(mlua::Error::runtime("Expected boolean"))?;
|
let typed_value=value.as_boolean().ok_or_else(||mlua::Error::runtime("Expected boolean"))?;
|
||||||
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Bool(typed_value));
|
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::Bool(typed_value));
|
||||||
},
|
},
|
||||||
rbx_reflection::DataType::Value(rbx_types::VariantType::String)=>{
|
rbx_reflection::DataType::Value(rbx_types::VariantType::String)=>{
|
||||||
let typed_value=value.as_str().ok_or(mlua::Error::runtime("Expected boolean"))?;
|
let typed_value=value.as_str().ok_or_else(||mlua::Error::runtime("Expected boolean"))?;
|
||||||
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::String(typed_value.to_owned()));
|
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::String(typed_value.to_owned()));
|
||||||
},
|
},
|
||||||
|
rbx_reflection::DataType::Value(rbx_types::VariantType::NumberSequence)=>{
|
||||||
|
let typed_value:crate::runner::number_sequence::NumberSequence=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected NumberSequence"))?.borrow()?;
|
||||||
|
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::NumberSequence(typed_value.into()));
|
||||||
|
},
|
||||||
|
rbx_reflection::DataType::Value(rbx_types::VariantType::ColorSequence)=>{
|
||||||
|
let typed_value:crate::runner::color_sequence::ColorSequence=*value.as_userdata().ok_or_else(||mlua::Error::runtime("Expected ColorSequence"))?.borrow()?;
|
||||||
|
instance.properties.insert(index_str.to_owned(),rbx_types::Variant::ColorSequence(typed_value.into()));
|
||||||
|
},
|
||||||
other=>return Err(mlua::Error::runtime(format!("Unimplemented property type: {other:?}"))),
|
other=>return Err(mlua::Error::runtime(format!("Unimplemented property type: {other:?}"))),
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
@ -362,12 +377,13 @@ static CLASS_FUNCTION_DATABASE:CFD=phf::phf_map!{
|
|||||||
"GetService"=>cf!(|lua,_this,service:mlua::String|{
|
"GetService"=>cf!(|lua,_this,service:mlua::String|{
|
||||||
dom_mut(lua,|dom|{
|
dom_mut(lua,|dom|{
|
||||||
//dom.root_ref()==this.referent ?
|
//dom.root_ref()==this.referent ?
|
||||||
match &*service.to_str()?{
|
let service=&*service.to_str()?;
|
||||||
"Lighting"=>{
|
match service{
|
||||||
let referent=find_first_child_of_class(dom,dom.root(),"Lighting")
|
"Lighting"|"RunService"=>{
|
||||||
|
let referent=find_first_child_of_class(dom,dom.root(),service)
|
||||||
.map(|instance|instance.referent())
|
.map(|instance|instance.referent())
|
||||||
.unwrap_or_else(||
|
.unwrap_or_else(||
|
||||||
dom.insert(dom.root_ref(),InstanceBuilder::new("Lighting"))
|
dom.insert(dom.root_ref(),InstanceBuilder::new(service))
|
||||||
);
|
);
|
||||||
Ok(Instance::new(referent))
|
Ok(Instance::new(referent))
|
||||||
},
|
},
|
||||||
@ -377,21 +393,21 @@ static CLASS_FUNCTION_DATABASE:CFD=phf::phf_map!{
|
|||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
"Terrain"=>phf::phf_map!{
|
"Terrain"=>phf::phf_map!{
|
||||||
"FillBlock"=>cf!(|_lua,_,_:(super::cframe::CFrame,Vector3,super::r#enum::Enum)|mlua::Result::Ok(()))
|
"FillBlock"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,Vector3,crate::runner::r#enum::Enum)|mlua::Result::Ok(()))
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
/// A store of created functions for each Roblox class.
|
/// A store of created functions for each Roblox class.
|
||||||
/// Functions are created the first time they are accessed and stored in this data structure.
|
/// Functions are created the first time they are accessed and stored in this data structure.
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
struct ClassFunctions{
|
struct ClassMethodsStore{
|
||||||
classes:HashMap<&'static str,//ClassName
|
classes:HashMap<&'static str,//ClassName
|
||||||
HashMap<&'static str,//Method name
|
HashMap<&'static str,//Method name
|
||||||
mlua::Function
|
mlua::Function
|
||||||
>
|
>
|
||||||
>
|
>
|
||||||
}
|
}
|
||||||
impl ClassFunctions{
|
impl ClassMethodsStore{
|
||||||
/// return self.classes[class] or create the ClassMethods and then return it
|
/// return self.classes[class] or create the ClassMethods and then return it
|
||||||
fn get_or_create_class_methods(&mut self,class:&str)->Option<ClassMethods>{
|
fn get_or_create_class_methods(&mut self,class:&str)->Option<ClassMethods>{
|
||||||
// Use get_entry to get the &'static str keys of the database
|
// Use get_entry to get the &'static str keys of the database
|
||||||
@ -426,6 +442,10 @@ impl ClassMethods<'_>{
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
fn class_methods_store_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut ClassMethodsStore)->mlua::Result<T>)->mlua::Result<T>{
|
||||||
|
let mut cf=lua.app_data_mut::<ClassMethodsStore>().ok_or_else(||mlua::Error::runtime("ClassMethodsStore missing"))?;
|
||||||
|
f(&mut *cf)
|
||||||
|
}
|
||||||
|
|
||||||
/// A virtual property pointer definition shorthand.
|
/// A virtual property pointer definition shorthand.
|
||||||
type VirtualPropertyFunctionPointer=fn(&rbx_types::Variant)->Option<rbx_types::Variant>;
|
type VirtualPropertyFunctionPointer=fn(&rbx_types::Variant)->Option<rbx_types::Variant>;
|
||||||
@ -474,3 +494,64 @@ fn find_virtual_property(
|
|||||||
//Transform Source property with provided function
|
//Transform Source property with provided function
|
||||||
(virtual_property.pointer)(variant)
|
(virtual_property.pointer)(variant)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// lazy-loaded per-instance userdata values
|
||||||
|
// This whole thing is a bad idea and a garbage collection nightmare.
|
||||||
|
// TODO: recreate rbx_dom_weak with my own instance type that owns this data.
|
||||||
|
type CreateUserData=fn(&mlua::Lua)->mlua::Result<mlua::AnyUserData>;
|
||||||
|
type LUD=phf::Map<&'static str,// Class name
|
||||||
|
phf::Map<&'static str,// Value name
|
||||||
|
CreateUserData
|
||||||
|
>
|
||||||
|
>;
|
||||||
|
static LAZY_USER_DATA:LUD=phf::phf_map!{
|
||||||
|
"RunService"=>phf::phf_map!{
|
||||||
|
"RenderStepped"=>|lua|{
|
||||||
|
lua.create_any_userdata(crate::runner::script_signal::ScriptSignal::new())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct InstanceValueStore{
|
||||||
|
values:HashMap<Ref,
|
||||||
|
HashMap<&'static str,
|
||||||
|
mlua::AnyUserData
|
||||||
|
>
|
||||||
|
>,
|
||||||
|
}
|
||||||
|
pub struct InstanceValues<'a>{
|
||||||
|
named_values:&'static phf::Map<&'static str,CreateUserData>,
|
||||||
|
values:&'a mut HashMap<&'static str,mlua::AnyUserData>,
|
||||||
|
}
|
||||||
|
impl InstanceValueStore{
|
||||||
|
pub fn get_or_create_instance_values(&mut self,instance:&rbx_dom_weak::Instance)->Option<InstanceValues>{
|
||||||
|
LAZY_USER_DATA.get(instance.class.as_str())
|
||||||
|
.map(|named_values|
|
||||||
|
InstanceValues{
|
||||||
|
named_values,
|
||||||
|
values:self.values.entry(instance.referent())
|
||||||
|
.or_insert_with(||HashMap::new()),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl InstanceValues<'_>{
|
||||||
|
pub fn get_or_create_value(&mut self,lua:&mlua::Lua,index:&str)->mlua::Result<Option<mlua::AnyUserData>>{
|
||||||
|
Ok(match self.named_values.get_entry(index){
|
||||||
|
Some((&static_index_str,&function_pointer))=>Some(
|
||||||
|
match self.values.entry(static_index_str){
|
||||||
|
Entry::Occupied(entry)=>entry.get().clone(),
|
||||||
|
Entry::Vacant(entry)=>entry.insert(
|
||||||
|
function_pointer(lua)?
|
||||||
|
).clone(),
|
||||||
|
}
|
||||||
|
),
|
||||||
|
None=>None,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn instance_value_store_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut InstanceValueStore)->mlua::Result<T>)->mlua::Result<T>{
|
||||||
|
let mut cf=lua.app_data_mut::<InstanceValueStore>().ok_or_else(||mlua::Error::runtime("InstanceValueStore missing"))?;
|
||||||
|
f(&mut *cf)
|
||||||
|
}
|
2
src/runner/instance/mod.rs
Normal file
2
src/runner/instance/mod.rs
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
pub mod instance;
|
||||||
|
pub use instance::Instance;
|
@ -7,5 +7,8 @@ mod color3;
|
|||||||
mod cframe;
|
mod cframe;
|
||||||
mod vector3;
|
mod vector3;
|
||||||
pub mod instance;
|
pub mod instance;
|
||||||
|
mod script_signal;
|
||||||
|
mod color_sequence;
|
||||||
|
mod number_sequence;
|
||||||
|
|
||||||
pub use runner::{Runner,Error};
|
pub use runner::{Runner,Runnable,Error};
|
||||||
|
31
src/runner/number_sequence.rs
Normal file
31
src/runner/number_sequence.rs
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
#[derive(Clone,Copy)]
|
||||||
|
pub struct NumberSequence{}
|
||||||
|
impl NumberSequence{
|
||||||
|
pub const fn new()->Self{
|
||||||
|
Self{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl Into<rbx_types::NumberSequence> for NumberSequence{
|
||||||
|
fn into(self)->rbx_types::NumberSequence{
|
||||||
|
rbx_types::NumberSequence{
|
||||||
|
keypoints:Vec::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
||||||
|
let number_sequence_table=lua.create_table()?;
|
||||||
|
|
||||||
|
number_sequence_table.raw_set("new",
|
||||||
|
lua.create_function(|_,_:mlua::MultiValue|
|
||||||
|
Ok(NumberSequence::new())
|
||||||
|
)?
|
||||||
|
)?;
|
||||||
|
|
||||||
|
globals.set("NumberSequence",number_sequence_table)?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
impl mlua::UserData for NumberSequence{}
|
||||||
|
type_from_lua_userdata!(NumberSequence);
|
@ -1,4 +1,6 @@
|
|||||||
use crate::context::Context;
|
use crate::context::Context;
|
||||||
|
#[cfg(feature="run-service")]
|
||||||
|
use crate::scheduler::scheduler_mut;
|
||||||
|
|
||||||
pub struct Runner{
|
pub struct Runner{
|
||||||
lua:mlua::Lua,
|
lua:mlua::Lua,
|
||||||
@ -29,11 +31,16 @@ fn init(lua:&mlua::Lua)->mlua::Result<()>{
|
|||||||
//global environment
|
//global environment
|
||||||
let globals=lua.globals();
|
let globals=lua.globals();
|
||||||
|
|
||||||
|
#[cfg(feature="run-service")]
|
||||||
|
crate::scheduler::set_globals(lua,&globals)?;
|
||||||
|
super::script_signal::set_globals(lua,&globals)?;
|
||||||
super::r#enum::set_globals(lua,&globals)?;
|
super::r#enum::set_globals(lua,&globals)?;
|
||||||
super::color3::set_globals(lua,&globals)?;
|
super::color3::set_globals(lua,&globals)?;
|
||||||
super::vector3::set_globals(lua,&globals)?;
|
super::vector3::set_globals(lua,&globals)?;
|
||||||
super::cframe::set_globals(lua,&globals)?;
|
super::cframe::set_globals(lua,&globals)?;
|
||||||
super::instance::set_globals(lua,&globals)?;
|
super::instance::instance::set_globals(lua,&globals)?;
|
||||||
|
super::number_sequence::set_globals(lua,&globals)?;
|
||||||
|
super::color_sequence::set_globals(lua,&globals)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@ -58,6 +65,8 @@ impl Runner{
|
|||||||
}
|
}
|
||||||
//this makes set_app_data shut up about the lifetime
|
//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)});
|
self.lua.set_app_data::<&'static mut rbx_dom_weak::WeakDom>(unsafe{core::mem::transmute(&mut context.dom)});
|
||||||
|
#[cfg(feature="run-service")]
|
||||||
|
self.lua.set_app_data::<crate::scheduler::Scheduler>(crate::scheduler::Scheduler::default());
|
||||||
Ok(Runnable{
|
Ok(Runnable{
|
||||||
lua:self.lua,
|
lua:self.lua,
|
||||||
_lifetime:&std::marker::PhantomData
|
_lifetime:&std::marker::PhantomData
|
||||||
@ -73,15 +82,62 @@ pub struct Runnable<'a>{
|
|||||||
impl Runnable<'_>{
|
impl Runnable<'_>{
|
||||||
pub fn drop_context(self)->Runner{
|
pub fn drop_context(self)->Runner{
|
||||||
self.lua.remove_app_data::<&'static mut rbx_dom_weak::WeakDom>();
|
self.lua.remove_app_data::<&'static mut rbx_dom_weak::WeakDom>();
|
||||||
|
#[cfg(feature="run-service")]
|
||||||
|
self.lua.remove_app_data::<crate::scheduler::Scheduler>();
|
||||||
Runner{
|
Runner{
|
||||||
lua:self.lua,
|
lua:self.lua,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn run_script(&self,script:super::instance::Instance)->Result<(),Error>{
|
pub fn run_script(&self,script:super::instance::Instance)->Result<(),Error>{
|
||||||
let (name,source)=super::instance::get_name_source(&self.lua,script).map_err(Error::RustLua)?;
|
let (name,source)=super::instance::instance::get_name_source(&self.lua,script).map_err(Error::RustLua)?;
|
||||||
self.lua.globals().set("script",script).map_err(Error::RustLua)?;
|
self.lua.globals().raw_set("script",script).map_err(Error::RustLua)?;
|
||||||
self.lua.load(source.as_str())
|
let f=self.lua.load(source.as_str())
|
||||||
.set_name(name)
|
.set_name(name).into_function().map_err(Error::RustLua)?;
|
||||||
.exec().map_err(|error|Error::Lua{source,error})
|
// TODO: set_environment without losing the ability to print from Lua
|
||||||
|
let thread=self.lua.create_thread(f).map_err(Error::RustLua)?;
|
||||||
|
thread.resume::<mlua::MultiValue>(()).map_err(|error|Error::Lua{source,error})?;
|
||||||
|
// wait() is called from inside Lua and goes to a rust function that schedules the thread and then yields
|
||||||
|
// No need to schedule the thread here
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
#[cfg(feature="run-service")]
|
||||||
|
pub fn has_scheduled_threads(&self)->Result<bool,mlua::Error>{
|
||||||
|
scheduler_mut(&self.lua,|scheduler|
|
||||||
|
Ok(scheduler.has_scheduled_threads())
|
||||||
|
)
|
||||||
|
}
|
||||||
|
#[cfg(feature="run-service")]
|
||||||
|
pub fn game_tick(&self)->Result<(),mlua::Error>{
|
||||||
|
if let Some(threads)=scheduler_mut(&self.lua,|scheduler|Ok(scheduler.tick_threads()))?{
|
||||||
|
for thread in threads{
|
||||||
|
//TODO: return dt and total run time
|
||||||
|
let result=thread.resume::<mlua::MultiValue>((1.0/30.0,0.0))
|
||||||
|
.map_err(|error|Error::Lua{source:"source unavailable".to_owned(),error});
|
||||||
|
match result{
|
||||||
|
Ok(_)=>(),
|
||||||
|
Err(e)=>println!("game_tick Error: {e}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
#[cfg(feature="run-service")]
|
||||||
|
pub fn run_service_step(&self)->Result<(),mlua::Error>{
|
||||||
|
let render_stepped=super::instance::instance::dom_mut(&self.lua,|dom|{
|
||||||
|
let run_service=super::instance::instance::find_first_child_of_class(dom,dom.root(),"RunService").ok_or_else(||mlua::Error::runtime("RunService missing"))?;
|
||||||
|
super::instance::instance::instance_value_store_mut(&self.lua,|instance_value_store|{
|
||||||
|
//unwrap because I trust my find_first_child_of_class function to
|
||||||
|
let mut instance_values=instance_value_store.get_or_create_instance_values(run_service).ok_or_else(||mlua::Error::runtime("RunService InstanceValues missing"))?;
|
||||||
|
let render_stepped=instance_values.get_or_create_value(&self.lua,"RenderStepped")?;
|
||||||
|
//let stepped=instance_values.get_or_create_value(&self.lua,"Stepped")?;
|
||||||
|
//let heartbeat=instance_values.get_or_create_value(&self.lua,"Heartbeat")?;
|
||||||
|
Ok(render_stepped)
|
||||||
|
})
|
||||||
|
})?;
|
||||||
|
if let Some(render_stepped)=render_stepped{
|
||||||
|
let signal:&super::script_signal::ScriptSignal=&*render_stepped.borrow()?;
|
||||||
|
signal.fire(&mlua::MultiValue::new());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
172
src/runner/script_signal.rs
Normal file
172
src/runner/script_signal.rs
Normal file
@ -0,0 +1,172 @@
|
|||||||
|
use std::{cell::RefCell,rc::Rc};
|
||||||
|
|
||||||
|
use mlua::UserDataFields;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
struct FunctionList{
|
||||||
|
functions:Vec<mlua::Function>,
|
||||||
|
}
|
||||||
|
impl FunctionList{
|
||||||
|
pub fn new()->Self{
|
||||||
|
Self{
|
||||||
|
functions:Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// This eats the Lua error
|
||||||
|
pub fn fire(self,args:&mlua::MultiValue){
|
||||||
|
// Make a copy of the list in case Lua attempts to modify it during the loop
|
||||||
|
for function in self.functions{
|
||||||
|
//wee let's allocate for our function calls
|
||||||
|
if let Err(e)=function.call::<mlua::MultiValue>(args.clone()){
|
||||||
|
println!("Script Signal Error: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[derive(Clone)]
|
||||||
|
struct RcFunctionList{
|
||||||
|
functions:Rc<RefCell<FunctionList>>,
|
||||||
|
}
|
||||||
|
impl RcFunctionList{
|
||||||
|
pub fn new()->Self{
|
||||||
|
Self{
|
||||||
|
functions:Rc::new(RefCell::new(FunctionList::new())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn fire(&self,args:&mlua::MultiValue){
|
||||||
|
// Make a copy of the list in case Lua attempts to modify it during the loop
|
||||||
|
self.functions.borrow().clone().fire(args)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct ScriptSignal{
|
||||||
|
// Emulate the garbage roblox api.
|
||||||
|
// ScriptConnection should not exist.
|
||||||
|
// :Disconnect should be a method on ScriptSignal, and this would be avoided entirely.
|
||||||
|
connections:RcFunctionList,
|
||||||
|
once:RcFunctionList,
|
||||||
|
wait:Rc<RefCell<Vec<mlua::Thread>>>,
|
||||||
|
}
|
||||||
|
pub struct ScriptConnection{
|
||||||
|
connection:RcFunctionList,
|
||||||
|
function:mlua::Function,
|
||||||
|
}
|
||||||
|
impl ScriptSignal{
|
||||||
|
pub fn new()->Self{
|
||||||
|
Self{
|
||||||
|
connections:RcFunctionList::new(),
|
||||||
|
once:RcFunctionList::new(),
|
||||||
|
wait:Rc::new(RefCell::new(Vec::new())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn fire(&self,args:&mlua::MultiValue){
|
||||||
|
self.connections.fire(args);
|
||||||
|
//Replace the FunctionList with an empty one and drop the borrow
|
||||||
|
let once=std::mem::replace(&mut *self.once.functions.borrow_mut(),FunctionList::new());
|
||||||
|
once.fire(args);
|
||||||
|
//resume threads waiting for this signal
|
||||||
|
let threads=std::mem::replace(&mut *self.wait.borrow_mut(),Vec::new());
|
||||||
|
for thread in threads{
|
||||||
|
if let Err(e)=thread.resume::<mlua::MultiValue>(args.clone()){
|
||||||
|
println!("Script Signal thread resume Error: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn connect(&self,function:mlua::Function)->ScriptConnection{
|
||||||
|
self.connections.functions.borrow_mut().functions.push(function.clone());
|
||||||
|
ScriptConnection{
|
||||||
|
connection:self.connections.clone(),
|
||||||
|
function,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn once(&self,function:mlua::Function)->ScriptConnection{
|
||||||
|
self.once.functions.borrow_mut().functions.push(function.clone());
|
||||||
|
ScriptConnection{
|
||||||
|
connection:self.once.clone(),
|
||||||
|
function,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn wait(&self,thread:mlua::Thread){
|
||||||
|
self.wait.borrow_mut().push(thread);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl ScriptConnection{
|
||||||
|
pub fn position(&self)->Option<usize>{
|
||||||
|
self.connection.functions.borrow().functions.iter().position(|function|function==&self.function)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl mlua::UserData for ScriptSignal{
|
||||||
|
fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
|
||||||
|
methods.add_method("Connect",|_lua,this,f:mlua::Function|
|
||||||
|
Ok(this.connect(f))
|
||||||
|
);
|
||||||
|
methods.add_method("Once",|_lua,this,f:mlua::Function|
|
||||||
|
Ok(this.once(f))
|
||||||
|
);
|
||||||
|
// Fire is not allowed to be called from Lua
|
||||||
|
// methods.add_method("Fire",|_lua,this,args:mlua::MultiValue|
|
||||||
|
// Ok(this.fire(args))
|
||||||
|
// );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl mlua::FromLua for ScriptSignal{
|
||||||
|
fn from_lua(value:mlua::Value,_lua:&mlua::Lua)->Result<Self,mlua::Error>{
|
||||||
|
match value{
|
||||||
|
mlua::Value::UserData(ud)=>Ok(ud.borrow::<Self>()?.clone()),
|
||||||
|
other=>Err(mlua::Error::runtime(format!("Expected {} got {:?}",stringify!(ScriptSignal),other))),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl mlua::UserData for ScriptConnection{
|
||||||
|
fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
|
||||||
|
fields.add_field_method_get("Connected",|_,this|{
|
||||||
|
Ok(this.position().is_some())
|
||||||
|
});
|
||||||
|
}
|
||||||
|
fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
|
||||||
|
methods.add_method("Disconnect",|_,this,_:()|{
|
||||||
|
if let Some(index)=this.position(){
|
||||||
|
this.connection.functions.borrow_mut().functions.remove(index);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn wait_thread(lua:&mlua::Lua,this:ScriptSignal)->Result<(),mlua::Error>{
|
||||||
|
Ok(this.wait(lua.current_thread()))
|
||||||
|
}
|
||||||
|
|
||||||
|
// This is used to avoid calling coroutine.yield from the rust side.
|
||||||
|
const LUA_WAIT:&str=
|
||||||
|
"local coroutine_yield=coroutine.yield
|
||||||
|
local wait_thread=wait_thread
|
||||||
|
return function(signal)
|
||||||
|
wait_thread(signal)
|
||||||
|
return coroutine_yield()
|
||||||
|
end";
|
||||||
|
|
||||||
|
pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
||||||
|
let coroutine_table=globals.get::<mlua::Table>("coroutine")?;
|
||||||
|
let wait_thread=lua.create_function(wait_thread)?;
|
||||||
|
|
||||||
|
//create wait function environment
|
||||||
|
let wait_env=lua.create_table()?;
|
||||||
|
wait_env.raw_set("coroutine",coroutine_table)?;
|
||||||
|
wait_env.raw_set("wait_thread",wait_thread)?;
|
||||||
|
|
||||||
|
//construct wait function from Lua code
|
||||||
|
let wait=lua.load(LUA_WAIT)
|
||||||
|
.set_name("wait")
|
||||||
|
.set_environment(wait_env)
|
||||||
|
.call::<mlua::Function>(())?;
|
||||||
|
|
||||||
|
lua.register_userdata_type::<ScriptSignal>(|reg|{
|
||||||
|
reg.add_field("Wait",wait);
|
||||||
|
mlua::UserData::register(reg);
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
106
src/scheduler.rs
Normal file
106
src/scheduler.rs
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
pub use tick::Tick;
|
||||||
|
mod tick{
|
||||||
|
#[derive(Clone,Copy,Default,Hash,PartialEq,Eq,PartialOrd,Ord)]
|
||||||
|
pub struct Tick(u64);
|
||||||
|
impl std::ops::Add<u64> for Tick{
|
||||||
|
type Output=Self;
|
||||||
|
fn add(self,rhs:u64)->Self::Output{
|
||||||
|
Self(self.0+rhs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl std::ops::Sub<u64> for Tick{
|
||||||
|
type Output=Self;
|
||||||
|
fn sub(self,rhs:u64)->Self::Output{
|
||||||
|
Self(self.0-rhs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl std::ops::AddAssign<u64> for Tick{
|
||||||
|
fn add_assign(&mut self,rhs:u64){
|
||||||
|
self.0+=rhs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl std::ops::SubAssign<u64> for Tick{
|
||||||
|
fn sub_assign(&mut self,rhs:u64){
|
||||||
|
self.0-=rhs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct Scheduler{
|
||||||
|
tick:Tick,
|
||||||
|
schedule:std::collections::HashMap<Tick,Vec<mlua::Thread>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Scheduler{
|
||||||
|
pub fn has_scheduled_threads(&self)->bool{
|
||||||
|
!self.schedule.is_empty()
|
||||||
|
}
|
||||||
|
pub fn schedule_thread(&mut self,delay:u64,thread:mlua::Thread){
|
||||||
|
self.schedule.entry(self.tick+delay.max(1))
|
||||||
|
.or_insert(Vec::new())
|
||||||
|
.push(thread);
|
||||||
|
}
|
||||||
|
pub fn tick_threads(&mut self)->Option<Vec<mlua::Thread>>{
|
||||||
|
self.tick+=1;
|
||||||
|
self.schedule.remove(&self.tick)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn scheduler_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut crate::scheduler::Scheduler)->mlua::Result<T>)->mlua::Result<T>{
|
||||||
|
let mut scheduler=lua.app_data_mut::<crate::scheduler::Scheduler>().ok_or_else(||mlua::Error::runtime("Scheduler missing"))?;
|
||||||
|
f(&mut *scheduler)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn schedule_thread(lua:&mlua::Lua,dt:mlua::Value)->Result<(),mlua::Error>{
|
||||||
|
let delay=match dt{
|
||||||
|
mlua::Value::Integer(i)=>i.max(0) as u64*60,
|
||||||
|
mlua::Value::Number(f)=>{
|
||||||
|
let delay=f.max(0.0)*60.0;
|
||||||
|
match delay.classify(){
|
||||||
|
std::num::FpCategory::Nan=>Err(mlua::Error::runtime("NaN"))?,
|
||||||
|
// cases where the number is too large to schedule
|
||||||
|
std::num::FpCategory::Infinite=>return Ok(()),
|
||||||
|
std::num::FpCategory::Normal=>if (u64::MAX as f64)<delay{
|
||||||
|
return Ok(());
|
||||||
|
},
|
||||||
|
_=>(),
|
||||||
|
}
|
||||||
|
delay as u64
|
||||||
|
},
|
||||||
|
mlua::Value::Nil=>0,
|
||||||
|
_=>Err(mlua::Error::runtime("Expected float"))?,
|
||||||
|
};
|
||||||
|
scheduler_mut(lua,|scheduler|{
|
||||||
|
scheduler.schedule_thread(delay.max(2),lua.current_thread());
|
||||||
|
Ok(())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// This is used to avoid calling coroutine.yield from the rust side.
|
||||||
|
const LUA_WAIT:&str=
|
||||||
|
"local coroutine_yield=coroutine.yield
|
||||||
|
local schedule_thread=schedule_thread
|
||||||
|
return function(dt)
|
||||||
|
schedule_thread(dt)
|
||||||
|
return coroutine_yield()
|
||||||
|
end";
|
||||||
|
|
||||||
|
pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
||||||
|
let coroutine_table=globals.get::<mlua::Table>("coroutine")?;
|
||||||
|
let schedule_thread=lua.create_function(schedule_thread)?;
|
||||||
|
|
||||||
|
//create wait function environment
|
||||||
|
let wait_env=lua.create_table()?;
|
||||||
|
wait_env.raw_set("coroutine",coroutine_table)?;
|
||||||
|
wait_env.raw_set("schedule_thread",schedule_thread)?;
|
||||||
|
|
||||||
|
//construct wait function from Lua code
|
||||||
|
let wait=lua.load(LUA_WAIT)
|
||||||
|
.set_name("wait")
|
||||||
|
.set_environment(wait_env)
|
||||||
|
.call::<mlua::Function>(())?;
|
||||||
|
|
||||||
|
globals.raw_set("wait",wait)?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user