rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-18 18:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

cg_RQ3_strobe changes

Browse source
This commit is contained in:
Andrei Drexler 2011-04-01 23:28:34 +00:00
parent a350a527c7
commit 03a12dc526
2 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
reaction/code/cgame/cg_ents.c
View file

@ -608,17 +608,48 @@ static void CG_Item(centity_t * cent)
VectorScale(ent.axis[1], scale, ent.axis[1]); VectorScale(ent.axis[1], scale, ent.axis[1]);
VectorScale(ent.axis[2], scale, ent.axis[2]); VectorScale(ent.axis[2], scale, ent.axis[2]);
// add to refresh list // Makro - nudge them up a bit
trap_R_AddRefEntityToScene(&ent); // the strobe effect looks a lot better if it isn't clipped by the ground
ent.origin[2] += 0.5f;
// add strobe effect -- should make this toggle? // add strobe effect -- should make this toggle?
// NiceAss: Temp Cvar usage for strobe shader. // NiceAss: Temp Cvar usage for strobe shader.
if ((item->giType == IT_WEAPON || if ((item->giType == IT_WEAPON ||
item->giType == IT_ARMOR || item->giType == IT_ARMOR ||
item->giType == IT_AMMO || item->giType == IT_HOLDABLE) && cg_RQ3_strobe.integer == 1) { item->giType == IT_AMMO || item->giType == IT_HOLDABLE) && cg_RQ3_strobe.integer) {
ent.customShader = cgs.media.itemStrobeShader; const float MAX_DIST = 512.f;
trap_R_AddRefEntityToScene(&ent); vec3_t delta;
float dist;
VectorSubtract(cg.refdef.vieworg, ent.origin, delta);
dist = VectorLengthSquared(delta);
if (dist <= MAX_DIST * MAX_DIST) {
refEntity_t glow = ent;
float frac = 1.f - sqrt(dist) * (1.f / MAX_DIST);
const float freq = 1.f;
frac *= frac;
// Note: sadly, this looks different depending on overbright bits
// 96 was picked to look good with OBB on
glow.customShader = cgs.media.itemStrobeShader;
glow.shaderRGBA[0] = glow.shaderRGBA[1] = 96;
glow.shaderRGBA[2] = 0;
// Makro - constant alpha for values >= 2, otherwise pulse
if (cg_RQ3_strobe.integer > 1)
glow.shaderRGBA[3] = (int)Com_Clamp(0.f, 255.f, frac * 255.f);
else
glow.shaderRGBA[3] = (int)Com_Clamp(0.f, 255.f, frac * 255.f * (sin(freq * 2.f * M_PI * cg.time / 1000.f) * 0.5 + 0.5));
trap_R_AddRefEntityToScene(&glow);
} }
}
// add to refresh list
trap_R_AddRefEntityToScene(&ent);
// accompanying rings / spheres for powerups // accompanying rings / spheres for powerups
if (!cg_simpleItems.integer) { if (!cg_simpleItems.integer) {
vec3_t spinAngles; vec3_t spinAngles;

2
reaction/code/cgame/cg_main.c
View file

@ -876,7 +876,7 @@ static cvarTable_t cvarTable[] = { // bk001129
// Elder: added // Elder: added
{&cg_RQ3_flash, "cg_RQ3_flash", "1", CVAR_ARCHIVE}, {&cg_RQ3_flash, "cg_RQ3_flash", "1", CVAR_ARCHIVE},
// NiceAss: added // NiceAss: added
{&cg_RQ3_strobe, "cg_RQ3_strobe", "0", CVAR_ARCHIVE}, {&cg_RQ3_strobe, "cg_RQ3_strobe", "1", CVAR_ARCHIVE},
{&cg_RQ3_painblend, "cg_RQ3_painblend", "1", CVAR_ARCHIVE}, {&cg_RQ3_painblend, "cg_RQ3_painblend", "1", CVAR_ARCHIVE},
//Slicer: no longer being used //Slicer: no longer being used
//{&cg_RQ3_ssgZoomAssist, "cg_RQ3_ssgZoomAssist", "1", CVAR_ARCHIVE}, //{&cg_RQ3_ssgZoomAssist, "cg_RQ3_ssgZoomAssist", "1", CVAR_ARCHIVE},