rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-13 08:27:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Flares

Browse source
This commit is contained in:
Andrei Drexler 2003-09-19 21:22:52 +00:00
parent 461277b8b0
commit 60050687ca
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reaction/cgame/cg_servercmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.78 2003/09/19 21:22:52 makro
// Flares
//
// Revision 1.77 2003/09/19 00:54:23 makro // Revision 1.77 2003/09/19 00:54:23 makro
// Flares again // Flares again
// //
@ -453,7 +456,7 @@ static void CG_ParseWarmup(void)
void CG_ParseSkyPortal(const char *str) void CG_ParseSkyPortal(const char *str)
{ {
//sky portal //sky portal
if (str && str[0] && Q_stricmp(str, "none")) { if (str && str[0] && Q_stricmp(str, "none") && atoi(Info_ValueForKey(str, "n"))) {
cgs.skyPortalOrigin[0] = atof(Info_ValueForKey(str, "x")); cgs.skyPortalOrigin[0] = atof(Info_ValueForKey(str, "x"));
cgs.skyPortalOrigin[1] = atof(Info_ValueForKey(str, "y")); cgs.skyPortalOrigin[1] = atof(Info_ValueForKey(str, "y"));
cgs.skyPortalOrigin[2] = atof(Info_ValueForKey(str, "z")); cgs.skyPortalOrigin[2] = atof(Info_ValueForKey(str, "z"));

11
reaction/cgame/cg_view.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.41 2003/09/19 21:22:52 makro
// Flares
//
// Revision 1.40 2003/09/19 00:54:23 makro // Revision 1.40 2003/09/19 00:54:23 makro
// Flares again // Flares again
// //
@ -1013,7 +1016,7 @@ static void CG_PlayBufferedSounds(void)
//========================================================================= //=========================================================================
#define FLARE_FADEOUT_TIME 1000 #define FLARE_FADEOUT_TIME 600
void CG_AddLensFlare() void CG_AddLensFlare()
{ {
@ -1066,10 +1069,12 @@ void CG_AddLensFlare()
if (cg.refdef.fov_x < 90) if (cg.refdef.fov_x < 90)
fovFactor = 5 - 0.05f * cg.refdef.fov_x; fovFactor = 5 - 0.05f * cg.refdef.fov_x;
color[0] = color[1] = color[2] = 1.0f; color[0] = color[1] = color[2] = color[3] = cgs.sunAlpha;
color[3] = cgs.sunAlpha;
if (!visible) { if (!visible) {
fade = 1.0f - (float)timeDelta / FLARE_FADEOUT_TIME; fade = 1.0f - (float)timeDelta / FLARE_FADEOUT_TIME;
color[0] *= fade;
color[1] *= fade;
color[2] *= fade;
color[3] *= fade; color[3] *= fade;
} }
//sun //sun

18
reaction/cgame/cgame.plg
View file

@ -6,16 +6,13 @@
--------------------Configuration: cgame - Win32 Release-------------------- --------------------Configuration: cgame - Win32 Release--------------------
</h3> </h3>
<h3>Command Lines</h3> <h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP33F.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP729.tmp" with contents
[ [
/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"Release/" /Fp"Release/cgame.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c /nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"Release/" /Fp"Release/cgame.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c
"C:\Games\Quake3\rq3source\reaction\cgame\cg_draw.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_main.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_servercmds.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_view.c" "C:\Games\Quake3\rq3source\reaction\cgame\cg_view.c"
] ]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP33F.tmp" Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP729.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP340.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP72A.tmp" with contents
[ [
/nologo /base:"0x30000000" /subsystem:windows /dll /incremental:no /pdb:"Release/cgamex86.pdb" /map:"Release/cgamex86.map" /machine:I386 /def:".\cgame.def" /out:"../Release/cgamex86.dll" /implib:"Release/cgamex86.lib" /nologo /base:"0x30000000" /subsystem:windows /dll /incremental:no /pdb:"Release/cgamex86.pdb" /map:"Release/cgamex86.map" /machine:I386 /def:".\cgame.def" /out:"../Release/cgamex86.dll" /implib:"Release/cgamex86.lib"
.\Release\bg_misc.obj .\Release\bg_misc.obj
@ -46,16 +43,13 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP340.tmp" with conte
.\Release\q_shared.obj .\Release\q_shared.obj
.\Release\ui_shared.obj .\Release\ui_shared.obj
] ]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP340.tmp" Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP72A.tmp"
<h3>Output Window</h3> <h3>Output Window</h3>
Compiling... Compiling...
cg_draw.c
cg_main.c
cg_servercmds.c
cg_view.c cg_view.c
Linking... Linking...
Creating library Release/cgamex86.lib and object Release/cgamex86.exp Creating library Release/cgamex86.lib and object Release/cgamex86.exp
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP344.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP72E.tmp" with contents
[ [
/nologo /o"Release/cgame.bsc" /nologo /o"Release/cgame.bsc"
.\Release\bg_misc.sbr .\Release\bg_misc.sbr
@ -85,7 +79,7 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP344.tmp" with conte
.\Release\q_math.sbr .\Release\q_math.sbr
.\Release\q_shared.sbr .\Release\q_shared.sbr
.\Release\ui_shared.sbr] .\Release\ui_shared.sbr]
Creating command line "bscmake.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP344.tmp" Creating command line "bscmake.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP72E.tmp"
Creating browse info file... Creating browse info file...
<h3>Output Window</h3> <h3>Output Window</h3>