zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-27 22:22:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use vertex buffer to render MD3 models.

Browse source
This commit is contained in:
Christoph Oelckers 2014-06-30 18:02:52 +02:00
parent 54297acde4
commit 6efefd9b7f
2 changed files with 4 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gl/models/gl_models.h
View file

@ -191,7 +191,6 @@ class FMD3Model : public FModel
unsigned int vindex; // contains numframes arrays of vertices unsigned int vindex; // contains numframes arrays of vertices
unsigned int iindex; unsigned int iindex;
unsigned int icount;
MD3Surface() MD3Surface()
{ {
@ -225,8 +224,6 @@ class FMD3Model : public FModel
MD3Frame * frames; MD3Frame * frames;
MD3Surface * surfaces; MD3Surface * surfaces;
void RenderTriangles(MD3Surface * surf, MD3Vertex * vert, MD3Vertex *vert2, double inter);
public: public:
FMD3Model() { } FMD3Model() { }
virtual ~FMD3Model(); virtual ~FMD3Model();

39
src/gl/models/gl_models_md3.cpp
View file

@ -42,6 +42,7 @@
#include "m_crc32.h" #include "m_crc32.h"
#include "gl/renderer/gl_renderstate.h" #include "gl/renderer/gl_renderstate.h"
#include "gl/renderer/gl_renderer.h"
#include "gl/scene/gl_drawinfo.h" #include "gl/scene/gl_drawinfo.h"
#include "gl/models/gl_models.h" #include "gl/models/gl_models.h"
#include "gl/textures/gl_material.h" #include "gl/textures/gl_material.h"
@ -233,7 +234,6 @@ void FMD3Model::BuildVertexBuffer(FModelVertexBuffer *buf)
buf->ibo_shadowdata.Push(surf->tris[k].VertIndex[l]); buf->ibo_shadowdata.Push(surf->tris[k].VertIndex[l]);
} }
} }
surf->icount = buf->ibo_shadowdata.Size() - surf->iindex;
} }
} }
@ -247,36 +247,6 @@ int FMD3Model::FindFrame(const char * name)
return -1; return -1;
} }
void FMD3Model::RenderTriangles(MD3Surface * surf, MD3Vertex * vert, MD3Vertex *vert2, double inter)
{
const bool interpolate = (vert2 != NULL && inter != 0. && vert != vert2);
gl_RenderState.Apply();
glBegin(GL_TRIANGLES);
for(int i=0; i<surf->numTriangles;i++)
{
for(int j=0;j<3;j++)
{
int x = surf->tris[i].VertIndex[j];
glTexCoord2fv(&surf->texcoords[x].s);
if (!interpolate)
{
glVertex3f(vert[x].x, vert[x].z, vert[x].y);
}
else
{
float interp[3];
interp[0] = inter * vert[x].x + (1. - inter) * vert2[x].x;
interp[1] = inter * vert[x].z + (1. - inter) * vert2[x].z;
interp[2] = inter * vert[x].y + (1. - inter) * vert2[x].y;
glVertex3fv(interp);
}
}
}
glEnd();
}
void FMD3Model::RenderFrame(FTexture * skin, int frameno, int frameno2, double inter, int translation) void FMD3Model::RenderFrame(FTexture * skin, int frameno, int frameno2, double inter, int translation)
{ {
if (frameno>=numFrames || frameno2>=numFrames) return; if (frameno>=numFrames || frameno2>=numFrames) return;
@ -299,10 +269,9 @@ void FMD3Model::RenderFrame(FTexture * skin, int frameno, int frameno2, double i
tex->Bind(0, translation); tex->Bind(0, translation);
MD3Vertex* vertices1 = surf->vertices + frameno * surf->numVertices; gl_RenderState.Apply();
MD3Vertex* vertices2 = surf->vertices + frameno2 * surf->numVertices; GLRenderer->mModelVBO->SetupFrame(surf->vindex + frameno * surf->numVertices, surf->vindex + frameno2 * surf->numVertices, inter);
glDrawElements(GL_TRIANGLES, surf->numTriangles * 3, GL_UNSIGNED_INT, (void*)(intptr_t)(surf->iindex * sizeof(unsigned int)));
RenderTriangles(surf, vertices1, vertices2, inter);
} }
} }