Sync to AGG tree to support stippi's Painter classes
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10693 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -26,6 +26,14 @@
|
||||
namespace agg
|
||||
{
|
||||
|
||||
enum
|
||||
{
|
||||
gradient_subpixel_shift = 4,
|
||||
gradient_subpixel_size = 1 << gradient_subpixel_shift,
|
||||
gradient_subpixel_mask = gradient_subpixel_size - 1
|
||||
};
|
||||
|
||||
|
||||
//==========================================================span_gradient
|
||||
template<class ColorT,
|
||||
class Interpolator,
|
||||
@@ -45,12 +53,7 @@ namespace agg
|
||||
base_shift = 8,
|
||||
base_size = 1 << base_shift,
|
||||
base_mask = base_size - 1,
|
||||
|
||||
gradient_shift = 4,
|
||||
gradient_size = 1 << gradient_shift,
|
||||
gradient_mask = gradient_size - 1,
|
||||
|
||||
downscale_shift = interpolator_type::subpixel_shift - gradient_shift
|
||||
downscale_shift = interpolator_type::subpixel_shift - gradient_subpixel_shift
|
||||
};
|
||||
|
||||
|
||||
@@ -67,23 +70,23 @@ namespace agg
|
||||
m_interpolator(&inter),
|
||||
m_gradient_function(&gradient_function),
|
||||
m_color_function(color_function),
|
||||
m_d1(int(d1 * gradient_size)),
|
||||
m_d2(int(d2 * gradient_size))
|
||||
m_d1(int(d1 * gradient_subpixel_size)),
|
||||
m_d2(int(d2 * gradient_subpixel_size))
|
||||
{}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
interpolator_type& interpolator() { return *m_interpolator; }
|
||||
const GradientF& gradient_function() const { return *m_gradient_function; }
|
||||
const ColorF color_function() const { return m_color_function; }
|
||||
double d1() const { return double(m_d1) / gradient_size; }
|
||||
double d2() const { return double(m_d2) / gradient_size; }
|
||||
double d1() const { return double(m_d1) / gradient_subpixel_size; }
|
||||
double d2() const { return double(m_d2) / gradient_subpixel_size; }
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
void interpolator(interpolator_type& i) { m_interpolator = &i; }
|
||||
void gradient_function(const GradientF& gf) { m_gradient_function = &gf; }
|
||||
void color_function(ColorF cf) { m_color_function = cf; }
|
||||
void d1(double v) { m_d1 = int(v * gradient_size); }
|
||||
void d2(double v) { m_d2 = int(v * gradient_size); }
|
||||
void d1(double v) { m_d1 = int(v * gradient_subpixel_size); }
|
||||
void d2(double v) { m_d2 = int(v * gradient_subpixel_size); }
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
color_type* generate(int x, int y, unsigned len)
|
||||
@@ -150,9 +153,20 @@ namespace agg
|
||||
};
|
||||
|
||||
|
||||
|
||||
//---------------------------------------------------------gradient_circle
|
||||
//==========================================================gradient_circle
|
||||
class gradient_circle
|
||||
{
|
||||
// Actually the same as radial. Just for compatibility
|
||||
public:
|
||||
static int calculate(int x, int y, int)
|
||||
{
|
||||
return int(fast_sqrt(x*x + y*y));
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
//==========================================================gradient_radial
|
||||
class gradient_radial
|
||||
{
|
||||
public:
|
||||
static int calculate(int x, int y, int)
|
||||
@@ -162,7 +176,148 @@ namespace agg
|
||||
};
|
||||
|
||||
|
||||
//--------------------------------------------------------------gradient_x
|
||||
//========================================================gradient_radial_d
|
||||
class gradient_radial_d
|
||||
{
|
||||
public:
|
||||
static int calculate(int x, int y, int)
|
||||
{
|
||||
return int(sqrt(double(x)*double(x) + double(y)*double(y)));
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
//====================================================gradient_radial_focus
|
||||
class gradient_radial_focus
|
||||
{
|
||||
public:
|
||||
//---------------------------------------------------------------------
|
||||
gradient_radial_focus() :
|
||||
m_radius(100 * gradient_subpixel_size),
|
||||
m_focus_x(0),
|
||||
m_focus_y(0)
|
||||
{
|
||||
update_values();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
gradient_radial_focus(double r, double fx, double fy) :
|
||||
m_radius (int(r * gradient_subpixel_size)),
|
||||
m_focus_x(int(fx * gradient_subpixel_size)),
|
||||
m_focus_y(int(fy * gradient_subpixel_size))
|
||||
{
|
||||
update_values();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
void init(double r, double fx, double fy)
|
||||
{
|
||||
m_radius = int(r * gradient_subpixel_size);
|
||||
m_focus_x = int(fx * gradient_subpixel_size);
|
||||
m_focus_y = int(fy * gradient_subpixel_size);
|
||||
update_values();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
double radius() const { return double(m_radius) / gradient_subpixel_size; }
|
||||
double focus_x() const { return double(m_focus_x) / gradient_subpixel_size; }
|
||||
double focus_y() const { return double(m_focus_y) / gradient_subpixel_size; }
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
int calculate(int x, int y, int d) const
|
||||
{
|
||||
double solution_x;
|
||||
double solution_y;
|
||||
|
||||
// Special case to avoid divide by zero or very near zero
|
||||
//---------------------------------
|
||||
if(x == int(m_focus_x))
|
||||
{
|
||||
solution_x = m_focus_x;
|
||||
solution_y = 0.0;
|
||||
solution_y += (y > m_focus_y) ? m_trivial : -m_trivial;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Slope of the focus-current line
|
||||
//-------------------------------
|
||||
double slope = double(y - m_focus_y) / double(x - m_focus_x);
|
||||
|
||||
// y-intercept of that same line
|
||||
//--------------------------------
|
||||
double yint = double(y) - (slope * x);
|
||||
|
||||
// Use the classical quadratic formula to calculate
|
||||
// the intersection point
|
||||
//--------------------------------
|
||||
double a = (slope * slope) + 1;
|
||||
double b = 2 * slope * yint;
|
||||
double c = yint * yint - m_radius2;
|
||||
double det = sqrt((b * b) - (4.0 * a * c));
|
||||
solution_x = -b;
|
||||
|
||||
// Choose the positive or negative root depending
|
||||
// on where the X coord lies with respect to the focus.
|
||||
solution_x += (x < m_focus_x) ? -det : det;
|
||||
solution_x /= 2.0 * a;
|
||||
|
||||
// Calculating of Y is trivial
|
||||
solution_y = (slope * solution_x) + yint;
|
||||
}
|
||||
|
||||
// Calculate the percentage (0...1) of the current point along the
|
||||
// focus-circumference line and return the normalized (0...d) value
|
||||
//-------------------------------
|
||||
solution_x -= double(m_focus_x);
|
||||
solution_y -= double(m_focus_y);
|
||||
double int_to_focus = solution_x * solution_x + solution_y * solution_y;
|
||||
double cur_to_focus = double(x - m_focus_x) * double(x - m_focus_x) +
|
||||
double(y - m_focus_y) * double(y - m_focus_y);
|
||||
|
||||
return int(sqrt(cur_to_focus / int_to_focus) * d);
|
||||
}
|
||||
|
||||
private:
|
||||
//---------------------------------------------------------------------
|
||||
void update_values()
|
||||
{
|
||||
// For use in the quadractic equation
|
||||
//-------------------------------
|
||||
m_radius2 = double(m_radius) * double(m_radius);
|
||||
|
||||
double dist = sqrt(double(m_focus_x) * double(m_focus_x) +
|
||||
double(m_focus_y) * double(m_focus_y));
|
||||
|
||||
// Test if distance from focus to center is greater than the radius
|
||||
// For the sake of assurance factor restrict the point to be
|
||||
// no further than 99% of the radius.
|
||||
//-------------------------------
|
||||
double r = m_radius * 0.99;
|
||||
if(dist > r)
|
||||
{
|
||||
// clamp focus to radius
|
||||
// x = r cos theta, y = r sin theta
|
||||
//------------------------
|
||||
double a = atan2(double(m_focus_y), double(m_focus_x));
|
||||
m_focus_x = int(r * cos(a));
|
||||
m_focus_y = int(r * sin(a));
|
||||
}
|
||||
|
||||
// Calculate the solution to be used in the case where x == focus_x
|
||||
//------------------------------
|
||||
m_trivial = sqrt(m_radius2 - (m_focus_x * m_focus_x));
|
||||
}
|
||||
|
||||
int m_radius;
|
||||
int m_focus_x;
|
||||
int m_focus_y;
|
||||
double m_radius2;
|
||||
double m_trivial;
|
||||
};
|
||||
|
||||
|
||||
|
||||
//==============================================================gradient_x
|
||||
class gradient_x
|
||||
{
|
||||
public:
|
||||
@@ -170,7 +325,7 @@ namespace agg
|
||||
};
|
||||
|
||||
|
||||
//--------------------------------------------------------------gradient_y
|
||||
//==============================================================gradient_y
|
||||
class gradient_y
|
||||
{
|
||||
public:
|
||||
@@ -178,7 +333,7 @@ namespace agg
|
||||
};
|
||||
|
||||
|
||||
//--------------------------------------------------------gradient_diamond
|
||||
//========================================================gradient_diamond
|
||||
class gradient_diamond
|
||||
{
|
||||
public:
|
||||
@@ -191,7 +346,7 @@ namespace agg
|
||||
};
|
||||
|
||||
|
||||
//-------------------------------------------------------------gradient_xy
|
||||
//=============================================================gradient_xy
|
||||
class gradient_xy
|
||||
{
|
||||
public:
|
||||
@@ -202,7 +357,7 @@ namespace agg
|
||||
};
|
||||
|
||||
|
||||
//--------------------------------------------------------gradient_sqrt_xy
|
||||
//========================================================gradient_sqrt_xy
|
||||
class gradient_sqrt_xy
|
||||
{
|
||||
public:
|
||||
@@ -213,7 +368,7 @@ namespace agg
|
||||
};
|
||||
|
||||
|
||||
//----------------------------------------------------------gradient_conic
|
||||
//==========================================================gradient_conic
|
||||
class gradient_conic
|
||||
{
|
||||
public:
|
||||
@@ -224,6 +379,44 @@ namespace agg
|
||||
};
|
||||
|
||||
|
||||
//=================================================gradient_repeat_adaptor
|
||||
template<class GradientF> class gradient_repeat_adaptor
|
||||
{
|
||||
public:
|
||||
gradient_repeat_adaptor(const GradientF& gradient) :
|
||||
m_gradient(&gradient) {}
|
||||
|
||||
int calculate(int x, int y, int d) const
|
||||
{
|
||||
int ret = m_gradient->calculate(x, y, d) % d;
|
||||
if(ret < 0) ret += d;
|
||||
return ret;
|
||||
}
|
||||
|
||||
private:
|
||||
const GradientF* m_gradient;
|
||||
};
|
||||
|
||||
|
||||
//================================================gradient_reflect_adaptor
|
||||
template<class GradientF> class gradient_reflect_adaptor
|
||||
{
|
||||
public:
|
||||
gradient_reflect_adaptor(const GradientF& gradient) :
|
||||
m_gradient(&gradient) {}
|
||||
|
||||
int calculate(int x, int y, int d) const
|
||||
{
|
||||
int d2 = d << 1;
|
||||
int ret = m_gradient->calculate(x, y, d) % d2;
|
||||
if(ret < 0) ret += d2;
|
||||
if(ret >= d) ret = d2 - ret;
|
||||
return ret;
|
||||
}
|
||||
|
||||
private:
|
||||
const GradientF* m_gradient;
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user