FadeTilesRenderer: Fix fade events not firing correctly (#495)

* Fix fade events not firing correctly * Comments
NASA-AMMOS · Mar 1, 2024 · 70c3268 · 70c3268
1 parent 70f981d
commit 70c3268
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/example/fadingTiles.js b/example/fadingTiles.js
@@ -141,6 +141,6 @@ function render() {
 
 	renderer.render( scene, camera );
 
-	params.fadingGroundTiles = groundTiles._fadeGroup.children.length + ' tiles';
+	params.fadingGroundTiles = groundTiles.fadingTiles + ' tiles';
 
 }
diff --git a/example/src/FadeManager.js b/example/src/FadeManager.js
@@ -345,7 +345,13 @@ export class FadeManager {
 
 			} );
 
-			if ( fadeOut === 1.0 || fadeOut >= fadeIn ) {
+			// Check if the fade in and fade out animations are complete
+			const fadeOutComplete = fadeOut === 1 || fadeOut === 0;
+			const fadeInComplete = fadeIn === 1 || fadeIn === 0;
+
+			// If they are or the fade out animation is further along than the
+			// fade in animation then mark the fade as completed for this tile
+			if ( ( fadeOutComplete && fadeInComplete ) || fadeOut >= fadeIn ) {
 
 				this.completeFade( object );
 

diff --git a/example/src/FadeTilesRenderer.js b/example/src/FadeTilesRenderer.js
@@ -104,6 +104,12 @@ export const FadeTilesRendererMixin = base => class extends base {
 
 	}
 
+	get fadingTiles() {
+
+		return this._fadeManager.fadeCount;
+
+	}
+
 	constructor( ...args ) {
 
 		super( ...args );