-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Mesh::merge
#11456
Merged
+79
−0
Merged
Add Mesh::merge
#11456
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
cb2d848
Add `Mesh::merge`
Jondolf 9ade3ee
Clean up match arm formatting
Jondolf c9bf410
Use vertex position count for index offset, document attribute mismatch
Jondolf 4969e2e
Merge branch 'main' into merge-mesh
Jondolf 3749ca8
Fix missing closing delimiters
Jondolf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -590,6 +590,85 @@ impl Mesh { | |
Ok(self) | ||
} | ||
|
||
/// Merges the [`Mesh`] data of `other` with `self`. The attributes and indices of `other` will be appended to `self`. | ||
/// | ||
/// Note that attributes of `other` that don't exist on `self` will be ignored. | ||
/// | ||
/// # Panics | ||
/// | ||
/// Panics if the vertex attribute values of `other` are incompatible with `self`. | ||
/// For example, [`VertexAttributeValues::Float32`] is incompatible with [`VertexAttributeValues::Float32x3`]. | ||
#[allow(clippy::match_same_arms)] | ||
pub fn merge(&mut self, other: Mesh) { | ||
use VertexAttributeValues::*; | ||
|
||
// The indices of `other` should start after the last vertex of `self`. | ||
let index_offset = self | ||
.attribute(Mesh::ATTRIBUTE_POSITION) | ||
.get_or_insert(&VertexAttributeValues::Float32x3(Vec::default())) | ||
.len(); | ||
|
||
// Extend attributes of `self` with attributes of `other`. | ||
for (id, values) in self.attributes_mut() { | ||
let enum_variant_name = values.enum_variant_name(); | ||
if let Some(other_values) = other.attribute(id) { | ||
match (values, other_values) { | ||
(Float32(vec1), Float32(vec2)) => vec1.extend(vec2), | ||
(Sint32(vec1), Sint32(vec2)) => vec1.extend(vec2), | ||
(Uint32(vec1), Uint32(vec2)) => vec1.extend(vec2), | ||
(Float32x2(vec1), Float32x2(vec2)) => vec1.extend(vec2), | ||
(Sint32x2(vec1), Sint32x2(vec2)) => vec1.extend(vec2), | ||
(Uint32x2(vec1), Uint32x2(vec2)) => vec1.extend(vec2), | ||
(Float32x3(vec1), Float32x3(vec2)) => vec1.extend(vec2), | ||
(Sint32x3(vec1), Sint32x3(vec2)) => vec1.extend(vec2), | ||
(Uint32x3(vec1), Uint32x3(vec2)) => vec1.extend(vec2), | ||
(Sint32x4(vec1), Sint32x4(vec2)) => vec1.extend(vec2), | ||
(Uint32x4(vec1), Uint32x4(vec2)) => vec1.extend(vec2), | ||
(Float32x4(vec1), Float32x4(vec2)) => vec1.extend(vec2), | ||
(Sint16x2(vec1), Sint16x2(vec2)) => vec1.extend(vec2), | ||
(Snorm16x2(vec1), Snorm16x2(vec2)) => vec1.extend(vec2), | ||
(Uint16x2(vec1), Uint16x2(vec2)) => vec1.extend(vec2), | ||
(Unorm16x2(vec1), Unorm16x2(vec2)) => vec1.extend(vec2), | ||
(Sint16x4(vec1), Sint16x4(vec2)) => vec1.extend(vec2), | ||
(Snorm16x4(vec1), Snorm16x4(vec2)) => vec1.extend(vec2), | ||
(Uint16x4(vec1), Uint16x4(vec2)) => vec1.extend(vec2), | ||
(Unorm16x4(vec1), Unorm16x4(vec2)) => vec1.extend(vec2), | ||
(Sint8x2(vec1), Sint8x2(vec2)) => vec1.extend(vec2), | ||
(Snorm8x2(vec1), Snorm8x2(vec2)) => vec1.extend(vec2), | ||
(Uint8x2(vec1), Uint8x2(vec2)) => vec1.extend(vec2), | ||
(Unorm8x2(vec1), Unorm8x2(vec2)) => vec1.extend(vec2), | ||
(Sint8x4(vec1), Sint8x4(vec2)) => vec1.extend(vec2), | ||
(Snorm8x4(vec1), Snorm8x4(vec2)) => vec1.extend(vec2), | ||
(Uint8x4(vec1), Uint8x4(vec2)) => vec1.extend(vec2), | ||
(Unorm8x4(vec1), Unorm8x4(vec2)) => vec1.extend(vec2), | ||
_ => panic!( | ||
"Incompatible vertex attribute types {} and {}", | ||
enum_variant_name, | ||
other_values.enum_variant_name() | ||
), | ||
Comment on lines
+644
to
+648
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We might want to return some error instead? I'm not sure how common it would be to reach this panic since I'd expect e.g. position attributes to almost always be |
||
} | ||
} | ||
} | ||
|
||
// Extend indices of `self` with indices of `other`. | ||
if let (Some(indices), Some(other_indices)) = (self.indices_mut(), other.indices()) { | ||
match (indices, other_indices) { | ||
(Indices::U16(i1), Indices::U16(i2)) => { | ||
i1.extend(i2.iter().map(|i| *i + index_offset as u16)); | ||
} | ||
(Indices::U32(i1), Indices::U32(i2)) => { | ||
i1.extend(i2.iter().map(|i| *i + index_offset as u32)); | ||
} | ||
(Indices::U16(i1), Indices::U32(i2)) => { | ||
i1.extend(i2.iter().map(|i| *i as u16 + index_offset as u16)); | ||
} | ||
(Indices::U32(i1), Indices::U16(i2)) => { | ||
i1.extend(i2.iter().map(|i| *i as u32 + index_offset as u32)); | ||
} | ||
} | ||
} | ||
} | ||
|
||
/// Transforms the vertex positions, normals, and tangents of the mesh by the given [`Transform`]. | ||
pub fn transformed_by(mut self, transform: Transform) -> Self { | ||
self.transform_by(transform); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From what I can see, if
self
andother
's attributes don't match up:self
has an attribute butother
doesn't, it is kept (note that this means future'sself.count_vertices()
will report the old vertices count);other
has an attribute butself
doesn't, it is silently ignored.Which could be kinda surprising. I don't see much better ways to handle this (other than error), in both cases it should be documented.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For now, I just added a short mention in the doc comment that attributes of
other
that don't exist onself
will be ignored