mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-11 18:50:46 +00:00
MD3 normals.
git-svn-id: https://svn.eduke32.com/eduke32@1239 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman
parent
9995cc46c2
commit
512bb9a5ab
3 changed files with 81 additions and 34 deletions
|
|
@ -76,6 +76,7 @@ typedef struct s_prrograminfo {
|
|||
GLhandleARB handle;
|
||||
// PR_BIT_ANIM_INTERPOLATION
|
||||
GLint attrib_nextFrameData;
|
||||
GLint attrib_nextFrameNormal;
|
||||
GLint uniform_frameProgress;
|
||||
// PR_BIT_DIFFUSE_MAP
|
||||
GLint uniform_diffuseMap;
|
||||
|
|
|
|||
|
|
@ -1538,7 +1538,7 @@ static void md3postload(md3model_t* m)
|
|||
{
|
||||
int framei, surfi, verti;
|
||||
md3xyzn_t *frameverts;
|
||||
float dist;
|
||||
float dist, lat, lng;
|
||||
|
||||
// apparently we can't trust loaded models bounding box/sphere information,
|
||||
// so let's compute it ourselves
|
||||
|
|
@ -1639,6 +1639,15 @@ static void md3postload(md3model_t* m)
|
|||
m->head.surfs[surfi].geometry[(verti * 6) + 1] = m->head.surfs[surfi].xyzn[verti].y;
|
||||
m->head.surfs[surfi].geometry[(verti * 6) + 2] = m->head.surfs[surfi].xyzn[verti].z;
|
||||
|
||||
// normal extraction from packed spherical coordinates
|
||||
// FIXME: swapping lat and lng because of npherno's compiler
|
||||
lat = m->head.surfs[surfi].xyzn[verti].nlng * (2 * PI) / 255.0f;
|
||||
lng = m->head.surfs[surfi].xyzn[verti].nlat * (2 * PI) / 255.0f;
|
||||
|
||||
m->head.surfs[surfi].geometry[(verti * 6) + 3] = cos(lat) * sin(lng);
|
||||
m->head.surfs[surfi].geometry[(verti * 6) + 4] = sin(lat) * sin(lng);
|
||||
m->head.surfs[surfi].geometry[(verti * 6) + 5] = cos(lng);
|
||||
|
||||
verti++;
|
||||
}
|
||||
surfi++;
|
||||
|
|
|
|||
|
|
@ -166,16 +166,20 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
|
|||
1 << PR_BIT_ANIM_INTERPOLATION,
|
||||
// vert_def
|
||||
"attribute vec4 nextFrameData;\n"
|
||||
"attribute vec4 nextFrameNormal;\n"
|
||||
"uniform float frameProgress;\n"
|
||||
"\n",
|
||||
// vert_prog
|
||||
" vec4 currentFramePosition;\n"
|
||||
" vec4 nextFramePosition;\n"
|
||||
"\n"
|
||||
" currentFramePosition = gl_Vertex * (1.0 - frameProgress);\n"
|
||||
" currentFramePosition = curVertex * (1.0 - frameProgress);\n"
|
||||
" nextFramePosition = nextFrameData * frameProgress;\n"
|
||||
" currentFramePosition = currentFramePosition + nextFramePosition;\n"
|
||||
" result = gl_ModelViewProjectionMatrix * currentFramePosition;\n"
|
||||
" curVertex = currentFramePosition + nextFramePosition;\n"
|
||||
"\n"
|
||||
" currentFramePosition = vec4(curNormal, 1.0) * (1.0 - frameProgress);\n"
|
||||
" nextFramePosition = nextFrameNormal * frameProgress;\n"
|
||||
" curNormal = vec3(currentFramePosition + nextFramePosition);\n"
|
||||
"\n",
|
||||
// frag_def
|
||||
"",
|
||||
|
|
@ -234,8 +238,8 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
|
|||
"varying vec3 vertexPos;\n"
|
||||
"\n",
|
||||
// vert_prog
|
||||
" vertexNormal = normalize(gl_NormalMatrix * gl_Normal);\n"
|
||||
" vertexPos = vec3(gl_ModelViewMatrix * gl_Vertex);\n"
|
||||
" vertexNormal = normalize(gl_NormalMatrix * curNormal);\n"
|
||||
" vertexPos = vec3(gl_ModelViewMatrix * curVertex);\n"
|
||||
"\n",
|
||||
// frag_def
|
||||
"uniform int lightCount;\n"
|
||||
|
|
@ -302,11 +306,11 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
|
|||
// vert_def
|
||||
"void main(void)\n"
|
||||
"{\n"
|
||||
" vec4 result = ftransform();\n"
|
||||
" int l = 0;\n"
|
||||
" vec4 curVertex = gl_Vertex;\n"
|
||||
" vec3 curNormal = gl_Normal;\n"
|
||||
"\n",
|
||||
// vert_prog
|
||||
" gl_Position = result;\n"
|
||||
" gl_Position = gl_ModelViewProjectionMatrix * curVertex;\n"
|
||||
"}\n",
|
||||
// frag_def
|
||||
"void main(void)\n"
|
||||
|
|
@ -2485,31 +2489,31 @@ static void polymer_drawmdsprite(spritetype *tspr)
|
|||
bglTranslatef(0.0f, 0.0, m->zadd * 64);
|
||||
|
||||
// debug code for drawing the model bounding sphere
|
||||
// bglDisable(GL_TEXTURE_2D);
|
||||
// bglBegin(GL_LINES);
|
||||
// bglColor4f(1.0, 0.0, 0.0, 1.0);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x,
|
||||
// m->head.frames[m->cframe].cen.y,
|
||||
// m->head.frames[m->cframe].cen.z);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x + m->head.frames[m->cframe].r,
|
||||
// m->head.frames[m->cframe].cen.y,
|
||||
// m->head.frames[m->cframe].cen.z);
|
||||
// bglColor4f(0.0, 1.0, 0.0, 1.0);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x,
|
||||
// m->head.frames[m->cframe].cen.y,
|
||||
// m->head.frames[m->cframe].cen.z);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x,
|
||||
// m->head.frames[m->cframe].cen.y + m->head.frames[m->cframe].r,
|
||||
// m->head.frames[m->cframe].cen.z);
|
||||
// bglColor4f(0.0, 0.0, 1.0, 1.0);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x,
|
||||
// m->head.frames[m->cframe].cen.y,
|
||||
// m->head.frames[m->cframe].cen.z);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x,
|
||||
// m->head.frames[m->cframe].cen.y,
|
||||
// m->head.frames[m->cframe].cen.z + m->head.frames[m->cframe].r);
|
||||
// bglEnd();
|
||||
// bglEnable(GL_TEXTURE_2D);
|
||||
// bglDisable(GL_TEXTURE_2D);
|
||||
// bglBegin(GL_LINES);
|
||||
// bglColor4f(1.0, 0.0, 0.0, 1.0);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x,
|
||||
// m->head.frames[m->cframe].cen.y,
|
||||
// m->head.frames[m->cframe].cen.z);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x + m->head.frames[m->cframe].r,
|
||||
// m->head.frames[m->cframe].cen.y,
|
||||
// m->head.frames[m->cframe].cen.z);
|
||||
// bglColor4f(0.0, 1.0, 0.0, 1.0);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x,
|
||||
// m->head.frames[m->cframe].cen.y,
|
||||
// m->head.frames[m->cframe].cen.z);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x,
|
||||
// m->head.frames[m->cframe].cen.y + m->head.frames[m->cframe].r,
|
||||
// m->head.frames[m->cframe].cen.z);
|
||||
// bglColor4f(0.0, 0.0, 1.0, 1.0);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x,
|
||||
// m->head.frames[m->cframe].cen.y,
|
||||
// m->head.frames[m->cframe].cen.z);
|
||||
// bglVertex3f(m->head.frames[m->cframe].cen.x,
|
||||
// m->head.frames[m->cframe].cen.y,
|
||||
// m->head.frames[m->cframe].cen.z + m->head.frames[m->cframe].r);
|
||||
// bglEnd();
|
||||
// bglEnable(GL_TEXTURE_2D);
|
||||
|
||||
polymer_getscratchmaterial(&mdspritematerial);
|
||||
|
||||
|
|
@ -2553,6 +2557,26 @@ static void polymer_drawmdsprite(spritetype *tspr)
|
|||
v0 = &s->geometry[m->cframe*s->numverts*6];
|
||||
v1 = &s->geometry[m->nframe*s->numverts*6];
|
||||
|
||||
// debug code for drawing model normals
|
||||
// bglDisable(GL_TEXTURE_2D);
|
||||
// bglBegin(GL_LINES);
|
||||
// bglColor4f(1.0, 1.0, 1.0, 1.0);
|
||||
//
|
||||
// int i = 0;
|
||||
// while (i < s->numverts)
|
||||
// {
|
||||
// bglVertex3f(v0[(i * 6) + 0],
|
||||
// v0[(i * 6) + 1],
|
||||
// v0[(i * 6) + 2]);
|
||||
// bglVertex3f(v0[(i * 6) + 0] + v0[(i * 6) + 3] * 100,
|
||||
// v0[(i * 6) + 1] + v0[(i * 6) + 4] * 100,
|
||||
// v0[(i * 6) + 2] + v0[(i * 6) + 5] * 100);
|
||||
// i++;
|
||||
// }
|
||||
// bglEnd();
|
||||
// bglEnable(GL_TEXTURE_2D);
|
||||
|
||||
|
||||
mdspritematerial.diffusemap =
|
||||
mdloadskin((md2model_t *)m,tile2model[Ptile2tile(tspr->picnum,sprite[tspr->owner].pal)].skinnum,tspr->pal,surfi);
|
||||
if (!mdspritematerial.diffusemap)
|
||||
|
|
@ -2576,6 +2600,8 @@ static void polymer_drawmdsprite(spritetype *tspr)
|
|||
mdloadskin((md2model_t *)m,tile2model[Ptile2tile(tspr->picnum,lpal)].skinnum,GLOWPAL,surfi);
|
||||
}
|
||||
|
||||
bglEnableClientState(GL_NORMAL_ARRAY);
|
||||
|
||||
if (pr_vbos > 1)
|
||||
{
|
||||
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, m->texcoords[surfi]);
|
||||
|
|
@ -2583,6 +2609,7 @@ static void polymer_drawmdsprite(spritetype *tspr)
|
|||
|
||||
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, m->geometry[surfi]);
|
||||
bglVertexPointer(3, GL_FLOAT, sizeof(float) * 6, (GLfloat*)(m->cframe * s->numverts * sizeof(float) * 6));
|
||||
bglNormalPointer(GL_FLOAT, sizeof(float) * 6, (GLfloat*)(m->cframe * s->numverts * sizeof(float) * 6) + 3);
|
||||
|
||||
if (pr_gpusmoothing)
|
||||
{
|
||||
|
|
@ -2603,6 +2630,7 @@ static void polymer_drawmdsprite(spritetype *tspr)
|
|||
else
|
||||
{
|
||||
bglVertexPointer(3, GL_FLOAT, sizeof(float) * 6, v0);
|
||||
bglNormalPointer(GL_FLOAT, sizeof(float) * 6, v0 + 3);
|
||||
bglTexCoordPointer(2, GL_FLOAT, 0, s->uv);
|
||||
|
||||
if (pr_gpusmoothing)
|
||||
|
|
@ -2617,6 +2645,8 @@ static void polymer_drawmdsprite(spritetype *tspr)
|
|||
|
||||
polymer_unbindmaterial(materialbits);
|
||||
}
|
||||
|
||||
bglDisableClientState(GL_NORMAL_ARRAY);
|
||||
}
|
||||
|
||||
bglPopMatrix();
|
||||
|
|
@ -2811,10 +2841,15 @@ static int32_t polymer_bindmaterial(_prmaterial material, char* lights, int
|
|||
if (programbits & prprogrambits[PR_BIT_ANIM_INTERPOLATION].bit)
|
||||
{
|
||||
bglEnableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameData);
|
||||
bglEnableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameNormal);
|
||||
bglVertexAttribPointerARB(prprograms[programbits].attrib_nextFrameData,
|
||||
3, GL_FLOAT, GL_FALSE,
|
||||
material.nextframedatastride,
|
||||
material.nextframedata);
|
||||
bglVertexAttribPointerARB(prprograms[programbits].attrib_nextFrameNormal,
|
||||
3, GL_FLOAT, GL_FALSE,
|
||||
material.nextframedatastride,
|
||||
material.nextframedata + 3);
|
||||
|
||||
bglUniform1fARB(prprograms[programbits].uniform_frameProgress, material.frameprogress);
|
||||
}
|
||||
|
|
@ -2919,6 +2954,7 @@ static void polymer_unbindmaterial(int32_t programbits)
|
|||
// PR_BIT_ANIM_INTERPOLATION
|
||||
if (programbits & prprogrambits[PR_BIT_ANIM_INTERPOLATION].bit)
|
||||
{
|
||||
bglDisableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameNormal);
|
||||
bglDisableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameData);
|
||||
}
|
||||
|
||||
|
|
@ -3003,6 +3039,7 @@ static void polymer_compileprogram(int32_t programbits)
|
|||
if (programbits & prprogrambits[PR_BIT_ANIM_INTERPOLATION].bit)
|
||||
{
|
||||
prprograms[programbits].attrib_nextFrameData = bglGetAttribLocationARB(program, "nextFrameData");
|
||||
prprograms[programbits].attrib_nextFrameNormal = bglGetAttribLocationARB(program, "nextFrameNormal");
|
||||
prprograms[programbits].uniform_frameProgress = bglGetUniformLocationARB(program, "frameProgress");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue