X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FInterpolator.hh;h=b32482c73a9e502667530293786db06f04b4d60a;hp=2c33844262db6835cc5eaf02258f09cf5d11d767;hb=d50942708db230dc5c43b8df89ede45525e1c394;hpb=57b78ebe21b1b48acd337daa5a1cb8c383959cfa

diff --git a/src/Moof/Interpolator.hh b/src/Moof/Interpolator.hh
index 2c33844..b32482c 100644
--- a/src/Moof/Interpolator.hh
+++ b/src/Moof/Interpolator.hh
@@ -35,6 +35,8 @@
 namespace Mf {
 
 
+// TODO - cleanup these classes
+
 class Interpolator
 {
 	void clamp(Scalar& value)
@@ -117,7 +119,7 @@ private:
 	bool	stopped_;
 };
 
-template <class T>
+template <class T = Scalar>
 class InterpolatorBase : public Interpolator
 {
 public:
@@ -153,13 +155,13 @@ private:
 };
 
 
-template <class T, int D>
-class BinomialInterpolator : public InterpolatorBase<T>
+template <int D, class T = Scalar>
+class PolynomialInterpolator : public InterpolatorBase<T>
 {
 public:
-	BinomialInterpolator() {}
+	PolynomialInterpolator() {}
 
-	explicit BinomialInterpolator(const T coefficients[D+1],
+	PolynomialInterpolator(const T coefficients[D+1],
 			Scalar seconds = 1.0, Interpolator::Mode mode = Interpolator::STOP)
 	{
 		init(coefficients, seconds, mode);
@@ -174,13 +176,13 @@ public:
 		fac[1] = 1.0;
 
 		// build an array of the computed factorials we will need
-		for (int i = 2; i <= D; i++)
+		for (int i = 2; i <= D; ++i)
 		{
 			fac[i] = i * fac[i - 1];
 		}
 
 		// combine the coefficients for fast updating
-		for (int i = 0; i <= D; i++)
+		for (int i = 0; i <= D; ++i)
 		{
 			// n! / (k! * (n - k)!)
 			coefficients_[i] = coefficients[i] * fac[D] / (fac[i] * fac[D - i]);
@@ -196,7 +198,7 @@ public:
 
 		value = coefficients_[0] * std::pow(beta, D);
 
-		for (int i = 1; i <= D; i++)
+		for (int i = 1; i <= D; ++i)
 		{
 			value += coefficients_[i] * std::pow(beta, D - i) *
 				std::pow(alpha, i);
@@ -208,13 +210,15 @@ private:
 };
 
 
+// specialized linear interpolator
+
 template <class T>
-class BinomialInterpolator<T,1> : public InterpolatorBase<T>
+class PolynomialInterpolator<1,T> : public InterpolatorBase<T>
 {
 public:
-	BinomialInterpolator() {}
+	PolynomialInterpolator() {}
 
-	explicit BinomialInterpolator(const T coefficients[2], Scalar seconds = 1.0,
+	PolynomialInterpolator(const T coefficients[2], Scalar seconds = 1.0,
 			Interpolator::Mode mode = Interpolator::STOP)
 		//InterpolatorBase<T>(seconds, mode)
 	{
@@ -246,20 +250,20 @@ private:
 // interpolation functions in cml for other types of interpolation such as
 // slerp and some multi-alpha interpolators.
 
-typedef BinomialInterpolator<Scalar, 1>	Lerps;	// linear
-typedef BinomialInterpolator<Vector2,1>	Lerpv2;
-typedef BinomialInterpolator<Vector3,1>	Lerpv3;
-typedef BinomialInterpolator<Vector4,1>	Lerpv4;
+typedef PolynomialInterpolator<1>			Lerp;	// linear
+typedef PolynomialInterpolator<1,Vector2>	Lerp2;
+typedef PolynomialInterpolator<1,Vector3>	Lerp3;
+typedef PolynomialInterpolator<1,Vector4>	Lerp4;
 
-typedef BinomialInterpolator<Scalar ,2>	Qerps;	// quadratic
-typedef BinomialInterpolator<Vector2,2>	Qerpv2;
-typedef BinomialInterpolator<Vector3,2>	Qerpv3;
-typedef BinomialInterpolator<Vector4,2>	Qerpv4;
+typedef PolynomialInterpolator<2>			Qerp;	// quadratic
+typedef PolynomialInterpolator<2,Vector2>	Qerp2;
+typedef PolynomialInterpolator<2,Vector3>	Qerp3;
+typedef PolynomialInterpolator<2,Vector4>	Qerp4;
 
-typedef BinomialInterpolator<Scalar ,3>	Cerps;	// cubic
-typedef BinomialInterpolator<Vector2,3>	Cerpv2;
-typedef BinomialInterpolator<Vector3,3>	Cerpv3;
-typedef BinomialInterpolator<Vector4,3>	Cerpv4;
+typedef PolynomialInterpolator<3>			Cerp;	// cubic
+typedef PolynomialInterpolator<3,Vector2>	Cerp2;
+typedef PolynomialInterpolator<3,Vector3>	Cerp3;
+typedef PolynomialInterpolator<3,Vector4>	Cerp4;
 
 
 } // namespace Mf