X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftags%2Fsynfig_0_61_07_rc3%2Fsrc%2Fsynfig%2Fvector.h;fp=synfig-core%2Ftags%2Fsynfig_0_61_07_rc3%2Fsrc%2Fsynfig%2Fvector.h;h=0000000000000000000000000000000000000000;hb=6fa8f2f38d4b0b35f8539bf94e27ae27015c7689;hp=46baff80b1feec4489bc08eb41e7707c24cf1753;hpb=47fce282611fbba1044921d22ca887f9b53ad91a;p=synfig.git

diff --git a/synfig-core/tags/synfig_0_61_07_rc3/src/synfig/vector.h b/synfig-core/tags/synfig_0_61_07_rc3/src/synfig/vector.h
deleted file mode 100644
index 46baff8..0000000
--- a/synfig-core/tags/synfig_0_61_07_rc3/src/synfig/vector.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file vector.h
-**	\brief Various discreet type definitions
-**
-**	$Id$
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
-**
-**	This package is free software; you can redistribute it and/or
-**	modify it under the terms of the GNU General Public License as
-**	published by the Free Software Foundation; either version 2 of
-**	the License, or (at your option) any later version.
-**
-**	This package is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-**	General Public License for more details.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === S T A R T =========================================================== */
-
-#ifndef __SYNFIG_VECTOR_H
-#define __SYNFIG_VECTOR_H
-
-/* === H E A D E R S ======================================================= */
-
-#include "angle.h"
-#include "real.h"
-#include <math.h>
-
-/* === M A C R O S ========================================================= */
-
-
-#ifdef WIN32
-#include <float.h>
-#ifndef isnan
-extern "C" { int _isnan(double x); }
-#define isnan _isnan
-#endif
-#endif
-
-// For some reason isnan() isn't working on macosx any more.
-// This is a quick fix.
-#if defined(__APPLE__) && !defined(SYNFIG_ISNAN_FIX)
-#ifdef isnan
-#undef isnan
-#endif
-inline bool isnan(double x) { return x != x; }
-inline bool isnan(float x) { return x != x; }
-#define SYNFIG_ISNAN_FIX 1
-#endif
-
-
-/* === T Y P E D E F S ===================================================== */
-
-/* === C L A S S E S & S T R U C T S ======================================= */
-
-namespace synfig {
-
-/*!	\class Vector
-**	\todo writeme
-*/
-class Vector
-{
-public:
-	typedef Real value_type;
-
-private:
-	value_type _x, _y;
-
-public:
-	Vector(): _x(0.0), _y(0.0) { };
-	Vector(const value_type &x, const value_type &y):_x(x),_y(y) { };
-
-	bool is_valid()const { return !(isnan(_x) || isnan(_y)); }
-
-	value_type &
-	operator[](const int& i)
-	{ return i?_y:_x; }
-
-	const value_type &
-	operator[](const int& i) const
-	{ return i?_y:_x; }
-
-	const Vector &
-	operator+=(const Vector &rhs)
-	{
-		_x+=rhs._x;
-		_y+=rhs._y;
-		return *this;
-	}
-
-	const Vector &
-	operator-=(const Vector &rhs)
-	{
-		_x-=rhs._x;
-		_y-=rhs._y;
-		return *this;
-	}
-
-	const Vector &
-	operator*=(const value_type &rhs)
-	{
-		_x*=rhs;
-		_y*=rhs;
-		return *this;
-	}
-
-	const Vector &
-	operator/=(const value_type &rhs)
-	{
-		value_type tmp=1.0/rhs;
-		_x*=tmp;
-		_y*=tmp;
-		return *this;
-	}
-
-	Vector
-	operator+(const Vector &rhs)const
-		{ return Vector(*this)+=rhs; }
-
-	Vector
-	operator-(const Vector &rhs)const
-		{ return Vector(*this)-=rhs; }
-
-	Vector
-	operator*(const value_type &rhs)const
-		{ return Vector(*this)*=rhs; }
-
-	Vector
-	operator/(const value_type &rhs)const
-		{ return Vector(*this)/=rhs; }
-
-	Vector
-	operator-()const
-		{ return Vector(-_x,-_y); }
-
-	value_type
-	operator*(const Vector &rhs)const
-		{ return _x*rhs._x+_y*rhs._y; }
-
-	bool
-	operator==(const Vector &rhs)const
-		{ return _x==rhs._x && _y==rhs._y; }
-
-	bool
-	operator!=(const Vector &rhs)const
-		{ return _y!=rhs._y || _x!=rhs._x; }
-
-	//! Returns the squared magnitude of the vector
-	value_type mag_squared()const
-		{ return _x*_x+_y*_y; }
-
-	//! Returns the magnitude of the vector
-	value_type mag()const
-		{ return sqrt(mag_squared()); }
-
-	//! Returns the reciprocal of the magnitude of the vector
-	value_type inv_mag()const
-		{ return 1.0/sqrt(mag_squared()); }
-
-	//! Returns a normalized version of the vector
-	Vector norm()const
-		{ return (*this)*inv_mag(); }
-
-	//! Returns a perpendicular version of the vector
-	Vector perp()const
-		{ return Vector(_y,-_x); }
-
-	Angle angle()const
-		{ return Angle::rad(atan2(_y, _x)); }
-
-	bool is_equal_to(const Vector& rhs)const
-	{
-		static const value_type epsilon(0.0000000000001);
-//		return (_x>rhs._x)?_x-rhs._x<=epsilon:rhs._x-_x<=epsilon && (_y>rhs._y)?_y-rhs._y<=epsilon:rhs._y-_y<=epsilon;
-		return (*this-rhs).mag_squared()<=epsilon;
-	}
-
-	static const Vector zero() { return Vector(0,0); }
-};
-
-/*!	\typedef Point
-**	\todo writeme
-*/
-typedef Vector Point;
-
-
-
-}; // END of namespace synfig
-
-namespace std {
-
-inline synfig::Vector::value_type
-abs(const synfig::Vector &rhs)
-	{ return rhs.mag(); }
-
-}; // END of namespace std
-
-#include <ETL/bezier>
-
-_ETL_BEGIN_NAMESPACE
-
-template <>
-class bezier_base<synfig::Vector,float> : public std::unary_function<float,synfig::Vector>
-{
-public:
-	typedef synfig::Vector value_type;
-	typedef float time_type;
-private:
-
-	bezier_base<synfig::Vector::value_type,time_type> bezier_x,bezier_y;
-
-	value_type a,b,c,d;
-
-protected:
-	affine_combo<value_type,time_type> affine_func;
-
-public:
-	bezier_base() { }
-	bezier_base(
-		const value_type &a, const value_type &b, const value_type &c, const value_type &d,
-		const time_type &r=0.0, const time_type &s=1.0):
-		a(a),b(b),c(c),d(d) { set_rs(r,s); sync(); }
-
-	void sync()
-	{
-		bezier_x[0]=a[0],bezier_y[0]=a[1];
-		bezier_x[1]=b[0],bezier_y[1]=b[1];
-		bezier_x[2]=c[0],bezier_y[2]=c[1];
-		bezier_x[3]=d[0],bezier_y[3]=d[1];
-		bezier_x.sync();
-		bezier_y.sync();
-	}
-
-	value_type
-	operator()(time_type t)const
-	{
-		return synfig::Vector(bezier_x(t),bezier_y(t));
-	}
-
-	void evaluate(time_type t, value_type &f, value_type &df) const
-	{
-		t=(t-get_r())/get_dt();
-
-		const value_type p1 = affine_func(
-							affine_func(a,b,t),
-							affine_func(b,c,t)
-							,t);
-		const value_type p2 = affine_func(
-							affine_func(b,c,t),
-							affine_func(c,d,t)
-						,t);
-
-		f = affine_func(p1,p2,t);
-		df = (p2-p1)*3;
-	}
-
-	void set_rs(time_type new_r, time_type new_s) { bezier_x.set_rs(new_r,new_s); bezier_y.set_rs(new_r,new_s); }
-	void set_r(time_type new_r) { bezier_x.set_r(new_r); bezier_y.set_r(new_r); }
-	void set_s(time_type new_s) { bezier_x.set_s(new_s); bezier_y.set_s(new_s); }
-	const time_type &get_r()const { return bezier_x.get_r(); }
-	const time_type &get_s()const { return bezier_x.get_s(); }
-	time_type get_dt()const { return bezier_x.get_dt(); }
-
-	value_type &
-	operator[](int i)
-	{ return (&a)[i]; }
-
-	const value_type &
-	operator[](int i) const
-	{ return (&a)[i]; }
-
-	//! Bezier curve intersection function
-	time_type intersect(const bezier_base<value_type,time_type> &/*x*/, time_type /*near*/=0.0)const
-	{
-		return 0;
-	}
-};
-
-_ETL_END_NAMESPACE
-
-
-/* === E N D =============================================================== */
-
-#endif