TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into development

Browse source
This commit is contained in:
Areloch 2016-05-10 13:07:19 -05:00
commit 55694ad0b6
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/lightAnimData.cpp
View file

@ -190,12 +190,14 @@ void LightAnimData::AnimValue<COUNT>::updateKey()
} }
template<U32 COUNT> template<U32 COUNT>
bool LightAnimData::AnimValue<COUNT>::animate( F32 time, F32 *output ) bool LightAnimData::AnimValue<COUNT>::animate(F32 time, F32 *output, bool multiply)
{ {
F32 scaledTime, lerpFactor, valueRange, keyFrameLerp; F32 scaledTime, lerpFactor, valueRange, keyFrameLerp;
U32 posFrom, posTo; U32 posFrom, posTo;
S32 keyFrameFrom, keyFrameTo; S32 keyFrameFrom, keyFrameTo;
F32 initialValue = *output; F32 initialValue = *output;
if (!multiply)
initialValue = 1;
bool wasAnimated = false; bool wasAnimated = false;
@ -305,6 +307,6 @@ void LightAnimData::animate( LightInfo *lightInfo, LightAnimState *state )
lightInfo->setColor( color ); lightInfo->setColor( color );
F32 brightness = state->brightness; F32 brightness = state->brightness;
mBrightness.animate( time, &brightness ); mBrightness.animate( time, &brightness, true );
lightInfo->setBrightness( brightness ); lightInfo->setBrightness( brightness );
} }

2
Engine/source/T3D/lightAnimData.h
View file

@ -151,7 +151,7 @@ public:
/// Performs the animation returning the results in the output if /// Performs the animation returning the results in the output if
/// the time scale is greater than zero. /// the time scale is greater than zero.
/// @return Returns true if the animation was performed. /// @return Returns true if the animation was performed.
bool animate( F32 time, F32 *output ); bool animate(F32 time, F32 *output, bool multiply = false);
/// Called when the key string is changed to update the /// Called when the key string is changed to update the
/// key length and time scale. /// key length and time scale.