hifuu-club/illusion-arena-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pure formatting changes

Browse Source
This commit is contained in:
sago007
2016-11-27 11:55:46 +01:00
parent e90e80eb92
commit c0c6bbb0ef
1 changed files with 371 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
code/renderer_oa/tr_flares.c
View File

@@ -110,7 +110,8 @@ int flareCoeff;
R_SetFlareCoeff
==================
*/
static void R_SetFlareCoeff( void ) {
static void R_SetFlareCoeff( void )
{
if(r_flareCoeff->value == 0.0f)
flareCoeff = atof(FLARE_STDCOEFF);
@@ -128,7 +129,8 @@ static int pvrhack = 0; // leilei = powervr workarounds
R_ClearFlares
==================
*/
void R_ClearFlares( void ) {
void R_ClearFlares( void )
{
int i;
Com_Memset( r_flareStructs, 0, sizeof( r_flareStructs ) );
@@ -155,7 +157,8 @@ float flaredsize; // leilei - dirty flare fix for widescreens
void RB_AddFlare(srfFlare_t *surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal, int radii, int efftype, float scaled, int type) {
void RB_AddFlare(srfFlare_t *surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal, int radii, int efftype, float scaled, int type)
{
int i;
flare_t *f, *oldest;
vec3_t local;
@@ -166,8 +169,7 @@ void RB_AddFlare(srfFlare_t *surface, int fogNum, vec3_t point, vec3_t color, ve
// fade the intensity of the flare down as the
// light surface turns away from the viewer
if(normal && (normal[0] || normal[1] || normal[2]) )
{
if(normal && (normal[0] || normal[1] || normal[2]) ) {
VectorSubtract( backEnd.viewParms.or.origin, point, local );
VectorNormalizeFast(local);
d = DotProduct(local, normal);
@@ -298,7 +300,8 @@ void RB_AddFlare(srfFlare_t *surface, int fogNum, vec3_t point, vec3_t color, ve
RB_AddDlightFlares
==================
*/
void RB_AddDlightFlares( void ) {
void RB_AddDlightFlares( void )
{
dlight_t *l;
int i, j, k;
fog_t *fog = NULL;
@@ -315,8 +318,7 @@ void RB_AddDlightFlares( void ) {
for (i=0 ; i<backEnd.refdef.num_dlights ; i++, l++) {
if(fog)
{
if(fog) {
// find which fog volume the light is in
for ( j = 1 ; j < tr.world->numfogs ; j++ ) {
fog = &tr.world->fogs[j];
@@ -360,7 +362,8 @@ RB_TestFlareFast
faster simple one.
==================
*/
static void RB_TestFlareFast( flare_t *f, int dotrace ) {
static void RB_TestFlareFast( flare_t *f, int dotrace )
{
float depth;
qboolean visible;
float fade;
@@ -381,8 +384,7 @@ static void RB_TestFlareFast( flare_t *f, int dotrace ) {
visible = 0;
return;
}
else
{
else {
visible = 1;
}
}
@@ -413,7 +415,8 @@ static void RB_TestFlareFast( flare_t *f, int dotrace ) {
{
fade = ( ( backEnd.refdef.time - f->fadeTime ) / 1000.0f ) * r_flareFade->value;
}
} else {
}
else {
if ( f->visible ) {
f->visible = qfalse;
f->fadeTime = backEnd.refdef.time - 1;
@@ -437,8 +440,7 @@ static void RB_TestFlareFast( flare_t *f, int dotrace ) {
if (f->visible) {
f->drawIntensity = 1;
}
else
{
else {
f->drawIntensity = 0;
}
}
@@ -450,7 +452,8 @@ static void RB_TestFlareFast( flare_t *f, int dotrace ) {
RB_TestFlare
==================
*/
static void RB_TestFlare( flare_t *f, int dotrace ) {
static void RB_TestFlare( flare_t *f, int dotrace )
{
float depth;
qboolean visible;
float fade;
@@ -473,8 +476,7 @@ static void RB_TestFlare( flare_t *f, int dotrace ) {
visible = 0;
return;
}
else
{
else {
visible = 1;
}
}
@@ -500,7 +502,8 @@ static void RB_TestFlare( flare_t *f, int dotrace ) {
{
fade = ( ( backEnd.refdef.time - f->fadeTime ) / 1000.0f ) * r_flareFade->value;
}
} else {
}
else {
if ( f->visible ) {
f->visible = qfalse;
f->fadeTime = backEnd.refdef.time - 1;
@@ -519,7 +522,8 @@ static void RB_TestFlare( flare_t *f, int dotrace ) {
}
static void RB_TestFlareTraceOnly( flare_t *f ) {
static void RB_TestFlareTraceOnly( flare_t *f )
{
float depth;
qboolean visible;
float fade;
@@ -539,8 +543,7 @@ static void RB_TestFlareTraceOnly( flare_t *f ) {
visible = 0;
return;
}
else
{
else {
visible = 1;
}
@@ -553,7 +556,8 @@ static void RB_TestFlareTraceOnly( flare_t *f ) {
{
fade = ( ( backEnd.refdef.time - f->fadeTime ) / 1000.0f ) * r_flareFade->value;
}
} else {
}
else {
if ( f->visible ) {
f->visible = qfalse;
f->fadeTime = backEnd.refdef.time - 1;
@@ -580,7 +584,8 @@ RB_RenderFlare
==================
*/
void RB_RenderFlare( flare_t *f ) {
void RB_RenderFlare( flare_t *f )
{
float size;
vec3_t color;
int iColor[3];
@@ -599,8 +604,7 @@ void RB_RenderFlare( flare_t *f ) {
else
distance = -f->eyeZ;
if ( (r_flaresDlightShrink->integer) && (f->type == 1) ) // leilei - dynamic light flares shrinking when close
{
if ( (r_flaresDlightShrink->integer) && (f->type == 1) ) { // leilei - dynamic light flares shrinking when close
float newd = distance / (48.0f);
if (newd > 1) newd = 1.0f;
@@ -624,9 +628,9 @@ void RB_RenderFlare( flare_t *f ) {
size = flaredsize * (r_flareSize->value / (distance * -2.0f));
}
else if (r_flareMethod->integer == 2) { // Raven method
size = flaredsize * ( r_flareSize->value/640.0f + 8 / -f->eyeZ ); }
else
{
size = flaredsize * ( r_flareSize->value/640.0f + 8 / -f->eyeZ );
}
else {
size = flaredsize * ( (r_flareSize->value) /640.0f + 8 / distance );
@@ -661,8 +665,7 @@ void RB_RenderFlare( flare_t *f ) {
else
intensity = flareCoeff * size * size / (factor * factor);
if (r_flareMethod->integer == 1) // leilei - stupid hack to fix the not the way method
{
if (r_flareMethod->integer == 1) { // leilei - stupid hack to fix the not the way method
if (intensity > 1) intensity = 1;
}
@@ -678,8 +681,7 @@ void RB_RenderFlare( flare_t *f ) {
// Calculations for fogging
if(tr.world && f->fogNum > 0 && f->fogNum < tr.world->numfogs)
{
if(tr.world && f->fogNum > 0 && f->fogNum < tr.world->numfogs) {
tess.numVertexes = 1;
VectorCopy(f->origin, tess.xyz[0]);
tess.fogNum = f->fogNum;
@@ -709,16 +711,13 @@ void RB_RenderFlare( flare_t *f ) {
RB_BeginSurface( tr.flareShaderAtlas, f->fogNum );
halfer = 0.5f;
}
else
{
else {
if (r_flareQuality->integer) // leilei - high quality flares get no depth testing
{
if (r_flareQuality->integer) { // leilei - high quality flares get no depth testing
int index;
for(index = 0; index <f->theshader->numUnfoggedPasses; index++)
{
for(index = 0; index <f->theshader->numUnfoggedPasses; index++) {
f->theshader->stages[index]->adjustColorsForFog = ACFF_NONE;
f->theshader->stages[index]->stateBits |= GLS_DEPTHTEST_DISABLE;
}
@@ -1003,22 +1002,37 @@ void RB_RenderFlare( flare_t *f ) {
size2=sizes[n]*flaredsize2*.25f;
drak = f->radius * 0.07;
if (atlases[n] == 1){ downsize1 = 1; downsize2 = 1; };
if (atlases[n] == 3){ downsize1 = 1; downsize2 = -1; };
if (atlases[n] == 4){ downsize1 = -1; downsize2 = -1; };
if (atlases[n] == 2){ downsize1 = -1; downsize2 = 1; };
if (atlases[n] == 1) {
downsize1 = 1;
downsize2 = 1;
};
if (atlases[n] == 3) {
downsize1 = 1;
downsize2 = -1;
};
if (atlases[n] == 4) {
downsize1 = -1;
downsize2 = -1;
};
if (atlases[n] == 2) {
downsize1 = -1;
downsize2 = 1;
};
if (modess == 1) {
brightness1[n] = brightness1[n] + brightness2[n] + brightness3[n] * 0.0100;
brightness2[n] = brightness1[n]; brightness3[n] = brightness1[n];
brightness2[n] = brightness1[n];
brightness3[n] = brightness1[n];
}
brightness1[n]=(int)(brightness1[n]*r_lensReflectionBrightness->value) * drak;
brightness2[n]=(int)(brightness2[n]*r_lensReflectionBrightness->value) * drak;
brightness3[n]=(int)(brightness3[n]*r_lensReflectionBrightness->value) * drak;
if (modess == 2) {
iColor[0] = 32.0f; iColor[1] = 32.0f; iColor[2] = 32.0f;
iColor[0] = 32.0f;
iColor[1] = 32.0f;
iColor[2] = 32.0f;
}
if (pvrhack) {
@@ -1027,8 +1041,7 @@ void RB_RenderFlare( flare_t *f ) {
colarz[1] = ceil(iColor[1]*brightness2[n]);
colarz[2] = ceil(iColor[2]*brightness3[n]);
}
else
{
else {
colarz[0] = ceil(iColor[0]);
colarz[1] = ceil(iColor[1]);
colarz[2] = ceil(iColor[2]);
@@ -1200,7 +1213,8 @@ when occluded by something in the main view, and portal flares that should
extend past the portal edge will be overwritten.
==================
*/
void RB_RenderFlares (void) {
void RB_RenderFlares (void)
{
flare_t *f;
flare_t **prev;
qboolean draw;
@@ -1213,8 +1227,7 @@ void RB_RenderFlares (void) {
// a very very very very nasty error relating to the trace checks
// leading to recursive startup in te OA3 menu
if(r_flareCoeff->modified)
{
if(r_flareCoeff->modified) {
R_SetFlareCoeff();
r_flareCoeff->modified = qfalse;
}
@@ -1258,7 +1271,8 @@ void RB_RenderFlares (void) {
if ( f->drawIntensity ) {
draw = qtrue;
} else {
}
else {
// this flare has completely faded out, so remove it from the chain
*prev = f->next;
f->next = r_inactiveFlares;
@@ -1302,7 +1316,8 @@ void RB_RenderFlares (void) {
void RB_DrawSunFlare( void ) {
void RB_DrawSunFlare( void )
{
float size;
float dist;
vec3_t origin, vec1, vec2;