From 11a7989f049e8e294f545176e12f7e6d252be49c Mon Sep 17 00:00:00 2001 From: Micha White Date: Thu, 13 Oct 2022 10:01:10 -0400 Subject: Minor changes --- examples/bmp.rs | 3 ++- shaders/sprite.wgsl | 2 -- src/instance.rs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/bmp.rs b/examples/bmp.rs index f029efc..39e83e2 100644 --- a/examples/bmp.rs +++ b/examples/bmp.rs @@ -54,6 +54,7 @@ fn main() { renderer.instances_mut().push_instance(Instance { position: [0.5, 0.5], size: [0.75; 2], + rotation: 0.5, texture_size: [icon_width, icon_height], texture_coordinates: [icon_x, icon_y], ..Default::default() @@ -72,7 +73,7 @@ fn main() { renderer.instances_mut().push_instance(Instance { position: [0.0, -0.5], - size: [0.75; 2], + size: [1.5; 2], texture_size: [gator_width, gator_height], texture_coordinates: [gator_x, gator_y], ..Default::default() diff --git a/shaders/sprite.wgsl b/shaders/sprite.wgsl index 61944a1..5a00e24 100644 --- a/shaders/sprite.wgsl +++ b/shaders/sprite.wgsl @@ -57,7 +57,5 @@ var s_diffuse: sampler; @fragment fn fs_main(in: VertexOutput) -> @location(0) vec4 { - //return vec4(1.0, 1.0, 1.0, 0.0); return textureSample(t_diffuse, s_diffuse, in.texture_coordinates); - //return textureSample(t_diffuse, s_diffuse, ); } \ No newline at end of file diff --git a/src/instance.rs b/src/instance.rs index dc1ee40..3479b67 100644 --- a/src/instance.rs +++ b/src/instance.rs @@ -21,7 +21,7 @@ pub struct Instance { /// Rotation, in radians pub rotation: f32, /// z-index - pub z_index: u32, + pub z_index: u32, // TODO something more interesting with z-axis } impl Default for Instance { -- cgit v1.2.3