oops

This reverts commit 7f007c59b6.

lib/rbx_loader/src/union.rs

@@ -1,10 +1,10 @@
 use crate::loader::MeshWithSize;
-use crate::rbx::RobloxPartDescription;
-use crate::primitives::{CUBE_DEFAULT_VERTICES,CUBE_DEFAULT_POLYS};
+use crate::rbx::{RobloxPartDescription};
+use crate::primitives::{CUBE_DEFAULT_VERTICES,CUBE_DEFAULT_POLYS,FaceDescription};
 
-use rbx_mesh::mesh_data::{VertexId as MeshDataVertexId,NormalId2 as MeshDataNormalId2};
+use rbx_mesh::mesh_data::{VertexId as MeshDataVertexId,NormalId as MeshDataNormalId,NormalId2 as MeshDataNormalId2,NormalId5 as MeshDataNormalId5};
 use rbx_mesh::physics_data::VertexId as PhysicsDataVertexId;
-use strafesnet_common::model::{self,IndexedVertex,PolygonGroup,PolygonGroupId,PolygonList,RenderConfigId};
+use strafesnet_common::model::{self,IndexedVertex,MeshBuilder,PolygonGroup,PolygonGroupId,PolygonList,RenderConfigId,VertexId};
 use strafesnet_common::integer::vec3;
 
 #[allow(dead_code)]
