zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Models in VBOs.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@754 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2008-06-01 08:58:06 +00:00
parent 59b8d7b757
commit f661a56e2f
3 changed files with 116 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/build/include/mdsprite.h
View file

@ -173,6 +173,10 @@ typedef struct
unsigned short *vindexes; unsigned short *vindexes;
float *maxdepths; float *maxdepths;
GLuint* vbos; GLuint* vbos;
// polymer VBO names after that, allocated per surface
GLuint* indices;
GLuint* texcoords;
GLuint* geometry;
} md3model; } md3model;
#define VOXBORDWIDTH 1 //use 0 to save memory, but has texture artifacts; 1 looks better... #define VOXBORDWIDTH 1 //use 0 to save memory, but has texture artifacts; 1 looks better...

5
polymer/build/include/polymer.h
View file

@ -14,7 +14,7 @@
// - MDSPRITES // - MDSPRITES
// o need to truly convert MD2s to MD3s with proper scale offset to just dump the data into VRAM // o need to truly convert MD2s to MD3s with proper scale offset to just dump the data into VRAM
// o need full translation and rotation support from CON to attach to game world or tags // o need full translation and rotation support from CON to attach to game world or tags
// o need to put frames into VBOs and blend between them // o need to blend between frames
// //
// the renderer should hopefully be pretty solid after all that // the renderer should hopefully be pretty solid after all that
// the rest will be a bliss :) // the rest will be a bliss :)
@ -160,6 +160,9 @@ static void polymer_initskybox(void);
static void polymer_getsky(void); static void polymer_getsky(void);
static void polymer_drawskyquad(int p1, int p2, GLfloat height); static void polymer_drawskyquad(int p1, int p2, GLfloat height);
static void polymer_drawartsky(short tilenum); static void polymer_drawartsky(short tilenum);
// MDSPRITES
static void polymer_drawmdsprite(spritetype *tspr);
static void polymer_loadmodelvbos(md3model* m);
# endif // !POLYMER_C # endif // !POLYMER_C

161
polymer/build/src/polymer.c
View file

