From 8c9e73c0d4f97ed3306d024bb2a4a9763ec5fb7b Mon Sep 17 00:00:00 2001 From: Andrei Drexler Date: Tue, 9 Mar 2004 00:39:47 +0000 Subject: [PATCH] Flares --- reaction/cgame/cg_view.c | 19 ++-- reaction/cgame/cgame.plg | 218 ++++++++++++--------------------------- 2 files changed, 78 insertions(+), 159 deletions(-) diff --git a/reaction/cgame/cg_view.c b/reaction/cgame/cg_view.c index cd2b4ab6..f555c84f 100644 --- a/reaction/cgame/cg_view.c +++ b/reaction/cgame/cg_view.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.46 2004/03/09 00:39:47 makro +// Flares +// // Revision 1.45 2004/03/07 17:39:11 makro // no message // @@ -1120,7 +1123,8 @@ void CG_AddLensFlare(qboolean sun) cgs.flareFadeFactor *= cg_RQ3_flareIntensity.value; } else { //add the reflection particles - if (cgs.flareFadeFactor != 0.0f) { + if (cgs.flareFadeFactor != 0.0f) + { float len = 0, color[4]; float size, hsize; int i; @@ -1142,11 +1146,14 @@ void CG_AddLensFlare(qboolean sun) CG_DrawPic(dp[0] - hsize, dp[1] - hsize, size, size, cgs.media.flareShader[cg.flareShaderNum[i]]); } - color[0] = color[1] = color[2] = 1.0f; - //Makro - too expensive ? - color[3] = cgs.flareFadeFactor * FLARE_BLIND_ALPHA * (1.0f - abs(320 - cgs.lastSunX) / 320.0f) * (1.0f - abs(240 - cgs.lastSunY) / 240.0f); - //color[3] = FLARE_BLIND_ALPHA * cgs.flareFadeFactor * (2.0f * cgs.flareForwardFactor - 1.0f); - CG_FillRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, color); + if (cgs.flareForwardFactor > 0) + { + color[0] = color[1] = color[2] = 1.0f; + color[3] = cgs.sunAlpha * cgs.flareForwardFactor * cgs.flareFadeFactor * FLARE_BLIND_ALPHA; + //Makro - too expensive + //color[3] = cgs.sunAlpha * cgs.flareFadeFactor * FLARE_BLIND_ALPHA * (1.0f - abs(320 - cgs.lastSunX) / 320.0f) * (1.0f - abs(240 - cgs.lastSunY) / 240.0f); + CG_FillRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, color); + } } } } diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg index ba8c8910..7ec76168 100644 --- a/reaction/cgame/cgame.plg +++ b/reaction/cgame/cgame.plg @@ -6,13 +6,39 @@ --------------------Configuration: cgame - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP15F.tmp" with contents +Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A0.tmp" with contents [ /nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"D:\Work\rq3source\reaction\Release/" /Fp"D:\Work\rq3source\reaction\Release/cgame.pch" /YX /Fo"D:\Work\rq3source\reaction\Release/" /Fd"D:\Work\rq3source\reaction\Release/" /FD /c +"D:\Work\rq3source\reaction\game\bg_misc.c" +"D:\Work\rq3source\reaction\game\bg_pmove.c" +"D:\Work\rq3source\reaction\game\bg_slidemove.c" +"D:\Work\rq3source\reaction\cgame\cg_atmospheric.c" +"D:\Work\rq3source\reaction\cgame\cg_consolecmds.c" +"D:\Work\rq3source\reaction\cgame\cg_draw.c" +"D:\Work\rq3source\reaction\cgame\cg_drawtools.c" +"D:\Work\rq3source\reaction\cgame\cg_effects.c" +"D:\Work\rq3source\reaction\cgame\cg_ents.c" +"D:\Work\rq3source\reaction\cgame\cg_event.c" +"D:\Work\rq3source\reaction\cgame\cg_info.c" +"D:\Work\rq3source\reaction\cgame\cg_localents.c" +"D:\Work\rq3source\reaction\cgame\cg_main.c" +"D:\Work\rq3source\reaction\cgame\cg_marks.c" +"D:\Work\rq3source\reaction\cgame\cg_players.c" +"D:\Work\rq3source\reaction\cgame\cg_playerstate.c" +"D:\Work\rq3source\reaction\cgame\cg_predict.c" +"D:\Work\rq3source\reaction\cgame\cg_scoreboard.c" +"D:\Work\rq3source\reaction\cgame\cg_servercmds.c" +"D:\Work\rq3source\reaction\cgame\cg_snapshot.c" +"D:\Work\rq3source\reaction\cgame\cg_syscalls.c" +"D:\Work\rq3source\reaction\cgame\cg_unlagged.c" "D:\Work\rq3source\reaction\cgame\cg_view.c" +"D:\Work\rq3source\reaction\cgame\cg_weapons.c" +"D:\Work\rq3source\reaction\game\q_math.c" +"D:\Work\rq3source\reaction\game\q_shared.c" +"D:\Work\rq3source\reaction\ui\ui_shared.c" ] -Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP15F.tmp" -Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP160.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A0.tmp" +Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A1.tmp" with contents [ /nologo /base:"0x30000000" /subsystem:windows /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/cgamex86.pdb" /map:"D:\Work\rq3source\reaction\Release/cgamex86.map" /machine:I386 /def:".\cgame.def" /out:"D:\Work\rq3source\reaction\Release\cgamex86.dll" /implib:"D:\Work\rq3source\reaction\Release/cgamex86.lib" \Work\rq3source\reaction\Release\bg_misc.obj @@ -43,13 +69,45 @@ Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP160.tmp" with conte \Work\rq3source\reaction\Release\q_shared.obj \Work\rq3source\reaction\Release\ui_shared.obj ] -Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP160.tmp" +Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A1.tmp"

