From 9e4401021950b72bbdf2e1db67ad393966bbd3df Mon Sep 17 00:00:00 2001 From: Kyle K Date: Sat, 16 Oct 2010 14:29:44 -0500 Subject: Cleanup some code --- obj.c | 7 +------ obj.h | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/obj.c b/obj.c index 62ff7b1..3b834e5 100644 --- a/obj.c +++ b/obj.c @@ -119,7 +119,7 @@ ObjModel* ObjLoadModel(char *memory, size_t size) if ((ret->nVertex != nV) || (ret->nNormal != nN) || (ret->nTexCoord != nT) || (ret->nFace != nF)) { - fprintf(stdout, "obj loader: warning, the number of scanned items does not equal to number of read\n"); + fprintf(stdout, "ObjLoadModel: warning, the number of scanned items does not equal to number of read\n"); if (ret->nVertex != nV) fprintf(stdout, "vertices: scanned %d, read %d\n", ret->nVertex, nV); if (ret->nNormal != nN) @@ -134,12 +134,7 @@ ObjModel* ObjLoadModel(char *memory, size_t size) if (ret->mtllib != NULL && ret->usemtl) { /* append directory to filename */ - //char *fname = (char *) malloc(sizeof(char) * 31); /* sprintf(fname, "./cube/%s", ret->mtllib); */ - //char *delimeter = strrchr(obj_last_fname, '/'); - //unsigned int offset = delimeter - obj_last_fname; - //strncpy(fname, obj_last_fname, offset + 1); - //strcat(fname, ret->mtllib); char *fname = ObjGetPath(ret->mtllib); char *mtl_mem = NULL; diff --git a/obj.h b/obj.h index fd2c13a..25a5c8f 100644 --- a/obj.h +++ b/obj.h @@ -55,10 +55,16 @@ typedef struct /* function prototypes */ ObjModel *ObjLoadModel(char *, size_t); + /* read a file into argument 2, and return amount of bytes read */ size_t ObjLoadFile(char *, char **); + void ObjList(ObjModel *); + +/* once we load an .obj file, we can extract path up to last '/' to load a + * mtl or texture that resides in the same folder */ char *ObjGetPath(char *); + void ObjFree(ObjModel *); #endif -- cgit v1.2.3