reimplemented testing code
This commit is contained in:
@ -13,7 +13,7 @@
|
|||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include "Square.h"
|
#include "Square.h"
|
||||||
#include "deff.h"
|
#include "deff.h"
|
||||||
#include <array>
|
#include <vector>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
int OpenGLVersion;
|
int OpenGLVersion;
|
||||||
@ -98,7 +98,7 @@ void renderInit() {
|
|||||||
//window->setWindowedFullscreen();
|
//window->setWindowedFullscreen();
|
||||||
window->beginRender();
|
window->beginRender();
|
||||||
//glfwSwapInterval(1);
|
//glfwSwapInterval(1);
|
||||||
window->setWindowedFullscreen();
|
//window->setWindowedFullscreen();
|
||||||
openGLContextInit();
|
openGLContextInit();
|
||||||
|
|
||||||
unsigned int vertexShader;
|
unsigned int vertexShader;
|
||||||
@ -156,14 +156,24 @@ void deinit() {
|
|||||||
void render() {
|
void render() {
|
||||||
INFO("Render thread starting");
|
INFO("Render thread starting");
|
||||||
renderInit();
|
renderInit();
|
||||||
|
std::vector<Square*> squares;
|
||||||
|
for (int i = 0; i < 100 * 100; i++) {
|
||||||
|
int x = i % 100;
|
||||||
|
int y = i / 100;
|
||||||
|
squares.push_back(new Square({x*6, y*6, 0}, {6, 6, 1}, {0, 0, 1, 1}));
|
||||||
|
}
|
||||||
while (running) {
|
while (running) {
|
||||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||||
window->beginRender();
|
window->beginRender();
|
||||||
|
for (auto square : squares) {
|
||||||
|
square->Draw();
|
||||||
|
}
|
||||||
window->endRender();
|
window->endRender();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void update() {
|
void update() {
|
||||||
|
glfwMakeContextCurrent(NULL);
|
||||||
INFO("Update Thread Starting");
|
INFO("Update Thread Starting");
|
||||||
while (!window->isClosing()) {
|
while (!window->isClosing()) {
|
||||||
glfwPollEvents();
|
glfwPollEvents();
|
||||||
|
Reference in New Issue
Block a user