NodeMaterial: unlit property (mrdoob#26429)

* NodeMaterial: unlit property * cleanup
aardgoose · Jul 14, 2023 · 6863177 · 6863177
1 parent 87d917b
commit 6863177
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/examples/jsm/nodes/materials/NodeMaterial.js b/examples/jsm/nodes/materials/NodeMaterial.js
@@ -1,4 +1,4 @@
-import { Material, ShaderMaterial, NoColorSpace } from 'three';
+import { Material, ShaderMaterial, NoColorSpace, LinearSRGBColorSpace } from 'three';
 import { getNodeChildren, getCacheKey } from '../core/NodeUtils.js';
 import { attribute } from '../core/AttributeNode.js';
 import { output, diffuseColor } from '../core/PropertyNode.js';
@@ -34,6 +34,7 @@ class NodeMaterial extends ShaderMaterial {
 
 		this.lights = true;
 		this.normals = true;
+		this.unlit = this.constructor === NodeMaterial.prototype.constructor; // Extended materials are not unlit by default
 
 		this.lightsNode = null;
 		this.envNode = null;
@@ -78,7 +79,7 @@ class NodeMaterial extends ShaderMaterial {
 
 		let outputNode;
 
-		if ( this.isUnlit === false ) {
+		if ( this.unlit === false ) {
 
 			if ( this.normals === true ) this.constructNormal( builder );
 
@@ -89,6 +90,12 @@ class NodeMaterial extends ShaderMaterial {
 
 			outputNode = this.constructOutput( builder, vec4( outgoingLightNode, diffuseColor.a ) );
 
+			// OUTPUT NODE
+
+			builder.stack.assign( output, outputNode );
+
+			//
+
 			if ( this.outputNode !== null ) outputNode = this.outputNode;
 
 		} else {
@@ -336,18 +343,18 @@ class NodeMaterial extends ShaderMaterial {
 
 		}
 
-		if ( outputColorSpace !== NoColorSpace ) outputNode = outputNode.linearToColorSpace( outputColorSpace );
+		if ( outputColorSpace !== LinearSRGBColorSpace && outputColorSpace !== NoColorSpace ) {
+
+			outputNode = outputNode.linearToColorSpace( outputColorSpace );
+
+		}
 
 		// FOG
 
 		const fogNode = builder.fogNode;
 
 		if ( fogNode ) outputNode = vec4( fogNode.mixAssign( outputNode.rgb ), outputNode.a );
 
-		// OUTPUT NODE
-
-		builder.stack.assign( output, outputNode );
-
 		return outputNode;
 
 	}
@@ -447,12 +454,6 @@ class NodeMaterial extends ShaderMaterial {
 
 	}
 
-	get isUnlit() {
-
-		return this.constructor === NodeMaterial.prototype.constructor;
-
-	}
-
 	copy( source ) {
 
 		this.lightsNode = source.lightsNode;