summaryrefslogtreecommitdiffstats
path: root/obj.h
diff options
context:
space:
mode:
Diffstat (limited to 'obj.h')
-rw-r--r--obj.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/obj.h b/obj.h
index d0ba3b5..6451b18 100644
--- a/obj.h
+++ b/obj.h
@@ -1,9 +1,8 @@
#ifndef _OBJLOADER_H_
#define _OBJLOADER_H_
-extern char obj_last_fname[101];
+extern char ObjLastFname[101];
-#pragma pack(1)
typedef struct
{
float x, y, z, w;
@@ -16,7 +15,7 @@ typedef struct
typedef struct
{
- float u, v, w;
+ float s, t, r, q;
} ObjTexCoord;
typedef struct
@@ -68,7 +67,10 @@ void ObjList(ObjModel *);
* mtl or texture that resides in the same folder */
char *ObjGetPath(const char *);
-void ObjPutFaceGLCmd(const ObjModel *, const unsigned);
+void ObjSubmitIndexedVertexArrayQuad(const ObjModel *);
+
+void ObjSubmitGLCommandsQuad(const ObjModel *);
+void ObjSubmitGLCommandsTriangle(const ObjModel *);
void ObjFree(ObjModel *);
static inline ObjNormal *ObjGetNormal(const ObjModel *model, const unsigned i,