Simplified mesh intersection logic #221
Conversation
Makogan
changed the title
|
I know there are merge conflicts but I don;t know if we want to merge to master or to a different branch. So I await further instructions. |
| // I heavily recommend that this is left here in case one needs to debug the above code. | ||
| fn _mesh_to_obj(mesh: &TriMesh, path: &PathBuf) { | ||
| let mut file = std::fs::File::create(path).unwrap(); | ||
|
|
||
| ObjData { | ||
| position: mesh | ||
| .vertices() | ||
| .into_iter() | ||
| .map(|v| [v.x as f32, v.y as f32, v.z as f32]) | ||
| .collect(), | ||
| objects: vec![Object { | ||
| groups: vec![Group { | ||
| polys: mesh | ||
| .indices() | ||
| .into_iter() | ||
| .map(|tri| { | ||
| SimplePolygon(vec![ | ||
| IndexTuple(tri[0] as usize, None, None), | ||
| IndexTuple(tri[1] as usize, None, None), | ||
| IndexTuple(tri[2] as usize, None, None), | ||
| ]) | ||
| }) | ||
| .collect(), | ||
| name: "".to_string(), | ||
| index: 0, | ||
| material: None, | ||
| }], | ||
| name: "".to_string(), | ||
| }], | ||
| ..Default::default() | ||
| } | ||
| .write_to_buf(&mut file) | ||
| .unwrap(); |
There was a problem hiding this comment.
This export is generally useful. Let’s have move it to an inherent methods TriMesh::to_obj into a new file src/transformation/mesh_obj.rs. That file should be feature-gated behind #[cfg(feature = "obj")].
In addition, instead of takin the path as argument, creating a file and calling write_to_buf, it should just return the ObjData.
You could additionally add a TriMesh::to_obj_file that creates and writes to the file. It will needs to return an Result instead of unwrapping.
There was a problem hiding this comment.
I am not fond of returning the ObjData.
The way the obj crate is structured has many flaws. I used it because it was the best I could find, but in a perfect world I would have preferred something that separates the geometry data and meta-data information instead of nesting structures into structures.
src/transformation/mesh_intersection/triangle_triangle_intersection.rs
Outdated
Show resolved
Hide resolved
@Makogan Yes, we want to merge to |
|
Merged to master and made sure the current code passes the CI checks |
There was a problem hiding this comment.
Thank you for this first round of changes.
I noticed that a few remarks went unnoticed. Don’t forget that github tends to collapse multiple conversations if there are many of them.
Two other remarks:
- The obj test files should be moved to a
assets/testsdirectory at the root of the repository. - Please add authoring & licence information as a comment in the
.objfiles.
src/transformation/mesh_intersection/triangle_triangle_intersection.rs
Outdated
Show resolved
Hide resolved
src/shape/shape.rs
Outdated
| /// Find the index of a vertex in a poly line, such that the two | ||
| /// edges incident in that vertex form the angle closest to 90 | ||
| /// degrees in the poly line. | ||
| #[cfg(feature = "dim3")] | ||
| pub(crate) fn angle_closest_to_90(points: &[na::Vector3<Real>]) -> usize { | ||
| let n = points.len(); | ||
|
|
||
| let mut best_cos = 2.0; | ||
| let mut selected_i = 0; | ||
| for i in 0..n { | ||
| let d1 = (points[i] - points[(i + 1) % n]).normalize(); | ||
| let d2 = (points[(i + 2) % n] - points[(i + 1) % n]).normalize(); | ||
|
|
||
| let cos = d1.dot(&d2); | ||
|
|
||
| let cos_abs = cos.abs(); | ||
| if cos_abs < best_cos { | ||
| best_cos = cos_abs; | ||
| selected_i = i; | ||
| } | ||
| } | ||
|
|
||
| selected_i | ||
| } |
There was a problem hiding this comment.
I’d rather have it in triangle.rs and private since that’s the only place it’s used.
There was a problem hiding this comment.
It is also used in the mesh intersection code inside of triangulate_constraints_and_merge_duplicates, line 407. That's why i had to move it there. So that I had access to it.
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
Co-authored-by: Sébastien Crozet <sebastien@crozet.re>
…akogan/parry into improve_mesh_intersection_code
|
Thank you, I took care of the last few details and updated the changelog. |
Change the mesh intersection code to rely on epsilon checks and point insertion to construct the final intersected mesh.