- asset loader (needed for android)

[andemo] / src / demo.c

diff --git a/src/demo.c b/src/demo.c
index 4ab00f3..6555b28 100644 (file)
--- a/src/demo.c
+++ b/src/demo.c
@@ -1,9 +1,22 @@
 #include "demo.h"
 #include "opengl.h"
+#include "assman.h"
+
+static unsigned int sdr_foo;
+static unsigned int tex_logo;
 
 int demo_init(void)
 {
-       glClearColor(1, 0, 0, 1);
+       if(init_opengl() == -1) {
+               return -1;
+       }
+
+       if(!(sdr_foo = get_sdrprog("sdr/foo.v.glsl", "sdr/foo.p.glsl"))) {
+               return -1;
+       }
+       if(!(tex_logo = get_tex2d("data/ml_logo_old.png"))) {
+               return -1;
+       }
        return 0;
 }
 
@@ -14,6 +27,7 @@ void demo_cleanup(void)
 void demo_display(void)
 {
        glClear(GL_COLOR_BUFFER_BIT);
+
 }
 
 void demo_reshape(int x, int y)