TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-25 09:33:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

use the templated mLerp

Browse source 
turns out a) it exists, and b) it uses the standard input order, so shoud be easier for new folks to remember
This commit is contained in:
AzaezelX 2022-11-28 22:12:25 -06:00
parent 82b5084875
commit 9f9049e6bd
7 changed files with 30 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/util/noise2d.cpp
View file

@ -88,13 +88,6 @@ U32 Noise2D::getSeed()
return mSeed;
}
inline F32 Noise2D::lerp(F32 t, F32 a, F32 b)
{
return a + t * (b - a);
}
inline F32 Noise2D::curve(F32 t)
{
return t * t * (3.0f - 2.0f * t);
@ -505,16 +498,16 @@ F32 Noise2D::getValue(F32 x, F32 y, S32 interval)
F32 v = dot(mGradient[ b10 ], rx1,ry0);
// Interpolation along the X axis.
F32 a = lerp(sx, u, v);
F32 a = mLerp(u, v,sx);
u = dot(mGradient[ b01 ], rx0,ry1);
v = dot(mGradient[ b11 ], rx1,ry1);
// Interpolation along the Y axis.
F32 b = lerp(sx, u, v);
F32 b = mLerp( u, v, sx);
// Final Interpolation
return lerp(sy, a, b);
return mLerp(a, b,sy);
}