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
Show Stats 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();

BIN
demo/grate_floor_lowres.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

8
demo/main.lua
View File

@ -36,7 +36,6 @@ function init()
ball1:SetupMesh()
ball1.material.tex = couch.Texture.FromFile("container.png")
ball1.material.usesTex = true
print(ball1.material.tex.width, ball1.material.tex.height)
couch.Node.GetRoot().children:Append(ball1)
ball1.transform:Translate(0.0, 3.0, 0.0)
@ -47,6 +46,13 @@ function init()
trough.material.usesTex = true
couch.Node.GetRoot().children:Append(trough)
trough.transform:Translate(10.0, 0.0, 0.0)
scaffold = couch.Mesh.FromFile("scaffold.glb")
scaffold:SetupMesh()
scaffold.material.tex = couch.Texture.FromFile("grate_floor_lowres.png")
scaffold.material.usesTex = true
couch.Node.GetRoot().children:Append(scaffold)
scaffold.transform:Translate(-10.0, 0.0, 0.0)
end
function update(delta)

BIN
demo/scaffold.glb Normal file
View File

Binary file not shown.

11
shaders/flat.frag
View File

@ -2,8 +2,6 @@
in vec3 UV;
out vec4 FragColor;
struct Material {
vec3 color;
bool usesColor;
@ -14,11 +12,14 @@ struct Material {
uniform Material material;
void main() {
FragColor = vec4(0.0);
gl_FragColor = vec4(0.0);
if (material.usesColor) {
FragColor += vec4(material.color, 1.0);
gl_FragColor += vec4(material.color, 1.0);
}
if (material.usesTex) {
FragColor += texture(material.tex, UV.xy / UV.z);
gl_FragColor += texture(material.tex, UV.xy / UV.z);
}
if (gl_FragColor.w < 0.99) {
discard;
}
}