forked from StrafesNET/strafe-project
refactor model gen
This commit is contained in:
@ -1,53 +1,88 @@
|
||||
pub fn the_unit_cube_lol() -> obj::ObjData{
|
||||
generate_partial_unit_cube([Some(glam::Affine2::IDENTITY);6])
|
||||
const CUBE_DEFAULT_TEXTURE_COORDS:[[f32;2];4]=[[0.0,0.0],[1.0,0.0],[1.0,1.0],[0.0,1.0]];
|
||||
const CUBE_DEFAULT_VERTICES:[[f32;3];8]=[
|
||||
[-1.,-1., 1.],//0 left bottom back
|
||||
[ 1.,-1., 1.],//1 right bottom back
|
||||
[ 1., 1., 1.],//2 right top back
|
||||
[-1., 1., 1.],//3 left top back
|
||||
[-1., 1.,-1.],//4 left top front
|
||||
[ 1., 1.,-1.],//5 right top front
|
||||
[ 1.,-1.,-1.],//6 right bottom front
|
||||
[-1.,-1.,-1.],//7 left bottom front
|
||||
];
|
||||
const CUBE_DEFAULT_NORMALS:[[f32;3];6]=[
|
||||
[ 1., 0., 0.],//AabbFace::Right
|
||||
[ 0., 1., 0.],//AabbFace::Top
|
||||
[ 0., 0., 1.],//AabbFace::Back
|
||||
[-1., 0., 0.],//AabbFace::Left
|
||||
[ 0.,-1., 0.],//AabbFace::Bottom
|
||||
[ 0., 0.,-1.],//AabbFace::Front
|
||||
];
|
||||
const CUBE_DEFAULT_POLYS:[[[u32;3];4];6]=[
|
||||
// right (1, 0, 0)
|
||||
[
|
||||
[6,2,0],//[vert,tex,norm]
|
||||
[5,1,0],
|
||||
[2,0,0],
|
||||
[1,3,0],
|
||||
],
|
||||
// top (0, 1, 0)
|
||||
[
|
||||
[5,3,1],
|
||||
[4,2,1],
|
||||
[3,1,1],
|
||||
[2,0,1],
|
||||
],
|
||||
// back (0, 0, 1)
|
||||
[
|
||||
[0,3,2],
|
||||
[1,2,2],
|
||||
[2,1,2],
|
||||
[3,0,2],
|
||||
],
|
||||
// left (-1, 0, 0)
|
||||
[
|
||||
[0,2,3],
|
||||
[3,1,3],
|
||||
[4,0,3],
|
||||
[7,3,3],
|
||||
],
|
||||
// bottom (0,-1, 0)
|
||||
[
|
||||
[1,1,4],
|
||||
[0,0,4],
|
||||
[7,3,4],
|
||||
[6,2,4],
|
||||
],
|
||||
// front (0, 0,-1)
|
||||
[
|
||||
[4,1,5],
|
||||
[5,0,5],
|
||||
[6,3,5],
|
||||
[7,2,5],
|
||||
],
|
||||
];
|
||||
pub fn the_unit_cube_lol() -> crate::model::ModelData{
|
||||
generate_partial_unit_cube([Some(FaceDescription::default());6],None)
|
||||
}
|
||||
pub fn generate_partial_unit_cube(face_transforms:[Option<glam::Affine2>;6])->obj::ObjData{
|
||||
let default_polys=[
|
||||
// right (1, 0, 0)
|
||||
obj::SimplePolygon(vec![
|
||||
obj::IndexTuple(6,Some(2),Some(0)),
|
||||
obj::IndexTuple(5,Some(1),Some(0)),
|
||||
obj::IndexTuple(2,Some(0),Some(0)),
|
||||
obj::IndexTuple(1,Some(3),Some(0)),
|
||||
]),
|
||||
// top (0, 1, 0)
|
||||
obj::SimplePolygon(vec![
|
||||
obj::IndexTuple(5,Some(3),Some(1)),
|
||||
obj::IndexTuple(4,Some(2),Some(1)),
|
||||
obj::IndexTuple(3,Some(1),Some(1)),
|
||||
obj::IndexTuple(2,Some(0),Some(1)),
|
||||
]),
|
||||
// back (0, 0, 1)
|
||||
obj::SimplePolygon(vec![
|
||||
obj::IndexTuple(0,Some(3),Some(2)),
|
||||
obj::IndexTuple(1,Some(2),Some(2)),
|
||||
obj::IndexTuple(2,Some(1),Some(2)),
|
||||
obj::IndexTuple(3,Some(0),Some(2)),
|
||||
]),
|
||||
// left (-1, 0, 0)
|
||||
obj::SimplePolygon(vec![
|
||||
obj::IndexTuple(0,Some(2),Some(3)),
|
||||
obj::IndexTuple(3,Some(1),Some(3)),
|
||||
obj::IndexTuple(4,Some(0),Some(3)),
|
||||
obj::IndexTuple(7,Some(3),Some(3)),
|
||||
]),
|
||||
// bottom (0,-1, 0)
|
||||
obj::SimplePolygon(vec![
|
||||
obj::IndexTuple(1,Some(1),Some(4)),
|
||||
obj::IndexTuple(0,Some(0),Some(4)),
|
||||
obj::IndexTuple(7,Some(3),Some(4)),
|
||||
obj::IndexTuple(6,Some(2),Some(4)),
|
||||
]),
|
||||
// front (0, 0,-1)
|
||||
obj::SimplePolygon(vec![
|
||||
obj::IndexTuple(4,Some(1),Some(5)),
|
||||
obj::IndexTuple(5,Some(0),Some(5)),
|
||||
obj::IndexTuple(6,Some(3),Some(5)),
|
||||
obj::IndexTuple(7,Some(2),Some(5)),
|
||||
]),
|
||||
];
|
||||
let default_verts=[[0.0,0.0],[1.0,0.0],[1.0,1.0],[0.0,1.0]];
|
||||
//generate transformed vertices
|
||||
|
||||
pub struct FaceDescription{
|
||||
transform:glam::Affine2,
|
||||
color:glam::Vec4,
|
||||
}
|
||||
impl std::default::Default for FaceDescription{
|
||||
fn default() -> Self {
|
||||
Self{
|
||||
transform:glam::Affine2::IDENTITY,
|
||||
color:glam::Vec4::ONE,
|
||||
}
|
||||
}
|
||||
}
|
||||
impl FaceDescription{
|
||||
pub fn new(transform:glam::Affine2,color:glam::Vec4)->Self{
|
||||
Self{transform,color}
|
||||
}
|
||||
}
|
||||
pub fn generate_partial_unit_cube(face_transforms:[Option<FaceDescription>;6],texture:Option<u32>) -> crate::model::ModelData{ //generate transformed vertices
|
||||
let mut generated_verts=Vec::new();
|
||||
let mut transforms=Vec::new();
|
||||
let mut generated_polys=Vec::new();
|
||||
@ -71,35 +106,37 @@ pub fn generate_partial_unit_cube(face_transforms:[Option<glam::Affine2>;6])->ob
|
||||
));
|
||||
}
|
||||
}
|
||||
obj::ObjData{
|
||||
position: vec![
|
||||
[-1.,-1., 1.],//0 left bottom back
|
||||
[ 1.,-1., 1.],//1 right bottom back
|
||||
[ 1., 1., 1.],//2 right top back
|
||||
[-1., 1., 1.],//3 left top back
|
||||
[-1., 1.,-1.],//4 left top front
|
||||
[ 1., 1.,-1.],//5 right top front
|
||||
[ 1.,-1.,-1.],//6 right bottom front
|
||||
[-1.,-1.,-1.],//7 left bottom front
|
||||
],
|
||||
texture: generated_verts,
|
||||
normal: vec![
|
||||
[ 1., 0., 0.],//AabbFace::Right
|
||||
[ 0., 1., 0.],//AabbFace::Top
|
||||
[ 0., 0., 1.],//AabbFace::Back
|
||||
[-1., 0., 0.],//AabbFace::Left
|
||||
[ 0.,-1., 0.],//AabbFace::Bottom
|
||||
[ 0., 0.,-1.],//AabbFace::Front
|
||||
],
|
||||
objects: vec![obj::Object{
|
||||
name: "Unit Cube".to_owned(),
|
||||
groups: vec![obj::Group{
|
||||
name: "Cube Vertices".to_owned(),
|
||||
index: 0,
|
||||
material: None,
|
||||
polys: generated_polys,
|
||||
}]
|
||||
}],
|
||||
material_libs: Vec::new(),
|
||||
let mut vertices = Vec::new();
|
||||
let mut vertex_index = std::collections::HashMap::<obj::IndexTuple,u16>::new();
|
||||
let mut entities = Vec::new();
|
||||
for group in object.groups {
|
||||
let mut indices = Vec::new();
|
||||
for poly in group.polys {
|
||||
for end_index in 2..poly.0.len() {
|
||||
for &index in &[0, end_index - 1, end_index] {
|
||||
let vert = poly.0[index];
|
||||
if let Some(&i)=vertex_index.get(&vert){
|
||||
indices.push(i);
|
||||
}else{
|
||||
let i=vertices.len() as u16;
|
||||
vertices.push(Vertex {
|
||||
pos: data.position[vert.0],
|
||||
texture: data.texture[vert.1.unwrap()],
|
||||
normal: data.normal[vert.2.unwrap()],
|
||||
color,
|
||||
});
|
||||
vertex_index.insert(vert,i);
|
||||
indices.push(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
entities.push(indices);
|
||||
}
|
||||
}
|
||||
ModelData {
|
||||
instances: Vec::new(),
|
||||
vertices,
|
||||
entities,
|
||||
texture,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user