simplify

mrdoob · Feb 8, 2024 · bb974b0 · bb974b0
1 parent bfb7311
commit bb974b0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/examples/jsm/nodes/accessors/ClippingNode.js b/examples/jsm/nodes/accessors/ClippingNode.js
@@ -24,31 +24,27 @@ class ClippingNode extends Node {
 
 		const clippingContext = builder.clippingContext;
 		const { localClipIntersection, localClippingCount, globalClippingCount } = clippingContext;
-		const l = globalClippingCount + localClippingCount;
 
-		this._numClippingPlanes = l;
-		this._numUnionClippingPlanes = localClipIntersection ? l - localClippingCount : l;
+		const numClippingPlanes = globalClippingCount + localClippingCount;
+		const numUnionClippingPlanes = localClipIntersection ? numClippingPlanes - localClippingCount: numClippingPlanes;
 
 		if ( this.scope === ClippingNode.ALPHA_TO_COVERAGE ) {
 
-			return this.setupAlphaToCoverage( clippingContext );
+			return this.setupAlphaToCoverage( clippingContext.planes, numClippingPlanes, numUnionClippingPlanes );
 
 		} else {
 
-			return this.setupDefault( clippingContext );
+			return this.setupDefault( clippingContext.planes );
 
 		}
 
 	}
 
-	setupAlphaToCoverage( clippingContext ) {
-
-		const numClippingPlanes = this._numClippingPlanes;
-		const numUnionClippingPlanes = this._numUnionClippingPlanes;
+	setupAlphaToCoverage( planes, numClippingPlanes, numUnionClippingPlanes ) {
 
 		return tslFn( () => {
 
-			const clippingPlanes = uniforms( clippingContext.planes );
+			const clippingPlanes = uniforms( planes );
 
 			const distanceToPlane = property( 'float', 'distanceToPlane' );
 			const distanceGradient = property( 'float', 'distanceToGradient' );
@@ -101,14 +97,11 @@ class ClippingNode extends Node {
 
 	}
 
-	setupDefault( clippingContext ) {
-
-		const numClippingPlanes = this._numClippingPlanes;
-		const numUnionClippingPlanes = this._numUnionClippingPlanes;
+	setupDefault( planes, numClippingPlanes, numUnionClippingPlanes ) {
 
 		return tslFn( () => {
 
-			const clippingPlanes = uniforms( clippingContext.planes );
+			const clippingPlanes = uniforms( planes );
 
 			let plane;
 

diff --git a/examples/jsm/renderers/common/ClippingContext.js b/examples/jsm/renderers/common/ClippingContext.js
@@ -13,10 +13,12 @@ class ClippingContext {
 
 		this.globalClippingCount = 0;
 
-		this.localClippingCount = 0;
+		this._localClippingCount = 0;
 		this.localClippingEnabled = false;
 		this.localClipIntersection = false;
 
+		this.offset = 0;
+
 		this.planes = [];
 
 		this.parentVersion = 0;
@@ -107,7 +109,6 @@ class ClippingContext {
 			this.parentVersion = parent.version;
 			this.viewMatrix = parent.viewMatrix;
 
-
 			update = true;
 
 		}
@@ -122,7 +123,7 @@ class ClippingContext {
 				const planes = this.planes;
 				const offset = this.globalClippingCount;
 
-				if ( update || l !== this.localClippingCount ) {
+				if ( update || l !== this._localClippingCount ) {
 
 					planes.length = offset + l;
 
@@ -132,17 +133,17 @@ class ClippingContext {
 
 					}
 
-					this.localClippingCount = l;
+					this._localClippingCount = l;
 					update = true;
 
 				}
 
 				this.projectPlanes( localClippingPlanes, offset );
 
 
-			} else if ( this.localClippingCount !== 0 ) {
+			} else if ( this._localClippingCount !== 0 ) {
 
-				this.localClippingCount = 0;
+				this._localClippingCount = 0;
 				update = true;
 
 			}