From 35bb18ace9f012c654f14e22e3d63cc6c8cb8e44 Mon Sep 17 00:00:00 2001
From: Till <asuro@posteo.de>
Date: Sat, 3 Aug 2019 00:01:44 +0200
Subject: [PATCH] default texture, y is up

---
 models/missing-texture.jpg | Bin 0 -> 1439 bytes
 src/main.rs                |  10 +++++-----
 src/vulkan.rs              |   8 +++++---
 3 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 models/missing-texture.jpg

diff --git a/models/missing-texture.jpg b/models/missing-texture.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..256d9c175be8f4f94fe99a413840c8041665a98f
GIT binary patch
literal 1439
zcmex=<NpH&0WUXCHwH#VMur521O|rx4;fNiD>Bm<7<_#hv=|r|I2c$Mr5IQl7#J8C
z7#QprrQvKhMhymLus9O~1EV1W69WSS9|Hq}9|Hs=faMrKrZO-VBxdH7=;fuBD46IO
zG5o*H;LO0p2m&CI2?SV}K_n{+3o{EFD;paavvYE=v2(Jsv2k#7aB_hF8wWQJHy00x
z12TjWq=$)#m6@59i=B-fq=Gd3{{Vv^2SWox12dx{1Ct;lvmoRDBMkBk42-NG*D-=T
z4fYNr6Eh1d8#@Ol7x(`o3|j>lm>8LvnOK-vSy@;Z7#M3AnV1<^1X+a?4ISBp0~6Vm
z3Pp?>CobercG`GQH0a_772~9$CQdFfaS2H&RW)@DO)V2sGjj_|D`yv1H+K(Dui%i-
zu<(e;sN|H?wDgS3tm2Z=vhs?`s^*r~w)T$Bu1S-pOr17;#>`oZ7B5-4Z25|nt2S-k
zvUS_`9Xod&I(+2lvEwIBp1O4T%GGPvZ`{1~@X_NZPoF)1@$%KjPoKYh{r3IG&tD*a
zF)}biyakGIZ2l5tU}9tf#Q{6WUyMxU42(?7f-J0xhHOHPf$WKe!b(Ps93oB=7j8Vr
zscandK{To8BA1wo$wSqTAg_UaMx4i*$nqK7V+eoUV&GwBWMC3x7G$tz_++L1H^BbZ
zfkh4WOS`oHthYaEu&BX)R@Gn?ZLrc{Skz#jsj>d6!+(ZsrY?p*(Tnz<`ur!DON05_
zq^|!AA^hJqXe{7Ax(n``0aVP?#h|f(|7B9we+KRIAAK|y@IRY}aN}SWf4~QJ`YkVb
nN)UUo{?nfS3?hfR82&C<wErse-!)ts%pda*ej7l=|8D{SeoHMb

literal 0
HcmV?d00001

diff --git a/src/main.rs b/src/main.rs
index 9263886..9d3634a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -66,7 +66,7 @@ impl TestGame {
             self.cubes = self.test_meshes.iter().map(|(mesh, tex_id)| renderer.add_game_object(GameObject::new(*mesh, *tex_id, renderer))).collect();
         }
 
-        self.cam_rotation = self.cam_rotation * Quaternion::from_angle_z(Deg(self.input.get_axis("look_horizontal") * 0.05));
+        self.cam_rotation = self.cam_rotation * Quaternion::from_angle_y(Deg(self.input.get_axis("look_horizontal") * 0.05));
         self.cam_rotation = Quaternion::from_angle_x(Deg(self.input.get_axis("look_vertical") * 0.05)) * self.cam_rotation;
         self.cam_position += self.cam_rotation.invert().rotate_vector(Vector3::new(
             self.input.get_axis("move_sideways") * -0.05,
@@ -110,10 +110,10 @@ fn main() {
     let mut renderer = VulkanRenderer::init(
         (-line_count..=line_count)
             .flat_map(|it| vec![
-                LinePoint { position: [it as f32, -line_count as f32, 0.] },
-                LinePoint { position: [it as f32, line_count as f32, 0.] },
-                LinePoint { position: [-line_count as f32, it as f32, 0.] },
-                LinePoint { position: [line_count as f32, it as f32, 0.] },
+                LinePoint { position: [it as f32, 0., -line_count as f32] },
+                LinePoint { position: [it as f32, 0., line_count as f32] },
+                LinePoint { position: [-line_count as f32, 0., it as f32] },
+                LinePoint { position: [line_count as f32, 0., it as f32] },
             ]).collect(),
         log_config.vulkan_validation_layers,
     );
diff --git a/src/vulkan.rs b/src/vulkan.rs
index 6e5feb7..1700b2a 100644
--- a/src/vulkan.rs
+++ b/src/vulkan.rs
@@ -289,18 +289,20 @@ impl VulkanRenderer {
 
 
         let (default_tex, default_tex_future) = {
-            let image = image::load_from_memory_with_format(include_bytes!("../models/Eye.png"),
-                                                            ImageFormat::PNG).unwrap().to_rgba();
+            let image = image::load_from_memory_with_format(include_bytes!("../models/missing-texture.jpg"),
+                                                            ImageFormat::JPEG).unwrap().to_rgba();
             let image_data = image.into_raw().clone();
 
             ImmutableImage::from_iter(
                 image_data.iter().cloned(),
-                Dimensions::Dim2d { width: 4096, height: 4096 },
+                Dimensions::Dim2d { width: 128, height: 128 },
                 Format::R8G8B8A8Unorm,
                 queue.clone(),
             ).unwrap()
         };
 
+        default_tex_future.flush().unwrap();
+
         let default_descriptor_set = Arc::new(PersistentDescriptorSet::start(pipeline.clone(), 0)
             .add_sampled_image(default_tex.clone(), sampler.clone()).unwrap()
             .build().unwrap()