+ remove "fast" rasterizer as it produces suboptimal results
This commit is contained in:
Artem Pavlenko
parent
1bf6510aeb
commit
449a40685a
1 changed files with 51 additions and 89 deletions
|
|
@ -63,102 +63,64 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
|
||||||
|
|
||||||
agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
|
agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
|
||||||
|
|
||||||
box2d<double> ext = query_extent_ * 1.0;
|
ras_ptr->reset();
|
||||||
|
set_gamma_method(stroke_, ras_ptr);
|
||||||
|
//metawriter_with_properties writer = sym.get_metawriter();
|
||||||
|
typedef boost::mpl::vector<clip_line_tag,transform_tag, offset_transform_tag, affine_transform_tag, smooth_tag, dash_tag, stroke_tag> conv_types;
|
||||||
|
vertex_converter<box2d<double>,rasterizer,line_symbolizer, proj_transform, CoordTransform,conv_types>
|
||||||
|
converter(query_extent_,*ras_ptr,sym,t_,prj_trans,scale_factor_);
|
||||||
|
|
||||||
if (sym.get_rasterizer() == RASTERIZER_FAST)
|
if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
|
||||||
|
converter.set<transform_tag>(); // always transform
|
||||||
|
|
||||||
|
if (fabs(sym.offset()) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
|
||||||
|
converter.set<affine_transform_tag>(); // optional affine transform
|
||||||
|
if (sym.smooth() > 0.0) converter.set<smooth_tag>(); // optional smooth converter
|
||||||
|
if (stroke_.has_dash()) converter.set<dash_tag>();
|
||||||
|
converter.set<stroke_tag>(); //always stroke
|
||||||
|
|
||||||
|
BOOST_FOREACH( geometry_type & geom, feature->paths())
|
||||||
{
|
{
|
||||||
/*
|
if (geom.num_points() > 1)
|
||||||
typedef agg::renderer_base<aa_renderer::pixel_format_type> ren_base;
|
|
||||||
typedef agg::renderer_outline_aa<ren_base> renderer_type;
|
|
||||||
typedef agg::rasterizer_outline_aa<renderer_type> rasterizer_type;
|
|
||||||
|
|
||||||
//typedef agg::conv_clip_polyline<geometry_type> clipped_geometry_type;
|
|
||||||
//typedef coord_transform2<CoordTransform,clipped_geometry_type> path_type;
|
|
||||||
|
|
||||||
agg::line_profile_aa profile;
|
|
||||||
profile.width(stroke_.get_width() * scale_factor_);
|
|
||||||
ren_base base_ren(pixf);
|
|
||||||
renderer_type ren(base_ren, profile);
|
|
||||||
ren.color(agg::rgba8(r, g, b, int(a*stroke_.get_opacity())));
|
|
||||||
//ren.clip_box(0,0,width_,height_);
|
|
||||||
rasterizer_type ras(ren);
|
|
||||||
ras.line_join(agg::outline_miter_accurate_join);
|
|
||||||
ras.round_cap(true);
|
|
||||||
|
|
||||||
for (unsigned i=0;i<feature->num_geometries();++i)
|
|
||||||
{
|
{
|
||||||
geometry_type & geom = feature->get_geometry(i);
|
converter.apply(geom);
|
||||||
if (geom.num_points() > 1)
|
|
||||||
{
|
|
||||||
clipped_geometry_type clipped(geom);
|
|
||||||
clipped.clip_box(ext.minx(),ext.miny(),ext.maxx(),ext.maxy());
|
|
||||||
path_type path(t_,clipped,prj_trans);
|
|
||||||
ras.add_path(path);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
*/
|
}
|
||||||
|
|
||||||
|
agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
|
||||||
|
|
||||||
|
if (sym.comp_op())
|
||||||
|
{
|
||||||
|
typedef agg::rgba8 color_type;
|
||||||
|
typedef agg::order_rgba order_type;
|
||||||
|
typedef agg::pixel32_type pixel_type;
|
||||||
|
typedef agg::comp_op_adaptor_rgba<color_type, order_type> blender_type; // comp blender
|
||||||
|
typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
|
||||||
|
typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
|
||||||
|
typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
|
||||||
|
pixfmt_comp_type pixf(buf);
|
||||||
|
pixf.comp_op(static_cast<agg::comp_op_e>(*sym.comp_op()));
|
||||||
|
renderer_base renb(pixf);
|
||||||
|
renderer_type ren(renb);
|
||||||
|
ren.color(agg::rgba8(r, g, b, int(a * stroke_.get_opacity())));
|
||||||
|
agg::scanline_u8 sl;
|
||||||
|
agg::render_scanlines(*ras_ptr, sl, ren);
|
||||||
|
}
|
||||||
|
else if (style_level_compositing_)
|
||||||
|
{
|
||||||
|
agg::pixfmt_rgba32_plain pixf(buf);
|
||||||
|
renderer_scanline_solid<agg::pixfmt_rgba32_plain> ren;
|
||||||
|
ren.attach(pixf);
|
||||||
|
ren.color(agg::rgba8(r, g, b, int(a * stroke_.get_opacity())));
|
||||||
|
ren.render(*ras_ptr);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ras_ptr->reset();
|
agg::pixfmt_rgba32 pixf(buf);
|
||||||
set_gamma_method(stroke_, ras_ptr);
|
renderer_scanline_solid<agg::pixfmt_rgba32> ren;
|
||||||
//metawriter_with_properties writer = sym.get_metawriter();
|
ren.attach(pixf);
|
||||||
typedef boost::mpl::vector<clip_line_tag,transform_tag, offset_transform_tag, affine_transform_tag, smooth_tag, dash_tag, stroke_tag> conv_types;
|
ren.color(agg::rgba8(r, g, b, int(a * stroke_.get_opacity())));
|
||||||
vertex_converter<box2d<double>,rasterizer,line_symbolizer, proj_transform, CoordTransform,conv_types>
|
ren.render(*ras_ptr);
|
||||||
converter(ext,*ras_ptr,sym,t_,prj_trans,scale_factor_);
|
|
||||||
|
|
||||||
if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
|
|
||||||
converter.set<transform_tag>(); // always transform
|
|
||||||
|
|
||||||
if (fabs(sym.offset()) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
|
|
||||||
converter.set<affine_transform_tag>(); // optional affine transform
|
|
||||||
if (sym.smooth() > 0.0) converter.set<smooth_tag>(); // optional smooth converter
|
|
||||||
if (stroke_.has_dash()) converter.set<dash_tag>();
|
|
||||||
converter.set<stroke_tag>(); //always stroke
|
|
||||||
|
|
||||||
BOOST_FOREACH( geometry_type & geom, feature->paths())
|
|
||||||
{
|
|
||||||
if (geom.num_points() > 1)
|
|
||||||
{
|
|
||||||
converter.apply(geom);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
|
|
||||||
|
|
||||||
if (sym.comp_op())
|
|
||||||
{
|
|
||||||
typedef agg::rgba8 color_type;
|
|
||||||
typedef agg::order_rgba order_type;
|
|
||||||
typedef agg::pixel32_type pixel_type;
|
|
||||||
typedef agg::comp_op_adaptor_rgba<color_type, order_type> blender_type; // comp blender
|
|
||||||
typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
|
|
||||||
typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
|
|
||||||
typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
|
|
||||||
pixfmt_comp_type pixf(buf);
|
|
||||||
pixf.comp_op(static_cast<agg::comp_op_e>(*sym.comp_op()));
|
|
||||||
renderer_base renb(pixf);
|
|
||||||
renderer_type ren(renb);
|
|
||||||
ren.color(agg::rgba8(r, g, b, int(a * stroke_.get_opacity())));
|
|
||||||
agg::scanline_u8 sl;
|
|
||||||
agg::render_scanlines(*ras_ptr, sl, ren);
|
|
||||||
}
|
|
||||||
else if (style_level_compositing_)
|
|
||||||
{
|
|
||||||
agg::pixfmt_rgba32_plain pixf(buf);
|
|
||||||
renderer_scanline_solid<agg::pixfmt_rgba32_plain> ren;
|
|
||||||
ren.attach(pixf);
|
|
||||||
ren.color(agg::rgba8(r, g, b, int(a * stroke_.get_opacity())));
|
|
||||||
ren.render(*ras_ptr);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
agg::pixfmt_rgba32 pixf(buf);
|
|
||||||
renderer_scanline_solid<agg::pixfmt_rgba32> ren;
|
|
||||||
ren.attach(pixf);
|
|
||||||
ren.color(agg::rgba8(r, g, b, int(a * stroke_.get_opacity())));
|
|
||||||
ren.render(*ras_ptr);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue