[ZooLib-checkins] SF.net SVN: zoolib:[2694] trunk/zoolib/source/cxx/zoolib/ZTween_Std.h

[<ag...@us...>]

Revision: 2694
          http://zoolib.svn.sourceforge.net/zoolib/?rev=2694&view=rev
Author:   agreen
Date:     2012-01-28 18:15:00 +0000 (Sat, 28 Jan 2012)
Log Message:
-----------
Whitespace and ctor function.

Modified Paths:
--------------
    trunk/zoolib/source/cxx/zoolib/ZTween_Std.h

Modified: trunk/zoolib/source/cxx/zoolib/ZTween_Std.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZTween_Std.h	2012-01-28 18:13:35 UTC (rev 2693)
+++ trunk/zoolib/source/cxx/zoolib/ZTween_Std.h	2012-01-28 18:15:00 UTC (rev 2694)
@@ -22,7 +22,6 @@
 #define __ZTween_Std_h__ 1
 #include "zconfig.h"
 
-#include "zoolib/ZCompat_algorithm.h" // for sMinMax
 #include "zoolib/ZTween.h"
 
 namespace ZooLib {
@@ -37,9 +36,9 @@
 public:
 	virtual ZQ<Val> QValAt(double iTime)
 		{
-		if (iTime < 0 || iTime >= 1.0)
-			return null;
-		return Fun(iTime);
+		if (iTime >= 0 && iTime <= 1.0)
+			return Fun(iTime);
+		return null;
 		}
 
 	virtual double Duration()
@@ -98,6 +97,14 @@
 	const ZRef<ZTween<Param> > fTween;
 	};
 
+template <class Val, class Param>
+ZRef<ZTween<Val> > sTween_Filter_Coerce(const ZRef<ZTween<Param> >& iTween)
+	{
+	if (iTween)
+		return new ZTween_Filter_Coerce<Val,Param>(iTween);
+	return null;
+	}
+
 // =================================================================================================
 // MARK: - sTween_OneMinus
 
@@ -443,14 +450,14 @@
 Val spTweenFun_BounceIn(double iTime)
 	{
 	if (iTime < 1 / 2.75)
+		{
 		return 7.5625 * iTime * iTime;
-
+		}
 	else if (iTime < 2 / 2.75)
 		{
 		iTime -= 1.5/2.75;
 		return 7.5625 * iTime * iTime + .75;
 		}
-
 	else if (iTime < 2.5 / 2.75)
 		{
 		iTime -= 2.25/2.75;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.