sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use mapnik-geometry

Browse source
This commit is contained in:
artemp 2015-03-09 16:59:00 +01:00
parent f919bd2c41
commit a958f5bda2
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/cairo/process_polygon_pattern_symbolizer.cpp
View file

@ -29,10 +29,12 @@
#include <mapnik/cairo/cairo_render_vector.hpp> #include <mapnik/cairo/cairo_render_vector.hpp>
#include <mapnik/renderer_common/render_pattern.hpp> #include <mapnik/renderer_common/render_pattern.hpp>
#include <mapnik/vertex_converters.hpp> #include <mapnik/vertex_converters.hpp>
#include <mapnik/vertex_processor.hpp>
#include <mapnik/marker.hpp> #include <mapnik/marker.hpp>
#include <mapnik/marker_cache.hpp> #include <mapnik/marker_cache.hpp>
#include <mapnik/agg_rasterizer.hpp> #include <mapnik/agg_rasterizer.hpp>
#include <mapnik/renderer_common/clipping_extent.hpp> #include <mapnik/renderer_common/clipping_extent.hpp>
#include <mapnik/renderer_common/apply_vertex_converter.hpp>
namespace mapnik namespace mapnik
{ {
@ -44,10 +46,10 @@ struct cairo_renderer_process_visitor_p
unsigned offset_x, unsigned offset_x,
unsigned offset_y, unsigned offset_y,
float opacity) float opacity)
: context_(context), : context_(context),
image_tr_(image_tr), image_tr_(image_tr),
offset_x_(offset_x), offset_x_(offset_x),
offset_y_(offset_y), offset_y_(offset_y),
opacity_(opacity) {} opacity_(opacity) {}
void operator() (marker_null const&) {} void operator() (marker_null const&) {}
@ -132,27 +134,24 @@ void cairo_renderer<T>::process(polygon_pattern_symbolizer const& sym,
agg::trans_affine tr; agg::trans_affine tr;
auto geom_transform = get_optional<transform_type>(sym, keys::geometry_transform); auto geom_transform = get_optional<transform_type>(sym, keys::geometry_transform);
if (geom_transform) { evaluate_transform(tr, feature, common_.vars_, *geom_transform, common_.scale_factor_); } if (geom_transform) { evaluate_transform(tr, feature, common_.vars_, *geom_transform, common_.scale_factor_); }
using vertex_converter_type = vertex_converter<cairo_context,
clip_poly_tag,
transform_tag,
affine_transform_tag,
simplify_tag,
smooth_tag>;
vertex_converter<cairo_context,clip_poly_tag,transform_tag,affine_transform_tag,simplify_tag,smooth_tag> vertex_converter_type converter(clip_box, context_,sym,common_.t_,prj_trans,tr,feature,common_.vars_,common_.scale_factor_);
converter(clip_box, context_,sym,common_.t_,prj_trans,tr,feature,common_.vars_,common_.scale_factor_);
if (prj_trans.equal() && clip) converter.set<clip_poly_tag>(); //optional clip (default: true) if (prj_trans.equal() && clip) converter.set<clip_poly_tag>(); //optional clip (default: true)
converter.set<transform_tag>(); //always transform converter.set<transform_tag>(); //always transform
converter.set<affine_transform_tag>(); converter.set<affine_transform_tag>();
if (simplify_tolerance > 0.0) converter.set<simplify_tag>(); // optional simplify converter if (simplify_tolerance > 0.0) converter.set<simplify_tag>(); // optional simplify converter
if (smooth > 0.0) converter.set<smooth_tag>(); // optional smooth converter if (smooth > 0.0) converter.set<smooth_tag>(); // optional smooth converter
// FIXME using apply_vertex_converter_type = detail::apply_vertex_converter<vertex_converter_type>;
#if 0 using vertex_processor_type = new_geometry::vertex_processor<apply_vertex_converter_type>;
for ( geometry_type const& geom : feature.paths()) apply_vertex_converter_type apply(converter);
{ mapnik::util::apply_visitor(vertex_processor_type(apply),feature.get_geometry());
if (geom.size() > 2)
{
vertex_adapter va(geom);
converter.apply(va);
}
}
#endif
// fill polygon // fill polygon
context_.set_fill_rule(CAIRO_FILL_RULE_EVEN_ODD); context_.set_fill_rule(CAIRO_FILL_RULE_EVEN_ODD);
context_.fill(); context_.fill();