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

Merge branch 'GarageGames/development' into ueberengine-dev-3.10

Browse source 
Conflicts:
	Engine/source/app/version.h
	Engine/source/terrain/terrData.cpp
This commit is contained in:
Duion 2016-12-13 17:28:36 +01:00
commit 186604eb76
974 changed files with 121718 additions and 233088 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/sfx/openal/sfxALDevice.cpp
View file

@ -61,7 +61,8 @@ SFXALDevice::SFXALDevice( SFXProvider *provider,
AssertFatal( mDevice != NULL && mContext != NULL, "Failed to create OpenAL device and/or context!" );
// Start the update thread.
#ifndef TORQUE_OS_LINUX
// TODO AsyncPeriodicUpdateThread support for Linux/Mac
#ifdef TORQUE_OS_WIN
if( !Con::getBoolVariable( "$_forceAllMainThread" ) )
{
SFXInternal::gUpdateThread = new AsyncPeriodicUpdateThread

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 )
{
}

2
Engine/source/sfx/sfxController.cpp
View file

@ -689,6 +689,7 @@ void SFXController::_play()
// Unpause sources, if we are paused.
if( mStatus == SFXStatusPaused )
{
for( U32 i = 0; i < mSources.size(); ++ i )
if( mSources[ i ].mPtr != NULL )
mSources[ i ].mPtr->play( 0.f ); // We want our fade values to take effect.
@ -697,6 +698,7 @@ void SFXController::_play()
mSources.erase( i );
-- i;
}
}
}
//-----------------------------------------------------------------------------

2
Engine/source/sfx/sfxEnvironment.cpp
View file

@ -32,7 +32,7 @@ IMPLEMENT_CO_DATABLOCK_V1( SFXEnvironment );
// Reverb flags.
static const U32 sReverbFlagDecayTimeScale = 0x001;
static const U32 sReverbFlagReflectionsScale = 0x002;
static const U32 sReverbFlagReflectionsDelayScale = 0x004;
//static const U32 sReverbFlagReflectionsDelayScale = 0x004; unused, but kept for doc purposes -BJR
static const U32 sReverbFlagReverbScale = 0x008;
static const U32 sReverbFlagReverbDelayScale = 0x010;
static const U32 sReverbFlagDecayHFLimit = 0x020;

2
Engine/source/sfx/sfxSoundscape.h
View file

@ -73,7 +73,7 @@ class SFXSoundscape
FlagUnique = BIT( 1 ), ///< No other instance of this ambience on stack.
};
enum DirtyBits
enum DirtyBits : U32
{
AmbienceDirty = BIT( 0 ), ///< Associated ambience has changed.
AllDirty = 0xFFFFFFFF

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 );

1
Engine/source/sfx/sfxSystem.cpp
View file

@ -182,7 +182,6 @@ static const U32 sDeviceInfoProvider = 0;
static const U32 sDeviceInfoName = 1;
static const U32 sDeviceInfoUseHardware = 2;
static const U32 sDeviceInfoMaxBuffers = 3;
static const U32 sDeviceInfoCaps = 4;
//-----------------------------------------------------------------------------

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 )
{
}