TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3

Browse source
This commit is contained in:
marauder2k7 2025-04-05 15:59:02 +01:00
commit 7c4d41ee21
21 changed files with 98 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/materials/materialDefinition.cpp
View file

@ -608,8 +608,8 @@ void Material::updateTimeBasedParams()
for (U32 i = 0; i < MAX_STAGES; i++)
{
mScrollOffset[i] += mScrollDir[i] * mScrollSpeed[i] * dt;
mScrollOffset[i].x = mWrapF(mScrollOffset[i].x, 0.0, 1.0);
mScrollOffset[i].y = mWrapF(mScrollOffset[i].y, 0.0, 1.0);
mScrollOffset[i].x = mWrapF(mScrollOffset[i].x, -1.0, 1.0);
mScrollOffset[i].y = mWrapF(mScrollOffset[i].y, -1.0, 1.0);
mRotPos[i] = mWrapF((mRotPos[i] + (mRotSpeed[i] * dt)), 0.0, 360.0);
mWavePos[i] = mWrapF((mWavePos[i] + (mWaveFreq[i] * dt)), 0.0, 1.0);
}