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 out of bound error if material name is missing #49

Merged
merged 2 commits into from
Mar 2, 2022
Merged

Fix out of bound error if material name is missing #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96bceb5
Fix out of bound error if material name is missing
Dyedbyte Feb 28, 2022
c30a1bf
Fix formatting
Dyedbyte Mar 1, 2022
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
78 changes: 39 additions & 39 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1464,7 +1464,7 @@ fn reorder_data(mesh: &mut Mesh) {
#[inline]
fn merge_identical_points<const N: usize>(points: &mut Vec<f32>, indices: &mut Vec<u32>)
where
[(); size_of::<[f32; N]>()]: ,
[(); size_of::<[f32; N]>()]:,
{
if indices.is_empty() {
return;
Expand Down Expand Up @@ -1742,7 +1742,8 @@ where
}
}
Some("usemtl") => {
let mat_name = line[7..].trim().to_owned();
let mat_name = line.split_once(" ").unwrap_or_default().1.trim().to_owned();

if !mat_name.is_empty() {
let new_mat = mat_map.get(&mat_name).cloned();
// As materials are returned per-model, a new material within an object
Expand Down Expand Up @@ -1981,47 +1982,46 @@ pub fn load_mtl_buf<B: BufRead>(reader: &mut B) -> MTLLoadResult {
/// and uses a `Cursor` to provide a `BufRead` interface on the buffer.
///
/// ```
///async {
///
/// use std::{env, fs::File, io::BufReader};
/// async {
/// use std::{env, fs::File, io::BufReader};
///
/// let dir = env::current_dir().unwrap();
/// let mut cornell_box_obj = dir.clone();
/// cornell_box_obj.push("obj/cornell_box.obj");
/// let mut cornell_box_file = BufReader::new(File::open(cornell_box_obj.as_path()).unwrap());
/// let dir = env::current_dir().unwrap();
/// let mut cornell_box_obj = dir.clone();
/// cornell_box_obj.push("obj/cornell_box.obj");
/// let mut cornell_box_file = BufReader::new(File::open(cornell_box_obj.as_path()).unwrap());
///
/// let m = tobj::load_obj_buf_async(
/// &mut cornell_box_file,
/// &tobj::LoadOptions {
/// triangulate: true,
/// single_index: true,
/// ..Default::default()
/// },
/// move |p| {
/// let dir_clone = dir.clone();
/// async move {
/// let mut cornell_box_mtl1 = dir_clone.clone();
/// cornell_box_mtl1.push("obj/cornell_box.mtl");
/// let m = tobj::load_obj_buf_async(
/// &mut cornell_box_file,
/// &tobj::LoadOptions {
/// triangulate: true,
/// single_index: true,
/// ..Default::default()
/// },
/// move |p| {
/// let dir_clone = dir.clone();
/// async move {
/// let mut cornell_box_mtl1 = dir_clone.clone();
/// cornell_box_mtl1.push("obj/cornell_box.mtl");
///
/// let mut cornell_box_mtl2 = dir_clone.clone();
/// cornell_box_mtl2.push("obj/cornell_box2.mtl");
/// let mut cornell_box_mtl2 = dir_clone.clone();
/// cornell_box_mtl2.push("obj/cornell_box2.mtl");
///
/// match p.as_str() {
/// "cornell_box.mtl" => {
/// let f = File::open(cornell_box_mtl1.as_path()).unwrap();
/// tobj::load_mtl_buf(&mut BufReader::new(f))
/// }
/// "cornell_box2.mtl" => {
/// let f = File::open(cornell_box_mtl2.as_path()).unwrap();
/// tobj::load_mtl_buf(&mut BufReader::new(f))
/// }
/// _ => unreachable!(),
/// }
/// }
/// },
/// )
/// .await;
///};
/// match p.as_str() {
/// "cornell_box.mtl" => {
/// let f = File::open(cornell_box_mtl1.as_path()).unwrap();
/// tobj::load_mtl_buf(&mut BufReader::new(f))
/// }
/// "cornell_box2.mtl" => {
/// let f = File::open(cornell_box_mtl2.as_path()).unwrap();
/// tobj::load_mtl_buf(&mut BufReader::new(f))
/// }
/// _ => unreachable!(),
/// }
/// }
/// },
/// )
/// .await;
/// };
/// ```
pub async fn load_obj_buf_async<B, ML, MLFut>(
reader: &mut B,
Expand Down