qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 08:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't do the lerp calcs for blend == 0 or blend == 1

Browse source
This commit is contained in:
Bill Currie 2001-08-21 05:46:55 +00:00
parent cd99a6a4b6
commit ec3eed4c7a
1 changed files with 44 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -451,6 +451,7 @@ GL_GetAliasFrameVerts (int frame, aliashdr_t *paliashdr, entity_t *e)
int numposes; int numposes;
trivertx_t *verts; trivertx_t *verts;
int i; int i;
float interval;
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);
@ -467,39 +468,27 @@ GL_GetAliasFrameVerts (int frame, aliashdr_t *paliashdr, entity_t *e)
vo->order = (int *) ((byte *) paliashdr + paliashdr->commands); vo->order = (int *) ((byte *) paliashdr + paliashdr->commands);
vo->verts = (blended_vert_t*)&vo[1]; vo->verts = (blended_vert_t*)&vo[1];
if (!gl_lerp_anim->int_val) { if (numposes > 1) {
float interval; interval = paliashdr->frames[frame].interval;
pose += (int) (r_realtime / interval) % numposes;
if (numposes > 1) {
interval = paliashdr->frames[frame].interval;
pose += (int) (r_realtime / interval) % numposes;
}
for (i = 0; i < count; i++) {
vo->verts[i].vert[0] = verts[i].v[0];
vo->verts[i].vert[1] = verts[i].v[1];
vo->verts[i].vert[2] = verts[i].v[2];
vo->verts[i].lightdot = shadedots[verts[i].lightnormalindex];
}
lastposenum = pose;
} else { } else {
/*
One tenth of a second is good for most Quake animations. If
the nextthink is longer then the animation is usually meant
to pause (e.g. check out the shambler magic animation in
shambler.qc). If its shorter then things will still be
smoothed partly, and the jumps will be less noticable
because of the shorter time. So, this is probably a good
assumption.
*/
interval = 0.1;
}
if (gl_lerp_anim->int_val) {
trivertx_t *verts1, *verts2; trivertx_t *verts1, *verts2;
float blend, lerp; float blend, lerp;
if (numposes > 1) { e->frame_interval = interval;
e->frame_interval = paliashdr->frames[frame].interval;
pose += (int) (r_realtime / e->frame_interval) % numposes;
} else {
/*
One tenth of a second is good for most Quake animations. If
the nextthink is longer then the animation is usually meant
to pause (e.g. check out the shambler magic animation in
shambler.qc). If its shorter then things will still be
smoothed partly, and the jumps will be less noticable
because of the shorter time. So, this is probably a good
assumption.
*/
e->frame_interval = 0.1;
}
if (e->pose2 != pose) { if (e->pose2 != pose) {
e->frame_start_time = r_realtime; e->frame_start_time = r_realtime;
@ -522,20 +511,34 @@ GL_GetAliasFrameVerts (int frame, aliashdr_t *paliashdr, entity_t *e)
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++) { if (!blend) {
vo->verts[i].vert[0] = verts1[i].v[0] * lerp verts = verts1;
+ verts2[i].v[0] * blend; } else if (blend == 1) {
vo->verts[i].vert[1] = verts1[i].v[1] * lerp verts = verts2;
+ verts2[i].v[1] * blend; } else {
vo->verts[i].vert[2] = verts1[i].v[2] * lerp for (i = 0; i < count; i++) {
+ verts2[i].v[2] * blend; vo->verts[i].vert[0] = verts1[i].v[0] * lerp
vo->verts[i].lightdot = + verts2[i].v[0] * blend;
shadedots[verts1[i].lightnormalindex] * lerp vo->verts[i].vert[1] = verts1[i].v[1] * lerp
+ shadedots[verts2[i].lightnormalindex] * blend; + verts2[i].v[1] * blend;
vo->verts[i].vert[2] = verts1[i].v[2] * lerp
+ verts2[i].v[2] * blend;
vo->verts[i].lightdot =
shadedots[verts1[i].lightnormalindex] * lerp
+ shadedots[verts2[i].lightnormalindex] * blend;
}
lastposenum0 = e->pose1;
lastposenum = e->pose2;
return vo;
} }
lastposenum0 = e->pose1;
lastposenum = e->pose2;
} }
for (i = 0; i < count; i++) {
vo->verts[i].vert[0] = verts[i].v[0];
vo->verts[i].vert[1] = verts[i].v[1];
vo->verts[i].vert[2] = verts[i].v[2];
vo->verts[i].lightdot = shadedots[verts[i].lightnormalindex];
}
lastposenum = pose;
return vo; return vo;
} }