Skip to content
This repository has been archived by the owner on Mar 8, 2023. It is now read-only.

Commit

Permalink
HARP-11899: Cull only labels that are completely off screen
Browse files Browse the repository at this point in the history
Signed-off-by: stefan.dachwitz <stefan.dachwitz@here.com>
  • Loading branch information
StefanDachwitz committed Oct 28, 2020
1 parent 45901ba commit 6e15d55
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
10 changes: 7 additions & 3 deletions @here/harp-mapview/lib/text/RenderState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,17 @@ export class RenderState {

/**
* Updates the state to [[FadingState.FadingOut]].
* If previous state is [[FadingState.FadingOut]] or [[FadingState.FadedOut]] it remains
* unchanged.
* If previous state is [[FadingState.FadingOut]], [[FadingState.FadedOut]] or
* [[FadingState.Undefined]] it remains unchanged.
*
* @param time - Current time.
*/
startFadeOut(time: number) {
if (this.m_state === FadingState.FadingOut || this.m_state === FadingState.FadedOut) {
if (
this.m_state === FadingState.FadingOut ||
this.m_state === FadingState.FadedOut ||
this.m_state === FadingState.Undefined
) {
return;
}

Expand Down
8 changes: 6 additions & 2 deletions @here/harp-mapview/test/RenderStateTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,15 @@ describe("RenderState", function() {
const renderState = new RenderState();
renderState.startFadeOut(100);

expect(renderState.isFadingOut()).to.be.true;
expect(renderState.startTime).to.equal(100);
expect(renderState.isFadingOut()).to.be.false;
expect(renderState.startTime).to.equal(0);
expect(renderState.value).to.equal(0.0);
expect(renderState.opacity).to.equal(1.0);
});

it("does not change an already fading out state", function() {
const renderState = new RenderState();
renderState.startFadeIn(100, true);
renderState.startFadeOut(100);
renderState.startFadeOut(200);

Expand Down Expand Up @@ -377,6 +378,7 @@ describe("RenderState", function() {

it("updates fading out states", function() {
const renderState = new RenderState();
renderState.startFadeIn(100, false);
renderState.startFadeOut(100);
renderState.updateFading(200, false);

Expand All @@ -388,6 +390,7 @@ describe("RenderState", function() {

it("switches to faded out after fading time passed", function() {
const renderState = new RenderState();
renderState.startFadeIn(100, false);
renderState.startFadeOut(100);
renderState.updateFading(100 + DEFAULT_FADE_TIME, false);

Expand All @@ -399,6 +402,7 @@ describe("RenderState", function() {

it("skips fading out when fading is disabled", function() {
const renderState = new RenderState();
renderState.startFadeIn(100, false);
renderState.startFadeOut(100);
renderState.updateFading(200, true);

Expand Down

0 comments on commit 6e15d55

Please sign in to comment.