Skip to content

Improve .obj file loading #681

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

Open
ZayadNimrod wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Improve .obj file loading #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60b44e8
Make normal loading more concise before we assume all models have nor…
ZayadNimrod Aug 2, 2026
a0cd109
Make model loading more concise by using `chunks_exact`
ZayadNimrod Aug 2, 2026
2d2a681
DRY up (bi)tangent calculations
ZayadNimrod Aug 2, 2026
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
46 changes: 14 additions & 32 deletions code/beginner/tutorial9-models/src/resources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,39 +111,21 @@ pub async fn load_model(
let meshes = models
.into_iter()
.map(|m| {
let vertices = (0..m.mesh.positions.len() / 3)
.map(|i| {
if m.mesh.normals.is_empty() {
model::ModelVertex {
position: [
m.mesh.positions[i * 3],
m.mesh.positions[i * 3 + 1],
m.mesh.positions[i * 3 + 2],
],
tex_coords: [
m.mesh.texcoords[i * 2],
1.0 - m.mesh.texcoords[i * 2 + 1],
],
normal: [0.0, 0.0, 0.0],
}
let coords = m
.mesh
.positions
.chunks_exact(3)
.zip(m.mesh.normals.chunks_exact(3))
.zip(m.mesh.texcoords.chunks_exact(2));
let vertices = coords
.map(|((position, normals), texcoords)| model::ModelVertex {
position: [position[0], position[1], position[2]],
tex_coords: [texcoords[0], 1.0 - texcoords[1]],
normal: if normals.is_empty() {
[0.0, 0.0, 0.0]
} else {
model::ModelVertex {
position: [
m.mesh.positions[i * 3],
m.mesh.positions[i * 3 + 1],
m.mesh.positions[i * 3 + 2],
],
tex_coords: [
m.mesh.texcoords[i * 2],
1.0 - m.mesh.texcoords[i * 2 + 1],
],
normal: [
m.mesh.normals[i * 3],
m.mesh.normals[i * 3 + 1],
m.mesh.normals[i * 3 + 2],
],
}
}
[normals[0], normals[1], normals[2]]
},
})
.collect::<Vec<_>>();

Expand Down
24 changes: 11 additions & 13 deletions code/intermediate/tutorial10-lighting/src/resources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,17 @@ pub async fn load_model(
let meshes = models
.into_iter()
.map(|m| {
let vertices = (0..m.mesh.positions.len() / 3)
.map(|i| model::ModelVertex {
position: [
m.mesh.positions[i * 3],
m.mesh.positions[i * 3 + 1],
m.mesh.positions[i * 3 + 2],
],
tex_coords: [m.mesh.texcoords[i * 2], 1.0 - m.mesh.texcoords[i * 2 + 1]],
normal: [
m.mesh.normals[i * 3],
m.mesh.normals[i * 3 + 1],
m.mesh.normals[i * 3 + 2],
],
let coords = m
.mesh
.positions
.chunks_exact(3)
.zip(m.mesh.normals.chunks_exact(3))
.zip(m.mesh.texcoords.chunks_exact(2));
let vertices = coords
.map(|((position, normals), texcoords)| model::ModelVertex {
position: [position[0], position[1], position[2]],
tex_coords: [texcoords[0], 1.0 - texcoords[1]],
normal: [normals[0], normals[1], normals[2]],
})
.collect::<Vec<_>>();

Expand Down
79 changes: 32 additions & 47 deletions code/intermediate/tutorial11-normals/src/resources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,17 @@ pub async fn load_model(
let meshes = models
.into_iter()
.map(|m| {
let mut vertices = (0..m.mesh.positions.len() / 3)
.map(|i| model::ModelVertex {
position: [
m.mesh.positions[i * 3],
m.mesh.positions[i * 3 + 1],
m.mesh.positions[i * 3 + 2],
],
tex_coords: [m.mesh.texcoords[i * 2], 1.0 - m.mesh.texcoords[i * 2 + 1]],
normal: [
m.mesh.normals[i * 3],
m.mesh.normals[i * 3 + 1],
m.mesh.normals[i * 3 + 2],
],
let coords = m
.mesh
.positions
.chunks_exact(3)
.zip(m.mesh.normals.chunks_exact(3))
.zip(m.mesh.texcoords.chunks_exact(2));
let mut vertices = coords
.map(|((position, normals), texcoords)| model::ModelVertex {
position: [position[0], position[1], position[2]],
tex_coords: [texcoords[0], 1.0 - texcoords[1]],
normal: [normals[0], normals[1], normals[2]],
// We'll calculate these later
tangent: [0.0; 3],
bitangent: [0.0; 3],
Expand All @@ -126,27 +124,21 @@ pub async fn load_model(
// Calculate tangents and bitangets. We're going to
// use the triangles, so we need to loop through the
// indices in chunks of 3
for c in indices.chunks(3) {
let v0 = vertices[c[0] as usize];
let v1 = vertices[c[1] as usize];
let v2 = vertices[c[2] as usize];
for c in indices.chunks_exact(3) {
let verts = c.iter().map(|i| vertices[*i as usize]);

let pos0: cgmath::Vector3<_> = v0.position.into();
let pos1: cgmath::Vector3<_> = v1.position.into();
let pos2: cgmath::Vector3<_> = v2.position.into();

let uv0: cgmath::Vector2<_> = v0.tex_coords.into();
let uv1: cgmath::Vector2<_> = v1.tex_coords.into();
let uv2: cgmath::Vector2<_> = v2.tex_coords.into();
let positions: Vec<cgmath::Vector3<_>> =
verts.clone().map(|v| v.position.into()).collect::<Vec<_>>();
let uvs: Vec<cgmath::Vector2<_>> =
verts.clone().map(|v| v.tex_coords.into()).collect();

// Calculate the edges of the triangle
let delta_pos1 = pos1 - pos0;
let delta_pos2 = pos2 - pos0;

let delta_pos1 = positions[1] - positions[0];
let delta_pos2 = positions[2] - positions[0];
// This will give us a direction to calculate the
// tangent and bitangent
let delta_uv1 = uv1 - uv0;
let delta_uv2 = uv2 - uv0;
let delta_uv1 = uvs[1] - uvs[0];
let delta_uv2 = uvs[2] - uvs[0];

// Solving the following system of equations will
// give us the tangent and bitangent.
Expand All @@ -160,24 +152,17 @@ pub async fn load_model(
// maps with wgpu texture coordinate system
let bitangent = (delta_pos2 * delta_uv1.x - delta_pos1 * delta_uv2.x) * -r;

// We'll use the same tangent/bitangent for each vertex in the triangle
vertices[c[0] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[0] as usize].tangent)).into();
vertices[c[1] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[1] as usize].tangent)).into();
vertices[c[2] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[2] as usize].tangent)).into();
vertices[c[0] as usize].bitangent =
(bitangent + cgmath::Vector3::from(vertices[c[0] as usize].bitangent)).into();
vertices[c[1] as usize].bitangent =
(bitangent + cgmath::Vector3::from(vertices[c[1] as usize].bitangent)).into();
vertices[c[2] as usize].bitangent =
(bitangent + cgmath::Vector3::from(vertices[c[2] as usize].bitangent)).into();

// Used to average the tangents/bitangents
triangles_included[c[0] as usize] += 1;
triangles_included[c[1] as usize] += 1;
triangles_included[c[2] as usize] += 1;
for i in 0..3 {
// We'll use the same tangent/bitangent for each vertex in the triangle
vertices[c[i] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[i] as usize].tangent)).into();
vertices[c[1] as usize].bitangent = (bitangent
+ cgmath::Vector3::from(vertices[c[1] as usize].bitangent))
.into();

// Used to average the tangents/bitangents
triangles_included[c[i] as usize] += 1;
}
}

// Average the tangents/bitangents
Expand Down
79 changes: 32 additions & 47 deletions code/intermediate/tutorial12-camera/src/resources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,17 @@ pub async fn load_model(
let meshes = models
.into_iter()
.map(|m| {
let mut vertices = (0..m.mesh.positions.len() / 3)
.map(|i| model::ModelVertex {
position: [
m.mesh.positions[i * 3],
m.mesh.positions[i * 3 + 1],
m.mesh.positions[i * 3 + 2],
],
tex_coords: [m.mesh.texcoords[i * 2], 1.0 - m.mesh.texcoords[i * 2 + 1]],
normal: [
m.mesh.normals[i * 3],
m.mesh.normals[i * 3 + 1],
m.mesh.normals[i * 3 + 2],
],
let coords = m
.mesh
.positions
.chunks_exact(3)
.zip(m.mesh.normals.chunks_exact(3))
.zip(m.mesh.texcoords.chunks_exact(2));
let mut vertices = coords
.map(|((position, normals), texcoords)| model::ModelVertex {
position: [position[0], position[1], position[2]],
tex_coords: [texcoords[0], 1.0 - texcoords[1]],
normal: [normals[0], normals[1], normals[2]],
// We'll calculate these later
tangent: [0.0; 3],
bitangent: [0.0; 3],
Expand All @@ -126,27 +124,21 @@ pub async fn load_model(
// Calculate tangents and bitangets. We're going to
// use the triangles, so we need to loop through the
// indices in chunks of 3
for c in indices.chunks(3) {
let v0 = vertices[c[0] as usize];
let v1 = vertices[c[1] as usize];
let v2 = vertices[c[2] as usize];
for c in indices.chunks_exact(3) {
let verts = c.iter().map(|i| vertices[*i as usize]);

let pos0: cgmath::Vector3<_> = v0.position.into();
let pos1: cgmath::Vector3<_> = v1.position.into();
let pos2: cgmath::Vector3<_> = v2.position.into();

let uv0: cgmath::Vector2<_> = v0.tex_coords.into();
let uv1: cgmath::Vector2<_> = v1.tex_coords.into();
let uv2: cgmath::Vector2<_> = v2.tex_coords.into();
let positions: Vec<cgmath::Vector3<_>> =
verts.clone().map(|v| v.position.into()).collect::<Vec<_>>();
let uvs: Vec<cgmath::Vector2<_>> =
verts.clone().map(|v| v.tex_coords.into()).collect();

// Calculate the edges of the triangle
let delta_pos1 = pos1 - pos0;
let delta_pos2 = pos2 - pos0;

let delta_pos1 = positions[1] - positions[0];
let delta_pos2 = positions[2] - positions[0];
// This will give us a direction to calculate the
// tangent and bitangent
let delta_uv1 = uv1 - uv0;
let delta_uv2 = uv2 - uv0;
let delta_uv1 = uvs[1] - uvs[0];
let delta_uv2 = uvs[2] - uvs[0];

// Solving the following system of equations will
// give us the tangent and bitangent.
Expand All @@ -160,24 +152,17 @@ pub async fn load_model(
// maps with wgpu texture coordinate system
let bitangent = (delta_pos2 * delta_uv1.x - delta_pos1 * delta_uv2.x) * -r;

// We'll use the same tangent/bitangent for each vertex in the triangle
vertices[c[0] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[0] as usize].tangent)).into();
vertices[c[1] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[1] as usize].tangent)).into();
vertices[c[2] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[2] as usize].tangent)).into();
vertices[c[0] as usize].bitangent =
(bitangent + cgmath::Vector3::from(vertices[c[0] as usize].bitangent)).into();
vertices[c[1] as usize].bitangent =
(bitangent + cgmath::Vector3::from(vertices[c[1] as usize].bitangent)).into();
vertices[c[2] as usize].bitangent =
(bitangent + cgmath::Vector3::from(vertices[c[2] as usize].bitangent)).into();

// Used to average the tangents/bitangents
triangles_included[c[0] as usize] += 1;
triangles_included[c[1] as usize] += 1;
triangles_included[c[2] as usize] += 1;
for i in 0..3 {
// We'll use the same tangent/bitangent for each vertex in the triangle
vertices[c[i] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[i] as usize].tangent)).into();
vertices[c[1] as usize].bitangent = (bitangent
+ cgmath::Vector3::from(vertices[c[1] as usize].bitangent))
.into();

// Used to average the tangents/bitangents
triangles_included[c[i] as usize] += 1;
}
}

// Average the tangents/bitangents
Expand Down
79 changes: 32 additions & 47 deletions code/intermediate/tutorial13-hdr/src/resources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,17 @@ pub async fn load_model(
let meshes = models
.into_iter()
.map(|m| {
let mut vertices = (0..m.mesh.positions.len() / 3)
.map(|i| model::ModelVertex {
position: [
m.mesh.positions[i * 3],
m.mesh.positions[i * 3 + 1],
m.mesh.positions[i * 3 + 2],
],
tex_coords: [m.mesh.texcoords[i * 2], 1.0 - m.mesh.texcoords[i * 2 + 1]],
normal: [
m.mesh.normals[i * 3],
m.mesh.normals[i * 3 + 1],
m.mesh.normals[i * 3 + 2],
],
let coords = m
.mesh
.positions
.chunks_exact(3)
.zip(m.mesh.normals.chunks_exact(3))
.zip(m.mesh.texcoords.chunks_exact(2));
let mut vertices = coords
.map(|((position, normals), texcoords)| model::ModelVertex {
position: [position[0], position[1], position[2]],
tex_coords: [texcoords[0], 1.0 - texcoords[1]],
normal: [normals[0], normals[1], normals[2]],
// We'll calculate these later
tangent: [0.0; 3],
bitangent: [0.0; 3],
Expand All @@ -127,27 +125,21 @@ pub async fn load_model(
// Calculate tangents and bitangets. We're going to
// use the triangles, so we need to loop through the
// indices in chunks of 3
for c in indices.chunks(3) {
let v0 = vertices[c[0] as usize];
let v1 = vertices[c[1] as usize];
let v2 = vertices[c[2] as usize];
for c in indices.chunks_exact(3) {
let verts = c.iter().map(|i| vertices[*i as usize]);

let pos0: cgmath::Vector3<_> = v0.position.into();
let pos1: cgmath::Vector3<_> = v1.position.into();
let pos2: cgmath::Vector3<_> = v2.position.into();

let uv0: cgmath::Vector2<_> = v0.tex_coords.into();
let uv1: cgmath::Vector2<_> = v1.tex_coords.into();
let uv2: cgmath::Vector2<_> = v2.tex_coords.into();
let positions: Vec<cgmath::Vector3<_>> =
verts.clone().map(|v| v.position.into()).collect::<Vec<_>>();
let uvs: Vec<cgmath::Vector2<_>> =
verts.clone().map(|v| v.tex_coords.into()).collect();

// Calculate the edges of the triangle
let delta_pos1 = pos1 - pos0;
let delta_pos2 = pos2 - pos0;

let delta_pos1 = positions[1] - positions[0];
let delta_pos2 = positions[2] - positions[0];
// This will give us a direction to calculate the
// tangent and bitangent
let delta_uv1 = uv1 - uv0;
let delta_uv2 = uv2 - uv0;
let delta_uv1 = uvs[1] - uvs[0];
let delta_uv2 = uvs[2] - uvs[0];

// Solving the following system of equations will
// give us the tangent and bitangent.
Expand All @@ -161,24 +153,17 @@ pub async fn load_model(
// maps with wgpu texture coordinate system
let bitangent = (delta_pos2 * delta_uv1.x - delta_pos1 * delta_uv2.x) * -r;

// We'll use the same tangent/bitangent for each vertex in the triangle
vertices[c[0] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[0] as usize].tangent)).into();
vertices[c[1] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[1] as usize].tangent)).into();
vertices[c[2] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[2] as usize].tangent)).into();
vertices[c[0] as usize].bitangent =
(bitangent + cgmath::Vector3::from(vertices[c[0] as usize].bitangent)).into();
vertices[c[1] as usize].bitangent =
(bitangent + cgmath::Vector3::from(vertices[c[1] as usize].bitangent)).into();
vertices[c[2] as usize].bitangent =
(bitangent + cgmath::Vector3::from(vertices[c[2] as usize].bitangent)).into();

// Used to average the tangents/bitangents
triangles_included[c[0] as usize] += 1;
triangles_included[c[1] as usize] += 1;
triangles_included[c[2] as usize] += 1;
for i in 0..3 {
// We'll use the same tangent/bitangent for each vertex in the triangle
vertices[c[i] as usize].tangent =
(tangent + cgmath::Vector3::from(vertices[c[i] as usize].tangent)).into();
vertices[c[1] as usize].bitangent = (bitangent
+ cgmath::Vector3::from(vertices[c[1] as usize].bitangent))
.into();

// Used to average the tangents/bitangents
triangles_included[c[i] as usize] += 1;
}
}

// Average the tangents/bitangents
Expand Down
Loading