don't set labels directly to visible when coming into screen

- this caused big label-clouds in tilted views
tangrams · Aug 9, 2016 · ba8d269 · ba8d269
1 parent 1de1837
commit ba8d269
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/core/src/labels/label.cpp b/core/src/labels/label.cpp
@@ -254,13 +254,7 @@ bool Label::update(const glm::mat4& _mvp, const glm::vec2& _screenSize, float _z
             return false;
         }
     } else if (m_state == State::out_of_screen) {
-        if (m_occludedLastFrame) {
-            enterState(State::sleep, 0.0);
-        } else {
-            // Non-occluded out-of-screen label came into
-            // screen again. Skip fade-in transition.
-            enterState(State::visible, 1.0);
-        }
+        enterState(State::sleep, 0.0);
     }
 
     return true;

diff --git a/tests/unit/labelTests.cpp b/tests/unit/labelTests.cpp
@@ -102,7 +102,7 @@ TEST_CASE( "Ensure the out of screen state transition", "[Core][Label]" ) {
     l.evalState(0);
     REQUIRE(l.state() != Label::State::none);
 
-    REQUIRE(l.state() == Label::State::visible);
+    REQUIRE(l.state() == Label::State::fading_in);
     REQUIRE(l.canOcclude());
 }