Commit 7d8a639a authored by Eddie Kohler's avatar Eddie Kohler

rename is_default() to null()

parent ae1debb9
...@@ -12,7 +12,7 @@ class Transform { public: ...@@ -12,7 +12,7 @@ class Transform { public:
// ~Transform() generated by compiler // ~Transform() generated by compiler
double value(int i) const { assert(i>=0&&i<6); return _m[i]; } double value(int i) const { assert(i>=0&&i<6); return _m[i]; }
bool is_default() const { return _default; } bool null() const { return _null; }
void add_scale(double, double); void add_scale(double, double);
void add_scale(const Point &p) { add_scale(p.x, p.y); } void add_scale(const Point &p) { add_scale(p.x, p.y); }
...@@ -41,7 +41,7 @@ class Transform { public: ...@@ -41,7 +41,7 @@ class Transform { public:
private: private:
double _m[6]; double _m[6];
bool _default; bool _null;
}; };
......
...@@ -8,7 +8,7 @@ Transform::Transform() ...@@ -8,7 +8,7 @@ Transform::Transform()
{ {
_m[0] = _m[4] = 1; _m[0] = _m[4] = 1;
_m[1] = _m[2] = _m[3] = _m[5] = 0; _m[1] = _m[2] = _m[3] = _m[5] = 0;
_default = true; _null = true;
} }
Transform::Transform(double m0, double m1, double m2, Transform::Transform(double m0, double m1, double m2,
...@@ -20,7 +20,7 @@ Transform::Transform(double m0, double m1, double m2, ...@@ -20,7 +20,7 @@ Transform::Transform(double m0, double m1, double m2,
_m[3] = m3; _m[3] = m3;
_m[4] = m4; _m[4] = m4;
_m[5] = m5; _m[5] = m5;
_default = (m2 == 0 && m0 == 1 && m1 == 0 && m3 == 0 && m4 == 1 && m5 == 0); _null = (m2 == 0 && m0 == 1 && m1 == 0 && m3 == 0 && m4 == 1 && m5 == 0);
} }
...@@ -33,7 +33,7 @@ Transform::add_scale(double x, double y) ...@@ -33,7 +33,7 @@ Transform::add_scale(double x, double y)
_m[4] *= y; _m[4] *= y;
if (x != 1 || y != 1) if (x != 1 || y != 1)
_default = false; _null = false;
} }
void void
...@@ -51,7 +51,7 @@ Transform::add_rotate(double r) ...@@ -51,7 +51,7 @@ Transform::add_rotate(double r)
_m[4] = b*c - a*s; _m[4] = b*c - a*s;
if (r != 0) if (r != 0)
_default = false; _null = false;
} }
void void
...@@ -61,7 +61,7 @@ Transform::add_translate(double x, double y) ...@@ -61,7 +61,7 @@ Transform::add_translate(double x, double y)
_m[5] += _m[3]*x + _m[4]*y; _m[5] += _m[3]*x + _m[4]*y;
if (x != 0 || y != 0) if (x != 0 || y != 0)
_default = false; _null = false;
} }
Transform Transform
...@@ -79,7 +79,7 @@ Transform::transform(const Transform &t) const ...@@ -79,7 +79,7 @@ Transform::transform(const Transform &t) const
Point & Point &
operator*=(Point &p, const Transform &t) operator*=(Point &p, const Transform &t)
{ {
if (!t.is_default()) { if (!t.null()) {
double x = p.x; double x = p.x;
p.x = x*t._m[0] + p.y*t._m[1] + t._m[2]; p.x = x*t._m[0] + p.y*t._m[1] + t._m[2];
p.y = x*t._m[3] + p.y*t._m[4] + t._m[5]; p.y = x*t._m[3] + p.y*t._m[4] + t._m[5];
...@@ -90,7 +90,7 @@ operator*=(Point &p, const Transform &t) ...@@ -90,7 +90,7 @@ operator*=(Point &p, const Transform &t)
Point Point
operator*(const Point &p, const Transform &t) operator*(const Point &p, const Transform &t)
{ {
return (t.is_default() return (t.null()
? p ? p
: Point(p.x*t._m[0] + p.y*t._m[1] + t._m[2], : Point(p.x*t._m[0] + p.y*t._m[1] + t._m[2],
p.x*t._m[3] + p.y*t._m[4] + t._m[5])); p.x*t._m[3] + p.y*t._m[4] + t._m[5]));
...@@ -99,7 +99,7 @@ operator*(const Point &p, const Transform &t) ...@@ -99,7 +99,7 @@ operator*(const Point &p, const Transform &t)
Bezier & Bezier &
operator*=(Bezier &b, const Transform &t) operator*=(Bezier &b, const Transform &t)
{ {
if (!t.is_default()) { if (!t.null()) {
b.mpoint(0) *= t; b.mpoint(0) *= t;
b.mpoint(1) *= t; b.mpoint(1) *= t;
b.mpoint(2) *= t; b.mpoint(2) *= t;
...@@ -111,7 +111,7 @@ operator*=(Bezier &b, const Transform &t) ...@@ -111,7 +111,7 @@ operator*=(Bezier &b, const Transform &t)
Bezier Bezier
operator*(const Bezier &b, const Transform &t) operator*(const Bezier &b, const Transform &t)
{ {
return (t.is_default() return (t.null()
? b ? b
: Bezier(b.point(0) * t, b.point(1) * t, b.point(2) * t, b.point(3) * t)); : Bezier(b.point(0) * t, b.point(1) * t, b.point(2) * t, b.point(3) * t));
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment