Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/materials/nodes/NodeMaterial.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Material } from '../Material.js';
import { NormalBlending } from '../../constants.js';

import { hashArray, hashString } from '../../nodes/core/NodeUtils.js';
import { output, diffuseColor, emissive, varyingProperty } from '../../nodes/core/PropertyNode.js';
Expand Down Expand Up @@ -820,7 +819,9 @@ class NodeMaterial extends Material {
* @param {NodeBuilder} builder - The current node builder.
* @param {BufferGeometry} geometry - The geometry.
*/
setupDiffuseColor( { object, geometry } ) {
setupDiffuseColor( builder ) {

const { object, geometry } = builder;

// MASK

Expand Down Expand Up @@ -902,9 +903,7 @@ class NodeMaterial extends Material {

// OPAQUE

const isOpaque = this.transparent === false && this.blending === NormalBlending && this.alphaToCoverage === false;

if ( isOpaque ) {
if ( builder.isOpaque() ) {

diffuseColor.a.assign( 1.0 );

Expand Down
15 changes: 14 additions & 1 deletion src/nodes/core/NodeBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import ChainMap from '../../renderers/common/ChainMap.js';

import BindGroup from '../../renderers/common/BindGroup.js';

import { REVISION, IntType, UnsignedIntType, LinearFilter, LinearMipmapNearestFilter, NearestMipmapLinearFilter, LinearMipmapLinearFilter } from '../../constants.js';
import { REVISION, IntType, UnsignedIntType, LinearFilter, LinearMipmapNearestFilter, NearestMipmapLinearFilter, LinearMipmapLinearFilter, NormalBlending } from '../../constants.js';
import { RenderTarget } from '../../core/RenderTarget.js';
import { Color } from '../../math/Color.js';
import { Vector2 } from '../../math/Vector2.js';
Expand Down Expand Up @@ -461,6 +461,19 @@ class NodeBuilder {

}

/**
* Whether the material is opaque or not.
*
* @return {boolean} Whether the material is opaque or not.
*/
isOpaque() {

const material = this.material;

return material.transparent === false && material.blending === NormalBlending && material.alphaToCoverage === false;

}

/**
* Returns the bind groups of the current renderer.
*
Expand Down
2 changes: 0 additions & 2 deletions src/nodes/lighting/LightsNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,6 @@ class LightsNode extends Node {

}

context.material.transparent = true;

}

totalDiffuseNode.assign( totalDiffuse );
Expand Down
10 changes: 7 additions & 3 deletions src/renderers/common/RenderList.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function reversePainterSortStable( a, b ) {
*/
function needsDoublePass( material ) {

const hasTransmission = material.transmission > 0 || material.transmissionNode;
const hasTransmission = material.transmission > 0 || ( material.transmissionNode && material.transmissionNode.isNode );

return hasTransmission && material.side === DoubleSide && material.forceSinglePass === false;

Expand Down Expand Up @@ -283,7 +283,9 @@ class RenderList {

if ( object.occlusionTest === true ) this.occlusionQueryCount ++;

if ( material.transparent === true || material.transmission > 0 ) {
if ( material.transparent === true || material.transmission > 0 ||
( material.transmissionNode && material.transmissionNode.isNode ) ||
( material.backdropNode && material.backdropNode.isNode ) ) {

if ( needsDoublePass( material ) ) this.transparentDoublePass.push( renderItem );

Expand Down Expand Up @@ -313,7 +315,9 @@ class RenderList {

const renderItem = this.getNextRenderItem( object, geometry, material, groupOrder, z, group, clippingContext );

if ( material.transparent === true || material.transmission > 0 ) {
if ( material.transparent === true || material.transmission > 0 ||
( material.transmissionNode && material.transmissionNode.isNode ) ||
( material.backdropNode && material.backdropNode.isNode ) ) {

if ( needsDoublePass( material ) ) this.transparentDoublePass.unshift( renderItem );

Expand Down
4 changes: 3 additions & 1 deletion src/renderers/common/Renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3102,7 +3102,9 @@ class Renderer {

overrideMaterial.alphaTest = material.alphaTest;
overrideMaterial.alphaMap = material.alphaMap;
overrideMaterial.transparent = material.transparent || material.transmission > 0;
overrideMaterial.transparent = material.transparent || material.transmission > 0 ||
( material.transmissionNode && material.transmissionNode.isNode ) ||
( material.backdropNode && material.backdropNode.isNode );

if ( overrideMaterial.isShadowPassMaterial ) {

Expand Down