summaryrefslogtreecommitdiffstats
path: root/objloader.c
diff options
context:
space:
mode:
authorKyle K <kylek389@gmail.com>2011-07-04 22:48:47 -0500
committerKamil Kaminski <kamilkss@gmail.com>2011-07-04 22:48:47 -0500
commit8d888af644a4291df660d1fb016b50363f84bae7 (patch)
tree1cfd840189ed509db585bf0631c0545d3253ce8d /objloader.c
parentea8f3b831e45aca8dbab407824919da4692493e1 (diff)
downloadOBJLoader-master.tar.gz
OBJLoader-master.tar.bz2
OBJLoader-master.zip
sync upHEADmaster
Diffstat (limited to 'objloader.c')
-rw-r--r--objloader.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/objloader.c b/objloader.c
index 699efdd..162e5b9 100644
--- a/objloader.c
+++ b/objloader.c
@@ -108,6 +108,7 @@ static void setup_opengl(ObjModel *model)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_BORDER);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glEnable(GL_TEXTURE_2D);
@@ -166,11 +167,11 @@ static void render(ObjModel *model)
glTranslatef(5.0f, 0.0f, -150.0f);
glBegin(GL_QUADS);
- int i;
- for (i = 0; i < model->nFace; i++)
- ObjPutFaceGLCmd(model, i);
+ ObjSubmitGLCommandsQuad(model);
glEnd();
+ /* ObjSubmitIndexedVertexArrayQuad(model); */
+
glPopMatrix();
/* buffer swap */