xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix displaced caption labels

Browse Source 
- use 'dy' in label bounding box
This commit is contained in:
Hannes Janetzek 2013-08-04 14:37:45 +02:00
parent 80624a5d06
commit 049751f05f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vtm/src/org/oscim/renderer/layers/TextRenderLayer.java
View File

@ -516,7 +516,8 @@ public class TextRenderLayer extends BasicRenderLayer {
l.bbox.setNormalized(l.x, l.y, cos, -sin, l.bbox.setNormalized(l.x, l.y, cos, -sin,
l.width + MIN_CAPTION_DIST, l.width + MIN_CAPTION_DIST,
l.text.fontHeight + MIN_CAPTION_DIST); l.text.fontHeight + MIN_CAPTION_DIST,
l.text.dy);
boolean overlaps = false; boolean overlaps = false;

7
vtm/src/org/oscim/utils/OBB2D.java
View File

@ -134,13 +134,18 @@ public class OBB2D {
computeAxes(); computeAxes();
} }
public void setNormalized(float cx, float cy, float vx, float vy, float width, float height) { public void setNormalized(float cx, float cy, float vx, float vy, float width, float height, float dy) {
float ux = -vy; float ux = -vy;
float uy = vx; float uy = vx;
float hw = width / 2; float hw = width / 2;
float hh = height / 2; float hh = height / 2;
if (dy != 0){
cx += vx * dy + vy * dy;
cy += -vy * dy + vx * dy;
}
vx *= hw; vx *= hw;
vy *= hw; vy *= hw;