Use a buffer applied to the bounding box based on the font size

matteblair · Dec 14, 2015 · e4a5442 · e4a5442
1 parent aebe3c4
commit e4a5442
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/core/resources/scene.yaml b/core/resources/scene.yaml
@@ -97,7 +97,6 @@ layers:
             polygons:
                 order: 0
                 color: '#f0ebeb'
-
     landuse:
         data: { source: osm }
         filter:

diff --git a/core/resources/shaders/sdf.fs b/core/resources/shaders/sdf.fs
@@ -84,6 +84,7 @@ void main(void) {
     #pragma tangram: filter
 
     gl_FragColor = color;
-    gl_FragColor += vec4(0.0, 0.0, 1.0, 0.5);
+    gl_FragColor.r *= 0.5;
+    gl_FragColor.a = 0.5;
 }
 
diff --git a/core/src/labels/label.cpp b/core/src/labels/label.cpp
@@ -226,7 +226,6 @@ void Label::resetState() {
     m_updateMeshVisibility = true;
     m_dirty = true;
     m_proxy = false;
-    m_skipTransitions = false;
     enterState(State::wait_occ, 0.0);
 }
 

diff --git a/core/src/labels/label.h b/core/src/labels/label.h
@@ -81,6 +81,7 @@ class Label {
         Transition selectTransition;
         Transition hideTransition;
         Transition showTransition;
+        float buffer = 0.f;
 
         // the label hash based on its styling parameters
         size_t paramHash;
@@ -159,8 +160,6 @@ class Label {
     bool m_occlusionSolved;
     // whether or not we need to update the mesh visibilit (alpha channel)
     bool m_updateMeshVisibility;
-    // label options
-    Options m_options;
     // whether this label should skip transitions to move to first visible state
     bool m_skipTransitions;
 
@@ -185,6 +184,8 @@ class Label {
     LabelMesh& m_mesh;
     // first vertex and count in m_mesh vertices
     Range m_vertexRange;
+    // label options
+    Options m_options;
 };
 
 }
@@ -209,4 +210,3 @@ namespace std {
         }
     };
 }
-
diff --git a/core/src/labels/textLabel.cpp b/core/src/labels/textLabel.cpp
@@ -47,7 +47,7 @@ void TextLabel::updateBBoxes(float _zoomFract) {
     obbCenter += m_perpAxis * m_quadLocalOrigin.y + m_perpAxis * m_dim.y;
     obbCenter += t * m_quadLocalOrigin.x;
 
-    m_obb = OBB(obbCenter.x, obbCenter.y, m_transform.state.rotation, m_dim.x, m_dim.y);
+    m_obb = OBB(obbCenter.x, obbCenter.y, m_transform.state.rotation, m_dim.x + m_options.buffer, m_dim.y + m_options.buffer);
     m_aabb = m_obb.getExtent();
 }
 
@@ -57,8 +57,9 @@ void TextLabel::align(glm::vec2& _screenPosition, const glm::vec2& _ap1, const g
         case Type::debug:
         case Type::point:
             // modify position set by updateScreenTransform()
-            _screenPosition.x -= m_dim.x * 0.5f;
+            _screenPosition.x -= m_dim.x * 0.5f + m_quadLocalOrigin.x;
             _screenPosition.y -= m_metrics.descender;
+
             if (m_nLines > 1) {
                 _screenPosition.y -= m_dim.y * 0.5f;
                 _screenPosition.y += m_metrics.lineHeight;
@@ -68,11 +69,11 @@ void TextLabel::align(glm::vec2& _screenPosition, const glm::vec2& _ap1, const g
         case Type::line: {
             // anchor at line center
             _screenPosition = (_ap1 + _ap2) * 0.5f;
+
             // move back by half the length (so that text will be drawn centered)
             glm::vec2 direction = glm::normalize(_ap1 - _ap2);
             _screenPosition += direction * m_dim.x * 0.5f;
-
-            _screenPosition += m_perpAxis * (m_dim.y * 0.5f  + m_metrics.descender);
+            _screenPosition += m_perpAxis * (m_dim.y * 0.5f + 2.f * m_metrics.descender);
             break;
         }
     }

diff --git a/core/src/style/textStyle.cpp b/core/src/style/textStyle.cpp
@@ -145,6 +145,9 @@ auto TextStyle::applyRule(const DrawRule& _rule, const Properties& _props) const
     float emSize = p.fontSize / 16.f;
     p.blurSpread = m_sdf ? emSize * 5.0f : 0.0f;
 
+    float boundingBoxBuffer = -p.fontSize / 2.f;
+    p.labelOptions.buffer = boundingBoxBuffer;
+
     std::hash<Parameters> hash;
     p.labelOptions.paramHash = hash(p);
 

diff --git a/core/src/text/textBuffer.cpp b/core/src/text/textBuffer.cpp
@@ -251,7 +251,6 @@ bool TextBuffer::addLabel(const TextStyle::Parameters& _params, Label::Transform
     }
 
     bbox.x -= xMin;
-    LOG("%f %f", quads[0].x0, quads[0].y0);
     glm::vec2 quadsLocalOrigin(xMin, quads[0].y0);
 
     _fontContext.unlock();