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

Improve angle calculation.

Browse source
This commit is contained in:
Hermann Kraus 2012-08-05 00:14:29 +02:00
parent 53fa3ff1e1
commit f20e90a524
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
include/mapnik/vertex_cache.hpp
View file

@ -68,7 +68,7 @@ public:
pixel_position const& current_position() const { return current_position_; } pixel_position const& current_position() const { return current_position_; }
double angle() const; double angle(double width);
bool next_subpath(); bool next_subpath();
bool next_segment(); bool next_segment();
@ -154,15 +154,28 @@ vertex_cache::vertex_cache(T &path)
} }
} }
double vertex_cache::angle() const double vertex_cache::angle(double width)
{ {
//Only calculate angle on request as it is expensive if (width + position_in_segment_ < current_segment_->length)
if (!angle_valid_)
{ {
angle_ = atan2(current_segment_->pos.y - segment_starting_point_.y, //Only calculate angle on request as it is expensive
current_segment_->pos.x - segment_starting_point_.x); if (!angle_valid_)
{
angle_ = atan2(current_segment_->pos.y - segment_starting_point_.y,
current_segment_->pos.x - segment_starting_point_.x);
}
return angle_;
} else
{
pixel_position old_pos = current_position_;
state s = save_state();
forward(width);
double angle = atan2(current_position_.y - old_pos.y,
current_position_.x - old_pos.x);
restore_state(s);
current_position_ = old_pos;
return angle;
} }
return angle_;
} }
bool vertex_cache::next_subpath() bool vertex_cache::next_subpath()

2
src/text/placement_finder_ng.cpp
View file

@ -334,7 +334,7 @@ bool placement_finder_ng::single_line_placement(vertex_cache &pp, signed orienta
text_line::const_iterator glyph_itr = (*line_itr)->begin(), glyph_end = (*line_itr)->end(); text_line::const_iterator glyph_itr = (*line_itr)->begin(), glyph_end = (*line_itr)->end();
for (; glyph_itr != glyph_end; glyph_itr++) for (; glyph_itr != glyph_end; glyph_itr++)
{ {
double angle = pp.angle(); double angle = pp.angle(glyph_itr->width);
std::cout << "angle:" << angle / (2 * M_PI) * 360 << "\n"; std::cout << "angle:" << angle / (2 * M_PI) * 360 << "\n";
double sina = sin(angle); double sina = sin(angle);
double cosa = cos(angle); double cosa = cos(angle);