@ -10,12 +10,13 @@ int pr_fov = 426; // appears to be the classic setting.
int pr_billboardingmode = 1; int pr_billboardingmode = 1;
int pr_verbosity = 1; // 0: silent, 1: errors and one-times, 2: multiple-times, 3: flood int pr_verbosity = 1; // 0: silent, 1: errors and one-times, 2: multiple-times, 3: flood
int pr_wireframe = 0; int pr_wireframe = 0;
int pr_vbos = 1; int pr_vbos = 2;
int pr_mirrordepth = 1; int pr_mirrordepth = 1;
int glerror; int glerror;
GLenum mapvbousage = GL_STREAM_DRAW_ARB; GLenum mapvbousage = GL_STREAM_DRAW_ARB;
GLenum modelvbousage = GL_STATIC_DRAW_ARB;
// DATA // DATA
_prsector *prsectors[MAXSECTORS]; _prsector *prsectors[MAXSECTORS];
@ -340,58 +341,6 @@ void polymer_drawmaskwall(int damaskwallcnt)
polymer_drawplane(-1, -3, &w->mask, 0); polymer_drawplane(-1, -3, &w->mask, 0);
} }
static void polymer_drawmdsprite(spritetype *tspr)
{
md3model* m;
float spos[3];
float ang;
float scale;
int surfi;
md3xyzn_t *v0;
md3surf_t *s;
GLuint i;
m = (md3model*)models[tile2model[Ptile2tile(tspr->picnum,sprite[tspr->owner].pal)].modelid];
updateanimation((md2model *)m,tspr);
if (m->head.flags == 1337)
return;
spos[0] = tspr->y;
spos[1] = -(float)(tspr->z) / 16.0f;
spos[2] = -tspr->x;
ang = (float)((tspr->ang) & 2047) / (2048.0f / 360.0f);
bglMatrixMode(GL_MODELVIEW);
bglPushMatrix();
scale = (m->head.flags == 1337) ? 1.0 : (1.0/64.0);
scale *= m->scale;
scale *= m->bscale;
scale *= 1024;
bglTranslatef(spos[0], spos[1], spos[2]);
bglRotatef(-ang, 0.0f, 1.0f, 0.0f);
bglRotatef(-90.0f, 1.0f, 0.0f, 0.0f);
bglRotatef(90.0f, 0.0f, 0.0f, 1.0f);
bglScalef(scale * (float)(tspr->xrepeat) / 64.0, scale * (float)(tspr->xrepeat) / 64.0, scale * (float)(tspr->yrepeat) / 64.0);
for (surfi=0;surfi<m->head.numsurfs;surfi++)
{
s = &m->head.surfs[surfi];
v0 = &s->xyzn[m->cframe*s->numverts];
i = mdloadskin((md2model *)m,tile2model[Ptile2tile(tspr->picnum,sprite[tspr->owner].pal)].skinnum,tspr->pal,surfi);
if (!i)
continue;
bglBindTexture(GL_TEXTURE_2D, i);
bglVertexPointer(3, GL_SHORT, sizeof(md3xyzn_t), v0);
bglTexCoordPointer(2, GL_FLOAT, 0, s->uv);
bglDrawElements(GL_TRIANGLES, s->numtris * 3, GL_UNSIGNED_INT, s->tris);
}
bglPopMatrix();
}
void polymer_drawsprite(int snum) void polymer_drawsprite(int snum)
{ {
int curpicnum, xsize, ysize, tilexoff, tileyoff, xoff, yoff; int curpicnum, xsize, ysize, tilexoff, tileyoff, xoff, yoff;
@ -2190,4 +2139,110 @@ static void polymer_drawartsky(short tilenum)
i++; i++;
} }
} }
// MDSPRITES
static void polymer_drawmdsprite(spritetype *tspr)
{
md3model* m;
float spos[3];
float ang;
float scale;
int surfi;
md3xyzn_t *v0;
md3surf_t *s;
GLuint i;
m = (md3model*)models[tile2model[Ptile2tile(tspr->picnum,sprite[tspr->owner].pal)].modelid];
updateanimation((md2model *)m,tspr);
if ((pr_vbos > 1) && (m->indices == NULL))
polymer_loadmodelvbos(m);
if (m->head.flags == 1337)
return;
spos[0] = tspr->y;
spos[1] = -(float)(tspr->z) / 16.0f;
spos[2] = -tspr->x;
ang = (float)((tspr->ang) & 2047) / (2048.0f / 360.0f);
bglMatrixMode(GL_MODELVIEW);
bglPushMatrix();
scale = (m->head.flags == 1337) ? 1.0 : (1.0/64.0);
scale *= m->scale;
scale *= m->bscale;
scale *= 1024;
bglTranslatef(spos[0], spos[1], spos[2]);
bglRotatef(-ang, 0.0f, 1.0f, 0.0f);
bglRotatef(-90.0f, 1.0f, 0.0f, 0.0f);
bglRotatef(90.0f, 0.0f, 0.0f, 1.0f);
bglScalef(scale * (float)(tspr->xrepeat) / 64.0, scale * (float)(tspr->xrepeat) / 64.0, scale * (float)(tspr->yrepeat) / 64.0);
for (surfi=0;surfi<m->head.numsurfs;surfi++)
{
s = &m->head.surfs[surfi];
v0 = &s->xyzn[m->cframe*s->numverts];
i = mdloadskin((md2model *)m,tile2model[Ptile2tile(tspr->picnum,sprite[tspr->owner].pal)].skinnum,tspr->pal,surfi);
if (!i)
continue;
bglBindTexture(GL_TEXTURE_2D, i);
if (pr_vbos > 1)
{
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, m->geometry[surfi]);
bglVertexPointer(3, GL_SHORT, sizeof(md3xyzn_t), (GLfloat*)(m->cframe * s->numverts * sizeof(md3xyzn_t)));
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, m->texcoords[surfi]);
bglTexCoordPointer(2, GL_FLOAT, 0, 0);
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, m->indices[surfi]);
bglDrawElements(GL_TRIANGLES, s->numtris * 3, GL_UNSIGNED_INT, 0);
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
} else {
bglVertexPointer(3, GL_SHORT, sizeof(md3xyzn_t), v0);
bglTexCoordPointer(2, GL_FLOAT, 0, s->uv);
bglDrawElements(GL_TRIANGLES, s->numtris * 3, GL_UNSIGNED_INT, s->tris);
}
}
bglPopMatrix();
}
static void polymer_loadmodelvbos(md3model* m)
{
int i;
md3surf_t *s;
m->indices = calloc(m->head.numsurfs, sizeof(GLuint));
m->texcoords = calloc(m->head.numsurfs, sizeof(GLuint));
m->geometry = calloc(m->head.numsurfs, sizeof(GLuint));
bglGenBuffersARB(m->head.numsurfs, m->indices);
bglGenBuffersARB(m->head.numsurfs, m->texcoords);
bglGenBuffersARB(m->head.numsurfs, m->geometry);
i = 0;
while (i < m->head.numsurfs)
{
s = &m->head.surfs[i];
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, m->indices[i]);
bglBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->numtris * sizeof(md3tri_t), s->tris, modelvbousage);
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, m->texcoords[i]);
bglBufferDataARB(GL_ARRAY_BUFFER_ARB, s->numverts * sizeof(md3uv_t), s->uv, modelvbousage);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, m->geometry[i]);
bglBufferDataARB(GL_ARRAY_BUFFER_ARB, s->numframes * s->numverts * sizeof(md3xyzn_t), s->xyzn, modelvbousage);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
i++;
}
}
#endif #endif