diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-06-08 17:26:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-06-08 17:26:01 +0300 |
| commit | e7f05704102d204ce73f97bca5f62312adcd1c2b (patch) | |
| tree | 5c490ccd372c6a3eec9021cca7167002fd88b006 | |
| parent | 0b9dc3ef09cf2e4db6877babf2b97404a6c6c4c9 (diff) | |
| download | manaverse-e7f05704102d204ce73f97bca5f62312adcd1c2b.tar.gz manaverse-e7f05704102d204ce73f97bca5f62312adcd1c2b.tar.bz2 manaverse-e7f05704102d204ce73f97bca5f62312adcd1c2b.tar.xz manaverse-e7f05704102d204ce73f97bca5f62312adcd1c2b.zip | |
Add simple shaders files.
| -rwxr-xr-x | configure.ac | 1 | ||||
| -rw-r--r-- | data/graphics/shaders/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/graphics/shaders/Makefile.am | 9 | ||||
| -rw-r--r-- | data/graphics/shaders/simple_frag.glsl | 7 | ||||
| -rw-r--r-- | data/graphics/shaders/simple_vertex.glsl | 6 |
5 files changed, 29 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 978a113a1..3756fd320 100755 --- a/configure.ac +++ b/configure.ac @@ -370,6 +370,7 @@ data/graphics/Makefile data/graphics/flags/Makefile data/graphics/gui/Makefile data/graphics/images/Makefile +data/graphics/shaders/Makefile data/graphics/sprites/Makefile data/sfx/Makefile data/sfx/system/Makefile diff --git a/data/graphics/shaders/CMakeLists.txt b/data/graphics/shaders/CMakeLists.txt new file mode 100644 index 000000000..0dc6cc124 --- /dev/null +++ b/data/graphics/shaders/CMakeLists.txt @@ -0,0 +1,6 @@ +SET(FILES + simple_frag.glsl + simple_vertex.glsl + ) + +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/shaders) diff --git a/data/graphics/shaders/Makefile.am b/data/graphics/shaders/Makefile.am new file mode 100644 index 000000000..db10da9b1 --- /dev/null +++ b/data/graphics/shaders/Makefile.am @@ -0,0 +1,9 @@ +shadersdir = $(pkgdatadir)/data/graphics/shaders + +shaders_DATA = \ + simple_frag.glsl \ + simple_vertex.glsl + +EXTRA_DIST = \ + $(shaders_DATA) \ + CMakeLists.txt diff --git a/data/graphics/shaders/simple_frag.glsl b/data/graphics/shaders/simple_frag.glsl new file mode 100644 index 000000000..87e90246e --- /dev/null +++ b/data/graphics/shaders/simple_frag.glsl @@ -0,0 +1,7 @@ +#version 150 core +out vec4 outColor; +uniform vec4 pixelColor; +void main() +{ + outColor = pixelColor; +} diff --git a/data/graphics/shaders/simple_vertex.glsl b/data/graphics/shaders/simple_vertex.glsl new file mode 100644 index 000000000..a26158e65 --- /dev/null +++ b/data/graphics/shaders/simple_vertex.glsl @@ -0,0 +1,6 @@ +#version 150 core +in vec2 position; +void main() +{ + gl_Position = vec4(position, 0.0, 1.0); +} |