StrafesNET/strafe-project
6
Fork 4
Code Issues5 Pull Requests2 Packages Projects Releases2 Wiki Activity

tweak get_texture_description

Browse Source
This commit is contained in:
Quaternions 2025-01-29 12:40:35 -08:00
parent d24baa365b
commit 77b41e7ebf
1 changed files with 6 additions and 9 deletions

15
lib/rbx_loader/src/rbx.rs

@ -406,16 +406,13 @@ enum RobloxBasePartDescription{
Wedge(RobloxWedgeDescription), Wedge(RobloxWedgeDescription),
CornerWedge(RobloxCornerWedgeDescription), CornerWedge(RobloxCornerWedgeDescription),
} }
fn get_texture_description<AcquireRenderConfigId>( fn get_texture_description<'a>(
temp_objects:&mut Vec<rbx_dom_weak::types::Ref>, temp_objects:&mut Vec<rbx_dom_weak::types::Ref>,
acquire_render_config_id:&mut AcquireRenderConfigId, render_config_deferred_loader:&mut RenderConfigDeferredLoader<&'a str>,
dom:&rbx_dom_weak::WeakDom, dom:&'a rbx_dom_weak::WeakDom,
object:&rbx_dom_weak::Instance, object:&rbx_dom_weak::Instance,
size:&rbx_dom_weak::types::Vector3, size:&rbx_dom_weak::types::Vector3,
)->RobloxPartDescription )->RobloxPartDescription{
where
AcquireRenderConfigId:FnMut(Option<&str>)->model::RenderConfigId,
{
//use the biggest one and cut it down later... //use the biggest one and cut it down later...
let mut part_texture_description:RobloxPartDescription=[None,None,None,None,None,None]; let mut part_texture_description:RobloxPartDescription=[None,None,None,None,None,None];
temp_objects.clear(); temp_objects.clear();
@ -433,7 +430,7 @@ fn get_texture_description<AcquireRenderConfigId>(
decal.properties.get("Color3"), decal.properties.get("Color3"),
decal.properties.get("Transparency"), decal.properties.get("Transparency"),
) { ) {
let render_id=acquire_render_config_id(Some(content.as_ref())); let render_id=render_config_deferred_loader.acquire_render_config_id(Some(content.as_ref()));
let normal_id=normalid.to_u32(); let normal_id=normalid.to_u32();
if normal_id<6{ if normal_id<6{
let (roblox_texture_color,roblox_texture_transform)=if decal.class=="Texture"{ let (roblox_texture_color,roblox_texture_transform)=if decal.class=="Texture"{
@ -747,7 +744,7 @@ pub fn convert<'a>(
physics_data=Some(value); physics_data=Some(value);
} }
} }
let part_texture_description=get_texture_description(&mut temp_objects,&mut acquire_render_config_id,dom,object,size); let part_texture_description=get_texture_description(&mut temp_objects,&mut render_config_deferred_loader,dom,object,size);
let union_deferred_attributes=UnionDeferredAttributes{ let union_deferred_attributes=UnionDeferredAttributes{
asset_id, asset_id,
mesh_data, mesh_data,