super-three 0.169.0 → 0.170.0

package/src/core/BufferGeometry.js

@@ -35,6 +35,7 @@ class BufferGeometry extends EventDispatcher {
 		this.type = 'BufferGeometry';
 
 		this.index = null;
+		this.indirect = null;
 		this.attributes = {};
 
 		this.morphAttributes = {};
@@ -73,6 +74,20 @@ class BufferGeometry extends EventDispatcher {
 
 	}
 
+	setIndirect( indirect ) {
+
+		this.indirect = indirect;
+
+		return this;
+
+	}
+
+	getIndirect() {
+
+		return this.indirect;
+
+	}
+
 	getAttribute( name ) {
 
 		return this.attributes[ name ];
@@ -272,16 +287,39 @@ class BufferGeometry extends EventDispatcher {
 
 	setFromPoints( points ) {
 
-		const position = [];
+		const positionAttribute = this.getAttribute( 'position' );
 
-		for ( let i = 0, l = points.length; i < l; i ++ ) {
+		if ( positionAttribute === undefined ) {
 
-			const point = points[ i ];
-			position.push( point.x, point.y, point.z || 0 );
+			const position = [];
 
-		}
+			for ( let i = 0, l = points.length; i < l; i ++ ) {
+
+				const point = points[ i ];
+				position.push( point.x, point.y, point.z || 0 );
+
+			}
+
+			this.setAttribute( 'position', new Float32BufferAttribute( position, 3 ) );
+
+		} else {
+
+			for ( let i = 0, l = positionAttribute.count; i < l; i ++ ) {
+
+				const point = points[ i ];
+				positionAttribute.setXYZ( i, point.x, point.y, point.z || 0 );
+
+			}
+
+			if ( points.length > positionAttribute.count ) {
 
-		this.setAttribute( 'position', new Float32BufferAttribute( position, 3 ) );
+				console.warn( 'THREE.BufferGeometry: Buffer size too small for points data. Use .dispose() and create a new geometry.' );
+
+			}
+
+			positionAttribute.needsUpdate = true;
+
+		}
 
 		return this;
 

package/src/geometries/CylinderGeometry.js

@@ -133,14 +133,14 @@ class CylinderGeometry extends BufferGeometry {
 
 					// faces
 
-					if ( radiusTop > 0 ) {
+					if ( radiusTop > 0 || y !== 0 ) {
 
 						indices.push( a, b, d );
 						groupCount += 3;
 
 					}
 
-					if ( radiusBottom > 0 ) {
+					if ( radiusBottom > 0 || y !== heightSegments - 1 ) {
 
 						indices.push( b, c, d );
 						groupCount += 3;

package/src/materials/LineBasicMaterial.js

@@ -3,14 +3,18 @@ import { Color } from '../math/Color.js';
 
 class LineBasicMaterial extends Material {
 
+	static get type() {
+
+		return 'LineBasicMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isLineBasicMaterial = true;
 
-		this.type = 'LineBasicMaterial';
-
 		this.color = new Color( 0xffffff );
 
 		this.map = null;

package/src/materials/LineDashedMaterial.js

@@ -2,14 +2,18 @@ import { LineBasicMaterial } from './LineBasicMaterial.js';
 
 class LineDashedMaterial extends LineBasicMaterial {
 
+	static get type() {
+
+		return 'LineDashedMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isLineDashedMaterial = true;
 
-		this.type = 'LineDashedMaterial';
-
 		this.scale = 1;
 		this.dashSize = 3;
 		this.gapSize = 1;

package/src/materials/Material.js

@@ -7,6 +7,20 @@ let _materialId = 0;
 
 class Material extends EventDispatcher {
 
+	static get type() {
+
+		return 'Material';
+
+	}
+
+	get type() {
+
+		return this.constructor.type;
+
+	}
+
+	set type( _value ) { /* */ }
+
 	constructor() {
 
 		super();
@@ -18,7 +32,6 @@ class Material extends EventDispatcher {
 		this.uuid = MathUtils.generateUUID();
 
 		this.name = '';
-		this.type = 'Material';
 
 		this.blending = NormalBlending;
 		this.side = FrontSide;

package/src/materials/MeshBasicMaterial.js

@@ -5,14 +5,18 @@ import { Euler } from '../math/Euler.js';
 
 class MeshBasicMaterial extends Material {
 
+	static get type() {
+
+		return 'MeshBasicMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isMeshBasicMaterial = true;
 
-		this.type = 'MeshBasicMaterial';
-
 		this.color = new Color( 0xffffff ); // emissive
 
 		this.map = null;

package/src/materials/MeshDepthMaterial.js

@@ -3,14 +3,18 @@ import { BasicDepthPacking } from '../constants.js';
 
 class MeshDepthMaterial extends Material {
 
+	static get type() {
+
+		return 'MeshDepthMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isMeshDepthMaterial = true;
 
-		this.type = 'MeshDepthMaterial';
-
 		this.depthPacking = BasicDepthPacking;
 
 		this.map = null;

package/src/materials/MeshDistanceMaterial.js

@@ -2,14 +2,18 @@ import { Material } from './Material.js';
 
 class MeshDistanceMaterial extends Material {
 
+	static get type() {
+
+		return 'MeshDistanceMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isMeshDistanceMaterial = true;
 
-		this.type = 'MeshDistanceMaterial';
-
 		this.map = null;
 
 		this.alphaMap = null;

package/src/materials/MeshLambertMaterial.js

@@ -6,14 +6,18 @@ import { Euler } from '../math/Euler.js';
 
 class MeshLambertMaterial extends Material {
 
+	static get type() {
+
+		return 'MeshLambertMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isMeshLambertMaterial = true;
 
-		this.type = 'MeshLambertMaterial';
-
 		this.color = new Color( 0xffffff ); // diffuse
 
 		this.map = null;

package/src/materials/MeshMatcapMaterial.js

@@ -5,6 +5,12 @@ import { Color } from '../math/Color.js';
 
 class MeshMatcapMaterial extends Material {
 
+	static get type() {
+
+		return 'MeshMatcapMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
@@ -13,8 +19,6 @@ class MeshMatcapMaterial extends Material {
 
 		this.defines = { 'MATCAP': '' };
 
-		this.type = 'MeshMatcapMaterial';
-
 		this.color = new Color( 0xffffff ); // diffuse
 
 		this.matcap = null;

package/src/materials/MeshNormalMaterial.js

@@ -4,14 +4,18 @@ import { Vector2 } from '../math/Vector2.js';
 
 class MeshNormalMaterial extends Material {
 
+	static get type() {
+
+		return 'MeshNormalMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isMeshNormalMaterial = true;
 
-		this.type = 'MeshNormalMaterial';
-
 		this.bumpMap = null;
 		this.bumpScale = 1;
 

package/src/materials/MeshPhongMaterial.js

@@ -6,14 +6,18 @@ import { Euler } from '../math/Euler.js';
 
 class MeshPhongMaterial extends Material {
 
+	static get type() {
+
+		return 'MeshPhongMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isMeshPhongMaterial = true;
 
-		this.type = 'MeshPhongMaterial';
-
 		this.color = new Color( 0xffffff ); // diffuse
 		this.specular = new Color( 0x111111 );
 		this.shininess = 30;

package/src/materials/MeshPhysicalMaterial.js

@@ -5,6 +5,12 @@ import * as MathUtils from '../math/MathUtils.js';
 
 class MeshPhysicalMaterial extends MeshStandardMaterial {
 
+	static get type() {
+
+		return 'MeshPhysicalMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
@@ -18,8 +24,6 @@ class MeshPhysicalMaterial extends MeshStandardMaterial {
 
 		};
 
-		this.type = 'MeshPhysicalMaterial';
-
 		this.anisotropyRotation = 0;
 		this.anisotropyMap = null;
 

package/src/materials/MeshStandardMaterial.js

@@ -6,6 +6,12 @@ import { Euler } from '../math/Euler.js';
 
 class MeshStandardMaterial extends Material {
 
+	static get type() {
+
+		return 'MeshStandardMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
@@ -14,8 +20,6 @@ class MeshStandardMaterial extends Material {
 
 		this.defines = { 'STANDARD': '' };
 
-		this.type = 'MeshStandardMaterial';
-
 		this.color = new Color( 0xffffff ); // diffuse
 		this.roughness = 1.0;
 		this.metalness = 0.0;

package/src/materials/MeshToonMaterial.js

@@ -5,6 +5,12 @@ import { Color } from '../math/Color.js';
 
 class MeshToonMaterial extends Material {
 
+	static get type() {
+
+		return 'MeshToonMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
@@ -13,8 +19,6 @@ class MeshToonMaterial extends Material {
 
 		this.defines = { 'TOON': '' };
 
-		this.type = 'MeshToonMaterial';
-
 		this.color = new Color( 0xffffff );
 
 		this.map = null;

package/src/materials/PointsMaterial.js

@@ -3,14 +3,18 @@ import { Color } from '../math/Color.js';
 
 class PointsMaterial extends Material {
 
+	static get type() {
+
+		return 'PointsMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isPointsMaterial = true;
 
-		this.type = 'PointsMaterial';
-
 		this.color = new Color( 0xffffff );
 
 		this.map = null;

package/src/materials/RawShaderMaterial.js

@@ -2,14 +2,18 @@ import { ShaderMaterial } from './ShaderMaterial.js';
 
 class RawShaderMaterial extends ShaderMaterial {
 
+	static get type() {
+
+		return 'RawShaderMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super( parameters );
 
 		this.isRawShaderMaterial = true;
 
-		this.type = 'RawShaderMaterial';
-
 	}
 
 }

package/src/materials/ShaderMaterial.js

@@ -6,14 +6,18 @@ import default_fragment from '../renderers/shaders/ShaderChunk/default_fragment.
 
 class ShaderMaterial extends Material {
 
+	static get type() {
+
+		return 'ShaderMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isShaderMaterial = true;
 
-		this.type = 'ShaderMaterial';
-
 		this.defines = {};
 		this.uniforms = {};
 		this.uniformsGroups = [];

package/src/materials/ShadowMaterial.js

@@ -3,14 +3,18 @@ import { Color } from '../math/Color.js';
 
 class ShadowMaterial extends Material {
 
+	static get type() {
+
+		return 'ShadowMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isShadowMaterial = true;
 
-		this.type = 'ShadowMaterial';
-
 		this.color = new Color( 0x000000 );
 		this.transparent = true;
 

package/src/materials/SpriteMaterial.js

@@ -3,14 +3,18 @@ import { Color } from '../math/Color.js';
 
 class SpriteMaterial extends Material {
 
+	static get type() {
+
+		return 'SpriteMaterial';
+
+	}
+
 	constructor( parameters ) {
 
 		super();
 
 		this.isSpriteMaterial = true;
 
-		this.type = 'SpriteMaterial';
-
 		this.color = new Color( 0xffffff );
 
 		this.map = null;

package/src/materials/nodes/NodeMaterial.js

@@ -10,19 +10,19 @@ 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 { positionLocal, positionView } 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 { depth, perspectiveDepthToLogarithmicDepth, viewZToOrthographicDepth } from '../../nodes/display/ViewportDepthNode.js';
+import { cameraFar, cameraNear } from '../../nodes/accessors/Camera.js';
 import { clipping, clippingAlpha } from '../../nodes/accessors/ClippingNode.js';
 import NodeMaterialObserver from './manager/NodeMaterialObserver.js';
+import getAlphaHashThreshold from '../../nodes/functions/material/getAlphaHashThreshold.js';
 
 class NodeMaterial extends Material {
 
@@ -57,6 +57,7 @@ class NodeMaterial extends Material {
 		this.alphaTestNode = null;
 
 		this.positionNode = null;
+		this.geometryNode = null;
 
 		this.depthNode = null;
 		this.shadowNode = null;
@@ -98,6 +99,12 @@ class NodeMaterial extends Material {
 
 		builder.stack.outputNode = this.vertexNode || this.setupPosition( builder );
 
+		if ( this.geometryNode !== null ) {
+
+			builder.stack.outputNode = builder.stack.outputNode.bypass( this.geometryNode );
+
+		}
+
 		builder.addFlow( 'vertex', builder.removeStack() );
 
 		// < FRAGMENT STAGE >
@@ -215,7 +222,7 @@ class NodeMaterial extends Material {
 
 	setupDepth( builder ) {
 
-		const { renderer } = builder;
+		const { renderer, camera } = builder;
 
 		// Depth
 
@@ -231,9 +238,15 @@ class NodeMaterial extends Material {
 
 			} else if ( renderer.logarithmicDepthBuffer === true ) {
 
-				const fragDepth = modelViewProjection().w.add( 1 );
+				if ( camera.isPerspectiveCamera ) {
 
-				depthNode = fragDepth.log2().mul( cameraLogDepth ).mul( 0.5 );
+					depthNode = perspectiveDepthToLogarithmicDepth( modelViewProjection().w, cameraNear, cameraFar );
+
+				} else {
+
+					depthNode = viewZToOrthographicDepth( positionView.z, cameraNear, cameraFar );
+
+				}
 
 			}
 
@@ -355,6 +368,14 @@ class NodeMaterial extends Material {
 
 		}
 
+		// ALPHA HASH
+
+		if ( this.alphaHash === true ) {
+
+			diffuseColor.a.lessThan( getAlphaHashThreshold( positionLocal ) ).discard();
+
+		}
+
 		if ( this.transparent === false && this.blending === NormalBlending && this.alphaToCoverage === false ) {
 
 			diffuseColor.a.assign( 1.0 );
@@ -447,7 +468,7 @@ class NodeMaterial extends Material {
 
 		if ( materialLightsNode.length > 0 ) {
 
-			lightsN = lights( [ ...lightsN.getLights(), ...materialLightsNode ] );
+			lightsN = builder.renderer.lighting.createNode( [ ...lightsN.getLights(), ...materialLightsNode ] );
 
 		}
 
@@ -474,7 +495,7 @@ class NodeMaterial extends Material {
 
 		let outgoingLightNode = this.setupOutgoingLight( builder );
 
-		if ( lightsNode && lightsNode.getScope().getLights().length > 0 ) {
+		if ( lightsNode && lightsNode.getScope().hasLights ) {
 
 			const lightingModel = this.setupLightingModel( builder );
 
@@ -622,6 +643,7 @@ class NodeMaterial extends Material {
 		this.alphaTestNode = source.alphaTestNode;
 
 		this.positionNode = source.positionNode;
+		this.geometryNode = source.geometryNode;
 
 		this.depthNode = source.depthNode;
 		this.shadowNode = source.shadowNode;

package/src/materials/nodes/SpriteNodeMaterial.js

@@ -59,9 +59,18 @@ class SpriteNodeMaterial extends NodeMaterial {
 		}
 
 
-		if ( ! sizeAttenuation && camera.isPerspectiveCamera ) {
+		if ( ! sizeAttenuation ) {
 
-			scale = scale.mul( mvPosition.z.negate() );
+			if ( camera.isPerspectiveCamera ) {
+
+				scale = scale.mul( mvPosition.z.negate() );
+
+			} else {
+
+				const orthoScale = float( 2.0 ).div( cameraProjectionMatrix.element( 1 ).element( 1 ) );
+				scale = scale.mul( orthoScale.mul( 2 ) );
+
+			}
 
 		}