Merge branch 'master' into feature/image-from-bytes

This commit is contained in:
Héctor Ramón Jiménez 2019-12-04 04:01:12 +01:00
commit 561c3641c6
24 changed files with 454 additions and 166 deletions

View file

@ -491,6 +491,7 @@ pub struct Image {
pub scale: [f32; 2],
}
#[repr(C)]
#[derive(Clone, Copy)]
pub struct Vertex {
_position: [f32; 2],
@ -513,6 +514,7 @@ const QUAD_VERTS: [Vertex; 4] = [
},
];
#[repr(C)]
#[derive(Clone, Copy)]
struct Instance {
_position: [f32; 2],