TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 07:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1984 from FooBarbarians/fix-1912

Browse source 
Reordering initialization methods #1912
This commit is contained in:
Areloch 2017-04-26 01:11:51 -05:00 • committed by GitHub
commit 19dcfde60f
70 changed files with 207 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/postFx/postEffect.cpp
View file

@ -266,21 +266,21 @@ PostEffect::PostEffect()
: mRenderTime( PFXAfterDiffuse ),
mRenderPriority( 1.0 ),
mEnabled( false ),
mSkip( false ),
mUpdateShader( true ),
mStateBlockData( NULL ),
mUpdateShader( true ),
mSkip( false ),
mAllowReflectPass( false ),
mTargetClear( PFXTargetClear_None ),
mTargetViewport( PFXTargetViewport_TargetSize ),
mTargetScale( Point2F::One ),
mTargetViewport( PFXTargetViewport_TargetSize ),
mTargetSize( Point2I::Zero ),
mTargetFormat( GFXFormatR8G8B8A8 ),
mTargetClearColor( ColorF::BLACK ),
mOneFrameOnly( false ),
mOnThisFrame( true ),
mShaderReloadKey( 0 ),
mIsValid( false ),
mRTSizeSC( NULL ),
mIsValid( false ),
mShaderReloadKey( 0 ),
mOneOverRTSizeSC( NULL ),
mViewportOffsetSC( NULL ),
mTargetViewportSC( NULL ),

4
Engine/source/postFx/postEffectManager.cpp
View file

@ -52,8 +52,8 @@ MODULE_END;
bool PostEffectManager::smRenderEffects = true;
PostEffectManager::PostEffectManager() :
mFrameStateSwitch( false ),
mLastBackBufferTarget( NULL )
mLastBackBufferTarget( NULL ),
mFrameStateSwitch( false )
{
GFXDevice::getDeviceEventSignal().notify( this, &PostEffectManager::_handleDeviceEvent );
RenderPassManager::getRenderBinSignal().notify( this, &PostEffectManager::_handleBinEvent );