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

Switch attributes to use iota in a complicated way

main
_ 2020-03-08 04:55:04 +00:00
parent cd4a66d764
commit 0db0df9e0e
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/bin/pumpkin.rs
View File

@ -132,19 +132,19 @@ where P: AsRef <std::path::Path>
struct ShaderClosure { struct ShaderClosure {
program: ShaderProgram, program: ShaderProgram,
uniforms: HashMap <u32, i32>, uniforms: HashMap <u32, i32>,
attributes: HashMap <usize, Option <u32>>, attributes: renderable_model::AttrMap,
} }
struct BorrowedShaderVars <'a> { struct BorrowedShaderVars <'a> {
unis: &'a HashMap <u32, i32>, unis: &'a HashMap <u32, i32>,
attrs: &'a HashMap <usize, Option <u32>>, attrs: &'a renderable_model::AttrMap,
} }
impl ShaderClosure { impl ShaderClosure {
pub fn new ( pub fn new (
program: ShaderProgram, program: ShaderProgram,
uniforms: HashMap <u32, i32>, uniforms: HashMap <u32, i32>,
attributes: HashMap <usize, Option <u32>> attributes: renderable_model::AttrMap
) -> Self ) -> Self
{ {
Self { Self {
@ -231,12 +231,15 @@ fn main () {
}); });
let get_shader_attrs = |shader: &ShaderProgram| { let get_shader_attrs = |shader: &ShaderProgram| {
let mut v = vec! [None; attr_lookup.iter ().map (|(i, _)| i).max ().unwrap () + 1];
let attrs = shader.get_attribute_locations (attr_lookup.iter ().map (|(_, v)| v).copied ()); let attrs = shader.get_attribute_locations (attr_lookup.iter ().map (|(_, v)| v).copied ());
HashMap::from_iter ( for ((i, _), loc) in attr_lookup.iter ().zip (attrs.iter ()) {
attr_lookup.iter ().enumerate () v [*i] = *loc;
.map (|(i, _)| (i, attrs [i])) }
)
v
}; };
let attrs = get_shader_attrs (&shader_program); let attrs = get_shader_attrs (&shader_program);
@ -264,9 +267,9 @@ fn main () {
{ {
use renderable_model::attributes::*; use renderable_model::attributes::*;
glezz::enable_vertex_attrib_array (attrs [&POS]); glezz::enable_vertex_attrib_array (attrs [POS]);
glezz::enable_vertex_attrib_array (attrs [&UV]); glezz::enable_vertex_attrib_array (attrs [UV]);
glezz::enable_vertex_attrib_array (attrs [&NORMAL]); glezz::enable_vertex_attrib_array (attrs [NORMAL]);
} }
let shader_diffuse = ShaderClosure::new (shader_program, unis, attrs); let shader_diffuse = ShaderClosure::new (shader_program, unis, attrs);

8
src/renderable_model.rs
View File

@ -37,7 +37,7 @@ unsafe fn vertex_attrib_pointer (id: Option <u32>, num_coords: i32, float_offset
} }
} }
pub type AttrMap = HashMap <usize, Option <u32>>; pub type AttrMap = Vec <Option <u32>>;
pub mod attributes { pub mod attributes {
use iota::iota; use iota::iota;
@ -110,9 +110,9 @@ impl RenderableModel {
unsafe { unsafe {
use attributes::*; use attributes::*;
vertex_attrib_pointer (attrs [&POS], 3, 0); vertex_attrib_pointer (attrs [POS], 3, 0);
vertex_attrib_pointer (attrs [&UV], 2, self.num_pos); vertex_attrib_pointer (attrs [UV], 2, self.num_pos);
vertex_attrib_pointer (attrs [&NORMAL], 3, self.num_pos + self.num_uv); vertex_attrib_pointer (attrs [NORMAL], 3, self.num_pos + self.num_uv);
} }
for mesh_num in start..end { for mesh_num in start..end {