mirror/blah
1
0
Fork 0
mirror of https://github.com/NoelFB/blah.git synced 2025-04-18 03:46:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

added Calc::approach for Vec2

Browse Source
This commit is contained in:
Noel Berry 2020-12-31 18:29:13 -08:00
parent 30cfbf203e
commit d8930f15ac
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/blah/math/calc.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <inttypes.h> #include <inttypes.h>
#include <blah/math/vec2.h>
namespace Blah namespace Blah
{ {
@ -22,7 +23,9 @@ namespace Blah
int rand_int(); int rand_int();
float approach(float t, float target, float maxDelta); float approach(float t, float target, float delta);
Vec2 approach(const Vec2& t, const Vec2& target, float delta);
float clamp(float t, float min, float max); float clamp(float t, float min, float max);

11
src/math/calc.cpp
View File

@ -31,9 +31,16 @@ int Calc::rand_int()
return rand(); return rand();
} }
float Calc::approach(float t, float target, float maxDelta) float Calc::approach(float t, float target, float delta)
{ {
return t < target ? min(t + maxDelta, target) : max(t - maxDelta, target); return t < target ? min(t + delta, target) : max(t - delta, target);
}
Vec2 Calc::approach(const Vec2& t, const Vec2& target, float delta)
{
if ((target - t).length() <= delta)
return target;
return t + (target - t).normal() * delta;
} }
float Calc::clamp(float t, float min, float max) float Calc::clamp(float t, float min, float max)