diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2018-01-06 11:30:24 +0000 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-01-06 11:30:24 +0000 |
commit | c7090180503f263c60ec34844992e0e8d4bea85a (patch) | |
tree | 6ecc5b2e16856db49de056738b36e1ba103d3049 /examples/resources | |
parent | cf4c73f2a75b470a4d4c4167105f92bc46f1926c (diff) | |
parent | 07012cf0982d3f86aebe83b5bdc4a67332c635da (diff) | |
download | YAGE-c7090180503f263c60ec34844992e0e8d4bea85a.tar.gz YAGE-c7090180503f263c60ec34844992e0e8d4bea85a.zip |
Merge branch 'develop'
Diffstat (limited to 'examples/resources')
28 files changed, 87 insertions, 0 deletions
diff --git a/examples/resources/breast_black.png b/examples/resources/breast_black.png Binary files differnew file mode 100644 index 00000000..180b292f --- /dev/null +++ b/examples/resources/breast_black.png diff --git a/examples/resources/bullet.png b/examples/resources/bullet.png Binary files differnew file mode 100644 index 00000000..89e6289b --- /dev/null +++ b/examples/resources/bullet.png diff --git a/examples/resources/colourshader.frag b/examples/resources/colourshader.frag new file mode 100644 index 00000000..e49d1ebb --- /dev/null +++ b/examples/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/resources/colourshader.vert b/examples/resources/colourshader.vert new file mode 100644 index 00000000..e5c10d77 --- /dev/null +++ b/examples/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/resources/container.jpg b/examples/resources/container.jpg Binary files differnew file mode 100644 index 00000000..d07bee4e --- /dev/null +++ b/examples/resources/container.jpg diff --git a/examples/resources/dngn_blood_fountain.png b/examples/resources/dngn_blood_fountain.png Binary files differnew file mode 100644 index 00000000..7214fd47 --- /dev/null +++ b/examples/resources/dngn_blood_fountain.png diff --git a/examples/resources/fighter_fd.png b/examples/resources/fighter_fd.png Binary files differnew file mode 100644 index 00000000..ea576b4d --- /dev/null +++ b/examples/resources/fighter_fd.png diff --git a/examples/resources/fighter_fl.png b/examples/resources/fighter_fl.png Binary files differnew file mode 100644 index 00000000..69b677ca --- /dev/null +++ b/examples/resources/fighter_fl.png diff --git a/examples/resources/fighter_md.png b/examples/resources/fighter_md.png Binary files differnew file mode 100644 index 00000000..1b333abb --- /dev/null +++ b/examples/resources/fighter_md.png diff --git a/examples/resources/fighter_ml.png b/examples/resources/fighter_ml.png Binary files differnew file mode 100644 index 00000000..74dca840 --- /dev/null +++ b/examples/resources/fighter_ml.png diff --git a/examples/resources/healer_fd.png b/examples/resources/healer_fd.png Binary files differnew file mode 100644 index 00000000..138e7c48 --- /dev/null +++ b/examples/resources/healer_fd.png diff --git a/examples/resources/healer_fl.png b/examples/resources/healer_fl.png Binary files differnew file mode 100644 index 00000000..8360cfb9 --- /dev/null +++ b/examples/resources/healer_fl.png diff --git a/examples/resources/healer_md.png b/examples/resources/healer_md.png Binary files differnew file mode 100644 index 00000000..20ce4d2f --- /dev/null +++ b/examples/resources/healer_md.png diff --git a/examples/resources/healer_ml.png b/examples/resources/healer_ml.png Binary files differnew file mode 100644 index 00000000..28377d6b --- /dev/null +++ b/examples/resources/healer_ml.png diff --git a/examples/resources/learnopenglshader.frag b/examples/resources/learnopenglshader.frag new file mode 100644 index 00000000..30919459 --- /dev/null +++ b/examples/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/resources/learnopenglshader.vert b/examples/resources/learnopenglshader.vert new file mode 100644 index 00000000..7b24b5d7 --- /dev/null +++ b/examples/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/resources/mage_fd.png b/examples/resources/mage_fd.png Binary files differnew file mode 100644 index 00000000..b6a692f7 --- /dev/null +++ b/examples/resources/mage_fd.png diff --git a/examples/resources/mage_fl.png b/examples/resources/mage_fl.png Binary files differnew file mode 100644 index 00000000..66f5d2e5 --- /dev/null +++ b/examples/resources/mage_fl.png diff --git a/examples/resources/mage_md.png b/examples/resources/mage_md.png Binary files differnew file mode 100644 index 00000000..40838087 --- /dev/null +++ b/examples/resources/mage_md.png diff --git a/examples/resources/mage_ml.png b/examples/resources/mage_ml.png Binary files differnew file mode 100644 index 00000000..d559fb56 --- /dev/null +++ b/examples/resources/mage_ml.png diff --git a/examples/resources/ranger_fd.png b/examples/resources/ranger_fd.png Binary files differnew file mode 100644 index 00000000..e574cb1f --- /dev/null +++ b/examples/resources/ranger_fd.png diff --git a/examples/resources/ranger_fl.png b/examples/resources/ranger_fl.png Binary files differnew file mode 100644 index 00000000..9bc31719 --- /dev/null +++ b/examples/resources/ranger_fl.png diff --git a/examples/resources/ranger_md.png b/examples/resources/ranger_md.png Binary files differnew file mode 100644 index 00000000..5803cbe6 --- /dev/null +++ b/examples/resources/ranger_md.png diff --git a/examples/resources/ranger_ml.png b/examples/resources/ranger_ml.png Binary files differnew file mode 100644 index 00000000..e2e528b4 --- /dev/null +++ b/examples/resources/ranger_ml.png diff --git a/examples/resources/textureshader.frag b/examples/resources/textureshader.frag new file mode 100644 index 00000000..ae12f4b0 --- /dev/null +++ b/examples/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/resources/textureshader.vert b/examples/resources/textureshader.vert new file mode 100644 index 00000000..447c68d4 --- /dev/null +++ b/examples/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/resources/wall.jpg b/examples/resources/wall.jpg Binary files differnew file mode 100644 index 00000000..49631987 --- /dev/null +++ b/examples/resources/wall.jpg diff --git a/examples/resources/wall.png b/examples/resources/wall.png Binary files differnew file mode 100644 index 00000000..3eb2cd6e --- /dev/null +++ b/examples/resources/wall.png |