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

Triangle with colors

Browse Source
This commit is contained in:
4VRDriver
2020-09-01 01:18:48 +02:00
parent 8f4306539d
commit 28661dd9f1
5 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Controller.cpp
View File

@@ -10,9 +10,6 @@
#endif
#include "Controller.h"
#include "ShaderProgram.h"
#include "VertexBuffer.h"
#include "defines.h"
Controller::Controller() {
if(!glfwInit()) exit(-1);
@@ -34,39 +31,34 @@ Controller::~Controller() {
}
void Controller::run() {
glClearColor(0.241f, 0.578f, 0.308f, 1.0f);
glClearColor(0.15f, 0.15f, 0.15f, 1.0f);
ShaderProgram shaderProgram("res/shaders/old.vs", "res/shaders/old.fs");
shaderProgram.bind();
shaderProgram = new ShaderProgram("res/shaders/basic.vs", "res/shaders/basic.fs");
shaderProgram->bind();
Vertex vertices[] = {
Vertex{-0.5f, -0.5f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f},
Vertex{0.5f, -0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f},
Vertex{0.0f, 0.5f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f}
};
uint32_t numVertices = sizeof(vertices) / sizeof(Vertex);
VertexBuffer vertexBuffer(vertices, numVertices);
vertexBuffer.unbind();
vertexBuffer = new VertexBuffer(vertices, numVertices);
// This is the game loop
while(!glfwWindowShouldClose(gameWindow->getGLFWwindow())) {
// Timing
limit_framerate();
static int slowdown = 0;
if(slowdown++ == 60) {
static int frameCount = 55;
if(frameCount++ == 60) {
std::cout << "FPS: " << 1/deltaTime << std::endl;
slowdown = 0;
frameCount = 0;
}
// Update game
// ...
// Render and buffer swap
glClear(GL_COLOR_BUFFER_BIT);
vertexBuffer.bind();
vertexBuffer->bind();
glDrawArrays(GL_TRIANGLES, 0, 3);
vertexBuffer.unbind();
vertexBuffer->unbind();
glfwSwapBuffers(gameWindow->getGLFWwindow());
@@ -76,11 +68,6 @@ void Controller::run() {
}
void Controller::error_callback(int error, const char* description) {
(void)error;
fprintf(stderr, "Error: %s\n", description);
}
void Controller::limit_framerate() {
static double startingTime = 0.0;
static double lastTime = 0.0;
@@ -101,3 +88,9 @@ void Controller::limit_framerate() {
startingTime = glfwGetTime();
}
// GLFW error function
void Controller::error_callback(int error, const char* description) {
(void)error;
fprintf(stderr, "Error: %s\n", description);
}