TDT4195/OpenGL_Intro
0
0
Fork 0
Code Issues Pull Requests 2 Releases Activity

fix: correct glm::mat3 usage and add missing argument in draw_scene call

Browse Source
This commit is contained in:
Adrian Gunnar Lauterer
2025-10-02 12:05:57 +02:00
parent 46bdbfb889
commit f7fcc2359b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@@ -149,14 +149,18 @@ unsafe fn draw_scene(node: &scene_graph::SceneNode, transform_loc: i32, normal_l
let mvp = view_projection * new_transform;
gl::UniformMatrix4fv(transform_loc, 1, gl::FALSE, mvp.as_ptr());
let nm4 = glm::transpose(&glm::inverse(&new_transform));
let normal_matrix = glm::mat3(&nm4);
let normal_matrix = glm::mat3(
nm4[(0,0)], nm4[(0,1)], nm4[(0,2)],
nm4[(1,0)], nm4[(1,1)], nm4[(1,2)],
nm4[(2,0)], nm4[(2,1)], nm4[(2,2)],
);
gl::UniformMatrix3fv(normal_loc, 1, gl::FALSE, normal_matrix.as_ptr());
gl::BindVertexArray(node.vao_id);
gl::DrawElements(gl::TRIANGLES, node.index_count, gl::UNSIGNED_INT, ptr::null());
}
// Recurse to children
for &child in &node.children {
draw_scene(&*child, transform_loc, view_projection, &new_transform);
draw_scene(&*child, transform_loc, normal_loc, view_projection, &new_transform);
}
}