From be288b1fd93afcc304f179ef8e5cecbc107ef5f1 Mon Sep 17 00:00:00 2001
From: Piotrek <piotrek54pl@gmail.com>
Date: Mon, 12 Apr 2021 20:22:18 +0200
Subject: [PATCH] changed vertex_color to vertex_uv

---
 src/.bin/shader.frag.spv | Bin 680 -> 564 bytes
 src/.bin/shader.vert.spv | Bin 1056 -> 1080 bytes
 src/app.rs               |  17 ++++++++---------
 src/shader.frag          |   4 ++--
 src/shader.vert          |   6 +++---
 src/vertex.rs            |   4 ++--
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/.bin/shader.frag.spv b/src/.bin/shader.frag.spv
index 8ac54224fbc846b8c2137f35b3a9f64207e4bf64..226a1d5edddc7cf8ccc3ad4fb42b09711d320ac3 100644
GIT binary patch
literal 564
zcmYk2PfNo<6vUrx)7IAhv!FMrcod2U6+zUK<Pxaj2UtoPB@o+^rU7q$Hb0dY!TGJN
zbYb%L%}(CTZnbjOFx#`1b!=#VYhV>IW^Jqc8b&YCcvZ~Cmsb}kx>of<G(BrrO%=RP
z(>VwG!hz724qgV@RW;S@OFz}*7Dg_dOv32V#ml8z6(3pRvUHxfS(+ztk(LR%=8i6%
z$Ju(eD+r|6^$jfW-mm%e&Bcpsk(-#B&r&9N;nt;v>dAK^u;|IU?T1Q9&QqV*{QgM$
zy10>WEIs$3$9tr2Q<WEizuokBz@cxcqGvApwyK`N^XTcx0C%n)ZC7Az`=0MUAFg#H
z=HSi3<6BIidM6gIj=;QUvCQgkIF)~Hu;K80QgX5%3TQdQAJ2O^a2L*gl<-FQ1$Xf;
A^Z)<=

literal 680
zcmYk2%}T>i5QWG7+gfd{w(3GEZUm*cP*DV3Nj8BhK0qi*lt67u8Vl}xHlNCk;`!1<
zdc$PyoH=*q%oGd9RkJm#Thk6~dD>PGV%D%q>K*sl9n6zpaB+DKW7CQ$5zdxXtt5}V
zjiL#OZP~u8B_6mM=vGu!voAd=shi_^&T#0s51v1pdGq9B9D3tu5_&-thkg<*LU^?m
zUNrH?@4+geEXHbI;&t_i!{9{D%KFgq5|3Uze>$GVOAKv`FivvJ(K~pDG7d4EJnl$2
z+K<vHEWLMiuL$eQdg3!9F`I!`lLtFh4!j{V`@GNNjWjkpQx;xR1_vCYW=o#8%-Gkz
zEl+*$+bl*m82LSUtv9Vlo|rknuCxngpcaQW-$KgrH$u_Sk+Hugq4eF!Fu8whH^Zoz
s^ST*E{YO<oUr)w+_~e=GPF>MU?nkPwW$2<eeL3t6U3K|idG-SD58hHYC;$Ke

diff --git a/src/.bin/shader.vert.spv b/src/.bin/shader.vert.spv
index 3ccffd5c68d02a0279e3629d8ade27706376ac19..dd48e112a9b7c0674b235bcfc5c51242274bf7ba 100644
GIT binary patch
delta 291
zcmX|+u@1pd7=_QhMT>M2T8dVT9)Ltb3}R|RJb)Ms7K6~0#Vkz+tH<yzp1~tXoL?@(
z*FWd<yZvwP&cksn-L(OQ5?pjrcd7hzy$y0G0!TLd!|IqIj~vR(+Z|K-x+y=qs4JgU
z-B&t`^>gY`sZl8qi$u&Gry|l1P4-RKV-~kTfb&@VFpI6(N$ffibHUYO1*YTpcTLmD
qhM(6mo#vdw<}U$lBIm`I_p))q?}nTasgNoe@!rht_rRMMACM2JFB#GR

