super-three 0.137.0 → 0.141.0

package/examples/jsm/renderers/webgpu/nodes/WebGPUNodeSampledTexture.js

@@ -1,4 +1,4 @@
-import { WebGPUSampledTexture } from '../WebGPUSampledTexture.js';
+import { WebGPUSampledTexture, WebGPUSampledCubeTexture } from '../WebGPUSampledTexture.js';
 
 class WebGPUNodeSampledTexture extends WebGPUSampledTexture {
 
@@ -18,4 +18,22 @@ class WebGPUNodeSampledTexture extends WebGPUSampledTexture {
 
 }
 
-export { WebGPUNodeSampledTexture };
+class WebGPUNodeSampledCubeTexture extends WebGPUSampledCubeTexture {
+
+	constructor( name, textureNode ) {
+
+		super( name, textureNode.value );
+
+		this.textureNode = textureNode;
+
+	}
+
+	getTexture() {
+
+		return this.textureNode.value;
+
+	}
+
+}
+
+export { WebGPUNodeSampledTexture, WebGPUNodeSampledCubeTexture };

package/examples/jsm/renderers/webgpu/nodes/WebGPUNodes.js

@@ -1,27 +1,35 @@
 import WebGPUNodeBuilder from './WebGPUNodeBuilder.js';
-import NodeFrame from '../../nodes/core/NodeFrame.js';
+import NodeFrame from 'three-nodes/core/NodeFrame.js';
 
 class WebGPUNodes {
 
-	constructor( renderer ) {
+	constructor( renderer, properties ) {
 
 		this.renderer = renderer;
+		this.properties = properties;
 
 		this.nodeFrame = new NodeFrame();
 
-		this.builders = new WeakMap();
-
 	}
 
-	get( object, lightNode ) {
+	get( object ) {
+
+		const objectProperties = this.properties.get( object );
 
-		let nodeBuilder = this.builders.get( object );
+		let nodeBuilder = objectProperties.nodeBuilder;
 
 		if ( nodeBuilder === undefined ) {
 
-			nodeBuilder = new WebGPUNodeBuilder( object, this.renderer, lightNode ).build();
+			const scene = objectProperties.scene;
+			const lightsNode = objectProperties.lightsNode;
+
+			nodeBuilder = new WebGPUNodeBuilder( object, this.renderer );
+			nodeBuilder.lightsNode = lightsNode;
+			nodeBuilder.fogNode = scene?.fogNode;
+			nodeBuilder.scene = scene;
+			nodeBuilder.build();
 
-			this.builders.set( object, nodeBuilder );
+			objectProperties.nodeBuilder = nodeBuilder;
 
 		}
 
@@ -31,7 +39,9 @@ class WebGPUNodes {
 
 	remove( object ) {
 
-		this.builders.delete( object );
+		const objectProperties = this.properties.get( object );
+
+		delete objectProperties.nodeBuilder;
 
 	}
 
@@ -41,18 +51,18 @@ class WebGPUNodes {
 
 	}
 
-	update( object, camera, lightNode ) {
+	update( object, camera ) {
 
 		const renderer = this.renderer;
 		const material = object.material;
 
-		const nodeBuilder = this.get( object, lightNode );
+		const nodeBuilder = this.get( object );
 		const nodeFrame = this.nodeFrame;
 
-		nodeFrame.material = material;
-		nodeFrame.camera = camera;
 		nodeFrame.object = object;
+		nodeFrame.camera = camera;
 		nodeFrame.renderer = renderer;
+		nodeFrame.material = material;
 
 		for ( const node of nodeBuilder.updateNodes ) {
 
@@ -64,7 +74,7 @@ class WebGPUNodes {
 
 	dispose() {
 
-		this.builders = new WeakMap();
+		this.nodeFrame = new NodeFrame();
 
 	}
 

package/examples/jsm/shaders/BlendShader.js

@@ -38,7 +38,8 @@ const BlendShader = {
 
 			vec4 texel1 = texture2D( tDiffuse1, vUv );
 			vec4 texel2 = texture2D( tDiffuse2, vUv );
-			gl_FragColor = opacity * mix( texel1, texel2, mixRatio );
+			gl_FragColor = mix( texel1, texel2, mixRatio );
+			gl_FragColor.a *= opacity;
 
 		}`
 

package/examples/jsm/shaders/CopyShader.js

@@ -2,7 +2,7 @@
  * Full-screen textured quad shader
  */
 
-var CopyShader = {
+const CopyShader = {
 
 	uniforms: {
 
@@ -32,8 +32,9 @@ var CopyShader = {
 
 		void main() {
 
-			vec4 texel = texture2D( tDiffuse, vUv );
-			gl_FragColor = opacity * texel;
+			gl_FragColor = texture2D( tDiffuse, vUv );
+			gl_FragColor.a *= opacity;
+
 
 		}`