Illusion/3dobs
1
0
Fork 0
mirror of https://github.com/IllusionMan1212/3dobs.git synced 2026-10-24 10:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(importer/obj): don't split to meshes by groups and warn about undefined material usage

Browse Source
This commit is contained in:
Illusion
2023-12-22 02:58:59 +02:00
parent 672d77ad81
commit 6f5e290a23
1 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/importer/obj.rs
+17 -31
View File
@@ -224,7 +224,7 @@ pub fn load_obj(
let now = std::time::Instant::now(); let now = std::time::Instant::now();
let reader = BufReader::with_capacity(BUF_CAP, file); let reader = BufReader::with_capacity(BUF_CAP, file);
let mut object_name = String::new(); let mut object_name = String::new();
let mut current_mesh_name = String::new(); let current_mesh_name = String::new();
let mut temp_vertices = Vec::new(); let mut temp_vertices = Vec::new();
let mut vertices = Vec::new(); let mut vertices = Vec::new();
let mut normals = Vec::new(); let mut normals = Vec::new();
@@ -271,28 +271,6 @@ pub fn load_obj(
object_name = iter.next().unwrap_or("").to_string(); object_name = iter.next().unwrap_or("").to_string();
} }
Some(ObjToken::Group) => {
let name = {
if current_mesh_name.is_empty() {
object_name.clone()
} else {
current_mesh_name.clone()
}
};
if !vertices.is_empty() {
meshes.push(ObjMesh {
name,
vertices: vertices.clone(),
indices: indices.clone(),
material: current_material.clone(),
});
}
vertices.clear();
indices.clear();
indices_counter = 0;
current_mesh_name = iter.next().unwrap_or("default_mesh").to_string();
}
Some(ObjToken::Vertex) => { Some(ObjToken::Vertex) => {
let vec = iter.collect::<Vec<_>>(); let vec = iter.collect::<Vec<_>>();
if vec.len() < 3 { if vec.len() < 3 {
@@ -475,16 +453,24 @@ pub fn load_obj(
indices.clear(); indices.clear();
indices_counter = 0; indices_counter = 0;
let mat_name = iter.next().unwrap_or("").to_string(); let mat_name = iter.next();
current_material = materials.get(&mat_name).cloned(); if mat_name.is_none() {
error!("Material usage statement has no material name");
continue;
}
let mat = materials.get(&mat_name.unwrap().to_owned()).cloned();
if mat.is_none() {
warn!("Usage of material \"{}\" which is not defined", mat_name.unwrap());
}
current_material = mat;
} }
// Things we ignore have a statement to not clutter the log // Things we ignore have a statement to not clutter the log
Some(ObjToken::Line) | Some(ObjToken::Point) => { Some(ObjToken::Line) |
// we don't handle lines or points Some(ObjToken::Point) |
} Some(ObjToken::SmoothShading) |
Some(ObjToken::SmoothShading) => { Some(ObjToken::Group) => {}
// idc about this
}
_ => { _ => {
warn!("Unhandled obj token: {}", token) warn!("Unhandled obj token: {}", token)
} }