@@ -25,7 +25,7 @@ impl std::fmt::Display for Error{
 // wacky state machine to make sure all vertices in a face agree upon what NormalId to use.
 // Roblox duplicates this information per vertex when it should only exist per-face.
 enum MeshDataNormalStatus{
-	Agree(MeshDataNormalId2),
+	Agree(MeshDataNormalId),
 	Conflicting,
 }
 struct MeshDataNormalChecker{
@@ -35,7 +35,7 @@ impl MeshDataNormalChecker{
 	fn new()->Self{
 		Self{status:None}
 	}
-	fn check(&mut self,normal:MeshDataNormalId2){
+	fn check(&mut self,normal:MeshDataNormalId){
 		self.status=match self.status.take(){
 			None=>Some(MeshDataNormalStatus::Agree(normal)),
 			Some(MeshDataNormalStatus::Agree(old_normal))=>{
@@ -48,7 +48,7 @@ impl MeshDataNormalChecker{
 			Some(MeshDataNormalStatus::Conflicting)=>Some(MeshDataNormalStatus::Conflicting),
 		};
 	}
-	fn into_agreed_normal(self)->Option<MeshDataNormalId2>{
+	fn into_agreed_normal(self)->Option<MeshDataNormalId>{
 		self.status.and_then(|status|match status{
 			MeshDataNormalStatus::Agree(normal)=>Some(normal),
 			MeshDataNormalStatus::Conflicting=>None,
@@ -56,6 +56,116 @@ impl MeshDataNormalChecker{
 	}
 }
 
+fn build_mesh2(
+	mb:&mut MeshBuilder,
+	polygon_groups_normal_id:&mut [Vec<Vec<VertexId>>;NORMAL_FACES],
+	cube_face_description:&[Option<FaceDescription>;NORMAL_FACES],
+	mesh:rbx_mesh::mesh_data::Mesh2,
+)->Result<(),Error>{
+	//autoscale to size, idk what roblox is doing with the graphics mesh size
+	let mut pos_min=glam::Vec3::MAX;
+	let mut pos_max=glam::Vec3::MIN;
+	for vertex in &mesh.vertices{
+		let p=vertex.pos.into();
+		pos_min=pos_min.min(p);
+		pos_max=pos_max.max(p);
+	}
+	let graphics_size=pos_max-pos_min;
+	for [MeshDataVertexId(vertex_id0),MeshDataVertexId(vertex_id1),MeshDataVertexId(vertex_id2)] in mesh.faces{
+		let face=[
+			mesh.vertices.get(vertex_id0 as usize).ok_or(Error::MissingVertexId(vertex_id0))?,
+			mesh.vertices.get(vertex_id1 as usize).ok_or(Error::MissingVertexId(vertex_id1))?,
+			mesh.vertices.get(vertex_id2 as usize).ok_or(Error::MissingVertexId(vertex_id2))?,
+		];
+		let mut normal_agreement_checker=MeshDataNormalChecker::new();
+		let face=face.into_iter().map(|vertex|{
+			let MeshDataNormalId2(normal_id)=vertex.normal_id;
+			normal_agreement_checker.check(normal_id);
+			let pos=glam::Vec3::from_array(vertex.pos)/graphics_size;
+			let pos=mb.acquire_pos_id(vec3::try_from_f32_array(pos.to_array())?);
+			let normal=mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm)?);
+			let tex_coord=glam::Vec2::from_array(vertex.tex);
+			let maybe_face_description=&cube_face_description[normal_id as usize-1];
+			let (tex,color)=match maybe_face_description{
+				Some(face_description)=>{
+					// transform texture coordinates and set decal color
+					let tex=mb.acquire_tex_id(face_description.transform.transform_point2(tex_coord));
+					let color=mb.acquire_color_id(face_description.color);
+					(tex,color)
+				},
+				None=>{
+					// texture coordinates don't matter and pass through mesh vertex color
+					let tex=mb.acquire_tex_id(tex_coord);
+					let color=mb.acquire_color_id(glam::Vec4::from_array(vertex.color.map(|f|f as f32/255.0f32)));
+					(tex,color)
+				},
+			};
+			Ok(mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color}))
+		}).collect::<Result<Vec<_>,_>>().map_err(Error::Planar64Vec3)?;
+		if let Some(normal_id)=normal_agreement_checker.into_agreed_normal(){
+			polygon_groups_normal_id[normal_id as usize].push(face);
+		}else{
+			panic!("Empty face!");
+		}
+	}
+	Ok(())
+}
+fn build_mesh5(
+	mb:&mut MeshBuilder,
+	polygon_groups_normal_id:&mut [Vec<Vec<VertexId>>;NORMAL_FACES],
+	cube_face_description:&[Option<FaceDescription>;NORMAL_FACES],
+	mesh:rbx_mesh::mesh_data::CSGMDL5,
+)->Result<(),Error>{
+	//autoscale to size, idk what roblox is doing with the graphics mesh size
+	let mut pos_min=glam::Vec3::MAX;
+	let mut pos_max=glam::Vec3::MIN;
+	for &pos in &mesh.positions{
+		let p=pos.into();
+		pos_min=pos_min.min(p);
+		pos_max=pos_max.max(p);
+	}
+	let graphics_size=pos_max-pos_min;
+	for face in mesh.faces.faces.chunks_exact(3){
+		let mut normal_agreement_checker=MeshDataNormalChecker::new();
+		let face=face.into_iter().map(|&vertex_id|{
+			let vertex_index=vertex_id as usize;
+			let &pos=mesh.positions.get(vertex_index).ok_or(Error::MissingVertexId(vertex_id))?;
+			let &MeshDataNormalId5(normal_id)=mesh.normal_ids.get(vertex_index).ok_or(Error::MissingVertexId(vertex_id))?;
+			let &norm=mesh.normals.values.get(vertex_index).ok_or(Error::MissingVertexId(vertex_id))?;
+			let &tex=mesh.tex.get(vertex_index).ok_or(Error::MissingVertexId(vertex_id))?;
+			let &color=mesh.colors.get(vertex_index).ok_or(Error::MissingVertexId(vertex_id))?;
+			normal_agreement_checker.check(normal_id);
+			let pos=glam::Vec3::from_array(pos)/graphics_size;
+			let pos=mb.acquire_pos_id(vec3::try_from_f32_array(pos.to_array()).map_err(Error::Planar64Vec3)?);
+			let normal=mb.acquire_normal_id(vec3::try_from_f32_array(norm).map_err(Error::Planar64Vec3)?);
+			let tex_coord=glam::Vec2::from_array(tex);
+			let maybe_face_description=&cube_face_description[normal_id as usize-1];
+			let (tex,color)=match maybe_face_description{
+				Some(face_description)=>{
+					// transform texture coordinates and set decal color
+					let tex=mb.acquire_tex_id(face_description.transform.transform_point2(tex_coord));
+					let color=mb.acquire_color_id(face_description.color);
+					(tex,color)
+				},
+				None=>{
+					// texture coordinates don't matter and pass through mesh vertex color
+					let tex=mb.acquire_tex_id(tex_coord);
+					let color=mb.acquire_color_id(glam::Vec4::from_array(color.map(|f|f as f32/255.0f32)));
+					(tex,color)
+				},
+			};
+			Ok(mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color}))
+		}).collect::<Result<Vec<_>,_>>()?;
+		if let Some(normal_id)=normal_agreement_checker.into_agreed_normal(){
+			polygon_groups_normal_id[normal_id as usize].push(face);
+		}else{
+			panic!("Empty face!");
+		}
+	}
+	Ok(())
+}
+
+const NORMAL_FACES:usize=6;
 impl std::error::Error for Error{}
 pub fn convert(
 	roblox_physics_data:&[u8],
@@ -63,11 +173,10 @@ pub fn convert(
 	size:glam::Vec3,
 	RobloxPartDescription(part_texture_description):RobloxPartDescription,
 )->Result<MeshWithSize,Error>{
-	const NORMAL_FACES:usize=6;
 	let mut polygon_groups_normal_id:[_;NORMAL_FACES]=[vec![],vec![],vec![],vec![],vec![],vec![]];
 
 	// build graphics and physics meshes
-	let mut mb=strafesnet_common::model::MeshBuilder::new();
+	let mut mb=MeshBuilder::new();
 	// graphics
 	let graphics_groups=if !roblox_mesh_data.is_empty(){
 		// create per-face texture coordinate affine transforms
@@ -79,56 +188,12 @@ pub fn convert(
 		let mesh_data=rbx_mesh::read_mesh_data_versioned(
 			std::io::Cursor::new(roblox_mesh_data)
 		).map_err(Error::RobloxMeshData)?;
-		let graphics_mesh=match mesh_data{
+		match mesh_data{
 			rbx_mesh::mesh_data::MeshData::CSGK(_)=>return Err(Error::Block),
-			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::V2(mesh_data2))=>mesh_data2.mesh,
-			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::V4(mesh_data4))=>mesh_data4.mesh,
+			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::V2(mesh_data2))=>build_mesh2(&mut mb,&mut polygon_groups_normal_id,&cube_face_description,mesh_data2.mesh)?,
+			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::V4(mesh_data4))=>build_mesh2(&mut mb,&mut polygon_groups_normal_id,&cube_face_description,mesh_data4.mesh)?,
+			rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::V5(mesh_data4))=>build_mesh5(&mut mb,&mut polygon_groups_normal_id,&cube_face_description,mesh_data4)?,
 		};
-		//autoscale to size, idk what roblox is doing with the graphics mesh size
-		let mut pos_min=glam::Vec3::MAX;
-		let mut pos_max=glam::Vec3::MIN;
-		for vertex in &graphics_mesh.vertices{
-			let p=vertex.pos.into();
-			pos_min=pos_min.min(p);
-			pos_max=pos_max.max(p);
-		}
-		let graphics_size=pos_max-pos_min;
-		for [MeshDataVertexId(vertex_id0),MeshDataVertexId(vertex_id1),MeshDataVertexId(vertex_id2)] in graphics_mesh.faces{
-			let face=[
-				graphics_mesh.vertices.get(vertex_id0 as usize).ok_or(Error::MissingVertexId(vertex_id0))?,
-				graphics_mesh.vertices.get(vertex_id1 as usize).ok_or(Error::MissingVertexId(vertex_id1))?,
-				graphics_mesh.vertices.get(vertex_id2 as usize).ok_or(Error::MissingVertexId(vertex_id2))?,
-			];
-			let mut normal_agreement_checker=MeshDataNormalChecker::new();
-			let face=face.into_iter().map(|vertex|{
-				normal_agreement_checker.check(vertex.normal_id);
-				let pos=glam::Vec3::from_array(vertex.pos)/graphics_size;
-				let pos=mb.acquire_pos_id(vec3::try_from_f32_array(pos.to_array())?);
-				let normal=mb.acquire_normal_id(vec3::try_from_f32_array(vertex.norm)?);
-				let tex_coord=glam::Vec2::from_array(vertex.tex);
-				let maybe_face_description=&cube_face_description[vertex.normal_id as usize-1];
-				let (tex,color)=match maybe_face_description{
-					Some(face_description)=>{
-						// transform texture coordinates and set decal color
-						let tex=mb.acquire_tex_id(face_description.transform.transform_point2(tex_coord));
-						let color=mb.acquire_color_id(face_description.color);
-						(tex,color)
-					},
-					None=>{
-						// texture coordinates don't matter and pass through mesh vertex color
-						let tex=mb.acquire_tex_id(tex_coord);
-						let color=mb.acquire_color_id(glam::Vec4::from_array(vertex.color.map(|f|f as f32/255.0f32)));
-						(tex,color)
-					},
-				};
-				Ok(mb.acquire_vertex_id(IndexedVertex{pos,tex,normal,color}))
-			}).collect::<Result<Vec<_>,_>>().map_err(Error::Planar64Vec3)?;
-			if let Some(normal_id)=normal_agreement_checker.into_agreed_normal(){
-				polygon_groups_normal_id[normal_id as usize-1].push(face);
-			}else{
-				panic!("Empty face!");
-			}
-		}
 		(0..NORMAL_FACES).map(|polygon_group_id|{
 			model::IndexedGraphicsGroup{
 				render:cube_face_description[polygon_group_id].as_ref().map_or(RenderConfigId::new(0),|face_description|face_description.render),