StrafesNET/strafe-project
7
Fork 4
Code Issues2 Pull Requests Packages Projects Releases2 Wiki Activity

rbx_loader: rename primitive functions to reflect what it does

Browse Source
This commit is contained in:
Quaternions 2025-03-21 12:55:04 -07:00
parent 413e176741
commit 1cf21be185
2 changed files with 8 additions and 8 deletions
lib/rbx_loader/src
primitives.rsrbx.rs

8
lib/rbx_loader/src/primitives.rs

@ -121,7 +121,7 @@ impl FaceDescription{
} }
} }
} }
pub fn generate_partial_unit_cube(CubeFaceDescription(face_descriptions):CubeFaceDescription)->Mesh{ pub fn unit_cube(CubeFaceDescription(face_descriptions):CubeFaceDescription)->Mesh{
const CUBE_DEFAULT_POLYS:[[[u32;2];4];6]=[ const CUBE_DEFAULT_POLYS:[[[u32;2];4];6]=[
// right (1, 0, 0) // right (1, 0, 0)
[ [
@ -243,7 +243,7 @@ pub fn generate_partial_unit_cube(CubeFaceDescription(face_descriptions):CubeFac
} }
} }
//don't think too hard about the copy paste because this is all going into the map tool eventually... //don't think too hard about the copy paste because this is all going into the map tool eventually...
pub fn generate_partial_unit_wedge(WedgeFaceDescription(face_descriptions):WedgeFaceDescription)->Mesh{ pub fn unit_wedge(WedgeFaceDescription(face_descriptions):WedgeFaceDescription)->Mesh{
const WEDGE_DEFAULT_POLYS:[&[[u32;2]];5]=[ const WEDGE_DEFAULT_POLYS:[&[[u32;2]];5]=[
// right (1, 0, 0) // right (1, 0, 0)
&[ &[
@ -363,7 +363,7 @@ pub fn generate_partial_unit_wedge(WedgeFaceDescription(face_descriptions):Wedge
} }
} }
pub fn generate_partial_unit_cornerwedge(CornerWedgeFaceDescription(face_descriptions):CornerWedgeFaceDescription)->Mesh{ pub fn unit_cornerwedge(CornerWedgeFaceDescription(face_descriptions):CornerWedgeFaceDescription)->Mesh{
const CORNERWEDGE_DEFAULT_POLYS:[&[[u32;2]];5]=[ const CORNERWEDGE_DEFAULT_POLYS:[&[[u32;2]];5]=[
// right (1, 0, 0) // right (1, 0, 0)
&[ &[
@ -482,7 +482,7 @@ pub fn generate_partial_unit_cornerwedge(CornerWedgeFaceDescription(face_descrip
} }
// TODO: fix face texture orientation // TODO: fix face texture orientation
pub fn generate_partial_cylinder(face_descriptions:CubeFaceDescription)->Mesh{ pub fn unit_cylinder(face_descriptions:CubeFaceDescription)->Mesh{
// cylinder is oriented about the x axis // cylinder is oriented about the x axis
// roblox cylinders use projected grid coordinates // roblox cylinders use projected grid coordinates
/// how many grid coordinates to use (positive and negative) /// how many grid coordinates to use (positive and negative)

8
lib/rbx_loader/src/rbx.rs

@ -611,11 +611,11 @@ pub fn convert<'a>(
let mesh_id=model::MeshId::new(primitive_meshes.len() as u32); let mesh_id=model::MeshId::new(primitive_meshes.len() as u32);
mesh_id_from_description.insert(basepart_description.clone(),mesh_id);//borrow checker going crazy mesh_id_from_description.insert(basepart_description.clone(),mesh_id);//borrow checker going crazy
let mesh=match basepart_description{ let mesh=match basepart_description{
RobloxBasePartDescription::Cylinder(part_texture_description)=>primitives::generate_partial_cylinder(CubeFaceDescription::new(part_texture_description,textureless_render_group)), RobloxBasePartDescription::Cylinder(part_texture_description)=>primitives::unit_cylinder(CubeFaceDescription::new(part_texture_description,textureless_render_group)),
RobloxBasePartDescription::Sphere(part_texture_description) RobloxBasePartDescription::Sphere(part_texture_description)
|RobloxBasePartDescription::Part(part_texture_description)=>primitives::generate_partial_unit_cube(CubeFaceDescription::new(part_texture_description,textureless_render_group)), |RobloxBasePartDescription::Part(part_texture_description)=>primitives::unit_cube(CubeFaceDescription::new(part_texture_description,textureless_render_group)),
RobloxBasePartDescription::Wedge(wedge_texture_description)=>primitives::generate_partial_unit_wedge(WedgeFaceDescription::new(wedge_texture_description,textureless_render_group)), RobloxBasePartDescription::Wedge(wedge_texture_description)=>primitives::unit_wedge(WedgeFaceDescription::new(wedge_texture_description,textureless_render_group)),
RobloxBasePartDescription::CornerWedge(cornerwedge_texture_description)=>primitives::generate_partial_unit_cornerwedge(CornerWedgeFaceDescription::new(cornerwedge_texture_description,textureless_render_group)), RobloxBasePartDescription::CornerWedge(cornerwedge_texture_description)=>primitives::unit_cornerwedge(CornerWedgeFaceDescription::new(cornerwedge_texture_description,textureless_render_group)),
}; };
primitive_meshes.push(mesh); primitive_meshes.push(mesh);
mesh_id mesh_id