aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/default_shader.frag7
-rw-r--r--resources/defaultshader.frag16
-rw-r--r--resources/defaultshader.vert (renamed from resources/default_shader.vert)0
-rwxr-xr-xscripts/add_version_headers7
-rw-r--r--tests/simplegame.cpp2
5 files changed, 22 insertions, 10 deletions
diff --git a/resources/default_shader.frag b/resources/default_shader.frag
deleted file mode 100644
index 93db96da..00000000
--- a/resources/default_shader.frag
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 130
-
-in vec2 fragment_position;
-in vec4 fragment_colour;
-in vec2 fragment_uv;
-
-out vec4 colour;
diff --git a/resources/defaultshader.frag b/resources/defaultshader.frag
new file mode 100644
index 00000000..1d8219a5
--- /dev/null
+++ b/resources/defaultshader.frag
@@ -0,0 +1,16 @@
+#version 130
+
+in vec2 fragment_position;
+in vec4 fragment_colour;
+in vec2 fragment_uv;
+
+out vec4 colour;
+
+uniform sampler2D texture_sampler;
+
+void main()
+{
+ vec4 texture_color = texture(texture_sampler, fragment_uv);
+
+ colour = texture_color;
+}
diff --git a/resources/default_shader.vert b/resources/defaultshader.vert
index d591e4bf..d591e4bf 100644
--- a/resources/default_shader.vert
+++ b/resources/defaultshader.vert
diff --git a/scripts/add_version_headers b/scripts/add_version_headers
index 209f0c66..c4fd3ffc 100755
--- a/scripts/add_version_headers
+++ b/scripts/add_version_headers
@@ -59,8 +59,11 @@ class HeaderUpdate(object):
with open(filePath, "r+") as f:
src = f.read()
f.seek(0)
- if lic_regex.match(src):
- print(filePath)
+ if not lic_regex.match(src):
+ print("Adding {}: ".format(
+ os.path.basename(filePath)), end="")
+ src = header.format(os.path.basename(filePath)) + src
+ print("done")
f.write(src)
f.truncate()
diff --git a/tests/simplegame.cpp b/tests/simplegame.cpp
index 6bd180ef..4fdb38d0 100644
--- a/tests/simplegame.cpp
+++ b/tests/simplegame.cpp
@@ -19,7 +19,7 @@ int main()
window.create("Simple Game", 800, 640);
sp.init();
- program.compileShaders("/home/yannherklotz/Github/YAGE/tests/resources/simplegame.vert", "/home/yannherklotz/Github/YAGE/tests/resources/simplegame.vert");
+ program.compileShaders("/home/yannherklotz/Github/YAGE/resources/defaultshader.vert", "/home/yannherklotz/Github/YAGE/tests/resources/defaultshader.frag");
program.addAttribute("vertex_position");
program.addAttribute("vertex_color");
program.addAttribute("vertex_uv");