Mercurial > hg > dmlib
changeset 978:fecf3967abee
Move lerp functions from dmlerp.c to dmcurves.c, too.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 27 Feb 2015 16:20:24 +0200 |
| parents | 4a6dece98cb2 |
| children | 76e8dcfeb808 |
| files | Makefile.gen src/dmcurves.c src/dmlerp.c |
| diffstat | 3 files changed, 22 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Fri Feb 27 16:18:08 2015 +0200 +++ b/Makefile.gen Fri Feb 27 16:20:24 2015 +0200 @@ -276,9 +276,9 @@ DMLIB_A=$(OBJPATH)dmlib.a DMLIB_OBJS += \ - dmfile.o dmbstr.o dmlib.o dmlerp.o dmstring.o \ + dmfile.o dmbstr.o dmlib.o dmcurves.o dmstring.o \ dmargs.o dmvecmat.o dmperlin.o dmimage.o \ - dmwav.o dmcurves.o dmengine.o dmfft.o dmzlib.o + dmwav.o dmengine.o dmfft.o dmzlib.o TESTS_TARGETS = $(addprefix $(TESTS_BINPATH),$(addsuffix $(EXEEXT),$(TESTS_BINARIES)))
--- a/src/dmcurves.c Fri Feb 27 16:18:08 2015 +0200 +++ b/src/dmcurves.c Fri Feb 27 16:20:24 2015 +0200 @@ -7,6 +7,26 @@ #include "dmcurves.h" +void dmLerpInit(DMLerpContext *ctx, DMFloat start, DMFloat end, DMFloat nsteps) +{ + ctx->start = start; + ctx->end = end; + ctx->nsteps = nsteps; +} + + +DMFloat dmCatmullRom(const DMFloat t, const DMFloat p0, const DMFloat p1, const DMFloat p2, const DMFloat p3) +{ + const DMFloat q = t * t; + return ( + (2 * p1) + + (-p0 + p2) * t + + (2 * p0 - 5 * p1 + 4 * p2 - p3) * q + + ( -p0 + 3 * p1 - 3 * p2 + p3) * q * t + ) * 0.5f; +} + + static inline const DMVector *dmSplineGetPoint(const DMVector *points, const int npoints, const int n) { return (n < 0) ? &points[0] : ((n < npoints) ? &points[n] : &points[npoints - 1]);
--- a/src/dmlerp.c Fri Feb 27 16:18:08 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -#include "dmlib.h" - -void dmLerpInit(DMLerpContext *ctx, DMFloat start, DMFloat end, DMFloat nsteps) -{ - ctx->start = start; - ctx->end = end; - ctx->nsteps = nsteps; -} - - -DMFloat dmCatmullRom(const DMFloat t, const DMFloat p0, const DMFloat p1, const DMFloat p2, const DMFloat p3) -{ - const DMFloat q = t * t; - return ( - (2 * p1) + - (-p0 + p2) * t + - (2 * p0 - 5 * p1 + 4 * p2 - p3) * q + - ( -p0 + 3 * p1 - 3 * p2 + p3) * q * t - ) * 0.5f; -}