cvar_t cl_locs_enable = {CVAR_SAVE, "locs_enable", "1", "enables replacement of certain % codes in chat messages: %l (location), %d (last death location), %h (health), %a (armor), %x (rockets), %c (cells), %r (rocket launcher status), %p (powerup status), %w (weapon status), %t (current time in level)"};
cvar_t cl_locs_show = {0, "locs_show", "0", "shows defined locations for editing purposes"};
+extern cvar_t r_equalize_entities_fullbright;
+
client_static_t cls;
client_state_t cl;
render->shadertime = shadertime;
render->alpha = 1;
VectorSet(render->colormod, 1, 1, 1);
+ VectorSet(render->glowmod, 1, 1, 1);
return render;
}
}
}
+ if (!cl.lightstyle)
+ {
+ for (j = 0;j < cl.max_lightstyle;j++)
+ {
+ r_refdef.scene.rtlightstylevalue[j] = 1;
+ r_refdef.scene.lightstylevalue[j] = 256;
+ }
+ return;
+ }
+
// light animations
// 'm' is normal light, 'a' is no light, 'z' is double bright
f = cl.time * 10;
frac = f - i;
for (j = 0;j < cl.max_lightstyle;j++)
{
- if (!cl.lightstyle || !cl.lightstyle[j].length)
+ if (!cl.lightstyle[j].length)
{
r_refdef.scene.rtlightstylevalue[j] = 1;
r_refdef.scene.lightstylevalue[j] = 256;
continue;
}
+ // static lightstyle "=value"
+ if (cl.lightstyle[j].map[0] == '=')
+ {
+ r_refdef.scene.rtlightstylevalue[j] = atof(cl.lightstyle[j].map + 1);
+ if ( r_lerplightstyles.integer || ((int)f - f) < 0.01)
+ r_refdef.scene.lightstylevalue[j] = r_refdef.scene.rtlightstylevalue[j];
+ continue;
+ }
k = i % cl.lightstyle[j].length;
l = (i-1) % cl.lightstyle[j].length;
k = cl.lightstyle[j].map[k] - 'a';
flagrender->skinnum = skin;
flagrender->alpha = 1;
VectorSet(flagrender->colormod, 1, 1, 1);
+ VectorSet(flagrender->glowmod, 1, 1, 1);
// attach the flag to the player matrix
Matrix4x4_CreateFromQuakeEntity(&flagmatrix, -f, -22, 0, 0, 0, -45, 1);
Matrix4x4_Concat(&flagrender->matrix, &player->render.matrix, &flagmatrix);
{
const matrix4x4_t *matrix;
matrix4x4_t blendmatrix, tempmatrix, matrix2;
- int j, k, l, frame;
- float origin[3], angles[3], delta[3], lerp, d;
+ int frame;
+ float origin[3], angles[3], lerp;
entity_t *t;
- dp_model_t *model;
//entity_persistent_t *p = &e->persistent;
//entity_render_t *r = &e->render;
// skip inactive entities and world
e->render.flags = e->state_current.flags;
e->render.effects = e->state_current.effects;
VectorScale(e->state_current.colormod, (1.0f / 32.0f), e->render.colormod);
+ VectorScale(e->state_current.glowmod, (1.0f / 32.0f), e->render.glowmod);
if(e >= cl.entities && e < cl.entities + cl.num_entities)
e->render.entitynumber = e - cl.entities;
else
e->render.flags |= t->render.flags & (RENDER_EXTERIORMODEL | RENDER_VIEWMODEL);
// if a valid tagindex is used, make it relative to that tag instead
// FIXME: use a model function to get tag info (need to handle skeletal)
- if (e->state_current.tagentity && e->state_current.tagindex >= 1 && (model = t->render.model))
+ if (e->state_current.tagentity && e->state_current.tagindex >= 1)
{
- // blend the matrices
- memset(&blendmatrix, 0, sizeof(blendmatrix));
- for (j = 0;j < MAX_FRAMEBLENDS && t->render.frameblend[j].lerp > 0;j++)
+ if(!CL_BlendTagMatrix(&t->render, e->state_current.tagindex - 1, &blendmatrix)) // i.e. no error
{
- matrix4x4_t tagmatrix;
- Mod_Alias_GetTagMatrix(model, t->render.frameblend[j].subframe, e->state_current.tagindex - 1, &tagmatrix);
- d = t->render.frameblend[j].lerp;
- for (l = 0;l < 4;l++)
- for (k = 0;k < 4;k++)
- blendmatrix.m[l][k] += d * tagmatrix.m[l][k];
+ // concat the tag matrices onto the entity matrix
+ Matrix4x4_Concat(&tempmatrix, &t->render.matrix, &blendmatrix);
+ // use the constructed tag matrix
+ matrix = &tempmatrix;
}
- // concat the tag matrices onto the entity matrix
- Matrix4x4_Concat(&tempmatrix, &t->render.matrix, &blendmatrix);
- // use the constructed tag matrix
- matrix = &tempmatrix;
}
}
else if (e->render.flags & RENDER_VIEWMODEL)
// interpolate the origin and angles
lerp = max(0, lerp);
VectorLerp(e->persistent.oldorigin, lerp, e->persistent.neworigin, origin);
+#if 0
+ // this fails at the singularity of euler angles
VectorSubtract(e->persistent.newangles, e->persistent.oldangles, delta);
if (delta[0] < -180) delta[0] += 360;else if (delta[0] >= 180) delta[0] -= 360;
if (delta[1] < -180) delta[1] += 360;else if (delta[1] >= 180) delta[1] -= 360;
if (delta[2] < -180) delta[2] += 360;else if (delta[2] >= 180) delta[2] -= 360;
VectorMA(e->persistent.oldangles, lerp, delta, angles);
+#else
+ {
+ vec3_t f0, u0, f1, u1;
+ AngleVectors(e->persistent.oldangles, f0, NULL, u0);
+ AngleVectors(e->persistent.newangles, f1, NULL, u1);
+ VectorMAM(1-lerp, f0, lerp, f1, f0);
+ VectorMAM(1-lerp, u0, lerp, u1, u0);
+ AnglesFromVectors(angles, f0, u0, false);
+ }
+#endif
}
else
{
if (e->render.model->type == mod_alias)
angles[0] = -angles[0];
if ((e->render.effects & EF_SELECTABLE) && cl.cmd.cursor_entitynumber == e->state_current.number)
+ {
VectorScale(e->render.colormod, 2, e->render.colormod);
+ VectorScale(e->render.glowmod, 2, e->render.glowmod);
+ }
}
// if model is alias or this is a tenebrae-like dlight, reverse pitch direction
else if (e->state_current.lightpflags & PFLAGS_FULLDYNAMIC)
angles[0] = -angles[0];
+ // NOTE: this must be synced to SV_GetPitchSign!
if ((e->render.effects & EF_ROTATE) && !(e->render.flags & RENDER_VIEWMODEL))
{
// tenebrae's sprites are all additive mode (weird)
if (gamemode == GAME_TENEBRAE && e->render.model && e->render.model->type == mod_sprite)
- e->render.effects |= EF_ADDITIVE;
+ e->render.flags |= RENDER_ADDITIVE;
// player model is only shown with chase_active on
if (e->state_current.number == cl.viewentity)
e->render.flags |= RENDER_EXTERIORMODEL;
// either fullbright or lit
- if (!(e->render.effects & EF_FULLBRIGHT) && !r_fullbright.integer)
- e->render.flags |= RENDER_LIGHT;
+ if(!r_fullbright.integer)
+ {
+ if (!(e->render.effects & EF_FULLBRIGHT))
+ e->render.flags |= RENDER_LIGHT;
+ else if(r_equalize_entities_fullbright.integer)
+ e->render.flags |= RENDER_LIGHT | RENDER_EQUALIZE;
+ }
// hide player shadow during intermission or nehahra movie
if (!(e->render.effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST))
&& (e->render.alpha >= 1)
e->render.flags |= RENDER_NOSELFSHADOW;
if (e->render.effects & EF_NOSELFSHADOW)
e->render.flags |= RENDER_NOSELFSHADOW;
+ if (e->render.effects & EF_NODEPTHTEST)
+ e->render.flags |= RENDER_NODEPTHTEST;
+ if (e->render.effects & EF_ADDITIVE)
+ e->render.flags |= RENDER_ADDITIVE;
+ if (e->render.effects & EF_DOUBLESIDED)
+ e->render.flags |= RENDER_DOUBLESIDED;
// make the other useful stuff
CL_UpdateRenderEntity(&e->render);
ent->state_previous = ent->state_current;
ent->state_current = defaultstate;
ent->state_current.time = cl.time;
- ent->state_current.number = -1;
+ ent->state_current.number = (unsigned short)-1;
ent->state_current.active = true;
ent->state_current.modelindex = cl.stats[STAT_WEAPON];
ent->state_current.frame = cl.stats[STAT_WEAPONFRAME];
trace_t trace;
matrix4x4_t tempmatrix;
Matrix4x4_Transform(&e->render.matrix, muzzleflashorigin, v2);
- trace = CL_Move(origin, vec3_origin, vec3_origin, v2, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, true, false, NULL, false);
+ trace = CL_TraceLine(origin, v2, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, true, false, NULL, false);
Matrix4x4_Normalize(&tempmatrix, &e->render.matrix);
Matrix4x4_SetOrigin(&tempmatrix, trace.endpos[0], trace.endpos[1], trace.endpos[2]);
Matrix4x4_Scale(&tempmatrix, 150, 1);
if (!r_fullbright.integer)
ent->render.flags |= RENDER_LIGHT;
VectorSet(ent->render.colormod, 1, 1, 1);
+ VectorSet(ent->render.glowmod, 1, 1, 1);
CL_UpdateRenderEntity(&ent->render);
r_refdef.scene.worldentity = &ent->render;
r_refdef.scene.worldmodel = cl.worldmodel;
// need to re-fetch the model pointer
e->render.model = cl.model_precache[e->state_baseline.modelindex];
// either fullbright or lit
- if (!(e->render.effects & EF_FULLBRIGHT) && !r_fullbright.integer)
- e->render.flags |= RENDER_LIGHT;
+ if(!r_fullbright.integer)
+ {
+ if (!(e->render.effects & EF_FULLBRIGHT))
+ e->render.flags |= RENDER_LIGHT;
+ else if(r_equalize_entities_fullbright.integer)
+ e->render.flags |= RENDER_LIGHT | RENDER_EQUALIZE;
+ }
// hide player shadow during intermission or nehahra movie
if (!(e->render.effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST)) && (e->render.alpha >= 1))
e->render.flags |= RENDER_SHADOW;
VectorSet(e->render.colormod, 1, 1, 1);
+ VectorSet(e->render.glowmod, 1, 1, 1);
R_LerpAnimation(&e->render);
CL_UpdateRenderEntity(&e->render);
r_refdef.scene.entities[r_refdef.scene.numentities++] = &e->render;
entrender->model = cl.csqc_model_precache[-(e->modelindex+1)];
entrender->alpha = 1;
VectorSet(entrender->colormod, 1, 1, 1);
+ VectorSet(entrender->glowmod, 1, 1, 1);
Matrix4x4_CreateFromQuakeEntity(&entrender->matrix, e->origin[0], e->origin[1], e->origin[2], 0, 0, 0, 1);
CL_UpdateRenderEntity(entrender);
entrender->model = cl.model_precache[cl.qw_modelindex_spike];
entrender->alpha = 1;
VectorSet(entrender->colormod, 1, 1, 1);
+ VectorSet(entrender->glowmod, 1, 1, 1);
Matrix4x4_CreateFromQuakeEntity(&entrender->matrix, v[0], v[1], v[2], v[3], v[4], v[5], 1);
CL_UpdateRenderEntity(entrender);
{
if (Cmd_Argc () == 1)
{
- Con_Printf("\"fog\" is \"%f %f %f %f %f %f %f\"\n", r_refdef.fog_density, r_refdef.fog_red, r_refdef.fog_green, r_refdef.fog_blue, r_refdef.fog_alpha, r_refdef.fog_start, r_refdef.fog_end);
+ Con_Printf("\"fog\" is \"%f %f %f %f %f %f %f %f %f\"\n", r_refdef.fog_density, r_refdef.fog_red, r_refdef.fog_green, r_refdef.fog_blue, r_refdef.fog_alpha, r_refdef.fog_start, r_refdef.fog_end, r_refdef.fog_height, r_refdef.fog_fadedepth);
return;
}
- r_refdef.fog_start = 0;
- r_refdef.fog_end = 16384;
- r_refdef.fog_alpha = 1;
+ FOG_clear(); // so missing values get good defaults
if(Cmd_Argc() > 1)
r_refdef.fog_density = atof(Cmd_Argv(1));
if(Cmd_Argc() > 2)
r_refdef.fog_start = atof(Cmd_Argv(6));
if(Cmd_Argc() > 7)
r_refdef.fog_end = atof(Cmd_Argv(7));
+ if(Cmd_Argc() > 8)
+ r_refdef.fog_height = atof(Cmd_Argv(8));
+ if(Cmd_Argc() > 9)
+ r_refdef.fog_fadedepth = atof(Cmd_Argv(9));
}
/*
projects / xonotic / darkplaces.git / blobdiff