Clean up

build/yuka.js

@@ -1,19 +1,19 @@
 /**
  * @license
  * The MIT License
- * 
+ *
  * Copyright © 2018 Yuka authors
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -2927,7 +2927,8 @@
 		/**
 		* Holds the implementation for the line of sight test of this game entity.
 		* This method is used by {@link Vision#visible} in order to determine whether
-		* this game entity blocks the given line of sight or not.
+		* this game entity blocks the given line of sight or not. Implement this method
+		* when your game entity acts as an obstacle.
 		*
 		* @param {Ray} ray - The ray that represents the line of sight.
 		* @param {Vector3} intersectionPoint - The intersection point.
@@ -7936,11 +7937,9 @@
 		 */
 		intersectRay( ray, worldMatrix, intersectionPoint, normal = null ) {
 
-			const geometry = this;
-
 			// check bounding sphere first in world space
 
-			boundingSphere$1.copy( geometry.boundingSphere ).applyMatrix4( worldMatrix );
+			boundingSphere$1.copy( this.boundingSphere ).applyMatrix4( worldMatrix );
 
 			if ( ray.intersectsBoundingSphere( boundingSphere$1 ) ) {
 
@@ -7951,12 +7950,12 @@
 
 				// check AABB in local space since its more expensive to convert an AABB to world space than a bounding sphere
 
-				if ( rayLocal.intersectsAABB( geometry.aabb ) ) {
+				if ( rayLocal.intersectsAABB( this.aabb ) ) {
 
 					// now perform more expensive test with all triangles of the geometry
 
-					const vertices = geometry.vertices;
-					const indices = geometry.indices;
+					const vertices = this.vertices;
+					const indices = this.indices;
 
 					if ( indices === null ) {
 
@@ -7968,7 +7967,7 @@
 							triangle.b.set( vertices[ i + 3 ], vertices[ i + 4 ], vertices[ i + 5 ] );
 							triangle.c.set( vertices[ i + 6 ], vertices[ i + 7 ], vertices[ i + 8 ] );
 
-							if ( rayLocal.intersectTriangle( triangle, geometry.backfaceCulling, intersectionPoint ) !== null ) {
+							if ( rayLocal.intersectTriangle( triangle, this.backfaceCulling, intersectionPoint ) !== null ) {
 
 								// transform intersection point back to world space
 
@@ -8006,7 +8005,7 @@
 							triangle.b.set( vertices[ ( b * stride ) ], vertices[ ( b * stride ) + 1 ], vertices[ ( b * stride ) + 2 ] );
 							triangle.c.set( vertices[ ( c * stride ) ], vertices[ ( c * stride ) + 1 ], vertices[ ( c * stride ) + 2 ] );
 
-							if ( rayLocal.intersectTriangle( triangle, geometry.backfaceCulling, intersectionPoint ) !== null ) {
+							if ( rayLocal.intersectTriangle( triangle, this.backfaceCulling, intersectionPoint ) !== null ) {
 
 								// transform intersection point back to world space
 

build/yuka.module.js

@@ -1,19 +1,19 @@
 /**
  * @license
  * The MIT License
- * 
+ *
  * Copyright © 2018 Yuka authors
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -2921,7 +2921,8 @@ class GameEntity {
 	/**
 	* Holds the implementation for the line of sight test of this game entity.
 	* This method is used by {@link Vision#visible} in order to determine whether
-	* this game entity blocks the given line of sight or not.
+	* this game entity blocks the given line of sight or not. Implement this method
+	* when your game entity acts as an obstacle.
 	*
 	* @param {Ray} ray - The ray that represents the line of sight.
 	* @param {Vector3} intersectionPoint - The intersection point.
@@ -7930,11 +7931,9 @@ class MeshGeometry {
 	 */
 	intersectRay( ray, worldMatrix, intersectionPoint, normal = null ) {
 
-		const geometry = this;
-
 		// check bounding sphere first in world space
 
-		boundingSphere$1.copy( geometry.boundingSphere ).applyMatrix4( worldMatrix );
+		boundingSphere$1.copy( this.boundingSphere ).applyMatrix4( worldMatrix );
 
 		if ( ray.intersectsBoundingSphere( boundingSphere$1 ) ) {
 
@@ -7945,12 +7944,12 @@ class MeshGeometry {
 
 			// check AABB in local space since its more expensive to convert an AABB to world space than a bounding sphere
 
-			if ( rayLocal.intersectsAABB( geometry.aabb ) ) {
+			if ( rayLocal.intersectsAABB( this.aabb ) ) {
 
 				// now perform more expensive test with all triangles of the geometry
 
-				const vertices = geometry.vertices;
-				const indices = geometry.indices;
+				const vertices = this.vertices;
+				const indices = this.indices;
 
 				if ( indices === null ) {
 
@@ -7962,7 +7961,7 @@ class MeshGeometry {
 						triangle.b.set( vertices[ i + 3 ], vertices[ i + 4 ], vertices[ i + 5 ] );
 						triangle.c.set( vertices[ i + 6 ], vertices[ i + 7 ], vertices[ i + 8 ] );
 
-						if ( rayLocal.intersectTriangle( triangle, geometry.backfaceCulling, intersectionPoint ) !== null ) {
+						if ( rayLocal.intersectTriangle( triangle, this.backfaceCulling, intersectionPoint ) !== null ) {
 
 							// transform intersection point back to world space
 
@@ -8000,7 +7999,7 @@ class MeshGeometry {
 						triangle.b.set( vertices[ ( b * stride ) ], vertices[ ( b * stride ) + 1 ], vertices[ ( b * stride ) + 2 ] );
 						triangle.c.set( vertices[ ( c * stride ) ], vertices[ ( c * stride ) + 1 ], vertices[ ( c * stride ) + 2 ] );
 
-						if ( rayLocal.intersectTriangle( triangle, geometry.backfaceCulling, intersectionPoint ) !== null ) {
+						if ( rayLocal.intersectTriangle( triangle, this.backfaceCulling, intersectionPoint ) !== null ) {
 
 							// transform intersection point back to world space
 

examples/entity/shooter/src/Ground.js

@@ -2,6 +2,7 @@
  * @author Mugen87 / https://github.com/Mugen87
  */
 import { GameEntity } from '../../../../build/yuka.module.js';
+
 class Ground extends GameEntity {
 
 	constructor( geometry ) {

examples/perception/common/Obstacle.js

@@ -10,7 +10,6 @@ class Obstacle extends GameEntity {
 
 		super();
 
-
 		this.geometry = geometry;
 
 	}
@@ -22,4 +21,5 @@ class Obstacle extends GameEntity {
 	}
 
 }
+
 export { Obstacle };

examples/playground/hideAndSeek/src/CustomObstacle.js

@@ -9,6 +9,7 @@ class CustomObstacle extends GameEntity {
 	constructor( geometry ) {
 
 		super();
+
 		this.geometry = geometry;
 
 	}
@@ -21,12 +22,6 @@ class CustomObstacle extends GameEntity {
 
 	}
 
-	intersectRay( ray, intersectionPoint, normal = null ) {
-
-		return this.geometry.intersectRay( ray, this.worldMatrix, intersectionPoint, normal );
-
-	}
-
 }
 
 export { CustomObstacle };

examples/playground/hideAndSeek/src/Enemy.js

@@ -9,11 +9,11 @@ import world from './World.js';
 
 class Enemy extends Vehicle {
 
-	constructor() {
+	constructor( geometry ) {
 
 		super();
 
-		this.geometry = null;
+		this.geometry = geometry;
 		this.maxSpeed = 5;
 		this.deathAnimDuration = 0.5;
 		this.currentTime = 0;
@@ -75,12 +75,6 @@ class Enemy extends Vehicle {
 
 	}
 
-	intersectRay( ray, intersectionPoint, normal = null ) {
-
-		return this.geometry.intersectRay( ray, this.worldMatrix, intersectionPoint, normal );
-
-	}
-
 	handleMessage() {
 
 		this.dead = true;

examples/playground/hideAndSeek/src/Ground.js

@@ -9,6 +9,7 @@ class Ground extends GameEntity {
 	constructor( geometry ) {
 
 		super();
+
 		this.geometry = geometry;
 
 	}
@@ -21,12 +22,6 @@ class Ground extends GameEntity {
 
 	}
 
-	intersectRay( ray, intersectionPoint, normal = null ) {
-
-		return this.geometry.intersectRay( ray, this.worldMatrix, intersectionPoint, normal );
-
-	}
-
 }
 
 export { Ground };

examples/playground/hideAndSeek/src/World.js

@@ -257,13 +257,13 @@ class World {
 
 		renderComponent.material = enemyMaterial;
 
-		const enemy = new Enemy();
+		const vertices = renderComponent.geometry.attributes.position.array;
+		const geometry = new YUKA.MeshGeometry( vertices );
+
+		const enemy = new Enemy( geometry );
 		enemy.boundingRadius = renderComponent.geometry.boundingSphere.radius;
 		enemy.setRenderComponent( renderComponent, sync );
 
-		const vertices = renderComponent.geometry.attributes.position.array;
-		enemy.geometry = new YUKA.MeshGeometry( vertices );
-
 		// compute spawning point
 
 		let spawningPoint = null;
@@ -298,7 +298,7 @@ class World {
 
 			const obstalce = obstacles[ i ];
 
-			if ( obstalce.intersectRay( ray, intersection.point, intersection.normal ) !== null ) {
+			if ( obstalce.geometry.intersectRay( ray, obstalce.worldMatrix, intersection.point, intersection.normal ) !== null ) {
 
 				const squaredDistance = intersection.point.squaredDistanceTo( ray.origin );
 				obstalce.squaredDistance = squaredDistance;

src/core/GameEntity.js

@@ -376,7 +376,8 @@ class GameEntity {
 	/**
 	* Holds the implementation for the line of sight test of this game entity.
 	* This method is used by {@link Vision#visible} in order to determine whether
-	* this game entity blocks the given line of sight or not.
+	* this game entity blocks the given line of sight or not. Implement this method
+	* when your game entity acts as an obstacle.
 	*
 	* @param {Ray} ray - The ray that represents the line of sight.
 	* @param {Vector3} intersectionPoint - The intersection point.

src/core/MeshGeometry.js

@@ -5,7 +5,6 @@ import { Ray } from "../math/Ray";
 import { Plane } from "../math/Plane";
 import { Matrix4 } from "../math/Matrix4";
 
-
 const boundingSphere = new BoundingSphere();
 const triangle = { a: new Vector3(), b: new Vector3(), c: new Vector3() };
 const rayLocal = new Ray();
@@ -89,11 +88,9 @@ class MeshGeometry {
 	 */
 	intersectRay( ray, worldMatrix, intersectionPoint, normal = null ) {
 
-		const geometry = this;
-
 		// check bounding sphere first in world space
 
-		boundingSphere.copy( geometry.boundingSphere ).applyMatrix4( worldMatrix );
+		boundingSphere.copy( this.boundingSphere ).applyMatrix4( worldMatrix );
 
 		if ( ray.intersectsBoundingSphere( boundingSphere ) ) {
 
@@ -104,12 +101,12 @@ class MeshGeometry {
 
 			// check AABB in local space since its more expensive to convert an AABB to world space than a bounding sphere
 
-			if ( rayLocal.intersectsAABB( geometry.aabb ) ) {
+			if ( rayLocal.intersectsAABB( this.aabb ) ) {
 
 				// now perform more expensive test with all triangles of the geometry
 
-				const vertices = geometry.vertices;
-				const indices = geometry.indices;
+				const vertices = this.vertices;
+				const indices = this.indices;
 
 				if ( indices === null ) {
 
@@ -121,7 +118,7 @@ class MeshGeometry {
 						triangle.b.set( vertices[ i + 3 ], vertices[ i + 4 ], vertices[ i + 5 ] );
 						triangle.c.set( vertices[ i + 6 ], vertices[ i + 7 ], vertices[ i + 8 ] );
 
-						if ( rayLocal.intersectTriangle( triangle, geometry.backfaceCulling, intersectionPoint ) !== null ) {
+						if ( rayLocal.intersectTriangle( triangle, this.backfaceCulling, intersectionPoint ) !== null ) {
 
 							// transform intersection point back to world space
 
@@ -159,7 +156,7 @@ class MeshGeometry {
 						triangle.b.set( vertices[ ( b * stride ) ], vertices[ ( b * stride ) + 1 ], vertices[ ( b * stride ) + 2 ] );
 						triangle.c.set( vertices[ ( c * stride ) ], vertices[ ( c * stride ) + 1 ], vertices[ ( c * stride ) + 2 ] );
 
-						if ( rayLocal.intersectTriangle( triangle, geometry.backfaceCulling, intersectionPoint ) !== null ) {
+						if ( rayLocal.intersectTriangle( triangle, this.backfaceCulling, intersectionPoint ) !== null ) {
 
 							// transform intersection point back to world space
 

test/unit_test/core/MeshGeometry.tests.js

@@ -130,13 +130,12 @@ describe( 'MeshGeometry', function () {
 			const ray = new Ray( new Vector3( 0.5, 5, 0.5 ), new Vector3( 0, - 1, 0 ) );
 
 			const matrix = new Matrix4();
-			matrix.setPosition( new Vector3( 0, 0, - 0.1 ) );
+			matrix.setPosition( new Vector3( 10, 0, 0 ) );
 			const intersectionPoint = new Vector3();
 
 			const result = geometry.intersectRay( ray, matrix, intersectionPoint );
 
-			expect( result ).not.to.be.null;
-			expect( intersectionPoint ).to.deep.equal( { x: 0.5, y: 0, z: 0.5 } );
+			expect( result ).to.be.null;
 
 		} );