From 580ebd83fd334956e0b03766a22b98c3d7043705 Mon Sep 17 00:00:00 2001
From: "re.kovalev" <re.kovalev@gmail.com>
Date: Tue, 25 Oct 2022 12:04:39 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A8=D0=B5=D0=B9=D0=B4=D0=B5=D1=80=D1=8B=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=82=D0=B5=D0=BA=D1=81?=
 =?UTF-8?q?=D1=82=D1=83=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shaders/shader.frag | 9 +++++++--
 shaders/shader.vert | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/shaders/shader.frag b/shaders/shader.frag
index 3f0ad51..801807d 100644
--- a/shaders/shader.frag
+++ b/shaders/shader.frag
@@ -1,8 +1,13 @@
 #version 330 core 
 
-out vec3 color; 
+in vec2 texCoord;
+
+uniform sampler2D tex_diffuse;
+
+out vec4 color; 
 
 void main() 
 { 
-    color = vec3(1, 0, 0); 
+    color = texture(tex_diffuse, texCoord);
 } 
+ 
\ No newline at end of file
diff --git a/shaders/shader.vert b/shaders/shader.vert
index 8a67d4d..caca2c7 100644
--- a/shaders/shader.vert
+++ b/shaders/shader.vert
@@ -1,11 +1,15 @@
 #version 330 core 
 
 layout(location = 0) in vec3 pos; 
+layout(location = 1) in vec2 inTexCoord;
 
 uniform mat4 vp;
 uniform mat4 model;
 
+out vec2 texCoord;
+
 void main() 
 { 
     gl_Position = vp * model * vec4(pos, 1.0);
+    texCoord = inTexCoord;
 }