Output Window

Compiling... +bg_misc.c +bg_pmove.c +bg_slidemove.c +cg_atmospheric.c +cg_consolecmds.c +D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(626) : warning C4706: assignment within conditional expression +D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(638) : warning C4706: assignment within conditional expression +D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(184) : warning C4701: local variable 'tr' may be used without having been initialized +D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(334) : warning C4701: local variable 'tr' may be used without having been initialized +cg_draw.c +cg_drawtools.c +cg_effects.c +cg_ents.c +cg_event.c +cg_info.c +cg_localents.c +cg_main.c +cg_marks.c +cg_players.c +cg_playerstate.c +cg_predict.c +cg_scoreboard.c +D:\Work\rq3source\reaction\cgame\cg_predict.c(805) : warning C4701: local variable 'predictCmd' may be used without having been initialized +D:\Work\rq3source\reaction\cgame\cg_predict.c(809) : warning C4701: local variable 'stateIndex' may be used without having been initialized +cg_servercmds.c +cg_snapshot.c +cg_syscalls.c +cg_unlagged.c cg_view.c +cg_weapons.c +q_math.c +q_shared.c +ui_shared.c Linking... Creating library D:\Work\rq3source\reaction\Release/cgamex86.lib and object D:\Work\rq3source\reaction\Release/cgamex86.exp -Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP164.tmp" with contents +Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A5.tmp" with contents [ /nologo /o"D:\Work\rq3source\reaction\Release/cgame.bsc" \Work\rq3source\reaction\Release\bg_misc.sbr @@ -79,160 +137,14 @@ Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP164.tmp" with conte \Work\rq3source\reaction\Release\q_math.sbr \Work\rq3source\reaction\Release\q_shared.sbr \Work\rq3source\reaction\Release\ui_shared.sbr] -Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP164.tmp" +Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A5.tmp" Creating browse info file...

Output Window

Results

-cgamex86.dll - 0 error(s), 0 warning(s) -

---------------------Configuration: game - Win32 Release-------------------- -

-

Command Lines

-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP165.tmp" with contents -[ -kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/qagamex86.pdb" /map:"D:\Work\rq3source\reaction\Release/qagamex86.map" /machine:I386 /def:".\game.def" /out:"D:\Work\rq3source\reaction\Release\qagamex86.dll" /implib:"D:\Work\rq3source\reaction\Release/qagamex86.lib" -\Work\rq3source\reaction\Release\ai_chat.obj -\Work\rq3source\reaction\Release\ai_cmd.obj -\Work\rq3source\reaction\Release\ai_dmnet.obj -\Work\rq3source\reaction\Release\ai_dmq3.obj -\Work\rq3source\reaction\Release\ai_main.obj -\Work\rq3source\reaction\Release\ai_team.obj -\Work\rq3source\reaction\Release\ai_vcmd.obj -\Work\rq3source\reaction\Release\bg_misc.obj -\Work\rq3source\reaction\Release\bg_pmove.obj -\Work\rq3source\reaction\Release\bg_slidemove.obj -\Work\rq3source\reaction\Release\g_active.obj -\Work\rq3source\reaction\Release\g_arenas.obj -\Work\rq3source\reaction\Release\g_bot.obj -\Work\rq3source\reaction\Release\g_client.obj -\Work\rq3source\reaction\Release\g_cmds.obj -\Work\rq3source\reaction\Release\g_combat.obj -\Work\rq3source\reaction\Release\g_fileio.obj -\Work\rq3source\reaction\Release\g_items.obj -\Work\rq3source\reaction\Release\g_main.obj -\Work\rq3source\reaction\Release\g_matchmode.obj -\Work\rq3source\reaction\Release\g_mem.obj -\Work\rq3source\reaction\Release\g_misc.obj -\Work\rq3source\reaction\Release\g_missile.obj -\Work\rq3source\reaction\Release\g_mover.obj -\Work\rq3source\reaction\Release\g_session.obj -\Work\rq3source\reaction\Release\g_spawn.obj -\Work\rq3source\reaction\Release\g_svcmds.obj -\Work\rq3source\reaction\Release\g_syscalls.obj -\Work\rq3source\reaction\Release\g_target.obj -\Work\rq3source\reaction\Release\g_team.obj -\Work\rq3source\reaction\Release\g_teamplay.obj -\Work\rq3source\reaction\Release\g_trigger.obj -\Work\rq3source\reaction\Release\g_unlagged.obj -\Work\rq3source\reaction\Release\g_utils.obj -\Work\rq3source\reaction\Release\g_weapon.obj -\Work\rq3source\reaction\Release\q_math.obj -\Work\rq3source\reaction\Release\q_shared.obj -\Work\rq3source\reaction\Release\rxn_game.obj -\Work\rq3source\reaction\Release\zcam.obj -\Work\rq3source\reaction\Release\zcam_target.obj -] -Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP165.tmp" -

