|
|
|
@ -4,42 +4,6 @@ |
|
|
|
#include "tangerine.h" |
|
|
|
#include "tangerine.h" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool |
|
|
|
|
|
|
|
addShaders(RenderState* rs) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (!addShaderProgram(rs->assets.arena, |
|
|
|
|
|
|
|
rs->gl_ctx, |
|
|
|
|
|
|
|
"../data/shader.vert", |
|
|
|
|
|
|
|
"../data/shader.frag", |
|
|
|
|
|
|
|
"default")) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
LOG(Error) << "error loading default shader\n"; |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!addShaderProgram(rs->assets.arena, |
|
|
|
|
|
|
|
rs->gl_ctx, |
|
|
|
|
|
|
|
"../data/colored_vertices.vert", |
|
|
|
|
|
|
|
"../data/colored_vertices.frag", |
|
|
|
|
|
|
|
"colored_vertices")) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
LOG(Error) << "error loading colored_vertices shader\n"; |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!addShaderProgram(rs->assets.arena, |
|
|
|
|
|
|
|
rs->gl_ctx, |
|
|
|
|
|
|
|
"../data/debug.vert", |
|
|
|
|
|
|
|
"../data/debug.frag", |
|
|
|
|
|
|
|
"debug")) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
LOG(Error) << "error loading debug shader\n"; |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool |
|
|
|
bool |
|
|
|
loadScene(RenderState* rs) |
|
|
|
loadScene(RenderState* rs) |
|
|
|
{ |
|
|
|
{ |
|
|
|
@ -150,11 +114,6 @@ main() |
|
|
|
rs->clear_col = {0.2, 0.2, 0.2, 1}; |
|
|
|
rs->clear_col = {0.2, 0.2, 0.2, 1}; |
|
|
|
|
|
|
|
|
|
|
|
if (rs) { |
|
|
|
if (rs) { |
|
|
|
if (!addShaders(rs)) { |
|
|
|
|
|
|
|
LOG(Error) << "error loading shaders\n"; |
|
|
|
|
|
|
|
return 1; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!loadScene(rs)) { |
|
|
|
if (!loadScene(rs)) { |
|
|
|
LOG(Error) << "error loading scene\n"; |
|
|
|
LOG(Error) << "error loading scene\n"; |
|
|
|
return 1; |
|
|
|
return 1; |
|
|
|
|