eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

fix bloom fast sample, limit sample to gl_max_size, use tableless algorithm for diamond size

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3503 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2010-01-18 20:09:55 +00:00
parent 04d181973a
commit 6c425bc3df
1 changed files with 21 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
engine/gl/gl_bloom.c
View file

@ -37,37 +37,13 @@ extern vrect_t gl_truescreenrect;
============================================================================== ==============================================================================
*/ */
static float Diamond8x[8][8] = { cvar_t r_bloom = FCVAR("r_bloom", "gl_bloom", "0", CVAR_ARCHIVE);
{0.0f, 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, 0.0f}, cvar_t r_bloom_alpha = SCVAR("r_bloom_alpha", "0.5");
{0.0f, 0.0f, 0.2f, 0.3f, 0.3f, 0.2f, 0.0f, 0.0f}, cvar_t r_bloom_diamond_size = SCVAR("r_bloom_diamond_size", "8");
{0.0f, 0.2f, 0.4f, 0.6f, 0.6f, 0.4f, 0.2f, 0.0f}, cvar_t r_bloom_intensity = SCVAR("r_bloom_intensity", "1");
{0.1f, 0.3f, 0.6f, 0.9f, 0.9f, 0.6f, 0.3f, 0.1f}, cvar_t r_bloom_darken = SCVAR("r_bloom_darken", "3");
{0.1f, 0.3f, 0.6f, 0.9f, 0.9f, 0.6f, 0.3f, 0.1f}, cvar_t r_bloom_sample_size = SCVARF("r_bloom_sample_size", "256", CVAR_RENDERERLATCH);
{0.0f, 0.2f, 0.4f, 0.6f, 0.6f, 0.4f, 0.2f, 0.0f}, cvar_t r_bloom_fast_sample = SCVARF("r_bloom_fast_sample", "0", CVAR_RENDERERLATCH);
{0.0f, 0.0f, 0.2f, 0.3f, 0.3f, 0.2f, 0.0f, 0.0f},
{0.0f, 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, 0.0f} };
static float Diamond6x[6][6] = {
{0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f},
{0.0f, 0.3f, 0.5f, 0.5f, 0.3f, 0.0f},
{0.1f, 0.5f, 0.9f, 0.9f, 0.5f, 0.1f},
{0.1f, 0.5f, 0.9f, 0.9f, 0.5f, 0.1f},
{0.0f, 0.3f, 0.5f, 0.5f, 0.3f, 0.0f},
{0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f} };
static float Diamond4x[4][4] = {
{0.3f, 0.4f, 0.4f, 0.3f},
{0.4f, 0.9f, 0.9f, 0.4f},
{0.4f, 0.9f, 0.9f, 0.4f},
{0.3f, 0.4f, 0.4f, 0.3f} };
cvar_t r_bloom = FCVAR("r_bloom", "gl_bloom", "0", CVAR_ARCHIVE);
cvar_t r_bloom_alpha = SCVAR("r_bloom_alpha", "0.5");
cvar_t r_bloom_diamond_size = SCVAR("r_bloom_diamond_size", "8");
cvar_t r_bloom_intensity = SCVAR("r_bloom_intensity", "1");
cvar_t r_bloom_darken = SCVAR("r_bloom_darken", "3");
cvar_t r_bloom_sample_size = SCVARF("r_bloom_sample_size", "256", CVAR_RENDERERLATCH);
cvar_t r_bloom_fast_sample = SCVARF("r_bloom_fast_sample", "0", CVAR_RENDERERLATCH);
typedef struct { typedef struct {
//texture numbers //texture numbers
@ -162,7 +138,7 @@ void R_Bloom_InitEffectTexture(void)
Cvar_SetValue (&r_bloom_sample_size, 32); Cvar_SetValue (&r_bloom_sample_size, 32);
//make sure bloom size is a power of 2 //make sure bloom size is a power of 2
bs.size_sample = r_bloom_sample_size.value; bs.size_sample = min(r_bloom_sample_size.value, gl_max_size.value);
bloomsizecheck = (float)bs.size_sample; bloomsizecheck = (float)bs.size_sample;
while (bloomsizecheck > 1.0f) bloomsizecheck /= 2.0f; while (bloomsizecheck > 1.0f) bloomsizecheck /= 2.0f;
if (bloomsizecheck != 1.0f) if (bloomsizecheck != 1.0f)
@ -436,54 +412,23 @@ void R_Bloom_GeneratexDiamonds(void)
//qglBlendFunc(GL_ONE, GL_ONE); //qglBlendFunc(GL_ONE, GL_ONE);
qglBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR); qglBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
if (r_bloom_diamond_size.value > 7 || r_bloom_diamond_size.value <= 3)
{ {
if (r_bloom_diamond_size.value != 8) int size = r_bloom_diamond_size.value;
Cvar_SetValue(&r_bloom_diamond_size, 8); float rad = r_bloom_diamond_size.value / 2.0f;
float point = (r_bloom_diamond_size.value - 1) / 2.0f;
float mult = min(1.0f, r_bloom_intensity.value * 2.0f / rad);
for (i=0; i<r_bloom_diamond_size.value; i++) for (i=0; i<size; i++)
{ {
for (j=0; j<r_bloom_diamond_size.value; j++) for (j=0; j<size; j++)
{ {
intensity = r_bloom_intensity.value * 0.3 * Diamond8x[i][j]; float f = ((point + 1.0f) - (fabs(point - i) + fabs(point - j))) / (point + 1.0f);
if (intensity < 0.01f) //float f = 1.0f - (fabs(point - i) * fabs(point - j) / (point * point)); // circle/cross?
intensity = mult * f;
if (intensity < 0.005f)
continue; continue;
qglColor4f(intensity, intensity, intensity, 1.0); qglColor4f(intensity, intensity, intensity, 1.0);
R_Bloom_SamplePass(i-4, j-4); R_Bloom_SamplePass( i-rad, j-rad );
}
}
}
else if (r_bloom_diamond_size.value > 5)
{
if (r_bloom_diamond_size.value != 6)
Cvar_SetValue(&r_bloom_diamond_size, 6);
for(i=0; i<r_bloom_diamond_size.value; i++)
{
for(j=0; j<r_bloom_diamond_size.value; j++)
{
intensity = r_bloom_intensity.value * 0.5 * Diamond6x[i][j];
if (intensity < 0.01f)
continue;
qglColor4f(intensity, intensity, intensity, 1.0);
R_Bloom_SamplePass(i-3, j-3);
}
}
}
else if (r_bloom_diamond_size.value > 3)
{
if (r_bloom_diamond_size.value != 4)
Cvar_SetValue(&r_bloom_diamond_size, 4);
for (i=0; i<r_bloom_diamond_size.value; i++)
{
for (j=0; j<r_bloom_diamond_size.value; j++)
{
intensity = r_bloom_intensity.value * 0.8f * Diamond4x[i][j];
if (intensity < 0.01f)
continue;
qglColor4f(intensity, intensity, intensity, 1.0);
R_Bloom_SamplePass( i-2, j-2 );
} }
} }
} }
@ -603,8 +548,8 @@ void R_BloomBlend (void)//refdef_t *fd, meshlist_t *meshlist )
bs.smp_s = (float)bs.smp_w/bs.size_sample; bs.smp_s = (float)bs.smp_w/bs.size_sample;
bs.smp_t = (float)bs.smp_h/bs.size_sample; bs.smp_t = (float)bs.smp_h/bs.size_sample;
buw = bs.size_downsample * bs.smp_s; buw = bs.size_backup * bs.smp_s;
buh = bs.size_downsample * bs.smp_t; buh = bs.size_backup * bs.smp_t;
//copy the screen space we'll use to work into the backup texture //copy the screen space we'll use to work into the backup texture
GL_Bind(bs.tx_backup); GL_Bind(bs.tx_backup);