Output Window

-Linking... - Creating library D:\Work\rq3source\reaction\Release/qagamex86.lib and object D:\Work\rq3source\reaction\Release/qagamex86.exp -Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP169.tmp" with contents -[ -/nologo /o"D:\Work\rq3source\reaction\Release/game.bsc" -\Work\rq3source\reaction\Release\ai_chat.sbr -\Work\rq3source\reaction\Release\ai_cmd.sbr -\Work\rq3source\reaction\Release\ai_dmnet.sbr -\Work\rq3source\reaction\Release\ai_dmq3.sbr -\Work\rq3source\reaction\Release\ai_main.sbr -\Work\rq3source\reaction\Release\ai_team.sbr -\Work\rq3source\reaction\Release\ai_vcmd.sbr -\Work\rq3source\reaction\Release\bg_misc.sbr -\Work\rq3source\reaction\Release\bg_pmove.sbr -\Work\rq3source\reaction\Release\bg_slidemove.sbr -\Work\rq3source\reaction\Release\g_active.sbr -\Work\rq3source\reaction\Release\g_arenas.sbr -\Work\rq3source\reaction\Release\g_bot.sbr -\Work\rq3source\reaction\Release\g_client.sbr -\Work\rq3source\reaction\Release\g_cmds.sbr -\Work\rq3source\reaction\Release\g_combat.sbr -\Work\rq3source\reaction\Release\g_fileio.sbr -\Work\rq3source\reaction\Release\g_items.sbr -\Work\rq3source\reaction\Release\g_main.sbr -\Work\rq3source\reaction\Release\g_matchmode.sbr -\Work\rq3source\reaction\Release\g_mem.sbr -\Work\rq3source\reaction\Release\g_misc.sbr -\Work\rq3source\reaction\Release\g_missile.sbr -\Work\rq3source\reaction\Release\g_mover.sbr -\Work\rq3source\reaction\Release\g_session.sbr -\Work\rq3source\reaction\Release\g_spawn.sbr -\Work\rq3source\reaction\Release\g_svcmds.sbr -\Work\rq3source\reaction\Release\g_syscalls.sbr -\Work\rq3source\reaction\Release\g_target.sbr -\Work\rq3source\reaction\Release\g_team.sbr -\Work\rq3source\reaction\Release\g_teamplay.sbr -\Work\rq3source\reaction\Release\g_trigger.sbr -\Work\rq3source\reaction\Release\g_unlagged.sbr -\Work\rq3source\reaction\Release\g_utils.sbr -\Work\rq3source\reaction\Release\g_weapon.sbr -\Work\rq3source\reaction\Release\q_math.sbr -\Work\rq3source\reaction\Release\q_shared.sbr -\Work\rq3source\reaction\Release\rxn_game.sbr -\Work\rq3source\reaction\Release\zcam.sbr -\Work\rq3source\reaction\Release\zcam_target.sbr] -Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP169.tmp" -Creating browse info file... -

