dane/couch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some demo stuff

Browse Source
This commit is contained in:
Dane Johnson
2021-01-20 12:50:59 -06:00
parent 472e269b01
commit 68f373bf69
7 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Material.cpp
View File

@@ -27,9 +27,9 @@ Texture Texture::FromFile(const char *filename) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
int nrChannels;
unsigned char* data = stbi_load(filename, &tex.width, &tex.height, &nrChannels, 0);
unsigned char* data = stbi_load(filename, &tex.width, &tex.height, &nrChannels, 4);
if (data) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tex.width, tex.height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex.width, tex.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
glGenerateMipmap(GL_TEXTURE_2D);
} else {
Util::Die("Error loading texture file: ", filename);

4
core/Screen.cpp
View File

@@ -1,10 +1,10 @@
#include "Screen.h"
const Vertex vertices[] = {
Vertex(-1.0f, -1.0f, 0.0f, 0.0f, 0.0f),
Vertex(-1.0f, 1.0f, 0.0f, 0.0f, 1.0f),
Vertex(-1.0f, -1.0f, 0.0f, 0.0f, 0.0f),
Vertex(1.0f, -1.0f, 0.0f, 1.0f, 0.0f),
Vertex(-1.0f, 1.0f, 0.0f, 0.0f, 1.0f),
Vertex(1.0f, -1.0f, 0.0f, 1.0f, 0.0f),
Vertex(1.0f, 1.0f, 0.0f, 1.0f, 1.0f)

3
core/couch.cpp
View File

@@ -85,6 +85,9 @@ int main() {
glViewport(0, 0, width, height);
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
root = Node::GetRoot();
Input *input = Input::GetInstance();