TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 23:40:42 +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

4
Engine/source/gfx/genericConstBuffer.cpp
View file

@ -240,8 +240,8 @@ void GenericConstBufferLayout::clear()
GenericConstBuffer::GenericConstBuffer(GenericConstBufferLayout* layout)
: mBuffer( NULL ),
mLayout( layout ),
: mLayout( layout ),
mBuffer( NULL ),
mDirtyStart( U32_MAX ),
mDirtyEnd( 0 )
{

2
Engine/source/gfx/gfxVertexFormat.cpp
View file

@ -73,8 +73,8 @@ U32 GFXVertexElement::getSizeInBytes() const
GFXVertexFormat::GFXVertexFormat()
: mDirty( true ),
mHasColor( false ),
mHasNormal( false ),
mHasColor( false ),
mHasTangent( false ),
mHasInstancing( false ),
mTexCoordCount( 0 ),

5
Engine/source/gfx/gl/gfxGLPrimitiveBuffer.cpp
View file

@ -36,8 +36,9 @@ GLCircularVolatileBuffer* getCircularVolatileIndexBuffer()
}
GFXGLPrimitiveBuffer::GFXGLPrimitiveBuffer(GFXDevice *device, U32 indexCount, U32 primitiveCount, GFXBufferType bufferType) :
GFXPrimitiveBuffer(device, indexCount, primitiveCount, bufferType), mZombieCache(NULL),
mBufferOffset(0)
GFXPrimitiveBuffer(device, indexCount, primitiveCount, bufferType),
mBufferOffset(0),
mZombieCache(NULL)
{
if( mBufferType == GFXBufferTypeVolatile )
{

4
Engine/source/gfx/gl/gfxGLWindowTarget.cpp
View file

@ -36,8 +36,8 @@ GFX_ImplementTextureProfile( BackBufferDepthProfile,
GFXTextureProfile::NONE );
GFXGLWindowTarget::GFXGLWindowTarget(PlatformWindow *win, GFXDevice *d)
: GFXWindowTarget(win), mDevice(d), mContext(NULL), mFullscreenContext(NULL)
, mCopyFBO(0), mBackBufferFBO(0), mSecondaryWindow(false)
: GFXWindowTarget(win), mDevice(d), mContext(NULL), mCopyFBO(0)
, mFullscreenContext(NULL), mBackBufferFBO(0), mSecondaryWindow(false)
{
win->appEvent.notify(this, &GFXGLWindowTarget::_onAppSignal);
}

4
Engine/source/gfx/screenshot.cpp
View file

@ -47,8 +47,8 @@ inline void sBlendPixelRGB888( U8* src, U8* dst, F32 factor )
ScreenShot::ScreenShot()
: mPending( false ),
mWriteJPG( false ),
mCurrTile( 0, 0 ),
mTiles( 1 )
mTiles( 1 ),
mCurrTile( 0, 0 )
{
mFilename[0] = 0;
}

8
Engine/source/gfx/video/theoraTexture.cpp
View file

@ -227,8 +227,8 @@ void TheoraTexture::FrameStream::releaseTextureLocks()
TheoraTexture::AsyncState::AsyncState( const ThreadSafeRef< OggInputStream >& oggStream, bool looping )
: mOggStream( oggStream ),
mTheoraDecoder( dynamic_cast< OggTheoraDecoder* >( oggStream->getDecoder( "Theora" ) ) ),
mVorbisDecoder( dynamic_cast< OggVorbisDecoder* >( oggStream->getDecoder( "Vorbis" ) ) ),
mCurrentTime( 0 )
mCurrentTime( 0 ),
mVorbisDecoder( dynamic_cast< OggVorbisDecoder* >( oggStream->getDecoder( "Vorbis" ) ) )
{
if( mTheoraDecoder )
{
@ -276,8 +276,8 @@ bool TheoraTexture::AsyncState::isAtEnd()
//-----------------------------------------------------------------------------
TheoraTexture::TheoraTexture()
: mPlaybackQueue( NULL ),
mCurrentFrame( NULL ),
: mCurrentFrame( NULL ),
mPlaybackQueue( NULL ),
mIsPaused( true )
{
GFXTextureManager::addEventDelegate( this, &TheoraTexture::_onTextureEvent );

12
Engine/source/gfx/video/videoCapture.cpp
View file

@ -54,15 +54,15 @@ MODULE_END;
VideoCapture::VideoCapture() :
mEncoder(NULL),
mIsRecording(false),
mCanvas(NULL),
mFrameGrabber(NULL),
mWaitingForCanvas(false),
mResolution(0,0),
mCanvas(NULL),
mIsRecording(false),
mFrameRate(30.0f),
mResolution(0,0),
mWaitingForCanvas(false),
mEncoderName("THEORA"),
mFileName(""),
mMsPerFrameError(0)
mMsPerFrameError(0),
mFileName("")
{
}