hack together nil instances

This commit is contained in:
Quaternions 2024-10-06 16:50:40 -07:00
parent e39b2cd674
commit 00c8699933
2 changed files with 23 additions and 10 deletions

View File

@ -47,12 +47,8 @@ impl Context{
} }
pub fn find_services(&self)->Option<Services>{ pub fn find_services(&self)->Option<Services>{
Some(Services{ //nil instances isn't real, it doesn't exist in real roblox places
workspace:*self.dom.root().children().iter().find(|&&r| None
self.dom.get_by_ref(r).is_some_and(|instance|instance.class=="Workspace")
)?,
game:self.dom.root_ref(),
})
} }
pub fn convert_into_place(&mut self)->Services{ pub fn convert_into_place(&mut self)->Services{
//snapshot root instances //snapshot root instances
@ -74,6 +70,15 @@ impl Context{
game.properties.insert("Workspace".to_owned(),rbx_types::Variant::Ref(workspace)); game.properties.insert("Workspace".to_owned(),rbx_types::Variant::Ref(workspace));
} }
self.dom.insert(game,InstanceBuilder::new("Lighting")); self.dom.insert(game,InstanceBuilder::new("Lighting"));
// Special nonexistent class that holds instances parented to nil,
// which can still be referenced by scripts.
// Using a sentinel value as a ref because global variables are hard.
let nil=self.dom.insert(
game,InstanceBuilder::new("Nil")
.with_referent(
<Ref as std::str::FromStr>::from_str("ffffffffffffffffffffffffffffffff").unwrap()
)
);
//transfer original root instances into workspace //transfer original root instances into workspace
for instance in children{ for instance in children{
@ -83,6 +88,7 @@ impl Context{
Services{ Services{
game, game,
workspace, workspace,
nil,
} }
} }
} }
@ -90,4 +96,5 @@ impl Context{
pub struct Services{ pub struct Services{
pub game:Ref, pub game:Ref,
pub workspace:Ref, pub workspace:Ref,
pub nil:Ref,
} }

View File

@ -16,9 +16,8 @@ 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.unwrap_or(Instance::nil());
dom_mut(lua,|dom|{ dom_mut(lua,|dom|{
//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))))
}) })
})? })?
@ -91,6 +90,12 @@ impl Instance{
pub const fn new(referent:Ref)->Self{ pub const fn new(referent:Ref)->Self{
Self{referent} Self{referent}
} }
// Using a sentinel value as a ref for nil instances because global variables are hard.
pub fn nil()->Self{
Self{
referent:<Ref as std::str::FromStr>::from_str("ffffffffffffffffffffffffffffffff").unwrap()
}
}
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(mlua::Error::runtime("Instance missing"))
} }
@ -124,11 +129,12 @@ impl mlua::UserData for Instance{
fields.add_field_method_get("Parent",|lua,this|{ fields.add_field_method_get("Parent",|lua,this|{
dom_mut(lua,|dom|{ dom_mut(lua,|dom|{
let instance=this.get(dom)?; let instance=this.get(dom)?;
//TODO: return nil when parent is Nil instances
Ok(Instance::new(instance.parent())) Ok(Instance::new(instance.parent()))
}) })
}); });
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.unwrap_or(Instance::nil());
dom_mut(lua,|dom|{ dom_mut(lua,|dom|{
dom.transfer_within(this.referent,parent.referent); dom.transfer_within(this.referent,parent.referent);
Ok(()) Ok(())
@ -218,7 +224,7 @@ impl mlua::UserData for Instance{
); );
methods.add_method("Destroy",|lua,this,()| methods.add_method("Destroy",|lua,this,()|
dom_mut(lua,|dom|{ dom_mut(lua,|dom|{
dom.destroy(this.referent); dom.transfer_within(this.referent,Instance::nil().referent);
Ok(()) Ok(())
}) })
); );