aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-12-30 16:07:41 +0000
committerYann Herklotz <ymherklotz@gmail.com>2017-12-30 16:07:41 +0000
commit5c1a57b3672ec1e0777d8d0878c6a7ae93ebfdca (patch)
tree4a7da71cdc548867aad8bbea45827effb80df527 /examples
parentd2ed94a517066da4f4ec53045f9c69bfc355eab6 (diff)
downloadYAGE-5c1a57b3672ec1e0777d8d0878c6a7ae93ebfdca.tar.gz
YAGE-5c1a57b3672ec1e0777d8d0878c6a7ae93ebfdca.zip
[Code] Fixed spritebatch and optimised it.
Diffstat (limited to 'examples')
-rw-r--r--examples/shooter/main.cpp43
1 files changed, 2 insertions, 41 deletions
diff --git a/examples/shooter/main.cpp b/examples/shooter/main.cpp
index fe98f300..12cf218d 100644
--- a/examples/shooter/main.cpp
+++ b/examples/shooter/main.cpp
@@ -2,59 +2,20 @@
#include "glad/glad.h"
-#include <iostream>
-
using std::cout;
int main(int argc, char **argv)
{
- cout << "Starting Shooter example...\n";
-
yage::Window window;
window.create("Shooter example", 800, 600);
- yage::Shader shader("examples/resources/colourshader.vert",
- "examples/resources/colourshader.frag");
-
- GLfloat vertices[] = {
- 0.0f, 0.5f, 1.f, 0.f, 0.f, // Vertex 1 (X, Y, R, G, B)
- 0.5f, -0.5f, 0.f, 1.f, 0.f, // Vertex 2 (X, Y, R, G, B)
- -0.5f, -0.5f, 0.f, 0.f, 1.f, // Vertex 3 (X, Y, R, G, B)
- };
-
- // create vertex array
- GLuint rect_vao, rect_vbo;
-
- // bind vertex array object
- glGenVertexArrays(1, &rect_vao);
- glBindVertexArray(rect_vao);
-
- // bind vertex buffer object
- glGenBuffers(1, &rect_vbo);
- glBindBuffer(GL_ARRAY_BUFFER, rect_vbo);
-
- glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
- shader.use();
-
- // enable vertex attribute arrays
- glEnableVertexAttribArray(0);
- glEnableVertexAttribArray(1);
-
- // set the vertex attribute pointers
- glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), 0);
- glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat),
- (void *)(2 * sizeof(GLfloat)));
+ yage::Shader shader("examples/resources/textureshader.vert",
+ "examples/resources/textureshader.frag");
while (!window.shouldClose()) {
window.pollEvents();
window.clearBuffer();
- glDrawArrays(GL_TRIANGLES, 0, 3);
-
window.swapBuffer();
}
-
- glDeleteBuffers(1, &rect_vbo);
-
- glDeleteVertexArrays(1, &rect_vao);
}