KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

objview: clean up drawing VBO code

This commit is contained in:
Brian Paul 2009-10-01 13:07:01 -06:00
parent c7c62521fb
commit 8d93a4c639
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
progs/objviewer/glmdraw.c
View File

@ -252,7 +252,6 @@ void
glmDrawVBO(GLMmodel *model)
{
GLMgroup* group;
int mode = GLM_MATERIAL;
assert(model->vbo);
@ -279,38 +278,14 @@ glmDrawVBO(GLMmodel *model)
glScalef(model->scale, model->scale, model->scale);
for (group = model->groups; group; group = group->next) {
if (0&&strcmp(group->name, "Fuselage") != 0)
continue;
if (group->numtriangles > 0) {
if (model->materials && (mode & GLM_MATERIAL)) {
#if 0
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT,
model->materials[group->material].ambient);
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE,
model->materials[group->material].diffuse);
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR,
model->materials[group->material].specular);
glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS,
model->materials[group->material].shininess);
#else
glmShaderMaterial(&model->materials[group->material]);
#endif
}
glmShaderMaterial(&model->materials[group->material]);
#if 0
glDrawElements(GL_TRIANGLES, 3 * group->numtriangles,
GL_UNSIGNED_INT, group->triIndexes);
#else
glDrawRangeElements(GL_TRIANGLES,
group->minIndex, group->maxIndex,
3 * group->numtriangles,
GL_UNSIGNED_INT, group->triIndexes);
#endif
glDisable(GL_BLEND);
}
}