Skip to content
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.

Sign up for GitHub

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

Fix loading of .obj mesh files #3772

Merged
merged 3 commits into from
Oct 10, 2023
Merged

Fix loading of .obj mesh files #3772

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4c3715
enforce .obj to be wavefront OBJ
teh-cmc Oct 10, 2023
ef62abd
lints
teh-cmc Oct 10, 2023
39f55fe
lowercase before guessing in all languages + update examples
teh-cmc Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions crates/re_types/src/components/media_type_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ impl MediaType {
/// Tries to guess the media type of the file at `path` based on its extension.
#[inline]
pub fn guess_from_path(path: impl AsRef<std::path::Path>) -> Option<Self> {
let path = path.as_ref();

// `mime_guess` considers `.obj` to be a a tgif… but really it's way more likely to be an obj.
if path.extension().and_then(|ext| ext.to_str()) == Some("obj") {
teh-cmc marked this conversation as resolved.
Show resolved Hide resolved
return Some(Self::obj());
}

mime_guess::from_path(path)
.first_raw()
.map(ToOwned::to_owned)
Expand Down
Loading