Output Window

- - - -

Results

-qagamex86.dll - 0 error(s), 0 warning(s) -

---------------------Configuration: ui - Win32 Release TA-------------------- -

-

Command Lines

-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP16A.tmp" with contents -[ -/nologo /base:"0x40000000" /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/uix86.pdb" /map:"D:\Work\rq3source\reaction\Release/uix86.map" /machine:I386 /def:".\ui.def" /out:"D:\Work\rq3source\reaction\Release\uix86.dll" /implib:"D:\Work\rq3source\reaction\Release/uix86.lib" -\Work\rq3source\reaction\Release\bg_misc.obj -\Work\rq3source\reaction\Release\q_math.obj -\Work\rq3source\reaction\Release\q_shared.obj -\Work\rq3source\reaction\Release\ui_atoms.obj -\Work\rq3source\reaction\Release\ui_gameinfo.obj -\Work\rq3source\reaction\Release\ui_main.obj -\Work\rq3source\reaction\Release\ui_players.obj -\Work\rq3source\reaction\Release\ui_shared.obj -\Work\rq3source\reaction\Release\ui_syscalls.obj -\Work\rq3source\reaction\Release\ui_util.obj -] -Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP16A.tmp" -

Output Window

-Linking... - Creating library D:\Work\rq3source\reaction\Release/uix86.lib and object D:\Work\rq3source\reaction\Release/uix86.exp -Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP16E.tmp" with contents -[ -/nologo /o"D:\Work\rq3source\reaction\Release/ta_ui.bsc" -\Work\rq3source\reaction\Release\bg_misc.sbr -\Work\rq3source\reaction\Release\q_math.sbr -\Work\rq3source\reaction\Release\q_shared.sbr -\Work\rq3source\reaction\Release\ui_atoms.sbr -\Work\rq3source\reaction\Release\ui_gameinfo.sbr -\Work\rq3source\reaction\Release\ui_main.sbr -\Work\rq3source\reaction\Release\ui_players.sbr -\Work\rq3source\reaction\Release\ui_shared.sbr -\Work\rq3source\reaction\Release\ui_syscalls.sbr -\Work\rq3source\reaction\Release\ui_util.sbr] -Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP16E.tmp" -Creating browse info file... -

Output Window

- - - -

Results

-uix86.dll - 0 error(s), 0 warning(s) +cgamex86.dll - 0 error(s), 6 warning(s)