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

169
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;
@@ -374,22 +377,21 @@ static void RB_TestFlareFast( flare_t *f, int dotrace ) {
glState.finishCalled = qfalse;
if (f->type == 2) dotrace = 0; // sun cant trace
// leilei - do trace, then complain
if (dotrace){
if (dotrace) {
trace_t yeah;
CM_Trace( &yeah, f->origin, backEnd.or.viewOrigin, NULL, NULL, NULL, f->origin, 1, NULL, NULL );
if (yeah.fraction < 1){
if (yeah.fraction < 1) {
visible = 0;
return;
}
else
{
else {
visible = 1;
}
}
// leilei - delay hack, to speed up the renderer
if (backEnd.refdef.time > f->delay){
if (backEnd.refdef.time > f->delay) {
// read back the z buffer contents
@@ -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;
@@ -466,15 +469,14 @@ static void RB_TestFlare( flare_t *f, int dotrace ) {
if (f->type == 2) dotrace = 0; // sun cant trace
// leilei - do trace, then complain
if (dotrace){
if (dotrace) {
trace_t yeah;
CM_Trace( &yeah, f->origin, backEnd.or.viewOrigin, NULL, NULL, NULL, f->origin, 1, NULL, NULL );
if (yeah.fraction < 1){
if (yeah.fraction < 1) {
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;
@@ -535,12 +539,11 @@ static void RB_TestFlareTraceOnly( flare_t *f ) {
// read from a traceline
trace_t yeah;
CM_Trace( &yeah, f->origin, backEnd.or.viewOrigin, NULL, NULL, NULL, f->origin, 1, NULL, NULL );
if (yeah.fraction < 1){
if (yeah.fraction < 1) {
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;
@@ -614,19 +618,19 @@ void RB_RenderFlare( flare_t *f ) {
// calculate the flare size..
/*
/*
* This is an alternative to intensity scaling. It changes the size of the flare on screen instead
* with growing distance. See in the description at the top why this is not the way to go.
*/
*/
// size will change ~ 1/r.
if (r_flareMethod->integer == 1 || r_flareMethod->integer == 4 ){ // The "not the way to go" method.
if (r_flareMethod->integer == 1 || r_flareMethod->integer == 4 ) { // The "not the way to go" method.
// seen in EF
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
{
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 / distance );
@@ -638,7 +642,7 @@ void RB_RenderFlare( flare_t *f ) {
/*
/*
* As flare sizes stay nearly constant with increasing distance we must decrease the intensity
* to achieve a reasonable visual result. The intensity is ~ (size^2 / distance^2) which can be
* got by considering the ratio of
@@ -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;
@@ -705,20 +707,17 @@ void RB_RenderFlare( flare_t *f ) {
float halfer = 1;
if (f->ftype == 5 || f->ftype == 6 || f->ftype == 7 || f->ftype == 166){
if (f->ftype == 5 || f->ftype == 6 || f->ftype == 7 || f->ftype == 166) {
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;
}
@@ -783,7 +782,7 @@ void RB_RenderFlare( flare_t *f ) {
// reflections -- tcpparena
if(f->ftype == 2 || f->ftype == 4){
if(f->ftype == 2 || f->ftype == 4) {
// renders sharp lens flare.
@@ -799,7 +798,7 @@ void RB_RenderFlare( flare_t *f ) {
int n;
cx=backEnd.viewParms.viewportX+(backEnd.viewParms.viewportWidth>>1);
cy=backEnd.viewParms.viewportY+(backEnd.viewParms.viewportHeight>>1);
for(n=0;n<5;n++){
for(n=0; n<5; n++) {
dx=(f->windowX-cx)*poses[n]+cx;
dy=(f->windowY-cy)*poses[n]+cy;
size2=sizes[n]*backEnd.viewParms.viewportWidth*.25f;
@@ -888,7 +887,7 @@ void RB_RenderFlare( flare_t *f ) {
if(f->ftype == 3 || f->ftype == 4){
if(f->ftype == 3 || f->ftype == 4) {
// renders fuzzy lens flare.
@@ -905,7 +904,7 @@ void RB_RenderFlare( flare_t *f ) {
cy=backEnd.viewParms.viewportY+(backEnd.viewParms.viewportHeight>>1);
for(n=0;n<2;n++){
for(n=0; n<2; n++) {
dx=(f->windowX-cx)*poses[n]+cx;
dy=(f->windowY-cy)*poses[n]+cy;
size2=sizes[n]*flaredsize2*.25f;
@@ -969,7 +968,7 @@ void RB_RenderFlare( flare_t *f ) {
float drak;
if(f->ftype == 5 || f->ftype == 6 || f->ftype == 7 || f->ftype == 166){
if(f->ftype == 5 || f->ftype == 6 || f->ftype == 7 || f->ftype == 166) {
// renders special atlas lens flare like fuzzy but not fuzzy
int modess;
@@ -981,7 +980,7 @@ void RB_RenderFlare( flare_t *f ) {
float size2;
float poses[]= {-1.0f, -0.75f, -0.64f, -0.57f, -0.37f, -0.35f, -0.3f, 1.2f, -.21f, 0.15f, .38f, .56f, .52f, 0.6f, 1.2f, 1.37f};
float sizes[]= {1.15f, 0.7f, 0.2f, 0.35f, 0.24f, .86f, .357f, 2.3f, 0.15f, 0.09f, 0.21f, 0.7f, 0.37f, 0.23f, 0.3f, 1.2f};
float atlases[]={4, 2, 1, 2, 2, 2, 2, 1, 1, 1, 2, 7, 8, 2, 3, 2};
float atlases[]= {4, 2, 1, 2, 2, 2, 2, 1, 1, 1, 2, 7, 8, 2, 3, 2};
float downsize1 = 0.25f;
float downsize2 = 0.25f;
@@ -997,38 +996,52 @@ void RB_RenderFlare( flare_t *f ) {
cy=backEnd.viewParms.viewportY+(backEnd.viewParms.viewportHeight>>1);
for(n=0;n<16;n++){
for(n=0; n<16; n++) {
dx=(f->windowX-cx)*poses[n]+cx;
dy=(f->windowY-cy)*poses[n]+cy;
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){
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;
if (modess == 2) {
iColor[0] = 32.0f;
iColor[1] = 32.0f;
iColor[2] = 32.0f;
}
if (pvrhack){
if (modess == 2){
if (pvrhack) {
if (modess == 2) {
colarz[0] = ceil(iColor[0]*brightness1[n]);
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]);
@@ -1098,7 +1111,7 @@ void RB_RenderFlare( flare_t *f ) {
}
}
if(f->ftype == 8 ){
if(f->ftype == 8 ) {
// renders anamorphic flare
// JUST LIKE TEH MOVEEZ!!!!!!!!!
@@ -1117,7 +1130,7 @@ void RB_RenderFlare( flare_t *f ) {
cy=backEnd.viewParms.viewportY+(backEnd.viewParms.viewportHeight>>1);
drak = f->radius * 0.02;
for(n=0;n<3;n++){
for(n=0; n<3; n++) {
dx=(f->windowX-cx)*poses[n]+cx;
dy=(f->windowY-cy)*poses[n]+cy;
size2=sizes[n]*flaredsize2 * drak*.25f;
@@ -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;
@@ -1354,7 +1369,7 @@ void RB_DrawSunFlare( void ) {
int g;
for (g=0;g<3;g++)
for (g=0; g<3; g++)
if (coll[g] > 1) coll[g] = 1;
VectorCopy( origin, temp );