Removed useless parameters
This commit is contained in:
parent
98aa501199
commit
8b0e6e2143
3 changed files with 7 additions and 11 deletions
6
bloom.cc
6
bloom.cc
|
@ -6,8 +6,6 @@
|
|||
|
||||
|
||||
T_BloomPass::T_BloomPass(
|
||||
__rd__ const uint32_t width ,
|
||||
__rd__ const uint32_t height ,
|
||||
__rw__ T_FilesWatcher& watcher ,
|
||||
__rw__ T_Texture& input )
|
||||
: input_( input ) ,
|
||||
|
@ -16,8 +14,8 @@ T_BloomPass::T_BloomPass(
|
|||
spBlur_( GL_FRAGMENT_SHADER , watcher ) ,
|
||||
spCombine_( GL_FRAGMENT_SHADER , watcher ) ,
|
||||
//
|
||||
txBlur0_( width , height , E_TexType::RGB16F , BloomLevels ) ,
|
||||
txBlur1_( width , height , E_TexType::RGB16F , BloomLevels ) ,
|
||||
txBlur0_( input.width( ) , input.height( ) , E_TexType::RGB16F , BloomLevels ) ,
|
||||
txBlur1_( input.width( ) , input.height( ) , E_TexType::RGB16F , BloomLevels ) ,
|
||||
//
|
||||
filterParams_{ 1.6 , 1.2 , .95 } ,
|
||||
blurWeights_{ 0.324 , 0.232 , 0.0855 , 0.0205 } ,
|
||||
|
|
4
bloom.hh
4
bloom.hh
|
@ -17,9 +17,7 @@ struct T_BloomPass
|
|||
T_BloomPass( T_BloomPass const& ) = delete;
|
||||
T_BloomPass( T_BloomPass&& ) = delete;
|
||||
|
||||
T_BloomPass( __rd__ const uint32_t width ,
|
||||
__rd__ const uint32_t height ,
|
||||
__rw__ T_FilesWatcher& watcher ,
|
||||
T_BloomPass( __rw__ T_FilesWatcher& watcher ,
|
||||
__rw__ T_Texture& input );
|
||||
|
||||
void render( );
|
||||
|
|
8
main.cc
8
main.cc
|
@ -74,8 +74,7 @@ T_Main::T_Main( )
|
|||
rtRaymarchOutput = std::make_unique < T_Rendertarget >(
|
||||
T_RendertargetSetup( ).add( *txRaymarchOutput ).create( ) );
|
||||
|
||||
bloomPass = std::make_unique< T_BloomPass >(
|
||||
1280 , 720 , watcher , *txRaymarchOutput );
|
||||
bloomPass = std::make_unique< T_BloomPass >( watcher , *txRaymarchOutput );
|
||||
}
|
||||
|
||||
void T_Main::mainLoop( )
|
||||
|
@ -186,7 +185,7 @@ void T_Main::render( )
|
|||
U_CAM_UP = 4 ,
|
||||
U_NEAR_PLANE = 5 ,
|
||||
U_LIGHT_DIR = 6 ,
|
||||
U_RENDER = 7 ,
|
||||
U_RAYMARCHER = 7 ,
|
||||
};
|
||||
|
||||
glUniform1f( U_TIME , 0 );
|
||||
|
@ -198,7 +197,8 @@ void T_Main::render( )
|
|||
glUniform1f( U_NEAR_PLANE , camera.np );
|
||||
|
||||
glUniform3f( U_LIGHT_DIR , 0 , 1 , 1 );
|
||||
glUniform4f( U_RENDER , 128 , 0.9 , 0.001 , 100 );
|
||||
|
||||
glUniform4f( U_RAYMARCHER , 128 , 0.9 , 0.001 , 100 );
|
||||
|
||||
glRectf( -1, -1 , 1 , 1 );
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue