super-three 0.165.0 → 0.168.0

package/src/materials/nodes/MeshMatcapNodeMaterial.js

@@ -0,0 +1,53 @@
+import NodeMaterial, { registerNodeMaterial } from './NodeMaterial.js';
+import { materialReference } from '../../nodes/accessors/MaterialReferenceNode.js';
+import { diffuseColor } from '../../nodes/core/PropertyNode.js';
+import { vec3 } from '../../nodes/tsl/TSLBase.js';
+import { mix } from '../../nodes/math/MathNode.js';
+import { matcapUV } from '../../nodes/utils/MatcapUVNode.js';
+
+import { MeshMatcapMaterial } from '../MeshMatcapMaterial.js';
+
+const _defaultValues = /*@__PURE__*/ new MeshMatcapMaterial();
+
+class MeshMatcapNodeMaterial extends NodeMaterial {
+
+	constructor( parameters ) {
+
+		super();
+
+		this.lights = false;
+
+		this.isMeshMatcapNodeMaterial = true;
+
+		this.setDefaultValues( _defaultValues );
+
+		this.setValues( parameters );
+
+	}
+
+	setupVariants( builder ) {
+
+		const uv = matcapUV;
+
+		let matcapColor;
+
+		if ( builder.material.matcap ) {
+
+			matcapColor = materialReference( 'matcap', 'texture' ).context( { getUV: () => uv } );
+
+		} else {
+
+			matcapColor = vec3( mix( 0.2, 0.8, uv.y ) ); // default if matcap is missing
+
+		}
+
+		diffuseColor.rgb.mulAssign( matcapColor.rgb );
+
+	}
+
+}
+
+
+export default MeshMatcapNodeMaterial;
+
+MeshMatcapNodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( 'MeshMatcap', MeshMatcapNodeMaterial );

package/src/materials/nodes/MeshNormalNodeMaterial.js

@@ -0,0 +1,40 @@
+import NodeMaterial, { registerNodeMaterial } from './NodeMaterial.js';
+import { diffuseColor } from '../../nodes/core/PropertyNode.js';
+import { directionToColor } from '../../nodes/utils/Packing.js';
+import { materialOpacity } from '../../nodes/accessors/MaterialNode.js';
+import { transformedNormalView } from '../../nodes/accessors/Normal.js';
+import { float, vec4 } from '../../nodes/tsl/TSLBase.js';
+
+import { MeshNormalMaterial } from '../MeshNormalMaterial.js';
+
+const _defaultValues = /*@__PURE__*/ new MeshNormalMaterial();
+
+class MeshNormalNodeMaterial extends NodeMaterial {
+
+	constructor( parameters ) {
+
+		super();
+
+		this.lights = false;
+
+		this.isMeshNormalNodeMaterial = true;
+
+		this.setDefaultValues( _defaultValues );
+
+		this.setValues( parameters );
+
+	}
+
+	setupDiffuseColor() {
+
+		const opacityNode = this.opacityNode ? float( this.opacityNode ) : materialOpacity;
+
+		diffuseColor.assign( vec4( directionToColor( transformedNormalView ), opacityNode ) );
+
+	}
+
+}
+
+export default MeshNormalNodeMaterial;
+
+MeshNormalNodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( 'MeshNormal', MeshNormalNodeMaterial );

package/src/materials/nodes/MeshPhongNodeMaterial.js

@@ -0,0 +1,74 @@
+import NodeMaterial, { registerNodeMaterial } from './NodeMaterial.js';
+import { shininess, specularColor } from '../../nodes/core/PropertyNode.js';
+import { materialShininess, materialSpecular } from '../../nodes/accessors/MaterialNode.js';
+import { float } from '../../nodes/tsl/TSLBase.js';
+import BasicEnvironmentNode from '../../nodes/lighting/BasicEnvironmentNode.js';
+import PhongLightingModel from '../../nodes/functions/PhongLightingModel.js';
+
+import { MeshPhongMaterial } from '../MeshPhongMaterial.js';
+
+const _defaultValues = /*@__PURE__*/ new MeshPhongMaterial();
+
+class MeshPhongNodeMaterial extends NodeMaterial {
+
+	constructor( parameters ) {
+
+		super();
+
+		this.isMeshPhongNodeMaterial = true;
+
+		this.lights = true;
+
+		this.shininessNode = null;
+		this.specularNode = null;
+
+		this.setDefaultValues( _defaultValues );
+
+		this.setValues( parameters );
+
+	}
+
+	setupEnvironment( builder ) {
+
+		const envNode = super.setupEnvironment( builder );
+
+		return envNode ? new BasicEnvironmentNode( envNode ) : null;
+
+	}
+
+	setupLightingModel( /*builder*/ ) {
+
+		return new PhongLightingModel();
+
+	}
+
+	setupVariants() {
+
+		// SHININESS
+
+		const shininessNode = ( this.shininessNode ? float( this.shininessNode ) : materialShininess ).max( 1e-4 ); // to prevent pow( 0.0, 0.0 )
+
+		shininess.assign( shininessNode );
+
+		// SPECULAR COLOR
+
+		const specularNode = this.specularNode || materialSpecular;
+
+		specularColor.assign( specularNode );
+
+	}
+
+	copy( source ) {
+
+		this.shininessNode = source.shininessNode;
+		this.specularNode = source.specularNode;
+
+		return super.copy( source );
+
+	}
+
+}
+
+export default MeshPhongNodeMaterial;
+
+MeshPhongNodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( 'MeshPhong', MeshPhongNodeMaterial );

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

@@ -1,16 +1,16 @@
-import { addNodeMaterial } from './NodeMaterial.js';
-import { transformedClearcoatNormalView } from '../accessors/NormalNode.js';
-import { clearcoat, clearcoatRoughness, sheen, sheenRoughness, iridescence, iridescenceIOR, iridescenceThickness, specularColor, specularF90, diffuseColor, metalness, roughness, anisotropy, alphaT, anisotropyT, anisotropyB, ior, transmission, thickness, attenuationDistance, attenuationColor, dispersion } from '../core/PropertyNode.js';
-import { materialClearcoat, materialClearcoatRoughness, materialClearcoatNormal, materialSheen, materialSheenRoughness, materialIridescence, materialIridescenceIOR, materialIridescenceThickness, materialSpecularIntensity, materialSpecularColor, materialAnisotropy, materialIOR, materialTransmission, materialThickness, materialAttenuationDistance, materialAttenuationColor, materialDispersion } from '../accessors/MaterialNode.js';
-import { float, vec2, vec3, If } from '../shadernode/ShaderNode.js';
-import getRoughness from '../functions/material/getRoughness.js';
-import { TBNViewMatrix } from '../accessors/AccessorsUtils.js';
-import PhysicalLightingModel from '../functions/PhysicalLightingModel.js';
+import { clearcoat, clearcoatRoughness, sheen, sheenRoughness, iridescence, iridescenceIOR, iridescenceThickness, specularColor, specularF90, diffuseColor, metalness, roughness, anisotropy, alphaT, anisotropyT, anisotropyB, ior, transmission, thickness, attenuationDistance, attenuationColor, dispersion } from '../../nodes/core/PropertyNode.js';
+import { materialClearcoat, materialClearcoatRoughness, materialClearcoatNormal, materialSheen, materialSheenRoughness, materialIridescence, materialIridescenceIOR, materialIridescenceThickness, materialSpecularIntensity, materialSpecularColor, materialAnisotropy, materialIOR, materialTransmission, materialThickness, materialAttenuationDistance, materialAttenuationColor, materialDispersion } from '../../nodes/accessors/MaterialNode.js';
+import { float, vec2, vec3, If } from '../../nodes/tsl/TSLBase.js';
+import getRoughness from '../../nodes/functions/material/getRoughness.js';
+import { TBNViewMatrix } from '../../nodes/accessors/AccessorsUtils.js';
+import PhysicalLightingModel from '../../nodes/functions/PhysicalLightingModel.js';
 import MeshStandardNodeMaterial from './MeshStandardNodeMaterial.js';
-import { mix, pow2, min } from '../math/MathNode.js';
-import { MeshPhysicalMaterial } from 'three';
+import { mix, pow2, min } from '../../nodes/math/MathNode.js';
 
-const defaultValues = new MeshPhysicalMaterial();
+import { MeshPhysicalMaterial } from '../MeshPhysicalMaterial.js';
+import { registerNodeMaterial } from './NodeMaterial.js';
+
+const _defaultValues = /*@__PURE__*/ new MeshPhysicalMaterial();
 
 class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial {
 
@@ -43,7 +43,7 @@ class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial {
 
 		this.anisotropyNode = null;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 
@@ -155,9 +155,9 @@ class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial {
 
 				anisotropyV.assign( vec2( 1.0, 0.0 ) );
 
-			} ).else( () => {
+			} ).Else( () => {
 
-				anisotropyV.divAssign( anisotropy );
+				anisotropyV.divAssign( vec2( anisotropy ) );
 				anisotropy.assign( anisotropy.saturate() );
 
 			} );
@@ -196,15 +196,17 @@ class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial {
 
 	}
 
-	setupNormal( builder ) {
+	setupClearcoatNormal() {
+
+		return this.clearcoatNormalNode ? vec3( this.clearcoatNormalNode ) : materialClearcoatNormal;
 
-		super.setupNormal( builder );
+	}
 
-		// CLEARCOAT NORMAL
+	setup( builder ) {
 
-		const clearcoatNormalNode = this.clearcoatNormalNode ? vec3( this.clearcoatNormalNode ) : materialClearcoatNormal;
+		builder.context.setupClearcoatNormal = () => this.setupClearcoatNormal( builder );
 
-		transformedClearcoatNormalView.assign( clearcoatNormalNode );
+		super.setup( builder );
 
 	}
 
@@ -240,4 +242,4 @@ class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial {
 
 export default MeshPhysicalNodeMaterial;
 
-addNodeMaterial( 'MeshPhysicalNodeMaterial', MeshPhysicalNodeMaterial );
+MeshPhysicalNodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( 'MeshPhysical', MeshPhysicalNodeMaterial );

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

@@ -1,9 +1,9 @@
-import { addNodeMaterial } from './NodeMaterial.js';
-import { transformedNormalView } from '../accessors/NormalNode.js';
-import { positionViewDirection } from '../accessors/PositionNode.js';
-import PhysicalLightingModel from '../functions/PhysicalLightingModel.js';
 import MeshPhysicalNodeMaterial from './MeshPhysicalNodeMaterial.js';
-import { float, vec3 } from '../shadernode/ShaderNode.js';
+import PhysicalLightingModel from '../../nodes/functions/PhysicalLightingModel.js';
+import { transformedNormalView } from '../../nodes/accessors/Normal.js';
+import { positionViewDirection } from '../../nodes/accessors/Position.js';
+import { float, vec3 } from '../../nodes/tsl/TSLBase.js';
+import { registerNodeMaterial } from './NodeMaterial.js';
 
 class SSSLightingModel extends PhysicalLightingModel {
 
@@ -81,4 +81,4 @@ class MeshSSSNodeMaterial extends MeshPhysicalNodeMaterial {
 
 export default MeshSSSNodeMaterial;
 
-addNodeMaterial( 'MeshSSSNodeMaterial', MeshSSSNodeMaterial );
+MeshSSSNodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( 'MeshSSS', MeshSSSNodeMaterial );

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

@@ -1,14 +1,15 @@
-import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
-import { diffuseColor, metalness, roughness, specularColor, specularF90 } from '../core/PropertyNode.js';
-import { mix } from '../math/MathNode.js';
-import { materialRoughness, materialMetalness } from '../accessors/MaterialNode.js';
-import getRoughness from '../functions/material/getRoughness.js';
-import PhysicalLightingModel from '../functions/PhysicalLightingModel.js';
-import { float, vec3, vec4 } from '../shadernode/ShaderNode.js';
+import NodeMaterial, { registerNodeMaterial } from './NodeMaterial.js';
+import { diffuseColor, metalness, roughness, specularColor, specularF90 } from '../../nodes/core/PropertyNode.js';
+import { mix } from '../../nodes/math/MathNode.js';
+import { materialRoughness, materialMetalness } from '../../nodes/accessors/MaterialNode.js';
+import getRoughness from '../../nodes/functions/material/getRoughness.js';
+import PhysicalLightingModel from '../../nodes/functions/PhysicalLightingModel.js';
+import EnvironmentNode from '../../nodes/lighting/EnvironmentNode.js';
+import { float, vec3, vec4 } from '../../nodes/tsl/TSLBase.js';
 
-import { MeshStandardMaterial } from 'three';
+import { MeshStandardMaterial } from '../MeshStandardMaterial.js';
 
-const defaultValues = new MeshStandardMaterial();
+const _defaultValues = /*@__PURE__*/ new MeshStandardMaterial();
 
 class MeshStandardNodeMaterial extends NodeMaterial {
 
@@ -18,17 +19,33 @@ class MeshStandardNodeMaterial extends NodeMaterial {
 
 		this.isMeshStandardNodeMaterial = true;
 
+		this.lights = true;
+
 		this.emissiveNode = null;
 
 		this.metalnessNode = null;
 		this.roughnessNode = null;
 
-		this.setDefaultValues( defaultValues );
+		this.setDefaultValues( _defaultValues );
 
 		this.setValues( parameters );
 
 	}
 
+	setupEnvironment( builder ) {
+
+		let envNode = super.setupEnvironment( builder );
+
+		if ( envNode === null && builder.environmentNode ) {
+
+			envNode = builder.environmentNode;
+
+		}
+
+		return envNode ? new EnvironmentNode( envNode ) : null;
+
+	}
+
 	setupLightingModel( /*builder*/ ) {
 
 		return new PhysicalLightingModel();
@@ -84,4 +101,4 @@ class MeshStandardNodeMaterial extends NodeMaterial {
 
 export default MeshStandardNodeMaterial;
 
-addNodeMaterial( 'MeshStandardNodeMaterial', MeshStandardNodeMaterial );
+MeshStandardNodeMaterial.type = /*@__PURE__*/ registerNodeMaterial( 'MeshStandard', MeshStandardNodeMaterial );

package/src/materials/nodes/MeshToonNodeMaterial.js

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