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

Merge pull request #1410 from Areloch/light_anim_brightness_fix

Browse source 
Light animation brightness fix
This commit is contained in:
Areloch 2015-09-16 21:27:44 -05:00
commit 0798b80371
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -195,6 +195,7 @@ bool LightAnimData::AnimValue<COUNT>::animate( F32 time, F32 *output )
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;
bool wasAnimated = false; bool wasAnimated = false;
@ -215,13 +216,13 @@ bool LightAnimData::AnimValue<COUNT>::animate( F32 time, F32 *output )
valueRange = ( value2[i] - value1[i] ) / 25.0f; valueRange = ( value2[i] - value1[i] ) / 25.0f;
if ( !smooth[i] ) if ( !smooth[i] )
output[i] = value1[i] + ( keyFrameFrom * valueRange ); output[i] = (value1[i] + (keyFrameFrom * valueRange)) * initialValue;
else else
{ {
lerpFactor = scaledTime - posFrom; lerpFactor = scaledTime - posFrom;
keyFrameLerp = ( keyFrameTo - keyFrameFrom ) * lerpFactor; keyFrameLerp = ( keyFrameTo - keyFrameFrom ) * lerpFactor;
output[i] = value1[i] + ( ( keyFrameFrom + keyFrameLerp ) * valueRange ); output[i] = (value1[i] + ((keyFrameFrom + keyFrameLerp) * valueRange)) * initialValue;
} }
} }