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

Removed ShapeBase::Thread::sound.

Browse source 
Weird feature that's not script-accessible or actually implemented.
This commit is contained in:
Daniel Buckmaster 2014-09-05 14:09:35 +10:00
parent 84ebe885e3
commit 69179cf809
2 changed files with 1 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/T3D/shapeBase.cpp
View file

@ -931,7 +931,6 @@ ShapeBase::ShapeBase()
for (i = 0; i < MaxScriptThreads; i++) { for (i = 0; i < MaxScriptThreads; i++) {
mScriptThread[i].sequence = -1; mScriptThread[i].sequence = -1;
mScriptThread[i].thread = 0; mScriptThread[i].thread = 0;
mScriptThread[i].sound = 0;
mScriptThread[i].state = Thread::Stop; mScriptThread[i].state = Thread::Stop;
mScriptThread[i].atEnd = false; mScriptThread[i].atEnd = false;
mScriptThread[i].timescale = 1.f; mScriptThread[i].timescale = 1.f;
@ -2162,7 +2161,6 @@ bool ShapeBase::setThreadSequence(U32 slot, S32 seq, bool reset)
if (!st.thread) if (!st.thread)
st.thread = mShapeInstance->addThread(); st.thread = mShapeInstance->addThread();
mShapeInstance->setSequence(st.thread,seq,0); mShapeInstance->setSequence(st.thread,seq,0);
stopThreadSound(st);
updateThread(st); updateThread(st);
} }
return true; return true;
@ -2189,7 +2187,6 @@ void ShapeBase::updateThread(Thread& st)
} }
mShapeInstance->setTimeScale( st.thread, 0.f ); mShapeInstance->setTimeScale( st.thread, 0.f );
stopThreadSound( st );
} break; } break;
case Thread::Play: case Thread::Play:
@ -2199,7 +2196,6 @@ void ShapeBase::updateThread(Thread& st)
mShapeInstance->setTimeScale(st.thread,1); mShapeInstance->setTimeScale(st.thread,1);
mShapeInstance->setPos( st.thread, ( st.timescale > 0.f ) ? 1.0f : 0.0f ); mShapeInstance->setPos( st.thread, ( st.timescale > 0.f ) ? 1.0f : 0.0f );
mShapeInstance->setTimeScale(st.thread,0); mShapeInstance->setTimeScale(st.thread,0);
stopThreadSound(st);
st.state = Thread::Stop; st.state = Thread::Stop;
} }
else else
@ -2211,16 +2207,11 @@ void ShapeBase::updateThread(Thread& st)
} }
mShapeInstance->setTimeScale(st.thread, st.timescale ); mShapeInstance->setTimeScale(st.thread, st.timescale );
if (!st.sound)
{
startSequenceSound(st);
}
} }
} break; } break;
case Thread::Destroy: case Thread::Destroy:
{ {
stopThreadSound(st);
st.atEnd = true; st.atEnd = true;
st.sequence = -1; st.sequence = -1;
if(st.thread) if(st.thread)
@ -2328,19 +2319,6 @@ bool ShapeBase::setThreadTimeScale( U32 slot, F32 timeScale )
return false; return false;
} }
void ShapeBase::stopThreadSound(Thread& thread)
{
if (thread.sound) {
}
}
void ShapeBase::startSequenceSound(Thread& thread)
{
if (!isGhost() || !thread.thread)
return;
stopThreadSound(thread);
}
void ShapeBase::advanceThreads(F32 dt) void ShapeBase::advanceThreads(F32 dt)
{ {
for (U32 i = 0; i < MaxScriptThreads; i++) { for (U32 i = 0; i < MaxScriptThreads; i++) {

11
Engine/source/T3D/shapeBase.h
View file

@ -733,8 +733,7 @@ protected:
/// ///
/// @see Thread::State /// @see Thread::State
S32 sequence; ///< The animation sequence which is running in this thread. S32 sequence; ///< The animation sequence which is running in this thread.
F32 timescale; ///< Timescale F32 timescale; ///< Timescale
U32 sound; ///< Handle to sound.
bool atEnd; ///< Are we at the end of this thread? bool atEnd; ///< Are we at the end of this thread?
F32 position; F32 position;
}; };
@ -1354,14 +1353,6 @@ public:
/// @param timescale Timescale /// @param timescale Timescale
bool setThreadTimeScale( U32 slot, F32 timeScale ); bool setThreadTimeScale( U32 slot, F32 timeScale );
/// Start the sound associated with an animation thread
/// @param thread Thread
void startSequenceSound(Thread& thread);
/// Stop the sound associated with an animation thread
/// @param thread Thread
void stopThreadSound(Thread& thread);
/// Advance all animation threads attached to this shapebase /// Advance all animation threads attached to this shapebase
/// @param dt Change in time from last call to this function /// @param dt Change in time from last call to this function
void advanceThreads(F32 dt); void advanceThreads(F32 dt);