reactor
/
2021-32-bit-holiday-jam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🚧 RenderableModel uses an index buffer now

main
_ 2020-02-17 01:27:57 +00:00
parent 5def012e85
commit 0e0e3f833a
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/glezz.rs
View File

@ -127,8 +127,7 @@ impl Drop for VertexBuffer {
} }
} }
struct IndexBuffer {
pub struct IndexBuffer {
id: u32, id: u32,
// Not bytes. Number of indexes. // Not bytes. Number of indexes.
len: usize, len: usize,
@ -216,7 +215,7 @@ pub struct RenderableModel {
uv: Vec <f32>, uv: Vec <f32>,
normals: Vec <f32>, normals: Vec <f32>,
indexes: Vec <u32>, indexes: IndexBuffer,
meshes: Vec <RenderableMesh>, meshes: Vec <RenderableMesh>,
} }
@ -245,13 +244,9 @@ impl RenderableModel {
LittleEndian::read_f32_into (normal_bytes, &mut normal_vec [..]); LittleEndian::read_f32_into (normal_bytes, &mut normal_vec [..]);
let index_slice = model.get_all_indexes (); let index_slice = model.get_all_indexes ();
let indexes = IndexBuffer::from_slice (index_slice);
const IDX_SIZE: usize = 4; let max_index: usize = indexes.max.try_into ().unwrap ();
let mut indexes = vec! [0; index_slice.len () / IDX_SIZE];
LittleEndian::read_u32_into (index_slice, &mut indexes [..]);
let max_index: usize = (*indexes.iter ().max ().unwrap ()).try_into ().unwrap ();
assert! (max_index * 3 < pos_vec.len ()); assert! (max_index * 3 < pos_vec.len ());
assert! (max_index * 2 < uv_vec.len ()); assert! (max_index * 2 < uv_vec.len ());
@ -269,7 +264,7 @@ impl RenderableModel {
uv: uv_vec, uv: uv_vec,
normals: normal_vec, normals: normal_vec,
indexes: indexes, indexes,
meshes, meshes,
} }
} }
@ -279,11 +274,14 @@ impl RenderableModel {
let mesh = &self.meshes [mesh_num]; let mesh = &self.meshes [mesh_num];
unsafe { unsafe {
gl::BindBuffer (gl::ARRAY_BUFFER, 0);
self.indexes.bind ();
vertex_attrib_pointer (attrs ["pos"], 3, &self.pos); vertex_attrib_pointer (attrs ["pos"], 3, &self.pos);
vertex_attrib_pointer (attrs ["uv"], 2, &self.uv); vertex_attrib_pointer (attrs ["uv"], 2, &self.uv);
vertex_attrib_pointer (attrs ["normal"], 3, &self.normals); vertex_attrib_pointer (attrs ["normal"], 3, &self.normals);
gl::DrawElements (gl::TRIANGLES, mesh.num_triangles * 3, gl::UNSIGNED_INT, &self.indexes [mesh.first_triangle * 3] as *const u32 as *const c_void); gl::DrawElements (gl::TRIANGLES, mesh.num_triangles * 3, gl::UNSIGNED_INT, (mesh.first_triangle * 3 * 4) as *const u8 as *const c_void);
} }
} }
} }