tseeker-pub/demotool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some more bloom tweaking

Browse source
This commit is contained in:
Emmanuel BENOîT 2017-09-30 21:27:50 +02:00
parent 34b393334c
commit 98aa501199
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bloom-combine.glsl
View file

@ -13,7 +13,7 @@ void main( void )
float f = u_Parameters.x; float f = u_Parameters.x;
color = textureLod( u_MainInput , tmp , 0 ).rgb; color = textureLod( u_MainInput , tmp , 0 ).rgb;
vec3 bloom = vec3( 0 ); vec3 bloom = vec3( 0 );
for ( int i = 0 ; i < 5 ; i ++ ) { for ( int i = 0 ; i < 6 ; i ++ ) {
bloom += f * textureLod( u_BlurInput , tmp , i ).rgb; bloom += f * textureLod( u_BlurInput , tmp , i ).rgb;
f = pow( f , u_Parameters.y + 1 ); f = pow( f , u_Parameters.y + 1 );
} }

8
bloom.cc
View file

@ -21,14 +21,14 @@ T_BloomPass::T_BloomPass(
// //
filterParams_{ 1.6 , 1.2 , .95 } , filterParams_{ 1.6 , 1.2 , .95 } ,
blurWeights_{ 0.324 , 0.232 , 0.0855 , 0.0205 } , blurWeights_{ 0.324 , 0.232 , 0.0855 , 0.0205 } ,
blurSize_{ 2. } , blurSize_{ 1.3 } ,
combineStrength_( 0.7 ) , combineStrength_( 0.45 ) ,
combineAttenuation_( 0.3 ) combineAttenuation_( 0.3 )
{ {
txBlur0_.wrap( E_TexWrap::CLAMP_EDGE ).samplingMode( E_TexSampling::LINEAR ); txBlur0_.wrap( E_TexWrap::CLAMP_EDGE ).samplingMode( E_TexSampling::LINEAR );
txBlur1_.wrap( E_TexWrap::CLAMP_EDGE ).samplingMode( E_TexSampling::LINEAR ); txBlur1_.wrap( E_TexWrap::CLAMP_EDGE ).samplingMode( E_TexSampling::LINEAR );
for ( int i = 0 ; i < 5 ; i ++ ) { for ( auto i = 0u ; i < BloomLevels ; i ++ ) {
rtBlur0_.push_back( T_RendertargetSetup( ).add( txBlur0_ , i ).create( ) ); rtBlur0_.push_back( T_RendertargetSetup( ).add( txBlur0_ , i ).create( ) );
rtBlur1_.push_back( T_RendertargetSetup( ).add( txBlur1_ , i ).create( ) ); rtBlur1_.push_back( T_RendertargetSetup( ).add( txBlur1_ , i ).create( ) );
} }
@ -115,7 +115,7 @@ void T_BloomPass::render( )
blur.set( 1 , txBlur0_ ); blur.set( 1 , txBlur0_ );
blur.bind( ); blur.bind( );
glUniform2f( 2 , input_.width( ) , input_.height( ) ); glUniform2f( 2 , input_.width( ) , input_.height( ) );
glUniform2f( 3 , combineStrength_ , 1 - combineAttenuation_ ); glUniform2f( 3 , combineStrength_ , combineAttenuation_ );
glRectf( -1, -1 , 1 , 1 ); glRectf( -1, -1 , 1 , 1 );
glBindTexture( GL_TEXTURE_2D , 0 ); glBindTexture( GL_TEXTURE_2D , 0 );
} }

2
bloom.hh
View file

@ -11,7 +11,7 @@
struct T_BloomPass struct T_BloomPass
{ {
static constexpr uint32_t BloomLevels = 5; static constexpr uint32_t BloomLevels = 6;
T_BloomPass( ) = delete; T_BloomPass( ) = delete;
T_BloomPass( T_BloomPass const& ) = delete; T_BloomPass( T_BloomPass const& ) = delete;