From bfd6f4493f41176b8b42887a069058d648f5ce45 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Tue, 3 Oct 2023 17:20:52 -0700 Subject: [PATCH] I was just stupid the whole time --- src/load_roblox.rs | 24 +++++++++++++++++++++--- src/primitives.rs | 10 +++++----- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/load_roblox.rs b/src/load_roblox.rs index a1f5cd01..e3dd5fb5 100644 --- a/src/load_roblox.rs +++ b/src/load_roblox.rs @@ -315,14 +315,32 @@ pub fn generate_indexed_models(dom:rbx_dom_weak::WeakDom) -> crate::model::Index } } //obscure rust syntax "slice pattern" - let [f0,f1,f2,f3,f4,f5]=part_texture_description; + let [ + f0,//Cube::Right + f1,//Cube::Top + f2,//Cube::Back + f3,//Cube::Left + f4,//Cube::Bottom + f5,//Cube::Front + ]=part_texture_description; let basepart_texture_description=match shape{ primitives::Primitives::Sphere=>RobloxBasePartDescription::Sphere, primitives::Primitives::Cube=>RobloxBasePartDescription::Part([f0,f1,f2,f3,f4,f5]), primitives::Primitives::Cylinder=>RobloxBasePartDescription::Cylinder, //use front face texture first and use top face texture as a fallback - primitives::Primitives::Wedge=>RobloxBasePartDescription::Wedge([f0,if f2.is_some(){f2}else{f1},f3,f4,f5]), - primitives::Primitives::CornerWedge=>RobloxBasePartDescription::CornerWedge([f1,f3,f4,f5]), + primitives::Primitives::Wedge=>RobloxBasePartDescription::Wedge([ + f0,//Wedge::Right + if f5.is_some(){f5}else{f1},//Wedge::TopFront + f2,//Wedge::Back + f3,//Wedge::Left + f4,//Wedge::Bottom + ]), + primitives::Primitives::CornerWedge=>RobloxBasePartDescription::CornerWedge([ + f0,//CornerWedge::Right + f1,//CornerWedge::Top + f4,//CornerWedge::Bottom + f5,//CornerWedge::Front + ]), }; //make new model if unit cube has not been created before let model_id=if let Some(&model_id)=model_id_from_description.get(&basepart_texture_description){ diff --git a/src/primitives.rs b/src/primitives.rs index 6f0e607c..fd290fff 100644 --- a/src/primitives.rs +++ b/src/primitives.rs @@ -113,11 +113,11 @@ pub enum CornerWedgeFace{ Front, } const CORNERWEDGE_DEFAULT_NORMALS:[[f32;3];5]=[ - [ 1., 0., 0.],//Wedge::Right - [ 0., 1., 1.],//Wedge::BackTop - [-1., 1., 0.],//Wedge::LeftTop - [ 0.,-1., 0.],//Wedge::Bottom - [ 0., 0.,-1.],//Wedge::Front + [ 1., 0., 0.],//CornerWedge::Right + [ 0., 1., 1.],//CornerWedge::BackTop + [-1., 1., 0.],//CornerWedge::LeftTop + [ 0.,-1., 0.],//CornerWedge::Bottom + [ 0., 0.,-1.],//CornerWedge::Front ]; //HashMap fits this use case perfectly but feels like using a sledgehammer to drive a nail pub fn unit_sphere()->crate::model::IndexedModel{