NavMesh: Remove obsolete code

Mugen87 · Jan 29, 2019 · 5534c79 · 5534c79
1 parent 3a27d4a
commit 5534c79
Show file tree

Hide file tree

Showing 7 changed files with 175 additions and 363 deletions.
diff --git a/build/yuka.js b/build/yuka.js
@@ -12891,12 +12891,6 @@
 			*/
 			this.polygon = null;
 
-			/**
-			* The unique index of the vertex.
-			* @type number
-			*/
-			this.nodeIndex = - 1;
-
 		}
 
 		/**
@@ -13109,10 +13103,6 @@
 
 			this._buildRegions( sortedEdgeList );
 
-			// ensure unique node indices for all twin edges
-
-			this._buildNodeIndices();
-
 			// now build the navigation graph
 
 			this._buildGraph();
@@ -13532,73 +13522,12 @@
 
 		}
 
-		_buildNodeIndices() {
-
-			const regions = this.regions;
-
-			const indicesMap = new Map();
-			let nextNodeIndex = 0;
-
-			for ( let i = 0, l = regions.length; i < l; i ++ ) {
-
-				const region = regions[ i ];
-
-				let edge = region.edge;
-
-				do {
-
-					// only edges with a twin reference needs to be considered
-
-					if ( edge.twin !== null && edge.nodeIndex === null ) {
-
-						let nodeIndex = - 1;
-						const position = edge.from();
-
-						// check all existing entries
-
-						for ( const [ index, pos ] of indicesMap.entries() ) {
-
-							if ( position.equals( pos ) === true ) {
-
-								// found, use the existing index
-
-								nodeIndex = index;
-								break;
-
-							}
-
-						}
-
-						// if no suitable index was found, create a new one
-
-						if ( nodeIndex === - 1 ) {
-
-							nodeIndex = nextNodeIndex ++;
-							indicesMap.set( nodeIndex, position );
-
-						}
-
-						// assign unique node index to edge
-
-						edge.nodeIndex = nodeIndex;
-						edge.twin.next.nodeIndex = nodeIndex;
-
-					}
-
-					edge = edge.next;
-
-				} while ( edge !== region.edge );
-
-			}
-
-		}
-
 		_buildGraph() {
 
 			const graph = this.graph;
 			const regions = this.regions;
 
-			// for each region, the code creates an array of directly accessible node indices
+			// for each region, the code creates an array of directly accessible regions
 
 			const regionNeighbourhood = new Array();
 
@@ -13610,17 +13539,26 @@
 				regionNeighbourhood.push( regionIndices );
 
 				let edge = region.edge;
+
+				// iterate through all egdes of the region (in other words: along its contour)
+
 				do {
 
+					// check for a portal edge
+
 					if ( edge.twin !== null ) {
 
-						regionIndices.push( this.regions.indexOf( edge.twin.polygon ) );
+						const regionIndex = this.regions.indexOf( edge.twin.polygon );
+
+						regionIndices.push( regionIndex ); // the index of the adjacent region
 
-						// add node to graph if necessary
+						// add node for this region to the graph if necessary
 
 						if ( graph.hasNode( this.regions.indexOf( edge.polygon ) ) === false ) {
 
-							graph.addNode( new NavNode( this.regions.indexOf( edge.polygon ), edge.polygon.centroid ) );
+							const node = new NavNode( this.regions.indexOf( edge.polygon ), edge.polygon.centroid );
+
+							graph.addNode( node );
 
 						}
 
@@ -13697,7 +13635,7 @@
 
 			/**
 			* A reference to the first half-edge of this polygon.
-			* @type Vector3
+			* @type HalfEdge
 			*/
 			this.edge = null;
 

diff --git a/build/yuka.min.js b/build/yuka.min.js
diff --git a/build/yuka.module.js b/build/yuka.module.js
@@ -12885,12 +12885,6 @@ class HalfEdge {
 		*/
 		this.polygon = null;
 
-		/**
-		* The unique index of the vertex.
-		* @type number
-		*/
-		this.nodeIndex = - 1;
-
 	}
 
 	/**
@@ -13103,10 +13097,6 @@ class NavMesh {
 
 		this._buildRegions( sortedEdgeList );
 
-		// ensure unique node indices for all twin edges
-
-		this._buildNodeIndices();
-
 		// now build the navigation graph
 
 		this._buildGraph();
@@ -13526,73 +13516,12 @@ class NavMesh {
 
 	}
 
-	_buildNodeIndices() {
-
-		const regions = this.regions;
-
-		const indicesMap = new Map();
-		let nextNodeIndex = 0;
-
-		for ( let i = 0, l = regions.length; i < l; i ++ ) {
-
-			const region = regions[ i ];
-
-			let edge = region.edge;
-
-			do {
-
-				// only edges with a twin reference needs to be considered
-
-				if ( edge.twin !== null && edge.nodeIndex === null ) {
-
-					let nodeIndex = - 1;
-					const position = edge.from();
-
-					// check all existing entries
-
-					for ( const [ index, pos ] of indicesMap.entries() ) {
-
-						if ( position.equals( pos ) === true ) {
-
-							// found, use the existing index
-
-							nodeIndex = index;
-							break;
-
-						}
-
-					}
-
-					// if no suitable index was found, create a new one
-
-					if ( nodeIndex === - 1 ) {
-
-						nodeIndex = nextNodeIndex ++;
-						indicesMap.set( nodeIndex, position );
-
-					}
-
-					// assign unique node index to edge
-
-					edge.nodeIndex = nodeIndex;
-					edge.twin.next.nodeIndex = nodeIndex;
-
-				}
-
-				edge = edge.next;
-
-			} while ( edge !== region.edge );
-
-		}
-
-	}
-
 	_buildGraph() {
 
 		const graph = this.graph;
 		const regions = this.regions;
 
-		// for each region, the code creates an array of directly accessible node indices
+		// for each region, the code creates an array of directly accessible regions
 
 		const regionNeighbourhood = new Array();
 
@@ -13604,17 +13533,26 @@ class NavMesh {
 			regionNeighbourhood.push( regionIndices );
 
 			let edge = region.edge;
+
+			// iterate through all egdes of the region (in other words: along its contour)
+
 			do {
 
+				// check for a portal edge
+
 				if ( edge.twin !== null ) {
 
-					regionIndices.push( this.regions.indexOf( edge.twin.polygon ) );
+					const regionIndex = this.regions.indexOf( edge.twin.polygon );
+
+					regionIndices.push( regionIndex ); // the index of the adjacent region
 
-					// add node to graph if necessary
+					// add node for this region to the graph if necessary
 
 					if ( graph.hasNode( this.regions.indexOf( edge.polygon ) ) === false ) {
 
-						graph.addNode( new NavNode( this.regions.indexOf( edge.polygon ), edge.polygon.centroid ) );
+						const node = new NavNode( this.regions.indexOf( edge.polygon ), edge.polygon.centroid );
+
+						graph.addNode( node );
 
 					}
 
@@ -13691,7 +13629,7 @@ class Polygon {
 
 		/**
 		* A reference to the first half-edge of this polygon.
-		* @type Vector3
+		* @type HalfEdge
 		*/
 		this.edge = null;
 

diff --git a/src/navigation/navmesh/HalfEdge.js b/src/navigation/navmesh/HalfEdge.js
@@ -45,12 +45,6 @@ class HalfEdge {
 		*/
 		this.polygon = null;
 
-		/**
-		* The unique index of the vertex.
-		* @type number
-		*/
-		this.nodeIndex = - 1;
-
 	}
 
 	/**