X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FMath.hh;h=d557c7f15114d7a07e15d393cbd66728bfba1f76;hp=45c6e90b7ee02543df9bed379ac519291529aaaa;hb=2f239b9ba2a556a5ca810cfffc60552a56a4fe86;hpb=b357615aba1dbde81e3c6999366604e6001010a7

diff --git a/src/Moof/Math.hh b/src/Moof/Math.hh
index 45c6e90..d557c7f 100644
--- a/src/Moof/Math.hh
+++ b/src/Moof/Math.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_MATH_HH_
 #define _MOOF_MATH_HH_
@@ -102,7 +85,7 @@ inline Vector3 promote(const Vector2& vec, Scalar extra = 0.0)
 }
 
 
-template <typename R, typename P>
+template <class R, class P>
 inline R convert(const P& p)
 {
 	return R(p);
@@ -132,11 +115,11 @@ inline Vector3 convert<Vector3,Vector2>(const Vector2& vec)
 	return Vector3(vec[0], vec[1], SCALAR(0.0));
 }
 
-template <typename P>
+template <class P>
 struct cast
 {
 	cast(const P& p) : param(p) {}
-	template <typename R>
+	template <class R>
 	operator R() { return convert<R,P>(param); }
 private:
 	const P& param;
@@ -157,10 +140,10 @@ inline bool isEqual(Scalar a, Scalar b, Scalar epsilon = EPSILON)
 
 
 
-// Here are some generic implementations of a few simple integrators.  To use,
-// you need one type representing the state and another containing the
-// derivatives of the primary state variables.  The state class must implement
-// these methods:
+// Here are some generic implementations of a few simple integrators.  To
+// use, you need one type representing the state and another containing the
+// derivatives of the primary state variables.  The state class must
+// implement these methods:
 //
 // void getDerivative(Derivative_Type& derivative, Scalar absoluteTime);
 // void step(const Derivative_Type& derivative, Scalar deltaTime);
@@ -170,7 +153,7 @@ inline bool isEqual(Scalar a, Scalar b, Scalar epsilon = EPSILON)
 // Derivative_Type operator+(const Derivative_Type& other) const
 // Derivative_Type operator*(const Derivative_Type& other) const
 
-template<typename S, typename D>
+template <class S, class D>
 inline D evaluate(const S& state, Scalar t)
 {
 	D derivative;
@@ -178,7 +161,7 @@ inline D evaluate(const S& state, Scalar t)
 	return derivative;
 }
 
-template<typename S, typename D>
+template <class S, class D>
 inline D evaluate(S state,  Scalar t, Scalar dt, const D& derivative)
 {
 	state.step(derivative, dt);
@@ -186,7 +169,7 @@ inline D evaluate(S state,  Scalar t, Scalar dt, const D& derivative)
 }
 
 
-template<typename S, typename D>
+template <class S, class D>
 inline void euler(S& state, Scalar t, Scalar dt)
 {
 	D a = evaluate<S,D>(state, t);
@@ -194,7 +177,7 @@ inline void euler(S& state, Scalar t, Scalar dt)
 	state.step(a, dt);
 }
 
-template<typename S, typename D>
+template <class S, class D>
 inline void rk2(S& state, Scalar t, Scalar dt)
 {
 	D a = evaluate<S,D>(state, t);
@@ -203,7 +186,7 @@ inline void rk2(S& state, Scalar t, Scalar dt)
 	state.step(b, dt);
 }
 
-template<typename S, typename D>
+template <class S, class D>
 inline void rk4(S& state, Scalar t, Scalar dt)
 {
 	D a = evaluate<S,D>(state, t);
@@ -219,5 +202,3 @@ inline void rk4(S& state, Scalar t, Scalar dt)
 
 #endif // _MOOF_MATH_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-