TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 12:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1805 from Azaezel/startRightEndRight

Browse source 
clang: constructor initialization order
This commit is contained in:
Areloch 2016-10-19 08:39:12 -05:00 • committed by GitHub
commit 6cc7bcd2e0
64 changed files with 260 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/sfx/openal/sfxALVoice.cpp
View file

@ -69,10 +69,10 @@ SFXALVoice::SFXALVoice( const OPENALFNTABLE &oalft,
ALuint sourceName )
: Parent( buffer ),
mOpenAL( oalft ),
mResumeAtSampleOffset( -1.0f ),
mSourceName( sourceName ),
mSampleOffset( 0 )
mResumeAtSampleOffset( -1.0f ),
mSampleOffset( 0 ),
mOpenAL( oalft )
{
AL_SANITY_CHECK();
}

16
Engine/source/sfx/sfxBuffer.cpp
View file

@ -36,13 +36,13 @@ Signal< void( SFXBuffer* ) > SFXBuffer::smBufferDestroyedSignal;
SFXBuffer::SFXBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description, bool createAsyncState )
: mStatus( STATUS_Null ),
mIsStreaming( description->mIsStreaming ),
mFormat( stream->getFormat() ),
mDuration( stream->getDuration() ),
mUniqueVoice( NULL ),
mIsDead( false ),
mIsStreaming( description->mIsStreaming ),
mIsLooping( description->mIsLooping ),
mIsUnique( description->mIsStreaming )
mIsUnique( description->mIsStreaming ),
mIsDead( false ),
mUniqueVoice( NULL )
{
using namespace SFXInternal;
@ -63,12 +63,12 @@ SFXBuffer::SFXBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription*
SFXBuffer::SFXBuffer( SFXDescription* description )
: mStatus( STATUS_Ready ),
mIsStreaming( false ), // Not streaming through our system.
mDuration( 0 ), // Must be set by subclass.
mUniqueVoice( NULL ),
mIsDead( false ),
mIsStreaming( false ), // Not streaming through our system.
mIsLooping( description->mIsLooping ),
mIsUnique( false ) // Must be set by subclass.
mIsUnique( false ), // Must be set by subclass.
mIsDead( false ),
mUniqueVoice( NULL )
{
}

32
Engine/source/sfx/sfxSource.cpp
View file

@ -191,9 +191,7 @@ SFXSource::SFXSource()
: mStatus( SFXStatusStopped ),
mSavedStatus( SFXStatusNull ),
mStatusCallback( NULL ),
mPitch( 1.f ),
mModulativePitch( 1.f ),
mEffectivePitch( 1.f ),
mDescription( NULL ),
mVolume( 1.f ),
mPreFadeVolume( 1.f ),
mFadedVolume( 1.f ),
@ -203,26 +201,28 @@ SFXSource::SFXSource()
mPriority( 0 ),
mModulativePriority( 1.f ),
mEffectivePriority( 0 ),
mVelocity( 0, 0, 0 ),
mPitch( 1.f ),
mModulativePitch( 1.f ),
mEffectivePitch( 1.f ),
mTransform( true ),
mVelocity( 0, 0, 0 ),
mMinDistance( 1 ),
mMaxDistance( 100 ),
mConeInsideAngle( 360 ),
mConeOutsideAngle( 360 ),
mConeOutsideVolume( 1 ),
mDescription( NULL ),
mDistToListener( 0.f ),
mTransformScattered( false ),
mPlayStartTick( 0 ),
mFadeSegmentEase( NULL ),
mFadeInTime( 0.f ),
mFadeOutTime( 0.f ),
mFadeInPoint( -1.f ),
mFadeOutPoint( -1.f ),
mFadeSegmentType( FadeSegmentNone ),
mFadeSegmentEase( NULL ),
mFadeSegmentStartPoint( 0.f ),
mFadeSegmentEndPoint( 0.f ),
mSavedFadeTime( -1.f ),
mDistToListener( 0.f )
mPlayStartTick( 0 )
{
VECTOR_SET_ASSOCIATION( mParameters );
}
@ -232,12 +232,9 @@ SFXSource::SFXSource()
SFXSource::SFXSource( SFXTrack* track, SFXDescription* description )
: mStatus( SFXStatusStopped ),
mSavedStatus( SFXStatusNull ),
mStatusCallback( NULL ),
mTrack( track ),
mDescription( description ),
mStatusCallback( NULL ),
mPitch( 1.f ),
mModulativePitch( 1.f ),
mEffectivePitch( 1.f ),
mVolume( 1.f ),
mPreFadeVolume( 1.f ),
mFadedVolume( 1.f ),
@ -247,25 +244,28 @@ SFXSource::SFXSource( SFXTrack* track, SFXDescription* description )
mPriority( 0 ),
mModulativePriority( 1.f ),
mEffectivePriority( 0 ),
mVelocity( 0, 0, 0 ),
mPitch( 1.f ),
mModulativePitch( 1.f ),
mEffectivePitch( 1.f ),
mTransform( true ),
mVelocity( 0, 0, 0 ),
mMinDistance( 1 ),
mMaxDistance( 100 ),
mConeInsideAngle( 360 ),
mConeOutsideAngle( 360 ),
mConeOutsideVolume( 1 ),
mDistToListener( 0.f ),
mTransformScattered( false ),
mPlayStartTick( 0 ),
mFadeInTime( 0.f ),
mFadeOutTime( 0.f ),
mFadeSegmentEase( NULL ),
mFadeInPoint( -1.f ),
mFadeOutPoint( -1.f ),
mFadeSegmentType( FadeSegmentNone ),
mFadeSegmentEase( NULL ),
mFadeSegmentStartPoint( 0.f ),
mFadeSegmentEndPoint( 0.f ),
mSavedFadeTime( -1.f ),
mDistToListener( 0.f )
mPlayStartTick( 0 )
{
VECTOR_SET_ASSOCIATION( mParameters );

4
Engine/source/sfx/sfxVoice.cpp
View file

@ -41,8 +41,8 @@ Signal< void( SFXVoice* voice ) > SFXVoice::smVoiceDestroyedSignal;
//-----------------------------------------------------------------------------
SFXVoice::SFXVoice( SFXBuffer* buffer )
: mBuffer( buffer ),
mStatus( SFXStatusNull ),
: mStatus( SFXStatusNull ),
mBuffer( buffer ),
mOffset( 0 )
{
}