diff --git a/lib/rbx_loader/src/rbx.rs b/lib/rbx_loader/src/rbx.rs
index 6afcdbf..c9df491 100644
--- a/lib/rbx_loader/src/rbx.rs
+++ b/lib/rbx_loader/src/rbx.rs
@@ -403,6 +403,85 @@ enum RobloxBasePartDescription{
Wedge(RobloxWedgeDescription),
CornerWedge(RobloxCornerWedgeDescription),
}
+fn get_texture_description<AcquireRenderConfigId>(
+ temp_objects:&mut Vec<rbx_dom_weak::types::Ref>,
+ acquire_render_config_id:&mut AcquireRenderConfigId,
+ dom:&rbx_dom_weak::WeakDom,
+ object:&rbx_dom_weak::Instance,
+ size:&rbx_dom_weak::types::Vector3,
+)->RobloxPartDescription
+ where
+ AcquireRenderConfigId:FnMut(Option<&str>)->model::RenderConfigId,
+{
+ //use the biggest one and cut it down later...
+ let mut part_texture_description:RobloxPartDescription=[None,None,None,None,None,None];
+ temp_objects.clear();
+ recursive_collect_superclass(temp_objects,&dom,object,"Decal");
+ for &mut decal_ref in temp_objects{
+ if let Some(decal)=dom.get_by_ref(decal_ref){
+ if let (
+ Some(rbx_dom_weak::types::Variant::Content(content)),
+ Some(rbx_dom_weak::types::Variant::Enum(normalid)),
+ Some(rbx_dom_weak::types::Variant::Color3(decal_color3)),
+ Some(rbx_dom_weak::types::Variant::Float32(decal_transparency)),
+ ) = (
+ decal.properties.get("Texture"),
+ decal.properties.get("Face"),
+ decal.properties.get("Color3"),
+ decal.properties.get("Transparency"),
+ ) {
+ let render_id=acquire_render_config_id(Some(content.as_ref()));
+ let normal_id=normalid.to_u32();
+ if normal_id<6{
+ let (roblox_texture_color,roblox_texture_transform)=if decal.class=="Texture"{
+ //generate tranform
+ if let (
+ Some(rbx_dom_weak::types::Variant::Float32(ox)),
+ Some(rbx_dom_weak::types::Variant::Float32(oy)),
+ Some(rbx_dom_weak::types::Variant::Float32(sx)),
+ Some(rbx_dom_weak::types::Variant::Float32(sy)),
+ ) = (
+ decal.properties.get("OffsetStudsU"),
+ decal.properties.get("OffsetStudsV"),
+ decal.properties.get("StudsPerTileU"),
+ decal.properties.get("StudsPerTileV"),
+ )
+ {
+ let (size_u,size_v)=match normal_id{
+ 0=>(size.z,size.y),//right
+ 1=>(size.x,size.z),//top
+ 2=>(size.x,size.y),//back
+ 3=>(size.z,size.y),//left
+ 4=>(size.x,size.z),//bottom
+ 5=>(size.x,size.y),//front
+ _=>unreachable!(),
+ };
+ (
+ glam::vec4(decal_color3.r,decal_color3.g,decal_color3.b,1.0-*decal_transparency),
+ RobloxTextureTransform{
+ offset_u:*ox/(*sx),offset_v:*oy/(*sy),
+ scale_u:size_u/(*sx),scale_v:size_v/(*sy),
+ }
+ )
+ }else{
+ (glam::Vec4::ONE,RobloxTextureTransform::default())
+ }
+ }else{
+ (glam::Vec4::ONE,RobloxTextureTransform::default())
+ };
+ part_texture_description[normal_id as usize]=Some(RobloxFaceTextureDescription{
+ render:render_id,
+ color:roblox_texture_color,
+ transform:roblox_texture_transform,
+ });
+ }else{
+ println!("NormalId={} is invalid",normal_id);
+ }
+ }
+ }
+ }
+ part_texture_description
+}
enum Shape{
Primitive(primitives::Primitives),
MeshPart,
@@ -514,74 +593,8 @@ where
let (availability,mesh_id)=match shape{
Shape::Primitive(primitive_shape)=>{
- //TODO: TAB TAB
- //use the biggest one and cut it down later...
- let mut part_texture_description:RobloxPartDescription=[None,None,None,None,None,None];
- temp_objects.clear();
- recursive_collect_superclass(&mut temp_objects, &dom, object,"Decal");
- for &decal_ref in &temp_objects{
- if let Some(decal)=dom.get_by_ref(decal_ref){
- if let (
- Some(rbx_dom_weak::types::Variant::Content(content)),
- Some(rbx_dom_weak::types::Variant::Enum(normalid)),
- Some(rbx_dom_weak::types::Variant::Color3(decal_color3)),
- Some(rbx_dom_weak::types::Variant::Float32(decal_transparency)),
- ) = (
- decal.properties.get("Texture"),
- decal.properties.get("Face"),
- decal.properties.get("Color3"),
- decal.properties.get("Transparency"),
- ) {
- let render_id=acquire_render_config_id(Some(content.as_ref()));
- let normal_id=normalid.to_u32();
- if normal_id<6{
- let (roblox_texture_color,roblox_texture_transform)=if decal.class=="Texture"{
- //generate tranform
- if let (
- Some(rbx_dom_weak::types::Variant::Float32(ox)),
- Some(rbx_dom_weak::types::Variant::Float32(oy)),
- Some(rbx_dom_weak::types::Variant::Float32(sx)),
- Some(rbx_dom_weak::types::Variant::Float32(sy)),
- ) = (
- decal.properties.get("OffsetStudsU"),
- decal.properties.get("OffsetStudsV"),
- decal.properties.get("StudsPerTileU"),
- decal.properties.get("StudsPerTileV"),
- )
- {
- let (size_u,size_v)=match normal_id{
- 0=>(size.z,size.y),//right
- 1=>(size.x,size.z),//top
- 2=>(size.x,size.y),//back
- 3=>(size.z,size.y),//left
- 4=>(size.x,size.z),//bottom
- 5=>(size.x,size.y),//front
- _=>unreachable!(),
- };
- (
- glam::vec4(decal_color3.r,decal_color3.g,decal_color3.b,1.0-*decal_transparency),
- RobloxTextureTransform{
- offset_u:*ox/(*sx),offset_v:*oy/(*sy),
- scale_u:size_u/(*sx),scale_v:size_v/(*sy),
- }
- )
- }else{
- (glam::Vec4::ONE,RobloxTextureTransform::default())
- }
- }else{
- (glam::Vec4::ONE,RobloxTextureTransform::default())
- };
- part_texture_description[normal_id as usize]=Some(RobloxFaceTextureDescription{
- render:render_id,
- color:roblox_texture_color,
- transform:roblox_texture_transform,
- });
- }else{
- println!("NormalId={} unsupported for shape={:?}",normal_id,primitive_shape);
- }
- }
- }
- }
+ //TODO: TAB TAB
+ let part_texture_description=get_texture_description(&mut temp_objects,&mut acquire_render_config_id,dom,object,size);
//obscure rust syntax "slice pattern"
let [
f0,//Cube::Right