From a8de6cb5593e3d6347393eb4c144c9cc22a470d8 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 19 May 2018 15:15:20 +0100 Subject: Moving resources and generalising examples --- examples/simple/main.cpp | 6 ++++++ examples/simple/resources/breast_black.png | Bin 0 -> 225 bytes examples/simple/resources/bullet.png | Bin 0 -> 1383 bytes examples/simple/resources/colourshader.frag | 10 ++++++++++ examples/simple/resources/colourshader.vert | 15 +++++++++++++++ examples/simple/resources/container.jpg | Bin 0 -> 184939 bytes examples/simple/resources/dngn_blood_fountain.png | Bin 0 -> 955 bytes examples/simple/resources/fighter_fd.png | Bin 0 -> 6467 bytes examples/simple/resources/fighter_fl.png | Bin 0 -> 2916 bytes examples/simple/resources/fighter_md.png | Bin 0 -> 6464 bytes examples/simple/resources/fighter_ml.png | Bin 0 -> 2843 bytes examples/simple/resources/healer_fd.png | Bin 0 -> 7862 bytes examples/simple/resources/healer_fl.png | Bin 0 -> 3256 bytes examples/simple/resources/healer_md.png | Bin 0 -> 6756 bytes examples/simple/resources/healer_ml.png | Bin 0 -> 2940 bytes examples/simple/resources/learnopenglshader.frag | 12 ++++++++++++ examples/simple/resources/learnopenglshader.vert | 14 ++++++++++++++ examples/simple/resources/mage_fd.png | Bin 0 -> 7026 bytes examples/simple/resources/mage_fl.png | Bin 0 -> 3283 bytes examples/simple/resources/mage_md.png | Bin 0 -> 6794 bytes examples/simple/resources/mage_ml.png | Bin 0 -> 3139 bytes examples/simple/resources/ranger_fd.png | Bin 0 -> 6798 bytes examples/simple/resources/ranger_fl.png | Bin 0 -> 2884 bytes examples/simple/resources/ranger_md.png | Bin 0 -> 6182 bytes examples/simple/resources/ranger_ml.png | Bin 0 -> 2803 bytes examples/simple/resources/textureshader.frag | 16 ++++++++++++++++ examples/simple/resources/textureshader.vert | 20 ++++++++++++++++++++ examples/simple/resources/wall.jpg | Bin 0 -> 256989 bytes examples/simple/resources/wall.png | Bin 0 -> 607366 bytes 29 files changed, 93 insertions(+) create mode 100644 examples/simple/main.cpp create mode 100644 examples/simple/resources/breast_black.png create mode 100644 examples/simple/resources/bullet.png create mode 100644 examples/simple/resources/colourshader.frag create mode 100644 examples/simple/resources/colourshader.vert create mode 100644 examples/simple/resources/container.jpg create mode 100644 examples/simple/resources/dngn_blood_fountain.png create mode 100644 examples/simple/resources/fighter_fd.png create mode 100644 examples/simple/resources/fighter_fl.png create mode 100644 examples/simple/resources/fighter_md.png create mode 100644 examples/simple/resources/fighter_ml.png create mode 100644 examples/simple/resources/healer_fd.png create mode 100644 examples/simple/resources/healer_fl.png create mode 100644 examples/simple/resources/healer_md.png create mode 100644 examples/simple/resources/healer_ml.png create mode 100644 examples/simple/resources/learnopenglshader.frag create mode 100644 examples/simple/resources/learnopenglshader.vert create mode 100644 examples/simple/resources/mage_fd.png create mode 100644 examples/simple/resources/mage_fl.png create mode 100644 examples/simple/resources/mage_md.png create mode 100644 examples/simple/resources/mage_ml.png create mode 100644 examples/simple/resources/ranger_fd.png create mode 100644 examples/simple/resources/ranger_fl.png create mode 100644 examples/simple/resources/ranger_md.png create mode 100644 examples/simple/resources/ranger_ml.png create mode 100644 examples/simple/resources/textureshader.frag create mode 100644 examples/simple/resources/textureshader.vert create mode 100644 examples/simple/resources/wall.jpg create mode 100644 examples/simple/resources/wall.png (limited to 'examples/simple') diff --git a/examples/simple/main.cpp b/examples/simple/main.cpp new file mode 100644 index 00000000..0869f9b1 --- /dev/null +++ b/examples/simple/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + std::cout << "Hello world"; +} diff --git a/examples/simple/resources/breast_black.png b/examples/simple/resources/breast_black.png new file mode 100644 index 00000000..180b292f Binary files /dev/null and b/examples/simple/resources/breast_black.png differ diff --git a/examples/simple/resources/bullet.png b/examples/simple/resources/bullet.png new file mode 100644 index 00000000..89e6289b Binary files /dev/null and b/examples/simple/resources/bullet.png differ diff --git a/examples/simple/resources/colourshader.frag b/examples/simple/resources/colourshader.frag new file mode 100644 index 00000000..e49d1ebb --- /dev/null +++ b/examples/simple/resources/colourshader.frag @@ -0,0 +1,10 @@ +#version 450 + +layout(location = 0) in vec4 fragment_colour; + +layout(location = 0) out vec4 colour; + +void main() +{ + colour = fragment_colour; +} diff --git a/examples/simple/resources/colourshader.vert b/examples/simple/resources/colourshader.vert new file mode 100644 index 00000000..e5c10d77 --- /dev/null +++ b/examples/simple/resources/colourshader.vert @@ -0,0 +1,15 @@ +#version 450 + +layout(location = 0) in vec2 vertex_position; +layout(location = 1) in vec4 vertex_colour; + +layout(location = 0) out vec4 fragment_colour; + +uniform mat4 P; + +void main() +{ + gl_Position = vec4(vertex_position, 0.f, 1.f); + + fragment_colour = vertex_colour; +} diff --git a/examples/simple/resources/container.jpg b/examples/simple/resources/container.jpg new file mode 100644 index 00000000..d07bee4e Binary files /dev/null and b/examples/simple/resources/container.jpg differ diff --git a/examples/simple/resources/dngn_blood_fountain.png b/examples/simple/resources/dngn_blood_fountain.png new file mode 100644 index 00000000..7214fd47 Binary files /dev/null and b/examples/simple/resources/dngn_blood_fountain.png differ diff --git a/examples/simple/resources/fighter_fd.png b/examples/simple/resources/fighter_fd.png new file mode 100644 index 00000000..ea576b4d Binary files /dev/null and b/examples/simple/resources/fighter_fd.png differ diff --git a/examples/simple/resources/fighter_fl.png b/examples/simple/resources/fighter_fl.png new file mode 100644 index 00000000..69b677ca Binary files /dev/null and b/examples/simple/resources/fighter_fl.png differ diff --git a/examples/simple/resources/fighter_md.png b/examples/simple/resources/fighter_md.png new file mode 100644 index 00000000..1b333abb Binary files /dev/null and b/examples/simple/resources/fighter_md.png differ diff --git a/examples/simple/resources/fighter_ml.png b/examples/simple/resources/fighter_ml.png new file mode 100644 index 00000000..74dca840 Binary files /dev/null and b/examples/simple/resources/fighter_ml.png differ diff --git a/examples/simple/resources/healer_fd.png b/examples/simple/resources/healer_fd.png new file mode 100644 index 00000000..138e7c48 Binary files /dev/null and b/examples/simple/resources/healer_fd.png differ diff --git a/examples/simple/resources/healer_fl.png b/examples/simple/resources/healer_fl.png new file mode 100644 index 00000000..8360cfb9 Binary files /dev/null and b/examples/simple/resources/healer_fl.png differ diff --git a/examples/simple/resources/healer_md.png b/examples/simple/resources/healer_md.png new file mode 100644 index 00000000..20ce4d2f Binary files /dev/null and b/examples/simple/resources/healer_md.png differ diff --git a/examples/simple/resources/healer_ml.png b/examples/simple/resources/healer_ml.png new file mode 100644 index 00000000..28377d6b Binary files /dev/null and b/examples/simple/resources/healer_ml.png differ diff --git a/examples/simple/resources/learnopenglshader.frag b/examples/simple/resources/learnopenglshader.frag new file mode 100644 index 00000000..30919459 --- /dev/null +++ b/examples/simple/resources/learnopenglshader.frag @@ -0,0 +1,12 @@ +#version 450 core +out vec4 FragColor; + +in vec4 ourColor; +in vec2 TexCoord; + +uniform sampler2D ourTexture; + +void main() +{ + FragColor = texture(ourTexture, TexCoord); +} diff --git a/examples/simple/resources/learnopenglshader.vert b/examples/simple/resources/learnopenglshader.vert new file mode 100644 index 00000000..7b24b5d7 --- /dev/null +++ b/examples/simple/resources/learnopenglshader.vert @@ -0,0 +1,14 @@ +#version 450 core +layout (location = 0) in vec2 aPos; +layout (location = 1) in vec4 aColor; +layout (location = 2) in vec2 aTexCoord; + +out vec4 ourColor; +out vec2 TexCoord; + +void main() +{ + gl_Position = vec4(aPos, 0.0, 1.0); + ourColor = aColor; + TexCoord = aTexCoord; +} diff --git a/examples/simple/resources/mage_fd.png b/examples/simple/resources/mage_fd.png new file mode 100644 index 00000000..b6a692f7 Binary files /dev/null and b/examples/simple/resources/mage_fd.png differ diff --git a/examples/simple/resources/mage_fl.png b/examples/simple/resources/mage_fl.png new file mode 100644 index 00000000..66f5d2e5 Binary files /dev/null and b/examples/simple/resources/mage_fl.png differ diff --git a/examples/simple/resources/mage_md.png b/examples/simple/resources/mage_md.png new file mode 100644 index 00000000..40838087 Binary files /dev/null and b/examples/simple/resources/mage_md.png differ diff --git a/examples/simple/resources/mage_ml.png b/examples/simple/resources/mage_ml.png new file mode 100644 index 00000000..d559fb56 Binary files /dev/null and b/examples/simple/resources/mage_ml.png differ diff --git a/examples/simple/resources/ranger_fd.png b/examples/simple/resources/ranger_fd.png new file mode 100644 index 00000000..e574cb1f Binary files /dev/null and b/examples/simple/resources/ranger_fd.png differ diff --git a/examples/simple/resources/ranger_fl.png b/examples/simple/resources/ranger_fl.png new file mode 100644 index 00000000..9bc31719 Binary files /dev/null and b/examples/simple/resources/ranger_fl.png differ diff --git a/examples/simple/resources/ranger_md.png b/examples/simple/resources/ranger_md.png new file mode 100644 index 00000000..5803cbe6 Binary files /dev/null and b/examples/simple/resources/ranger_md.png differ diff --git a/examples/simple/resources/ranger_ml.png b/examples/simple/resources/ranger_ml.png new file mode 100644 index 00000000..e2e528b4 Binary files /dev/null and b/examples/simple/resources/ranger_ml.png differ diff --git a/examples/simple/resources/textureshader.frag b/examples/simple/resources/textureshader.frag new file mode 100644 index 00000000..ae12f4b0 --- /dev/null +++ b/examples/simple/resources/textureshader.frag @@ -0,0 +1,16 @@ +#version 330 + +in vec2 fragment_position; +in vec4 fragment_colour; +in vec2 fragment_uv; + +out vec4 colour; + +uniform sampler2D texture_sampler; + +void main() +{ + vec4 texture_colour = texture(texture_sampler, fragment_uv); + + colour = texture_colour * fragment_colour; +} diff --git a/examples/simple/resources/textureshader.vert b/examples/simple/resources/textureshader.vert new file mode 100644 index 00000000..447c68d4 --- /dev/null +++ b/examples/simple/resources/textureshader.vert @@ -0,0 +1,20 @@ +#version 330 + +layout(location = 0) in vec2 vertex_position; +layout(location = 1) in vec4 vertex_colour; +layout(location = 2) in vec2 vertex_uv; + +out vec2 fragment_position; +out vec4 fragment_colour; +out vec2 fragment_uv; + +uniform mat4 P; + +void main() +{ + gl_Position = vec4((P*vec4(vertex_position, 0.f, 1.f)).xy, 0.f, 1.f); + + fragment_position = vertex_position; + fragment_colour = vertex_colour; + fragment_uv = vec2(vertex_uv.x, 1-vertex_uv.y); +} diff --git a/examples/simple/resources/wall.jpg b/examples/simple/resources/wall.jpg new file mode 100644 index 00000000..49631987 Binary files /dev/null and b/examples/simple/resources/wall.jpg differ diff --git a/examples/simple/resources/wall.png b/examples/simple/resources/wall.png new file mode 100644 index 00000000..3eb2cd6e Binary files /dev/null and b/examples/simple/resources/wall.png differ -- cgit