- /*Debug("Top: %f, %f", m_top.first, m_top.second);
- Debug("Bottom: %f, %f", m_bottom.first, m_bottom.second);
- Debug("Left: %f, %f", m_left.first, m_left.second);
- Debug("Right: %f, %f", m_right.first, m_right.second);
- Debug("Left - Right: %f, %f", m_right.first - m_left.first, m_right.second - m_left.second);
- Debug("Top - Bottom: %f, %f", m_top.first - m_bottom.first, m_top.second - m_bottom.second);
- */
+
+ Vec2 pt = (m_top + m_bottom)/2;
+ if (PointInside(objects, pt))
+ m_fill_points.push_back(pt);
+ pt = (m_left + m_right)/2;
+ if (PointInside(objects, pt))
+ m_fill_points.push_back(pt);
+ pt = (m_left + m_right + m_top + m_bottom)/4;
+ if (PointInside(objects, pt))
+ m_fill_points.push_back(pt);
+
+}
+
+
+bool Path::PointInside(const Objects & objects, const Vec2 & pt, bool debug) const
+{
+ vector<Vec2> x_ints;
+ vector<Vec2> y_ints;
+ for (unsigned i = m_start; i <= m_end; ++i)
+ {
+ Bezier bez(objects.beziers[objects.data_indices[i]].ToAbsolute(objects.bounds[i]));
+ vector<Vec2> xi(bez.SolveX(pt.x));
+ vector<Vec2> yi(bez.SolveY(pt.y));
+ x_ints.insert(x_ints.end(), xi.begin(), xi.end());
+ y_ints.insert(y_ints.end(), yi.begin(), yi.end());
+ }
+ //Debug("Solved for intersections");
+ unsigned bigger = 0;
+ unsigned smaller = 0;
+ for (unsigned i = 0; i < x_ints.size(); ++i)
+ {
+ if (debug)
+ Debug("X Intersection %u at %f,%f vs %f,%f", i,x_ints[i].x, x_ints[i].y, pt.x, pt.y);
+ if (x_ints[i].y >= pt.y)
+ {
+
+ ++bigger;
+ }
+ }
+ smaller = x_ints.size() - bigger;
+ if (debug)
+ {
+ Debug("%u horizontal, %u bigger, %u smaller", x_ints.size(), bigger, smaller);
+ }
+ if (smaller % 2 == 0 || bigger % 2 == 0)
+ return false;
+
+ bigger = 0;
+ smaller = 0;
+
+ for (unsigned i = 0; i < y_ints.size(); ++i)
+ {
+ if (debug)
+ Debug("Y Intersection %u at %f,%f vs %f,%f", i,x_ints[i].x, x_ints[i].y, pt.x, pt.y);
+ if (y_ints[i].x >= pt.x)
+ {
+
+ ++bigger;
+ }
+ }
+ smaller = y_ints.size() - bigger;
+ if (debug)
+ {
+ Debug("%u vertical, %u bigger, %u smaller", y_ints.size(), bigger, smaller);
+ }
+ if (smaller % 2 == 0 || bigger % 2 == 0)
+ return false;
+
+
+ return true;