ov2 update merge in from wrong branchname #1

Closed
adriangl wants to merge 12 commits from ov3 into ov2
Showing only changes of commit ff9600071f - Show all commits
+13 -2
View File
@@ -302,8 +302,19 @@ fn main() {
simple_shader.activate();
// build and send the transform matrix (start from identity)
let mut transform: glm::Mat4 = glm::identity();
// modify element (0,0) here; change indices to test a, b, c, d, e, f, etc.
transform[(0,0)] = elapsed.sin();
// cycle through each transform parameter (a,b,c,d,e,f) over time
let cycle_duration = 2.0;
let idx = ((elapsed / cycle_duration).floor() as usize) % 6;
let v = elapsed.sin();
match idx {
0 => transform[(0,0)] = v, // a
1 => transform[(0,1)] = v, // b
2 => transform[(0,3)] = v, // c
3 => transform[(1,0)] = v, // d
4 => transform[(1,1)] = v, // e
5 => transform[(1,3)] = v, // f
_ => {}
}
gl::UniformMatrix4fv(transform_loc, 1, gl::FALSE, transform.as_ptr());
gl::BindVertexArray(my_vao);
gl::DrawElements(