mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 16:44:36 +00:00
uninitialized variables-sfx
This commit is contained in:
parent
7392d598da
commit
a1a6143e01
11 changed files with 32 additions and 16 deletions
|
|
@ -40,6 +40,7 @@ SFXVorbisStream* SFXVorbisStream::create( Stream *stream )
|
||||||
|
|
||||||
SFXVorbisStream::SFXVorbisStream()
|
SFXVorbisStream::SFXVorbisStream()
|
||||||
: mVF( NULL ),
|
: mVF( NULL ),
|
||||||
|
mBitstream(-1),
|
||||||
mBytesRead( 0 )
|
mBytesRead( 0 )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
@ -47,6 +48,9 @@ SFXVorbisStream::SFXVorbisStream()
|
||||||
SFXVorbisStream::SFXVorbisStream( const SFXVorbisStream& cloneFrom )
|
SFXVorbisStream::SFXVorbisStream( const SFXVorbisStream& cloneFrom )
|
||||||
: Parent( cloneFrom )
|
: Parent( cloneFrom )
|
||||||
{
|
{
|
||||||
|
mVF = NULL;
|
||||||
|
mBitstream = -1;
|
||||||
|
mBytesRead = 0;
|
||||||
if( !mStream->hasCapability( Stream::StreamPosition ) )
|
if( !mStream->hasCapability( Stream::StreamPosition ) )
|
||||||
{
|
{
|
||||||
Con::errorf( "SFXVorbisStream::SFXVorbisStream() - Source stream does not allow seeking" );
|
Con::errorf( "SFXVorbisStream::SFXVorbisStream() - Source stream does not allow seeking" );
|
||||||
|
|
|
||||||
|
|
@ -94,6 +94,7 @@ SFXWavStream* SFXWavStream::create( Stream *stream )
|
||||||
}
|
}
|
||||||
|
|
||||||
SFXWavStream::SFXWavStream()
|
SFXWavStream::SFXWavStream()
|
||||||
|
:mDataStart(-1)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,8 +35,11 @@ SFXALDevice::SFXALDevice( SFXProvider *provider,
|
||||||
: Parent( name, provider, useHardware, maxBuffers ),
|
: Parent( name, provider, useHardware, maxBuffers ),
|
||||||
mOpenAL( openal ),
|
mOpenAL( openal ),
|
||||||
mContext( NULL ),
|
mContext( NULL ),
|
||||||
mDevice( NULL ),
|
mDevice( NULL ),
|
||||||
mRolloffFactor( 1.0f )
|
mDistanceModel(SFXDistanceModelLinear),
|
||||||
|
mDistanceFactor(1.0f),
|
||||||
|
mRolloffFactor( 1.0f ),
|
||||||
|
mUserRolloffFactor(1.0f)
|
||||||
{
|
{
|
||||||
mMaxBuffers = getMax( maxBuffers, 8 );
|
mMaxBuffers = getMax( maxBuffers, 8 );
|
||||||
|
|
||||||
|
|
@ -80,6 +83,10 @@ SFXALDevice::SFXALDevice( SFXProvider *provider,
|
||||||
SFXInternal::gUpdateThread->start();
|
SFXInternal::gUpdateThread->start();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
dMemset(effectSlot, 0, sizeof(effectSlot));
|
||||||
|
dMemset(effect, 0, sizeof(effect));
|
||||||
|
uLoop = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ class SFXALProvider : public SFXProvider
|
||||||
public:
|
public:
|
||||||
|
|
||||||
SFXALProvider()
|
SFXALProvider()
|
||||||
: SFXProvider( "OpenAL" ) { mALDL = NULL; }
|
: SFXProvider( "OpenAL" ) { dMemset(&mOpenAL,0,sizeof(mOpenAL)); mALDL = NULL; }
|
||||||
virtual ~SFXALProvider();
|
virtual ~SFXALProvider();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,8 @@ ConsoleDocClass( SFXController,
|
||||||
|
|
||||||
SFXController::SFXController( SFXPlayList* playList )
|
SFXController::SFXController( SFXPlayList* playList )
|
||||||
: Parent( playList ),
|
: Parent( playList ),
|
||||||
mTrace( playList->trace() )
|
mTrace( playList->trace() ),
|
||||||
|
mLoopCounter(0)
|
||||||
{
|
{
|
||||||
VECTOR_SET_ASSOCIATION( mInsns );
|
VECTOR_SET_ASSOCIATION( mInsns );
|
||||||
VECTOR_SET_ASSOCIATION( mSources );
|
VECTOR_SET_ASSOCIATION( mSources );
|
||||||
|
|
|
||||||
|
|
@ -93,13 +93,14 @@ class SFXController : public SFXSource
|
||||||
U32 mLoopCount;
|
U32 mLoopCount;
|
||||||
} mArg;
|
} mArg;
|
||||||
|
|
||||||
Insn() {}
|
Insn()
|
||||||
|
: mOpcode(SFXController::OP_Delay), mSlotIndex(0), mState(NULL) {mArg.mLoopCount=0;}
|
||||||
Insn( EOp opcode )
|
Insn( EOp opcode )
|
||||||
: mOpcode( opcode ), mSlotIndex( U32_MAX ), mState( NULL ) {}
|
: mOpcode( opcode ), mSlotIndex( U32_MAX ), mState( NULL ) {mArg.mLoopCount=0;}
|
||||||
Insn( U32 slotIndex, SFXState* state )
|
Insn( U32 slotIndex, SFXState* state )
|
||||||
: mSlotIndex( slotIndex ), mState( state ) {}
|
: mOpcode(SFXController::OP_Delay), mSlotIndex( slotIndex ), mState( state ){mArg.mLoopCount=0;}
|
||||||
Insn( EOp opcode, U32 slotIndex, SFXState* state )
|
Insn( EOp opcode, U32 slotIndex, SFXState* state )
|
||||||
: mOpcode( opcode ), mSlotIndex( slotIndex ), mState( state ) {}
|
: mOpcode( opcode ), mSlotIndex( slotIndex ), mState( state ) {mArg.mLoopCount=0;}
|
||||||
};
|
};
|
||||||
|
|
||||||
///
|
///
|
||||||
|
|
@ -130,7 +131,7 @@ class SFXController : public SFXSource
|
||||||
F32 mFadeOutTime;
|
F32 mFadeOutTime;
|
||||||
|
|
||||||
Source()
|
Source()
|
||||||
: mState( 0 ) {}
|
: mState( 0 ), mSlotIndex(0), mVolumeScale(1.0f), mPitchScale(1.0f), mFadeInTime(0), mFadeOutTime(0) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
/// The current instruction in "mInsns".
|
/// The current instruction in "mInsns".
|
||||||
|
|
@ -169,7 +170,7 @@ class SFXController : public SFXSource
|
||||||
void _genTransition( Insn& insn, SFXPlayList::ETransitionMode transition );
|
void _genTransition( Insn& insn, SFXPlayList::ETransitionMode transition );
|
||||||
|
|
||||||
///
|
///
|
||||||
void _dumpInsns();
|
void _dumpInsns() {};
|
||||||
|
|
||||||
///
|
///
|
||||||
void _initInsn();
|
void _initInsn();
|
||||||
|
|
@ -198,7 +199,7 @@ class SFXController : public SFXSource
|
||||||
~SFXController();
|
~SFXController();
|
||||||
|
|
||||||
/// Constructor for the sake of ConsoleObject.
|
/// Constructor for the sake of ConsoleObject.
|
||||||
explicit SFXController() {}
|
explicit SFXController(): mIp(0), mTrace(false), mDelayEndTime(0), mLoopCounter(0) {}
|
||||||
|
|
||||||
/// Return the playlist being played back by the controller.
|
/// Return the playlist being played back by the controller.
|
||||||
SFXPlayList* getPlayList() const;
|
SFXPlayList* getPlayList() const;
|
||||||
|
|
|
||||||
|
|
@ -324,7 +324,7 @@ class SFXWrapAroundBuffer : public SFXBuffer
|
||||||
|
|
||||||
SFXWrapAroundBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description );
|
SFXWrapAroundBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description );
|
||||||
SFXWrapAroundBuffer( SFXDescription* description )
|
SFXWrapAroundBuffer( SFXDescription* description )
|
||||||
: Parent( description ), mBufferSize( 0 ) {}
|
: Parent( description ), mBufferSize( 0 ), mWriteOffset(0) {}
|
||||||
|
|
||||||
virtual U32 getMemoryUsed() const { return mBufferSize; }
|
virtual U32 getMemoryUsed() const { return mBufferSize; }
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -107,6 +107,8 @@ bool SFXRangeModifier::update()
|
||||||
|
|
||||||
SFXFadeModifier::SFXFadeModifier( SFXSource* source, F32 time, F32 endVolume, F32 startTime, EOnEnd onEndDo, bool removeWhenDone )
|
SFXFadeModifier::SFXFadeModifier( SFXSource* source, F32 time, F32 endVolume, F32 startTime, EOnEnd onEndDo, bool removeWhenDone )
|
||||||
: Parent( source, startTime, startTime + time, removeWhenDone ),
|
: Parent( source, startTime, startTime + time, removeWhenDone ),
|
||||||
|
mStartVolume(source->getVolume()),
|
||||||
|
mCurrentVolume(source->getVolume()),
|
||||||
mEndVolume( endVolume ),
|
mEndVolume( endVolume ),
|
||||||
mOnEnd( onEndDo )
|
mOnEnd( onEndDo )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ class SFXModifier : public IPolled
|
||||||
|
|
||||||
/// Create an effect that operates on "source".
|
/// Create an effect that operates on "source".
|
||||||
SFXModifier( SFXSource* source, bool removeWhenDone = false )
|
SFXModifier( SFXSource* source, bool removeWhenDone = false )
|
||||||
: mSource( source ) {}
|
: mSource( source ), mRemoveWhenDone(removeWhenDone) {}
|
||||||
|
|
||||||
virtual ~SFXModifier() {}
|
virtual ~SFXModifier() {}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ ConsoleDocClass( SFXSound,
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
SFXSound::SFXSound()
|
SFXSound::SFXSound()
|
||||||
: mVoice( NULL )
|
: mVoice( NULL ), mDuration(0), mSetPositionValue(0)
|
||||||
{
|
{
|
||||||
// NOTE: This should never be used directly
|
// NOTE: This should never be used directly
|
||||||
// and is only here to satisfy satisfy the
|
// and is only here to satisfy satisfy the
|
||||||
|
|
@ -79,7 +79,7 @@ SFXSound::SFXSound()
|
||||||
|
|
||||||
SFXSound::SFXSound( SFXProfile *profile, SFXDescription* desc )
|
SFXSound::SFXSound( SFXProfile *profile, SFXDescription* desc )
|
||||||
: Parent( profile, desc ),
|
: Parent( profile, desc ),
|
||||||
mVoice( NULL )
|
mVoice( NULL ), mDuration(0)
|
||||||
{
|
{
|
||||||
mSetPositionValue = 0;
|
mSetPositionValue = 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -208,7 +208,7 @@ class SFXWorld : public ScopeTracker< NUM_DIMENSIONS, Object >
|
||||||
/// between this space and the space above us in the stack.
|
/// between this space and the space above us in the stack.
|
||||||
Object mObject;
|
Object mObject;
|
||||||
|
|
||||||
Scope() {}
|
Scope() :mSortValue(0), mSoundscape(NULL) {}
|
||||||
Scope( F32 sortValue, Object object )
|
Scope( F32 sortValue, Object object )
|
||||||
: mSortValue( sortValue ),
|
: mSortValue( sortValue ),
|
||||||
mSoundscape( NULL ),
|
mSoundscape( NULL ),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue