From 16915d86d4b866c1fcce7523b0d34e8343ff52fc Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Sun, 24 Dec 2017 21:04:38 +0000
Subject: [Code] Simple game example furthered

---
 examples/resources/textureshader.frag | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 examples/resources/textureshader.frag

(limited to 'examples/resources/textureshader.frag')

diff --git a/examples/resources/textureshader.frag b/examples/resources/textureshader.frag
new file mode 100644
index 00000000..ef728b04
--- /dev/null
+++ b/examples/resources/textureshader.frag
@@ -0,0 +1,16 @@
+#version 450
+
+layout(location = 0) in vec2 fragment_position;
+layout(location = 1) in vec4 fragment_colour;
+layout(location = 2) in vec2 fragment_uv;
+
+out vec4 colour;
+
+uniform sampler2D texture_sampler;
+
+void main()
+{
+    vec4 texture_color = texture(texture_sampler, fragment_uv);
+
+    colour = texture_color * fragment_colour;
+}
-- 
cgit 


From 354d7df4d2779ed7391701d1ef4344e959b64582 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Wed, 27 Dec 2017 19:21:12 +0000
Subject: [Broken] Texture is black.

---
 examples/resources/textureshader.frag | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'examples/resources/textureshader.frag')

diff --git a/examples/resources/textureshader.frag b/examples/resources/textureshader.frag
index ef728b04..8d916be6 100644
--- a/examples/resources/textureshader.frag
+++ b/examples/resources/textureshader.frag
@@ -4,13 +4,15 @@ layout(location = 0) in vec2 fragment_position;
 layout(location = 1) in vec4 fragment_colour;
 layout(location = 2) in vec2 fragment_uv;
 
-out vec4 colour;
+layout(location = 0) out vec4 colour;
+layout(location = 1) out vec4 colour2;
 
 uniform sampler2D texture_sampler;
 
 void main()
 {
-    vec4 texture_color = texture(texture_sampler, fragment_uv);
+    vec4 texture_colour = texture(texture_sampler, fragment_uv);
 
-    colour = texture_color * fragment_colour;
+    colour2 = vec4(1.f, 0.f, 0.f, 1.f);
+    colour = texture_colour;
 }
-- 
cgit 


From 34908f108ad7c2ee6cff96491a0bc40381477424 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Sun, 31 Dec 2017 18:00:01 +0000
Subject: [Test] Benchmarking the engine and trying to optimize.

---
 examples/resources/textureshader.frag | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'examples/resources/textureshader.frag')

diff --git a/examples/resources/textureshader.frag b/examples/resources/textureshader.frag
index 8d916be6..1292de96 100644
--- a/examples/resources/textureshader.frag
+++ b/examples/resources/textureshader.frag
@@ -1,11 +1,10 @@
-#version 450
+#version 330
 
-layout(location = 0) in vec2 fragment_position;
-layout(location = 1) in vec4 fragment_colour;
-layout(location = 2) in vec2 fragment_uv;
+in vec2 fragment_position;
+in vec4 fragment_colour;
+in vec2 fragment_uv;
 
-layout(location = 0) out vec4 colour;
-layout(location = 1) out vec4 colour2;
+out vec4 colour;
 
 uniform sampler2D texture_sampler;
 
@@ -13,6 +12,5 @@ void main()
 {
     vec4 texture_colour = texture(texture_sampler, fragment_uv);
 
-    colour2 = vec4(1.f, 0.f, 0.f, 1.f);
     colour = texture_colour;
 }
-- 
cgit 


From db6480dccd9a3dbf4100a824930a36251f4e743c Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Fri, 5 Jan 2018 15:56:35 +0000
Subject: [Engine] Log levels added to engine.

---
 examples/resources/textureshader.frag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/resources/textureshader.frag')

diff --git a/examples/resources/textureshader.frag b/examples/resources/textureshader.frag
index 1292de96..ae12f4b0 100644
--- a/examples/resources/textureshader.frag
+++ b/examples/resources/textureshader.frag
@@ -12,5 +12,5 @@ void main()
 {
     vec4 texture_colour = texture(texture_sampler, fragment_uv);
 
-    colour = texture_colour;
+    colour = texture_colour * fragment_colour;
 }
-- 
cgit