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

Sun flare changes.

Browse source
This commit is contained in:
Andrei Drexler 2011-03-14 12:21:39 +00:00
parent 37bcb2c318
commit 6a8d553efe
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reaction/code/cgame/cg_view.c
View file

@ -1178,7 +1178,7 @@ void CG_AddLensFlare(qboolean sun)
if (timeDelta > FLARE_FADEOUT_TIME)
{
cgs.lastSunTime = 0;
return;
timeDelta = FLARE_FADEOUT_TIME;
}
cgs.flareFadeFactor = 1.0f - (float)timeDelta / FLARE_FADEOUT_TIME;
}
@ -1188,7 +1188,9 @@ void CG_AddLensFlare(qboolean sun)
else
cgs.flareFovFactor = 1.0f;
//finally, add the sun
if (cgs.sunFlareSize > 0 && cgs.sunAlpha > 0 && cgs.flareFadeFactor != 0.0f) {
if (1) {
//if (cgs.sunFlareSize > 0 && cgs.sunAlpha > 0 && cgs.flareFadeFactor != 0.0f) {
refEntity_t ent;
memset(&ent, 0, sizeof(ent));
@ -1198,11 +1200,12 @@ void CG_AddLensFlare(qboolean sun)
//this function wouldn't be complete without some funny math
//this makes the sprite as big as the mapper wanted it to be
ent.radius = cgs.sunFlareSize * tr.fraction * 25.6f;
ent.renderfx = RF_DEPTHHACK;
//ent.renderfx = RF_DEPTHHACK | RF_SUNFLARE;
ent.renderfx = RF_SUNFLARE;
ent.shaderRGBA[0] = cgs.flareFadeFactor * cgs.sunAlpha * 255;
ent.shaderRGBA[1] = ent.shaderRGBA[0];
ent.shaderRGBA[2] = ent.shaderRGBA[0];
ent.shaderRGBA[3] = ent.shaderRGBA[0];
ent.shaderRGBA[1] = cgs.sunAlpha * 255;
ent.shaderRGBA[2] = 0.f;
ent.shaderRGBA[3] = 0.f;
trap_R_AddRefEntityToScene(&ent);
}
//speed hack
@ -1241,7 +1244,8 @@ void CG_AddLensFlare(qboolean sun)
color[0] = color[1] = color[2] = 1.0f;
//color[3] = cgs.sunAlpha * cgs.flareForwardFactor * cgs.flareFadeFactor * FLARE_BLIND_ALPHA;
color[3] = min_atten * min_atten * cgs.flareFadeFactor * FLARE_BLIND_ALPHA;
CG_FillRect(cgs.screenXMin, 0, cgs.screenWidth, SCREEN_HEIGHT, color);
//CG_FillRect(cgs.screenXMin, 0, cgs.screenWidth, SCREEN_HEIGHT, color);
}
}
}

2
reaction/code/cgame/tr_types.h
View file

@ -42,6 +42,8 @@
#define RF_WRAP_FRAMES 512 // mod the model frames by the maxframes to allow continuous
// animation without needing to know the frame count
#define RF_SUNFLARE 1024
// refdef flags
#define RDF_NOWORLDMODEL 1 // used for player configuration screen
#define RDF_HYPERSPACE 4 // teleportation effect