writing obj loader

[dosdemo] / src / infcubes.c

diff --git a/src/infcubes.c b/src/infcubes.c
index 4da85c6..36225f9 100644 (file)
--- a/src/infcubes.c
+++ b/src/infcubes.c
@@ -51,9 +51,14 @@ static int init(void)
        }
        convimg_rgb24_rgb16(tex_outer.pixels, (unsigned char*)tex_outer.pixels, tex_outer.width, tex_outer.height);
 
+       /*
        if(gen_cube_mesh(&mesh_cube, 1.0f, 3) == -1) {
                return -1;
        }
+       */
+       if(load_mesh(&mesh_cube, "data/bevelbox.obj") == -1) {
+               return -1;
+       }
        return 0;
 }