qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 23:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

lerping works again. flames no longer flicker, but players do a /little/

Browse source
This commit is contained in:
Bill Currie 2001-08-21 03:49:17 +00:00
parent 9c43a43bb3
commit 9bad6b89bb
1 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
libs/video/renderer/gl/gl_rmain.c
View file

@ -64,9 +64,13 @@
#include "view.h" #include "view.h"
typedef struct { typedef struct {
trivertx_t *verts; vec3_t vert;
float lightdot;
} blended_vert_t;
typedef struct {
blended_vert_t *verts;
int *order; int *order;
int blended;
} vert_order_t; } vert_order_t;
entity_t r_worldentity; entity_t r_worldentity;
@ -256,10 +260,9 @@ static void
GL_DrawAliasFrame (vert_order_t *vo, qboolean fb) GL_DrawAliasFrame (vert_order_t *vo, qboolean fb)
{ {
float l; float l;
trivertx_t *verts; blended_vert_t *verts;
int *order; int *order;
int count; int count;
int blended = vo->blended;
verts = vo->verts; verts = vo->verts;
order = vo->order; order = vo->order;
@ -287,18 +290,14 @@ GL_DrawAliasFrame (vert_order_t *vo, qboolean fb)
if (!fb) { if (!fb) {
// normals and vertexes come from the frame list // normals and vertexes come from the frame list
if (blended) l = shadelight * verts->lightdot;
l = verts->lightnormalindex / 256.0;
else
l = shadedots[verts->lightnormalindex];
l *= shadelight;
// LordHavoc: cleanup after Endy // LordHavoc: cleanup after Endy
qfglColor4f (shadecolor[0] * l, shadecolor[1] * l, qfglColor4f (shadecolor[0] * l, shadecolor[1] * l,
shadecolor[2] * l, modelalpha); shadecolor[2] * l, modelalpha);
} }
qfglVertex3f (verts->v[0], verts->v[1], verts->v[2]); qfglVertex3fv (verts->vert);
verts++; verts++;
} while (--count); } while (--count);
@ -447,11 +446,11 @@ vert_order_t *
GL_GetAliasFrameVerts (int frame, aliashdr_t *paliashdr, entity_t *e) GL_GetAliasFrameVerts (int frame, aliashdr_t *paliashdr, entity_t *e)
{ {
vert_order_t *vo; vert_order_t *vo;
int *order;
int count; int count;
int pose; int pose;
int numposes; int numposes;
trivertx_t *verts; trivertx_t *verts;
int i;
if ((frame >= paliashdr->mdl.numframes) || (frame < 0)) { if ((frame >= paliashdr->mdl.numframes) || (frame < 0)) {
Con_DPrintf ("R_AliasSetupFrame: no such frame %d\n", frame); Con_DPrintf ("R_AliasSetupFrame: no such frame %d\n", frame);
@ -463,22 +462,28 @@ GL_GetAliasFrameVerts (int frame, aliashdr_t *paliashdr, entity_t *e)
verts = (trivertx_t *) ((byte *) paliashdr + paliashdr->posedata); verts = (trivertx_t *) ((byte *) paliashdr + paliashdr->posedata);
if (numposes == 1 || !gl_lerp_anim->int_val) { count = paliashdr->poseverts;
vo = Hunk_TempAlloc (sizeof (*vo) + count * sizeof (blended_vert_t));
vo->order = (int *) ((byte *) paliashdr + paliashdr->commands);
vo->verts = (blended_vert_t*)&vo[1];
if (!gl_lerp_anim->int_val) {
float interval; float interval;
if (numposes > 1) { if (numposes > 1) {
interval = paliashdr->frames[frame].interval; interval = paliashdr->frames[frame].interval;
pose += (int) (r_realtime / interval) % numposes; pose += (int) (r_realtime / interval) % numposes;
} }
vo = Hunk_TempAlloc (sizeof (*vo)); for (i = 0; i < count; i++) {
vo->verts = verts + pose * paliashdr->poseverts; vo->verts[i].vert[0] = verts[i].v[0];
vo->order = (int *) ((byte *) paliashdr + paliashdr->commands); vo->verts[i].vert[1] = verts[i].v[1];
vo->blended = 0; vo->verts[i].vert[2] = verts[i].v[2];
vo->verts[i].lightdot = shadedots[verts[i].lightnormalindex];
}
lastposenum = pose; lastposenum = pose;
} else { } else {
trivertx_t *verts1, *verts2; trivertx_t *verts1, *verts2;
float blend, lerp; float blend, lerp;
int i;
if (numposes > 1) { if (numposes > 1) {
e->frame_interval = paliashdr->frames[frame].interval; e->frame_interval = paliashdr->frames[frame].interval;
@ -514,27 +519,21 @@ GL_GetAliasFrameVerts (int frame, aliashdr_t *paliashdr, entity_t *e)
blend = 1; blend = 1;
lerp = 1 - blend; lerp = 1 - blend;
order = (int *) ((byte *) paliashdr + paliashdr->commands);
count = paliashdr->poseverts;
vo = Hunk_TempAlloc (sizeof (*vo) + count * sizeof (trivertx_t));
vo->order = order;
vo->verts = (trivertx_t*)&vo[1];
vo->blended = 1;
verts1 = verts + e->pose1 * count; verts1 = verts + e->pose1 * count;
verts2 = verts + e->pose2 * count; verts2 = verts + e->pose2 * count;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
vo->verts[i].v[0] = verts1[i].v[0] * lerp vo->verts[i].vert[0] = verts1[i].v[0] * lerp
+ verts2[i].v[0] * blend; + verts2[i].v[0] * blend;
vo->verts[i].v[1] = verts1[i].v[1] * lerp vo->verts[i].vert[1] = verts1[i].v[1] * lerp
+ verts2[i].v[1] * blend; + verts2[i].v[1] * blend;
vo->verts[i].v[2] = verts1[i].v[2] * lerp vo->verts[i].vert[2] = verts1[i].v[2] * lerp
+ verts2[i].v[2] * blend; + verts2[i].v[2] * blend;
vo->verts[i].lightnormalindex = vo->verts[i].lightdot =
(shadedots[verts[i].lightnormalindex] * lerp shadedots[verts[i].lightnormalindex] * lerp
+ shadedots[verts2[i].lightnormalindex] * blend) * 256; + shadedots[verts2[i].lightnormalindex] * blend;
} }
lastposenum0 = e->pose1; lastposenum0 = e->pose1;
lastposenum = e->pose2; lastposenum = e->pose2;