super-three 0.165.0 → 0.168.0

package/{examples/jsm/nodes/materials → src/materials/nodes}/NodeMaterial.js

@@ -1,29 +1,27 @@
-import { Material } from 'three';
-import { getNodeChildren, getCacheKey } from '../core/NodeUtils.js';
-import { attribute } from '../core/AttributeNode.js';
-import { output, diffuseColor, varyingProperty } from '../core/PropertyNode.js';
-import { materialAlphaTest, materialColor, materialOpacity, materialEmissive, materialNormal } from '../accessors/MaterialNode.js';
-import { modelViewProjection } from '../accessors/ModelViewProjectionNode.js';
-import { transformedNormalView, normalLocal } from '../accessors/NormalNode.js';
-import { instance } from '../accessors/InstanceNode.js';
-import { batch } from '../accessors/BatchNode.js';
-import { materialReference } from '../accessors/MaterialReferenceNode.js';
-import { positionLocal, positionView } from '../accessors/PositionNode.js';
-import { skinningReference } from '../accessors/SkinningNode.js';
-import { morphReference } from '../accessors/MorphNode.js';
-import { texture } from '../accessors/TextureNode.js';
-import { cubeTexture } from '../accessors/CubeTextureNode.js';
-import { lightsNode } from '../lighting/LightsNode.js';
-import { mix } from '../math/MathNode.js';
-import { float, vec3, vec4 } from '../shadernode/ShaderNode.js';
-import AONode from '../lighting/AONode.js';
-import { lightingContext } from '../lighting/LightingContextNode.js';
-import EnvironmentNode from '../lighting/EnvironmentNode.js';
-import IrradianceNode from '../lighting/IrradianceNode.js';
-import { depthPixel } from '../display/ViewportDepthNode.js';
-import { cameraLogDepth } from '../accessors/CameraNode.js';
-import { clipping, clippingAlpha } from '../accessors/ClippingNode.js';
-import { faceDirection } from '../display/FrontFacingNode.js';
+import { Material } from '../Material.js';
+import { NormalBlending } from '../../constants.js';
+
+import { getNodeChildren, getCacheKey } from '../../nodes/core/NodeUtils.js';
+import { attribute } from '../../nodes/core/AttributeNode.js';
+import { output, diffuseColor, emissive, varyingProperty } from '../../nodes/core/PropertyNode.js';
+import { materialAlphaTest, materialColor, materialOpacity, materialEmissive, materialNormal, materialLightMap, materialAOMap } from '../../nodes/accessors/MaterialNode.js';
+import { modelViewProjection } from '../../nodes/accessors/ModelViewProjectionNode.js';
+import { normalLocal } from '../../nodes/accessors/Normal.js';
+import { instance } from '../../nodes/accessors/InstanceNode.js';
+import { batch } from '../../nodes/accessors/BatchNode.js';
+import { materialReference } from '../../nodes/accessors/MaterialReferenceNode.js';
+import { positionLocal } from '../../nodes/accessors/Position.js';
+import { skinningReference } from '../../nodes/accessors/SkinningNode.js';
+import { morphReference } from '../../nodes/accessors/MorphNode.js';
+import { lights } from '../../nodes/lighting/LightsNode.js';
+import { mix } from '../../nodes/math/MathNode.js';
+import { float, vec3, vec4 } from '../../nodes/tsl/TSLBase.js';
+import AONode from '../../nodes/lighting/AONode.js';
+import { lightingContext } from '../../nodes/lighting/LightingContextNode.js';
+import IrradianceNode from '../../nodes/lighting/IrradianceNode.js';
+import { depth } from '../../nodes/display/ViewportDepthNode.js';
+import { cameraLogDepth } from '../../nodes/accessors/Camera.js';
+import { clipping, clippingAlpha } from '../../nodes/accessors/ClippingNode.js';
 
 const NodeMaterials = new Map();
 
