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

Removed useless parameters

Browse source
This commit is contained in:
Emmanuel BENOîT 2017-09-30 21:30:31 +02:00
parent 98aa501199
commit 8b0e6e2143
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bloom.cc
View file

@ -6,8 +6,6 @@
T_BloomPass::T_BloomPass( T_BloomPass::T_BloomPass(
__rd__ const uint32_t width ,
__rd__ const uint32_t height ,
__rw__ T_FilesWatcher& watcher , __rw__ T_FilesWatcher& watcher ,
__rw__ T_Texture& input ) __rw__ T_Texture& input )
: input_( input ) , : input_( input ) ,
@ -16,8 +14,8 @@ T_BloomPass::T_BloomPass(
spBlur_( GL_FRAGMENT_SHADER , watcher ) , spBlur_( GL_FRAGMENT_SHADER , watcher ) ,
spCombine_( GL_FRAGMENT_SHADER , watcher ) , spCombine_( GL_FRAGMENT_SHADER , watcher ) ,
// //
txBlur0_( width , height , E_TexType::RGB16F , BloomLevels ) , txBlur0_( input.width( ) , input.height( ) , E_TexType::RGB16F , BloomLevels ) ,
txBlur1_( width , height , E_TexType::RGB16F , BloomLevels ) , txBlur1_( input.width( ) , input.height( ) , E_TexType::RGB16F , BloomLevels ) ,
// //
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 } ,

4
bloom.hh
View file

@ -17,9 +17,7 @@ struct T_BloomPass
T_BloomPass( T_BloomPass const& ) = delete; T_BloomPass( T_BloomPass const& ) = delete;
T_BloomPass( T_BloomPass&& ) = delete; T_BloomPass( T_BloomPass&& ) = delete;
T_BloomPass( __rd__ const uint32_t width , T_BloomPass( __rw__ T_FilesWatcher& watcher ,
__rd__ const uint32_t height ,
__rw__ T_FilesWatcher& watcher ,
__rw__ T_Texture& input ); __rw__ T_Texture& input );
void render( ); void render( );

8
main.cc
View file

@ -74,8 +74,7 @@ T_Main::T_Main( )
rtRaymarchOutput = std::make_unique < T_Rendertarget >( rtRaymarchOutput = std::make_unique < T_Rendertarget >(
T_RendertargetSetup( ).add( *txRaymarchOutput ).create( ) ); T_RendertargetSetup( ).add( *txRaymarchOutput ).create( ) );
bloomPass = std::make_unique< T_BloomPass >( bloomPass = std::make_unique< T_BloomPass >( watcher , *txRaymarchOutput );
1280 , 720 , watcher , *txRaymarchOutput );
} }
void T_Main::mainLoop( ) void T_Main::mainLoop( )
@ -186,7 +185,7 @@ void T_Main::render( )
U_CAM_UP = 4 , U_CAM_UP = 4 ,
U_NEAR_PLANE = 5 , U_NEAR_PLANE = 5 ,
U_LIGHT_DIR = 6 , U_LIGHT_DIR = 6 ,
U_RENDER = 7 , U_RAYMARCHER = 7 ,
}; };
glUniform1f( U_TIME , 0 ); glUniform1f( U_TIME , 0 );
@ -198,7 +197,8 @@ void T_Main::render( )
glUniform1f( U_NEAR_PLANE , camera.np ); glUniform1f( U_NEAR_PLANE , camera.np );
glUniform3f( U_LIGHT_DIR , 0 , 1 , 1 ); 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 ); glRectf( -1, -1 , 1 , 1 );
} }