derek/fall-fever
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add texture support

Browse Source
This commit is contained in:
4VRDriver
2020-09-02 18:37:53 +02:00
parent f8868be702
commit b8715fba4d
11 changed files with 133 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Controller.cpp
View File

@@ -10,6 +10,7 @@
#endif
#include "Controller.h"
#include "Texture.h"
Controller::Controller() {
if(!glfwInit()) exit(-1);
@@ -40,13 +41,23 @@ void Controller::run() {
shaderProgram.bind();
Vertex vertices[] = {
Vertex{-0.5f, -0.5f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f},
Vertex{0.5f, -0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
Vertex{0.0f, 0.5f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f}
Vertex{-0.5f, -0.5f, 0.0f,
0.0f, 0.0f,
1.0f, 0.0f, 0.0f, 1.0f},
Vertex{0.5f, -0.5f, 0.0f,
1.0f, 0.0f,
0.0f, 1.0f,0.0f, 1.0f},
Vertex{-0.5f, 0.5f, 0.0f,
0.0f, 1.0f,
0.0f, 0.0f, 1.0f, 1.0f},
Vertex{0.5f, 0.5f, 0.0f,
1.0f, 1.0f,
0.0f, 0.0f, 1.0f, 1.0f}
};
uint32_t indices[] = {
0, 1, 2
0, 1, 2,
1, 2, 3
};
uint32_t numVertices = sizeof(vertices) / sizeof(Vertex);
@@ -54,6 +65,8 @@ void Controller::run() {
VertexBuffer vertexBuffer(vertices, indices, numVertices, numIndices);
Texture tex1("res/tex.png", shaderProgram.getShaderProgramId());
// This is the game loop
while(!glfwWindowShouldClose(gameWindow->getGLFWwindow())) {
// Timing
@@ -74,7 +87,9 @@ void Controller::run() {
glClear(GL_COLOR_BUFFER_BIT);
vertexBuffer.bind();
tex1.bind(0);
glDrawElements(GL_TRIANGLES, numIndices, GL_UNSIGNED_INT, 0);
tex1.unbind();
vertexBuffer.unbind();
glfwSwapBuffers(gameWindow->getGLFWwindow());