rearrange functions

src/base/TilesRendererBase.js

@@ -1,6 +1,8 @@
 import path from 'path';
 import { LRUCache } from '../utilities/LRUCache.js';
 import { PriorityQueue } from '../utilities/PriorityQueue.js';
+import { determineFrustumSet, toggleTiles, skipTraversal, markUsedSetLeaves, traverseSet } from './traverseFunctions.js';
+import { UNLOADED, LOADING, PARSING, LOADED, FAILED } from './constants.js';
 
 // TODO: find out why tiles are left dangling in the hierarchy
 // TODO: Address the issue of too many promises, garbage collection
@@ -9,323 +11,6 @@ import { PriorityQueue } from '../utilities/PriorityQueue.js';
 // TODO: See if declaring function inline improves performance
 // TODO: Make sure active state works as expected
 
-const UNLOADED = 0;
-const LOADING = 1;
-const PARSING = 2;
-const LOADED = 3;
-const FAILED = 4;
-
-function traverseSet( tile, beforeCb = null, afterCb = null, parent = null, depth = 0 ) {
-
-	if ( beforeCb && beforeCb( tile, parent, depth ) ) {
-
-		if ( afterCb ) {
-
-			afterCb( tile, parent, depth );
-
-		}
-
-		return;
-
-	}
-
-	const children = tile.children;
-	for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-		traverseSet( children[ i ], beforeCb, afterCb, tile, depth + 1 );
-
-	}
-
-	if ( afterCb ) {
-
-		afterCb( tile, parent, depth );
-
-	}
-
-}
-
-function isUsedThisFrame( tile, frameCount ) {
-
-	return tile.__lastFrameVisited === frameCount && tile.__used;
-
-}
-
-function resetFrameState( tile, frameCount ) {
-
-	if ( tile.__lastFrameVisited !== frameCount ) {
-
-		tile.__lastFrameVisited = frameCount;
-		tile.__used = false;
-		tile.__inFrustum = false;
-		tile.__isLeaf = false;
-		tile.__visible = false;
-		tile.__active = false;
-		tile.__error = 0;
-
-	}
-
-}
-
-function recursivelyMarkUsed( tile, frameCount, lruCache ) {
-
-	resetFrameState( tile, frameCount );
-
-	tile.__used = true;
-	lruCache.markUsed( tile );
-	if ( tile.__contentEmpty ) {
-
-		const children = tile.children;
-		for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-			recursivelyMarkUsed( children[ i ], frameCount, lruCache );
-
-		}
-
-	}
-
-}
-
-// TODO: include frustum mask here?
-function determineFrustumSet( tile, renderer ) {
-
-	const stats = renderer.stats;
-	const frameCount = renderer.frameCount;
-	const errorTarget = renderer.errorTarget;
-	const maxDepth = renderer.maxDepth;
-	const loadSiblings = renderer.loadSiblings;
-	const lruCache = renderer.lruCache;
-	resetFrameState( tile, frameCount );
-
-	const inFrustum = renderer.tileInView( tile );
-	if ( inFrustum === false ) {
-
-		return false;
-
-	}
-
-	tile.__used = true;
-	lruCache.markUsed( tile );
-
-	tile.__inFrustum = true;
-	stats.inFrustum ++;
-
-	if ( ! tile.__contentEmpty ) {
-
-		const error = renderer.calculateError( tile );
-		tile.__error = error;
-		if ( error <= errorTarget ) {
-
-			return true;
-
-		}
-
-	}
-
-	if ( renderer.maxDepth > 0 && tile.__depth + 1 >= maxDepth ) {
-
-		return true;
-
-	}
-
-	let anyChildrenUsed = false;
-	const children = tile.children;
-	for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-		const c = children[ i ];
-		const r = determineFrustumSet( c, renderer );
-		anyChildrenUsed = anyChildrenUsed || r;
-
-	}
-
-	if ( anyChildrenUsed && loadSiblings ) {
-
-		for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-			recursivelyMarkUsed( tile, frameCount, lruCache );
-
-		}
-
-	}
-
-	return true;
-
-}
-
-function markUsedSetLeaves( tile, renderer ) {
-
-	const stats = renderer.stats;
-	const frameCount = renderer.frameCount;
-	if ( ! isUsedThisFrame( tile, frameCount ) ) {
-
-		return;
-
-	}
-
-	stats.used ++;
-
-	const children = tile.children;
-	let anyChildrenUsed = false;
-	for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-		const c = children[ i ];
-		anyChildrenUsed = anyChildrenUsed || isUsedThisFrame( c, frameCount );
-
-	}
-
-	if ( ! anyChildrenUsed ) {
-
-		tile.__isLeaf = true;
-
-		// TODO: stats
-
-	} else {
-
-		for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-			const c = children[ i ];
-			markUsedSetLeaves( c, renderer );
-
-		}
-
-	}
-
-}
-
-function skipTraversal( tile, renderer ) {
-
-	const stats = renderer.stats;
-	const frameCount = renderer.frameCount;
-	if ( ! isUsedThisFrame( tile, frameCount ) ) {
-
-		return;
-
-	}
-
-	const lruCache = renderer.lruCache;
-	if ( tile.__isLeaf ) {
-
-		if ( tile.__loadingState === LOADED ) {
-
-			if ( tile.__inFrustum ) {
-
-				tile.__visible = true;
-				stats.visible ++;
-
-			}
-			tile.__active = true;
-			stats.active ++;
-
-		} else if ( ! lruCache.isFull() ) {
-
-			renderer.requestTileContents( tile );
-
-		}
-		return;
-
-	}
-
-	const errorRequirement = renderer.errorTarget * renderer.errorThreshold;
-	const meetsSSE = tile.__error < errorRequirement;
-	const hasContent = tile.__loadingState === LOADED && ! tile.__contentEmpty;
-	const children = tile.children;
-	let allChildrenHaveContent = true;
-	for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-		const c = children[ i ];
-		if ( isUsedThisFrame( c, frameCount ) ) {
-
-			const childContent = c.__loadingState === LOADED || tile.__contentEmpty;
-			allChildrenHaveContent = allChildrenHaveContent && childContent;
-
-		}
-
-	}
-
-	if ( meetsSSE && ! hasContent && ! lruCache.isFull() ) {
-
-		renderer.requestTileContents( tile );
-
-	}
-
-	if ( meetsSSE && hasContent && ! allChildrenHaveContent ) {
-
-		if ( tile.__inFrustum ) {
-
-			tile.__visible = true;
-			stats.visible ++;
-
-		}
-		tile.__active = true;
-		stats.active ++;
-
-		for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-			const c = children[ i ];
-			if ( isUsedThisFrame( c, frameCount ) && ! lruCache.isFull() ) {
-
-				renderer.requestTileContents( c );
-
-			}
-
-		}
-		return;
-
-	}
-
-	for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-		const c = children[ i ];
-		if ( isUsedThisFrame( c, frameCount ) ) {
-
-			skipTraversal( c, renderer );
-
-		}
-
-	}
-
-}
-
-function toggleTiles( tile, renderer ) {
-
-	const frameCount = renderer.frameCount;
-	const isUsed = isUsedThisFrame( tile, frameCount );
-	if ( isUsed || tile.__usedLastFrame ) {
-
-		if ( ! isUsed ) {
-
-			if ( ! tile.__contentEmpty && tile.__loadingState === LOADED ) {
-
-				renderer.setTileVisible( tile, false );
-				renderer.setTileActive( tile, false );
-
-			}
-			tile.__usedLastFrame = false;
-
-		} else {
-
-			if ( ! tile.__contentEmpty && tile.__loadingState === LOADED ) {
-
-				// enable visibility if active due to shadows
-				renderer.setTileActive( tile, tile.__active );
-				renderer.setTileVisible( tile, tile.__active || tile.__visible );
-
-			}
-			tile.__usedLastFrame = true;
-
-		}
-
-		const children = tile.children;
-		for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-			const c = children[ i ];
-			toggleTiles( c, renderer );
-
-		}
-
-	}
-
-}
-
 export class TilesRendererBase {
 
 	get root() {

src/base/constants.js

@@ -0,0 +1,5 @@
+export const UNLOADED = 0;
+export const LOADING = 1;
+export const PARSING = 2;
+export const LOADED = 3;
+export const FAILED = 4;

src/base/traverseFunctions.js

@@ -0,0 +1,312 @@
+import { LOADED } from './constants.js';
+
+function isUsedThisFrame( tile, frameCount ) {
+
+	return tile.__lastFrameVisited === frameCount && tile.__used;
+
+}
+
+function resetFrameState( tile, frameCount ) {
+
+	if ( tile.__lastFrameVisited !== frameCount ) {
+
+		tile.__lastFrameVisited = frameCount;
+		tile.__used = false;
+		tile.__inFrustum = false;
+		tile.__isLeaf = false;
+		tile.__visible = false;
+		tile.__active = false;
+		tile.__error = 0;
+
+	}
+
+}
+
+function recursivelyMarkUsed( tile, frameCount, lruCache ) {
+
+	resetFrameState( tile, frameCount );
+
+	tile.__used = true;
+	lruCache.markUsed( tile );
+	if ( tile.__contentEmpty ) {
+
+		const children = tile.children;
+		for ( let i = 0, l = children.length; i < l; i ++ ) {
+
+			recursivelyMarkUsed( children[ i ], frameCount, lruCache );
+
+		}
+
+	}
+
+}
+
+export function traverseSet( tile, beforeCb = null, afterCb = null, parent = null, depth = 0 ) {
+
+	if ( beforeCb && beforeCb( tile, parent, depth ) ) {
+
+		if ( afterCb ) {
+
+			afterCb( tile, parent, depth );
+
+		}
+
+		return;
+
+	}
+
+	const children = tile.children;
+	for ( let i = 0, l = children.length; i < l; i ++ ) {
+
+		traverseSet( children[ i ], beforeCb, afterCb, tile, depth + 1 );
+
+	}
+
+	if ( afterCb ) {
+
+		afterCb( tile, parent, depth );
+
+	}
+
+}
+
+// TODO: include frustum mask here?
+export function determineFrustumSet( tile, renderer ) {
+
+	const stats = renderer.stats;
+	const frameCount = renderer.frameCount;
+	const errorTarget = renderer.errorTarget;
+	const maxDepth = renderer.maxDepth;
+	const loadSiblings = renderer.loadSiblings;
+	const lruCache = renderer.lruCache;
+	resetFrameState( tile, frameCount );
+
+	const inFrustum = renderer.tileInView( tile );
+	if ( inFrustum === false ) {
+
+		return false;
+
+	}
+
+	tile.__used = true;
+	lruCache.markUsed( tile );
+
+	tile.__inFrustum = true;
+	stats.inFrustum ++;
+
+	if ( ! tile.__contentEmpty ) {
+
+		const error = renderer.calculateError( tile );
+		tile.__error = error;
+		if ( error <= errorTarget ) {
+
+			return true;
+
+		}
+
+	}
+
+	if ( renderer.maxDepth > 0 && tile.__depth + 1 >= maxDepth ) {
+
+		return true;
+
+	}
+
+	let anyChildrenUsed = false;
+	const children = tile.children;
+	for ( let i = 0, l = children.length; i < l; i ++ ) {
+
+		const c = children[ i ];
+		const r = determineFrustumSet( c, renderer );
+		anyChildrenUsed = anyChildrenUsed || r;
+
+	}
+
+	if ( anyChildrenUsed && loadSiblings ) {
+
+		for ( let i = 0, l = children.length; i < l; i ++ ) {
+
+			recursivelyMarkUsed( tile, frameCount, lruCache );
+
+		}
+
+	}
+
+	return true;
+
+}
+
+export function markUsedSetLeaves( tile, renderer ) {
+
+	const stats = renderer.stats;
+	const frameCount = renderer.frameCount;
+	if ( ! isUsedThisFrame( tile, frameCount ) ) {
+
+		return;
+
+	}
+
+	stats.used ++;
+
+	const children = tile.children;
+	let anyChildrenUsed = false;
+	for ( let i = 0, l = children.length; i < l; i ++ ) {
+
+		const c = children[ i ];
+		anyChildrenUsed = anyChildrenUsed || isUsedThisFrame( c, frameCount );
+
+	}
+
+	if ( ! anyChildrenUsed ) {
+
+		tile.__isLeaf = true;
+
+		// TODO: stats
+
+	} else {
+
+		for ( let i = 0, l = children.length; i < l; i ++ ) {
+
+			const c = children[ i ];
+			markUsedSetLeaves( c, renderer );
+
+		}
+
+	}
+
+}
+
+export function skipTraversal( tile, renderer ) {
+
+	const stats = renderer.stats;
+	const frameCount = renderer.frameCount;
+	if ( ! isUsedThisFrame( tile, frameCount ) ) {
+
+		return;
+
+	}
+
+	const lruCache = renderer.lruCache;
+	if ( tile.__isLeaf ) {
+
+		if ( tile.__loadingState === LOADED ) {
+
+			if ( tile.__inFrustum ) {
+
+				tile.__visible = true;
+				stats.visible ++;
+
+			}
+			tile.__active = true;
+			stats.active ++;
+
+		} else if ( ! lruCache.isFull() ) {
+
+			renderer.requestTileContents( tile );
+
+		}
+		return;
+
+	}
+
+	const errorRequirement = renderer.errorTarget * renderer.errorThreshold;
+	const meetsSSE = tile.__error < errorRequirement;
+	const hasContent = tile.__loadingState === LOADED && ! tile.__contentEmpty;
+	const children = tile.children;
+	let allChildrenHaveContent = true;
+	for ( let i = 0, l = children.length; i < l; i ++ ) {
+
+		const c = children[ i ];
+		if ( isUsedThisFrame( c, frameCount ) ) {
+
+			const childContent = c.__loadingState === LOADED || tile.__contentEmpty;
+			allChildrenHaveContent = allChildrenHaveContent && childContent;
+
+		}
+
+	}
+
+	if ( meetsSSE && ! hasContent && ! lruCache.isFull() ) {
+
+		renderer.requestTileContents( tile );
+
+	}
+
+	if ( meetsSSE && hasContent && ! allChildrenHaveContent ) {
+
+		if ( tile.__inFrustum ) {
+
+			tile.__visible = true;
+			stats.visible ++;
+
+		}
+		tile.__active = true;
+		stats.active ++;
+
+		for ( let i = 0, l = children.length; i < l; i ++ ) {
+
+			const c = children[ i ];
+			if ( isUsedThisFrame( c, frameCount ) && ! lruCache.isFull() ) {
+
+				renderer.requestTileContents( c );
+
+			}
+
+		}
+		return;
+
+	}
+
+	for ( let i = 0, l = children.length; i < l; i ++ ) {
+
+		const c = children[ i ];
+		if ( isUsedThisFrame( c, frameCount ) ) {
+
+			skipTraversal( c, renderer );
+
+		}
+
+	}
+
+}
+
+export function toggleTiles( tile, renderer ) {
+
+	const frameCount = renderer.frameCount;
+	const isUsed = isUsedThisFrame( tile, frameCount );
+	if ( isUsed || tile.__usedLastFrame ) {
+
+		if ( ! isUsed ) {
+
+			if ( ! tile.__contentEmpty && tile.__loadingState === LOADED ) {
+
+				renderer.setTileVisible( tile, false );
+				renderer.setTileActive( tile, false );
+
+			}
+			tile.__usedLastFrame = false;
+
+		} else {
+
+			if ( ! tile.__contentEmpty && tile.__loadingState === LOADED ) {
+
+				// enable visibility if active due to shadows
+				renderer.setTileActive( tile, tile.__active );
+				renderer.setTileVisible( tile, tile.__active || tile.__visible );
+
+			}
+			tile.__usedLastFrame = true;
+
+		}
+
+		const children = tile.children;
+		for ( let i = 0, l = children.length; i < l; i ++ ) {
+
+			const c = children[ i ];
+			toggleTiles( c, renderer );
+
+		}
+
+	}
+
+}