delta 267
zcmdnNv4De@nMs+Qfq{{Mi-DIxej;x$qu9j6Ol4LEP6h^svecrI_~iVY{2~ShRv_dC
zie=_OMJ7I-&L}pyma!j5@-mq-GEa78x~*!>zydUifk6z28G%?E$Y%r65<twr&|t3s
z<jYP@Wp=Lz+R7jf#2}S{K*K?*B%xwJ3N9uE6$6<DQzs1-V*=6v4D3LsGcd>iF-Sj1
kJxCs8qa)B<Ss*P3#KJ%<3dD8{%pg85Si@hSBQ1a!06Vf9MF0Q*

diff --git a/src/app.rs b/src/app.rs
index 2bc4fbc..e557417 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -3,17 +3,15 @@ use wgpu::util::DeviceExt;
 use crate::vertex::Vertex;
 
 const VERTICES: &[Vertex] = &[
-    Vertex { position: [-0.0868241, 0.49240386, 0.0], color: [1.0, 0.0, 0.0] }, // A
-    Vertex { position: [-0.49513406, 0.06958647, 0.0], color: [0.0, 1.0, 0.0] }, // B
-    Vertex { position: [-0.21918549, -0.44939706, 0.0], color: [0.0, 0.0, 1.0] }, // C
-    Vertex { position: [0.35966998, -0.3473291, 0.0], color: [0.0, 0.5, 0.5] }, // D
-    Vertex { position: [0.44147372, 0.2347359, 0.0],color: [0.5, 0.5, 0.0] }, // E
+    Vertex { position: [-0.5, 0.5, 0.0], uv: [0.0, 1.0] },
+    Vertex { position: [ 0.5, 0.5, 0.0], uv: [1.0, 1.0] },
+    Vertex { position: [ 0.5,-0.5, 0.0], uv: [1.0, 0.0] },
+    Vertex { position: [-0.5,-0.5, 0.0], uv: [0.0, 0.0] },
 ];
 
 const INDICES: &[u16] = &[
-    0, 1, 4,
-    1, 2, 4,
-    2, 3, 4,
+    0, 1, 3,
+    3, 1, 2
 ];
 
 pub struct App {
@@ -91,7 +89,7 @@ impl App {
         let prim_state = wgpu::PrimitiveState { // primitive
             topology: wgpu::PrimitiveTopology::TriangleList,
             strip_index_format: None,
-            front_face: wgpu::FrontFace::Ccw,
+            front_face: wgpu::FrontFace::Cw,
             cull_mode: wgpu::CullMode::Back,
             polygon_mode: wgpu::PolygonMode::Fill,
         };
@@ -131,6 +129,7 @@ impl App {
         );
 
         // Save values in app
+        println!("Initialized");
         Self { surface, device, queue, swapchain_desc, swapchain, pipeline, vertex_buffer, index_buffer }
     }
 
diff --git a/src/shader.frag b/src/shader.frag
index 9f09429..b4ca97f 100644
--- a/src/shader.frag
+++ b/src/shader.frag
@@ -1,10 +1,10 @@
 // shader.frag
 #version 450
 
-layout(location=0) in vec3 vert_color;
+layout(location=0) in vec2 vert_uv;
 layout(location=0) out vec4 frag_color;
 
 void main() 
 {
-    frag_color = vec4(vert_color, 1.0);
+    frag_color = vec4(vert_uv, 0.0, 1.0);
 }
\ No newline at end of file
diff --git a/src/shader.vert b/src/shader.vert
index ecf2291..3731eb2 100644
--- a/src/shader.vert
+++ b/src/shader.vert
@@ -1,12 +1,12 @@
 #version 450
 
 layout(location=0) in vec3 in_position;
-layout(location=1) in vec3 in_color;
-layout(location=0) out vec3 vert_color;
+layout(location=1) in vec2 in_uv;
+layout(location=0) out vec2 vert_uv;
 
 
 void main() 
 {
-    vert_color = in_color;
+    vert_uv = in_uv;
     gl_Position = vec4(in_position, 1.0);
 }
\ No newline at end of file
diff --git a/src/vertex.rs b/src/vertex.rs
index 8f26feb..480aaac 100644
--- a/src/vertex.rs
+++ b/src/vertex.rs
@@ -4,7 +4,7 @@
 #[derive(Copy, Clone, Debug, bytemuck::Pod, bytemuck::Zeroable)]
 pub struct Vertex {
     pub position: [f32; 3],
-    pub color: [f32; 3],
+    pub uv: [f32; 2],
 }
 
 impl Vertex {
@@ -23,7 +23,7 @@ impl Vertex {
                 wgpu::VertexAttribute {
                     offset: std::mem::size_of::<[f32; 3]>() as wgpu::BufferAddress,
                     shader_location: 1,
-                    format: wgpu::VertexFormat::Float3,
+                    format: wgpu::VertexFormat::Float2,
                 }
             ]
         }