diff --git a/lib/rbx_loader/src/primitives.rs b/lib/rbx_loader/src/primitives.rs index 8dbb7ac0..f5e0132b 100644 --- a/lib/rbx_loader/src/primitives.rs +++ b/lib/rbx_loader/src/primitives.rs @@ -51,22 +51,6 @@ pub enum WedgeFace{ Left, Bottom, } -const WEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[ - vec3::int( 1, 0, 0),//Wedge::Right - vec3::int( 0, 1,-1),//Wedge::TopFront - vec3::int( 0, 0, 1),//Wedge::Back - vec3::int(-1, 0, 0),//Wedge::Left - vec3::int( 0,-1, 0),//Wedge::Bottom -]; -/* -local cornerWedgeVerticies = { - Vector3.new(-1/2,-1/2,-1/2),7 - Vector3.new(-1/2,-1/2, 1/2),0 - Vector3.new( 1/2,-1/2,-1/2),6 - Vector3.new( 1/2,-1/2, 1/2),1 - Vector3.new( 1/2, 1/2,-1/2),5 -} -*/ #[derive(Hash,PartialEq,Eq)] pub enum CornerWedgeFace{ Right, @@ -75,13 +59,6 @@ pub enum CornerWedgeFace{ Bottom, Front, } -const CORNERWEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[ - vec3::int( 1, 0, 0),//CornerWedge::Right - vec3::int( 0, 1, 1),//CornerWedge::BackTop - vec3::int(-1, 1, 0),//CornerWedge::LeftTop - vec3::int( 0,-1, 0),//CornerWedge::Bottom - vec3::int( 0, 0,-1),//CornerWedge::Front -]; #[derive(Default)] pub struct CubeFaceDescription([Option<FaceDescription>;6]); impl CubeFaceDescription{ @@ -92,16 +69,6 @@ impl CubeFaceDescription{ self.0.into_iter().enumerate().filter_map(|(i,v)|v.map(|u|(i,u))) } } -pub fn unit_cube(render:RenderConfigId)->Mesh{ - let mut t=CubeFaceDescription::default(); - t.insert(CubeFace::Right,FaceDescription::new_with_render_id(render)); - t.insert(CubeFace::Top,FaceDescription::new_with_render_id(render)); - t.insert(CubeFace::Back,FaceDescription::new_with_render_id(render)); - t.insert(CubeFace::Left,FaceDescription::new_with_render_id(render)); - t.insert(CubeFace::Bottom,FaceDescription::new_with_render_id(render)); - t.insert(CubeFace::Front,FaceDescription::new_with_render_id(render)); - generate_partial_unit_cube(t) -} #[derive(Default)] pub struct WedgeFaceDescription([Option<FaceDescription>;5]); impl WedgeFaceDescription{ @@ -112,15 +79,6 @@ impl WedgeFaceDescription{ self.0.into_iter().enumerate().filter_map(|v|v.1.map(|u|(v.0,u))) } } -// pub fn unit_wedge(render:RenderConfigId)->Mesh{ -// let mut t=WedgeFaceDescription::default(); -// t.insert(WedgeFace::Right,FaceDescription::new_with_render_id(render)); -// t.insert(WedgeFace::TopFront,FaceDescription::new_with_render_id(render)); -// t.insert(WedgeFace::Back,FaceDescription::new_with_render_id(render)); -// t.insert(WedgeFace::Left,FaceDescription::new_with_render_id(render)); -// t.insert(WedgeFace::Bottom,FaceDescription::new_with_render_id(render)); -// generate_partial_unit_wedge(t) -// } #[derive(Default)] pub struct CornerWedgeFaceDescription([Option<FaceDescription>;5]); impl CornerWedgeFaceDescription{ @@ -131,15 +89,6 @@ impl CornerWedgeFaceDescription{ self.0.into_iter().enumerate().filter_map(|v|v.1.map(|u|(v.0,u))) } } -// pub fn unit_cornerwedge(render:RenderConfigId)->Mesh{ -// let mut t=CornerWedgeFaceDescription::default(); -// t.insert(CornerWedgeFace::Right,FaceDescription::new_with_render_id(render)); -// t.insert(CornerWedgeFace::TopBack,FaceDescription::new_with_render_id(render)); -// t.insert(CornerWedgeFace::TopLeft,FaceDescription::new_with_render_id(render)); -// t.insert(CornerWedgeFace::Bottom,FaceDescription::new_with_render_id(render)); -// t.insert(CornerWedgeFace::Front,FaceDescription::new_with_render_id(render)); -// generate_partial_unit_cornerwedge(t) -// } #[derive(Clone)] pub struct FaceDescription{ @@ -314,6 +263,13 @@ pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->Mesh [6,2,4], ], ]; + const WEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[ + vec3::int( 1, 0, 0),//Wedge::Right + vec3::int( 0, 1,-1),//Wedge::TopFront + vec3::int( 0, 0, 1),//Wedge::Back + vec3::int(-1, 0, 0),//Wedge::Left + vec3::int( 0,-1, 0),//Wedge::Bottom + ]; let mut generated_pos=Vec::new(); let mut generated_tex=Vec::new(); let mut generated_normal=Vec::new(); @@ -425,6 +381,13 @@ pub fn generate_partial_unit_cornerwedge(face_descriptions:CornerWedgeFaceDescri [7,2,4], ], ]; + const CORNERWEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[ + vec3::int( 1, 0, 0),//CornerWedge::Right + vec3::int( 0, 1, 1),//CornerWedge::BackTop + vec3::int(-1, 1, 0),//CornerWedge::LeftTop + vec3::int( 0,-1, 0),//CornerWedge::Bottom + vec3::int( 0, 0,-1),//CornerWedge::Front + ]; let mut generated_pos=Vec::new(); let mut generated_tex=Vec::new(); let mut generated_normal=Vec::new();