@@ -40,8 +38,7 @@ class NodeMaterial extends Material {
 		this.forceSinglePass = false;
 
 		this.fog = true;
-		this.lights = true;
-		this.normals = true;
+		this.lights = false;
 
 		this.lightsNode = null;
 		this.envNode = null;
@@ -61,6 +58,7 @@ class NodeMaterial extends Material {
 		this.shadowPositionNode = null;
 
 		this.outputNode = null;
+		this.mrtNode = null;
 
 		this.fragmentNode = null;
 		this.vertexNode = null;
@@ -81,6 +79,8 @@ class NodeMaterial extends Material {
 
 	setup( builder ) {
 
+		builder.context.setupNormal = () => this.setupNormal( builder );
+
 		// < VERTEX STAGE >
 
 		builder.addStack();
@@ -101,8 +101,6 @@ class NodeMaterial extends Material {
 
 		if ( this.fragmentNode === null ) {
 
-			if ( this.normals === true ) this.setupNormal( builder );
-
 			this.setupDiffuseColor( builder );
 			this.setupVariants( builder );
 
@@ -124,6 +122,33 @@ class NodeMaterial extends Material {
 
 			if ( this.outputNode !== null ) resultNode = this.outputNode;
 
+			// MRT
+
+			const renderTarget = builder.renderer.getRenderTarget();
+
+			if ( renderTarget !== null ) {
+
+				const mrt = builder.renderer.getMRT();
+				const materialMRT = this.mrtNode;
+
+				if ( mrt !== null ) {
+
+					resultNode = mrt;
+
+					if ( materialMRT !== null ) {
+
+						resultNode = mrt.merge( materialMRT );
+
+					}
+
+				} else if ( materialMRT !== null ) {
+
+					resultNode = materialMRT;
+
+				}
+
+			}
+
 		} else {
 
 			let fragmentNode = this.fragmentNode;
@@ -179,17 +204,27 @@ class NodeMaterial extends Material {
 
 		let depthNode = this.depthNode;
 
-		if ( depthNode === null && renderer.logarithmicDepthBuffer === true ) {
+		if ( depthNode === null ) {
+
+			const mrt = renderer.getMRT();
+
+			if ( mrt && mrt.has( 'depth' ) ) {
+
+				depthNode = mrt.get( 'depth' );
+
+			} else if ( renderer.logarithmicDepthBuffer === true ) {
 
-			const fragDepth = modelViewProjection().w.add( 1 );
+				const fragDepth = modelViewProjection().w.add( 1 );
 
-			depthNode = fragDepth.log2().mul( cameraLogDepth ).mul( 0.5 );
+				depthNode = fragDepth.log2().mul( cameraLogDepth ).mul( 0.5 );
+
+			}
 
 		}
 
 		if ( depthNode !== null ) {
 
-			depthPixel.assign( depthNode ).append();
+			depth.assign( depthNode ).append();
 
 		}
 
@@ -232,7 +267,7 @@ class NodeMaterial extends Material {
 
 		}
 
-		if ( ( object.instanceMatrix && object.instanceMatrix.isInstancedBufferAttribute === true ) && builder.isAvailable( 'instance' ) === true ) {
+		if ( ( object.instanceMatrix && object.instanceMatrix.isInstancedBufferAttribute === true ) ) {
 
 			instance( object ).append();
 
@@ -275,6 +310,15 @@ class NodeMaterial extends Material {
 
 		}
 
+		if ( object.isBatchedMesh && object._colorsTexture ) {
+
+			const batchColor = varyingProperty( 'vec3', 'vBatchColor' );
+
+			colorNode = batchColor.mul( colorNode );
+
+		}
+
+
 		// COLOR
 
 		diffuseColor.assign( colorNode );
@@ -294,35 +338,33 @@ class NodeMaterial extends Material {
 
 		}
 
-	}
+		if ( this.transparent === false && this.blending === NormalBlending && this.alphaToCoverage === false ) {
 
-	setupVariants( /*builder*/ ) {
+			diffuseColor.a.assign( 1.0 );
 
-		// Interface function.
+		}
 
 	}
 
-	setupNormal() {
-
-		// NORMAL VIEW
+	setupVariants( /*builder*/ ) {
 
-		if ( this.flatShading === true ) {
+		// Interface function.
 
-			const normalNode = positionView.dFdx().cross( positionView.dFdy() ).normalize();
+	}
 
-			transformedNormalView.assign( normalNode.mul( faceDirection ) );
+	setupOutgoingLight() {
 
-		} else {
+		return ( this.lights === true ) ? vec3( 0 ) : diffuseColor.rgb;
 
-			const normalNode = this.normalNode ? vec3( this.normalNode ) : materialNormal;
+	}
 
-			transformedNormalView.assign( normalNode.mul( faceDirection ) );
+	setupNormal() {
 
-		}
+		return this.normalNode ? vec3( this.normalNode ) : materialNormal;
 
 	}
 
-	getEnvNode( builder ) {
+	setupEnvironment( /*builder*/ ) {
 
 		let node = null;
 
@@ -332,11 +374,21 @@ class NodeMaterial extends Material {
 
 		} else if ( this.envMap ) {
 
-			node = this.envMap.isCubeTexture ? cubeTexture( this.envMap ) : texture( this.envMap );
+			node = this.envMap.isCubeTexture ? materialReference( 'envMap', 'cubeTexture' ) : materialReference( 'envMap', 'texture' );
+
+		}
+
+		return node;
 
-		} else if ( builder.environmentNode ) {
+	}
 
-			node = builder.environmentNode;
+	setupLightMap( builder ) {
+
+		let node = null;
+
+		if ( builder.material.lightMap ) {
+
+			node = new IrradianceNode( materialLightMap );
 
 		}
 
@@ -346,27 +398,29 @@ class NodeMaterial extends Material {
 
 	setupLights( builder ) {
 
-		const envNode = this.getEnvNode( builder );
+		const materialLightsNode = [];
 
 		//
 
-		const materialLightsNode = [];
+		const envNode = this.setupEnvironment( builder );
 
-		if ( envNode ) {
+		if ( envNode && envNode.isLightingNode ) {
 
-			materialLightsNode.push( new EnvironmentNode( envNode ) );
+			materialLightsNode.push( envNode );
 
 		}
 
-		if ( builder.material.lightMap ) {
+		const lightMapNode = this.setupLightMap( builder );
 
-			materialLightsNode.push( new IrradianceNode( materialReference( 'lightMap', 'texture' ) ) );
+		if ( lightMapNode && lightMapNode.isLightingNode ) {
+
+			materialLightsNode.push( lightMapNode );
 
 		}
 
 		if ( this.aoNode !== null || builder.material.aoMap ) {
 
-			const aoNode = this.aoNode !== null ? this.aoNode : texture( builder.material.aoMap );
+			const aoNode = this.aoNode !== null ? this.aoNode : materialAOMap;
 
 			materialLightsNode.push( new AONode( aoNode ) );
 
@@ -376,7 +430,7 @@ class NodeMaterial extends Material {
 
 		if ( materialLightsNode.length > 0 ) {
 
-			lightsN = lightsNode( [ ...lightsN.lightNodes, ...materialLightsNode ] );
+			lightsN = lights( [ ...lightsN.getLights(), ...materialLightsNode ] );
 
 		}
 
@@ -401,9 +455,9 @@ class NodeMaterial extends Material {
 
 		const lightsNode = lights ? this.setupLights( builder ) : null;
 
-		let outgoingLightNode = diffuseColor.rgb;
+		let outgoingLightNode = this.setupOutgoingLight( builder );
 
-		if ( lightsNode && lightsNode.hasLight !== false ) {
+		if ( lightsNode && lightsNode.getScope().getLights().length > 0 ) {
 
 			const lightingModel = this.setupLightingModel( builder );
 
@@ -419,7 +473,9 @@ class NodeMaterial extends Material {
 
 		if ( ( emissiveNode && emissiveNode.isNode === true ) || ( material.emissive && material.emissive.isColor === true ) ) {
 
-			outgoingLightNode = outgoingLightNode.add( vec3( emissiveNode ? emissiveNode : materialEmissive ) );
+			emissive.assign( vec3( emissiveNode ? emissiveNode : materialEmissive ) );
+
+			outgoingLightNode = outgoingLightNode.add( emissive );
 
 		}
 
@@ -431,9 +487,13 @@ class NodeMaterial extends Material {
 
 		// FOG
 
-		const fogNode = builder.fogNode;
+		if ( this.fog === true ) {
+
+			const fogNode = builder.fogNode;
+
+			if ( fogNode ) outputNode = vec4( fogNode.mix( outputNode.rgb, fogNode.colorNode ), outputNode.a );
 
-		if ( fogNode ) outputNode = vec4( fogNode.mix( outputNode.rgb, fogNode.colorNode ), outputNode.a );
+		}
 
 		return outputNode;
 
@@ -551,6 +611,7 @@ class NodeMaterial extends Material {
 		this.shadowPositionNode = source.shadowPositionNode;
 
 		this.outputNode = source.outputNode;
+		this.mrtNode = source.mrtNode;
 
 		this.fragmentNode = source.fragmentNode;
 		this.vertexNode = source.vertexNode;
@@ -559,50 +620,37 @@ class NodeMaterial extends Material {
 
 	}
 
-	static fromMaterial( material ) {
-
-		if ( material.isNodeMaterial === true ) { // is already a node material
-
-			return material;
-
-		}
-
-		const type = material.type.replace( 'Material', 'NodeMaterial' );
+}
 
-		const nodeMaterial = createNodeMaterialFromType( type );
+export default NodeMaterial;
 
-		if ( nodeMaterial === undefined ) {
+NodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( '', NodeMaterial );
 
-			throw new Error( `NodeMaterial: Material "${ material.type }" is not compatible.` );
+export function registerNodeMaterial( type, nodeMaterialClass ) {
 
-		}
+	const suffix = 'NodeMaterial';
+	const nodeMaterialType = type + suffix;
 
-		for ( const key in material ) {
+	if ( typeof nodeMaterialClass !== 'function' ) throw new Error( `THREE.Node: NodeMaterial class "${ type }" is not a class.` );
 
-			nodeMaterial[ key ] = material[ key ];
+	if ( NodeMaterials.has( nodeMaterialType ) ) {
 
-		}
-
-		return nodeMaterial;
+		console.warn( `THREE.Node: Redefinition of NodeMaterial class "${ nodeMaterialType }".` );
+		return;
 
 	}
 
-}
-
-export default NodeMaterial;
+	if ( type.slice( - suffix.length ) === suffix ) {
 
-export function addNodeMaterial( type, nodeMaterial ) {
-
-	if ( typeof nodeMaterial !== 'function' || ! type ) throw new Error( `Node material ${ type } is not a class` );
-	if ( NodeMaterials.has( type ) ) {
-
-		console.warn( `Redefinition of node material ${ type }` );
+		console.warn( `THREE.NodeMaterial: NodeMaterial class ${ nodeMaterialType } should not have '${ suffix }' suffix.` );
 		return;
 
 	}
 
-	NodeMaterials.set( type, nodeMaterial );
-	nodeMaterial.type = type;
+	NodeMaterials.set( nodeMaterialType, nodeMaterialClass );
+	nodeMaterialClass.type = nodeMaterialType;
+
+	return nodeMaterialType;
 
 }
 
@@ -617,5 +665,3 @@ export function createNodeMaterialFromType( type ) {
 	}
 
 }
-
-addNodeMaterial( 'NodeMaterial', NodeMaterial );

package/{examples/jsm/nodes/materials/Materials.js → src/materials/nodes/NodeMaterials.js}

@@ -1,6 +1,6 @@
 // @TODO: We can simplify "export { default as SomeNode, other, exports } from '...'" to just "export * from '...'" if we will use only named exports
 
-export { default as NodeMaterial, addNodeMaterial, createNodeMaterialFromType } from './NodeMaterial.js';
+export { default as NodeMaterial } from './NodeMaterial.js';
 export { default as InstancedPointsNodeMaterial } from './InstancedPointsNodeMaterial.js';
 export { default as LineBasicNodeMaterial } from './LineBasicNodeMaterial.js';
 export { default as LineDashedNodeMaterial } from './LineDashedNodeMaterial.js';

package/{examples/jsm/nodes/materials → src/materials/nodes}/PointsNodeMaterial.js

@@ -1,8 +1,8 @@
-import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
+import NodeMaterial, { registerNodeMaterial } from './NodeMaterial.js';
 
-import { PointsMaterial } from 'three';
+import { PointsMaterial } from '../PointsMaterial.js';
 
-const defaultValues = new PointsMaterial();
+const _defaultValues = /*@__PURE__*/ new PointsMaterial();
 
 class PointsNodeMaterial extends NodeMaterial {
 
@@ -13,12 +13,11 @@ class PointsNodeMaterial extends NodeMaterial {
 		this.isPointsNodeMaterial = true;
 
 		this.lights = false;
-		this.normals = false;
 		this.transparent = true;
 
 		this.sizeNode = null;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 
@@ -36,4 +35,4 @@ class PointsNodeMaterial extends NodeMaterial {
 
 export default PointsNodeMaterial;
 
-addNodeMaterial( 'PointsNodeMaterial', PointsNodeMaterial );
+PointsNodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( 'Points', PointsNodeMaterial );

package/src/materials/nodes/ShadowNodeMaterial.js

@@ -0,0 +1,34 @@
+import NodeMaterial, { registerNodeMaterial } from './NodeMaterial.js';
+import ShadowMaskModel from '../../nodes/functions/ShadowMaskModel.js';
+
+import { ShadowMaterial } from '../ShadowMaterial.js';
+
+const _defaultValues = /*@__PURE__*/ new ShadowMaterial();
+
+class ShadowNodeMaterial extends NodeMaterial {
+
+	constructor( parameters ) {
+
+		super();
+
+		this.isShadowNodeMaterial = true;
+
+		this.lights = true;
+
+		this.setDefaultValues( _defaultValues );
+
+		this.setValues( parameters );
+
+	}
+
+	setupLightingModel( /*builder*/ ) {
+
+		return new ShadowMaskModel();
+
+	}
+
+}
+
+export default ShadowNodeMaterial;
+
+ShadowNodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( 'Shadow', ShadowNodeMaterial );

package/{examples/jsm/nodes/materials → src/materials/nodes}/SpriteNodeMaterial.js

@@ -1,14 +1,15 @@
-import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
-import { uniform } from '../core/UniformNode.js';
-import { cameraProjectionMatrix } from '../accessors/CameraNode.js';
-import { materialRotation } from '../accessors/MaterialNode.js';
-import { modelViewMatrix, modelWorldMatrix } from '../accessors/ModelNode.js';
-import { positionLocal } from '../accessors/PositionNode.js';
-import { float, vec2, vec3, vec4 } from '../shadernode/ShaderNode.js';
+import NodeMaterial, { registerNodeMaterial } from './NodeMaterial.js';
+import { uniform } from '../../nodes/core/UniformNode.js';
+import { cameraProjectionMatrix } from '../../nodes/accessors/Camera.js';
+import { materialRotation } from '../../nodes/accessors/MaterialNode.js';
+import { modelViewMatrix, modelWorldMatrix } from '../../nodes/accessors/ModelNode.js';
+import { positionLocal } from '../../nodes/accessors/Position.js';
+import { rotate } from '../../nodes/utils/RotateNode.js';
+import { float, vec2, vec3, vec4 } from '../../nodes/tsl/TSLBase.js';
 
-import { SpriteMaterial } from 'three';
+import { SpriteMaterial } from '../SpriteMaterial.js';
 
-const defaultValues = new SpriteMaterial();
+const _defaultValues = /*@__PURE__*/ new SpriteMaterial();
 
 class SpriteNodeMaterial extends NodeMaterial {
 
@@ -19,13 +20,12 @@ class SpriteNodeMaterial extends NodeMaterial {
 		this.isSpriteNodeMaterial = true;
 
 		this.lights = false;
-		this.normals = false;
 
 		this.positionNode = null;
 		this.rotationNode = null;
 		this.scaleNode = null;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 
@@ -61,7 +61,7 @@ class SpriteNodeMaterial extends NodeMaterial {
 
 		const rotation = float( rotationNode || materialRotation );
 
-		const rotatedPosition = alignedPosition.rotate( rotation );
+		const rotatedPosition = rotate( alignedPosition, rotation );
 
 		mvPosition = vec4( mvPosition.xy.add( rotatedPosition ), mvPosition.zw );
 
@@ -87,4 +87,4 @@ class SpriteNodeMaterial extends NodeMaterial {
 
 export default SpriteNodeMaterial;
 
-addNodeMaterial( 'SpriteNodeMaterial', SpriteNodeMaterial );
+SpriteNodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( 'Sprite', SpriteNodeMaterial );

package/{examples/jsm/nodes/materials → src/materials/nodes}/VolumeNodeMaterial.js

@@ -1,14 +1,13 @@
-import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
-import { varying } from '../core/VaryingNode.js';
-import { property } from '../core/PropertyNode.js';
-import { materialReference } from '../accessors/MaterialReferenceNode.js';
-import { modelWorldMatrixInverse } from '../accessors/ModelNode.js';
-import { cameraPosition } from '../accessors/CameraNode.js';
-import { positionGeometry } from '../accessors/PositionNode.js';
-import { tslFn, vec2, vec3, vec4 } from '../shadernode/ShaderNode.js';
-import { min, max } from '../math/MathNode.js';
-import { loop, Break } from '../utils/LoopNode.js';
-import { texture3D } from '../accessors/Texture3DNode.js';
+import NodeMaterial, { registerNodeMaterial } from './NodeMaterial.js';
+import { property } from '../../nodes/core/PropertyNode.js';
+import { materialReference } from '../../nodes/accessors/MaterialReferenceNode.js';
+import { modelWorldMatrixInverse } from '../../nodes/accessors/ModelNode.js';
+import { cameraPosition } from '../../nodes/accessors/Camera.js';
+import { positionGeometry } from '../../nodes/accessors/Position.js';
+import { Fn, varying, vec2, vec3, vec4 } from '../../nodes/tsl/TSLBase.js';
+import { min, max } from '../../nodes/math/MathNode.js';
+import { Loop, Break } from '../../nodes/utils/LoopNode.js';
+import { texture3D } from '../../nodes/accessors/Texture3DNode.js';
 
 class VolumeNodeMaterial extends NodeMaterial {
 
@@ -16,7 +15,6 @@ class VolumeNodeMaterial extends NodeMaterial {
 
 		super();
 
-		this.normals = false;
 		this.lights = false;
 		this.isVolumeNodeMaterial = true;
 		this.testNode = null;
@@ -29,7 +27,7 @@ class VolumeNodeMaterial extends NodeMaterial {
 
 		const map = texture3D( this.map, null, 0 );
 
-		const hitBox = tslFn( ( { orig, dir } ) => {
+		const hitBox = Fn( ( { orig, dir } ) => {
 
 			const box_min = vec3( - 0.5 );
 			const box_max = vec3( 0.5 );
@@ -49,7 +47,7 @@ class VolumeNodeMaterial extends NodeMaterial {
 
 		} );
 
-		this.fragmentNode = tslFn( () => {
+		this.fragmentNode = Fn( () => {
 
 			const vOrigin = varying( vec3( modelWorldMatrixInverse.mul( vec4( cameraPosition, 1.0 ) ) ) );
 			const vDirection = varying( positionGeometry.sub( vOrigin ) );
@@ -69,7 +67,7 @@ class VolumeNodeMaterial extends NodeMaterial {
 
 			const ac = property( 'vec4', 'ac' ).assign( vec4( materialReference( 'base', 'color' ), 0.0 ) );
 
-			loop( { type: 'float', start: bounds.x, end: bounds.y, update: '+= delta' }, () => {
+			Loop( { type: 'float', start: bounds.x, end: bounds.y, update: '+= delta' }, () => {
 
 				const d = property( 'float', 'd' ).assign( map.uv( p.add( 0.5 ) ).r );
 
@@ -103,4 +101,4 @@ class VolumeNodeMaterial extends NodeMaterial {
 
 export default VolumeNodeMaterial;
 
-addNodeMaterial( 'VolumeNodeMaterial', VolumeNodeMaterial );
+VolumeNodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( 'Volume', VolumeNodeMaterial );

package/src/math/Box2.js

@@ -119,8 +119,8 @@ class Box2 {
 
 	containsPoint( point ) {
 
-		return point.x < this.min.x || point.x > this.max.x ||
-			point.y < this.min.y || point.y > this.max.y ? false : true;
+		return point.x >= this.min.x && point.x <= this.max.x &&
+			point.y >= this.min.y && point.y <= this.max.y;
 
 	}
 
@@ -147,8 +147,8 @@ class Box2 {
 
 		// using 4 splitting planes to rule out intersections
 
-		return box.max.x < this.min.x || box.min.x > this.max.x ||
-			box.max.y < this.min.y || box.min.y > this.max.y ? false : true;
+		return box.max.x >= this.min.x && box.min.x <= this.max.x &&
+			box.max.y >= this.min.y && box.min.y <= this.max.y;
 
 	}
 

package/src/math/Box3.js

@@ -238,9 +238,9 @@ class Box3 {
 
 	containsPoint( point ) {
 
-		return point.x < this.min.x || point.x > this.max.x ||
-			point.y < this.min.y || point.y > this.max.y ||
-			point.z < this.min.z || point.z > this.max.z ? false : true;
+		return point.x >= this.min.x && point.x <= this.max.x &&
+			point.y >= this.min.y && point.y <= this.max.y &&
+			point.z >= this.min.z && point.z <= this.max.z;
 
 	}
 
@@ -268,9 +268,9 @@ class Box3 {
 	intersectsBox( box ) {
 
 		// using 6 splitting planes to rule out intersections.
-		return box.max.x < this.min.x || box.min.x > this.max.x ||
-			box.max.y < this.min.y || box.min.y > this.max.y ||
-			box.max.z < this.min.z || box.min.z > this.max.z ? false : true;
+		return box.max.x >= this.min.x && box.min.x <= this.max.x &&
+			box.max.y >= this.min.y && box.min.y <= this.max.y &&
+			box.max.z >= this.min.z && box.min.z <= this.max.z;
 
 	}