super-three 0.136.0 → 0.141.0

package/examples/jsm/renderers/webgpu/WebGPUTextures.js

@@ -1,6 +1,6 @@
 import { GPUTextureFormat, GPUAddressMode, GPUFilterMode, GPUTextureDimension } from './constants.js';
 import { CubeTexture, Texture, NearestFilter, NearestMipmapNearestFilter, NearestMipmapLinearFilter, LinearFilter, RepeatWrapping, MirroredRepeatWrapping,
-	RGBFormat, RGBAFormat, RedFormat, RGFormat, RGBA_S3TC_DXT1_Format, RGBA_S3TC_DXT3_Format, RGBA_S3TC_DXT5_Format, UnsignedByteType, FloatType, HalfFloatType, sRGBEncoding
+	RGBAFormat, RedFormat, RGFormat, RGBA_S3TC_DXT1_Format, RGBA_S3TC_DXT3_Format, RGBA_S3TC_DXT5_Format, UnsignedByteType, FloatType, HalfFloatType, sRGBEncoding
 } from 'three';
 import WebGPUTextureUtils from './WebGPUTextureUtils.js';
 
@@ -349,7 +349,7 @@ class WebGPUTextures {
 
 		// transfer texture data
 
-		if ( texture.isDataTexture || texture.isDataTexture2DArray || texture.isDataTexture3D ) {
+		if ( texture.isDataTexture || texture.isDataArrayTexture || texture.isData3DTexture ) {
 
 			this._copyBufferToTexture( image, format, textureGPU );
 
@@ -361,11 +361,15 @@ class WebGPUTextures {
 
 		} else if ( texture.isCubeTexture ) {
 
-			this._copyCubeMapToTexture( image, texture, textureGPU );
+			if ( image.length === 6 ) {
+
+				this._copyCubeMapToTexture( image, format, texture, textureGPU, textureGPUDescriptor, needsMipmaps );
+
+			}
 
 		} else {
 
-			if ( image !== undefined ) {
+			if ( image !== null ) {
 
 				// assume HTMLImageElement, HTMLCanvasElement or ImageBitmap
 
@@ -387,7 +391,7 @@ class WebGPUTextures {
 
 	}
 
-	_copyBufferToTexture( image, format, textureGPU ) {
+	_copyBufferToTexture( image, format, textureGPU, origin = { x: 0, y: 0, z: 0 } ) {
 
 		// @TODO: Consider to use GPUCommandEncoder.copyBufferToTexture()
 		// @TODO: Consider to support valid buffer layouts with other formats like RGB
@@ -400,7 +404,8 @@ class WebGPUTextures {
 		this.device.queue.writeTexture(
 			{
 				texture: textureGPU,
-				mipLevel: 0
+				mipLevel: 0,
+				origin
 			},
 			data,
 			{
@@ -415,17 +420,29 @@ class WebGPUTextures {
 
 	}
 
-	_copyCubeMapToTexture( images, texture, textureGPU ) {
+	_copyCubeMapToTexture( images, format, texture, textureGPU, textureGPUDescriptor, needsMipmaps ) {
 
-		for ( let i = 0; i < images.length; i ++ ) {
+		for ( let i = 0; i < 6; i ++ ) {
 
 			const image = images[ i ];
 
-			this._getImageBitmap( image, texture ).then( imageBitmap => {
+			if ( image.isDataTexture ) {
 
-				this._copyExternalImageToTexture( imageBitmap, textureGPU, { x: 0, y: 0, z: i } );
+				this._copyBufferToTexture( image.image, format, textureGPU, { z : i } );
 
-			} );
+				if ( needsMipmaps === true ) this._generateMipmaps( textureGPU, textureGPUDescriptor, i );
+
+			} else {
+
+				this._getImageBitmap( image, texture ).then( imageBitmap => {
+
+					this._copyExternalImageToTexture( imageBitmap, textureGPU, { z : i } );
+
+					if ( needsMipmaps === true ) this._generateMipmaps( textureGPU, textureGPUDescriptor, i );
+
+				} );
+
+			}
 
 		}
 
@@ -439,7 +456,7 @@ class WebGPUTextures {
 			}, {
 				texture: textureGPU,
 				mipLevel: 0,
-				origin: origin
+				origin
 			}, {
 				width: image.width,
 				height: image.height,
@@ -477,14 +494,14 @@ class WebGPUTextures {
 				{
 					width: Math.ceil( width / blockData.width ) * blockData.width,
 					height: Math.ceil( height / blockData.width ) * blockData.width,
-					depthOrArrayLayers: 1,
+					depthOrArrayLayers: 1
 				} );
 
 		}
 
 	}
 
-	_generateMipmaps( textureGPU, textureGPUDescriptor ) {
+	_generateMipmaps( textureGPU, textureGPUDescriptor, baseArrayLayer ) {
 
 		if ( this.utils === null ) {
 
@@ -492,7 +509,7 @@ class WebGPUTextures {
 
 		}
 
-		this.utils.generateMipmaps( textureGPU, textureGPUDescriptor );
+		this.utils.generateMipmaps( textureGPU, textureGPUDescriptor, baseArrayLayer );
 
 	}
 
@@ -528,7 +545,7 @@ class WebGPUTextures {
 
 		let dimension;
 
-		if ( texture.isDataTexture3D ) {
+		if ( texture.isData3DTexture ) {
 
 			dimension = GPUTextureDimension.ThreeD;
 
@@ -564,7 +581,6 @@ class WebGPUTextures {
 				formatGPU = ( encoding === sRGBEncoding ) ? GPUTextureFormat.BC3RGBAUnormSRGB : GPUTextureFormat.BC3RGBAUnorm;
 				break;
 
-			case RGBFormat:
 			case RGBAFormat:
 
 				switch ( type ) {
@@ -698,11 +714,13 @@ class WebGPUTextures {
 
 		if ( texture.isCubeTexture ) {
 
-			width = ( image.length > 0 ) ? image[ 0 ].width : 1;
-			height = ( image.length > 0 ) ? image[ 0 ].height : 1;
+			const faceImage = image.length > 0 ? image[ 0 ].image || image[ 0 ] : null;
+
+			width = faceImage?.width || 1;
+			height = faceImage?.height || 1;
 			depth = 6; // one image for each side of the cube map
 
-		} else if ( image !== undefined ) {
+		} else if ( image !== null ) {
 
 			width = image.width;
 			height = image.height;

package/examples/jsm/renderers/webgpu/WebGPUUniform.js

@@ -34,6 +34,8 @@ class FloatUniform extends WebGPUUniform {
 
 		super( name, value );
 
+		this.isFloatUniform = true;
+
 		this.boundary = 4;
 		this.itemSize = 1;
 
@@ -41,14 +43,14 @@ class FloatUniform extends WebGPUUniform {
 
 }
 
-FloatUniform.prototype.isFloatUniform = true;
-
 class Vector2Uniform extends WebGPUUniform {
 
 	constructor( name, value = new Vector2() ) {
 
 		super( name, value );
 
+		this.isVector2Uniform = true;
+
 		this.boundary = 8;
 		this.itemSize = 2;
 
@@ -56,14 +58,14 @@ class Vector2Uniform extends WebGPUUniform {
 
 }
 
-Vector2Uniform.prototype.isVector2Uniform = true;
-
 class Vector3Uniform extends WebGPUUniform {
 
 	constructor( name, value = new Vector3() ) {
 
 		super( name, value );
 
+		this.isVector3Uniform = true;
+
 		this.boundary = 16;
 		this.itemSize = 3;
 
@@ -71,14 +73,14 @@ class Vector3Uniform extends WebGPUUniform {
 
 }
 
-Vector3Uniform.prototype.isVector3Uniform = true;
-
 class Vector4Uniform extends WebGPUUniform {
 
 	constructor( name, value = new Vector4() ) {
 
 		super( name, value );
 
+		this.isVector4Uniform = true;
+
 		this.boundary = 16;
 		this.itemSize = 4;
 
@@ -86,14 +88,14 @@ class Vector4Uniform extends WebGPUUniform {
 
 }
 
-Vector4Uniform.prototype.isVector4Uniform = true;
-
 class ColorUniform extends WebGPUUniform {
 
 	constructor( name, value = new Color() ) {
 
 		super( name, value );
 
+		this.isColorUniform = true;
+
 		this.boundary = 16;
 		this.itemSize = 3;
 
@@ -101,14 +103,14 @@ class ColorUniform extends WebGPUUniform {
 
 }
 
-ColorUniform.prototype.isColorUniform = true;
-
 class Matrix3Uniform extends WebGPUUniform {
 
 	constructor( name, value = new Matrix3() ) {
 
 		super( name, value );
 
+		this.isMatrix3Uniform = true;
+
 		this.boundary = 48;
 		this.itemSize = 12;
 
@@ -116,14 +118,14 @@ class Matrix3Uniform extends WebGPUUniform {
 
 }
 
-Matrix3Uniform.prototype.isMatrix3Uniform = true;
-
 class Matrix4Uniform extends WebGPUUniform {
 
 	constructor( name, value = new Matrix4() ) {
 
 		super( name, value );
 
+		this.isMatrix4Uniform = true;
+
 		this.boundary = 64;
 		this.itemSize = 16;
 
@@ -131,6 +133,4 @@ class Matrix4Uniform extends WebGPUUniform {
 
 }
 
-Matrix4Uniform.prototype.isMatrix4Uniform = true;
-
 export { FloatUniform, Vector2Uniform, Vector3Uniform, Vector4Uniform, ColorUniform, Matrix3Uniform, Matrix4Uniform };

package/examples/jsm/renderers/webgpu/WebGPUUniformBuffer.js

@@ -1,45 +1,18 @@
-import WebGPUBinding from './WebGPUBinding.js';
-import { getFloatLength } from './WebGPUBufferUtils.js';
-
+import WebGPUBuffer from './WebGPUBuffer.js';
 import { GPUBindingType } from './constants.js';
 
-class WebGPUUniformBuffer extends WebGPUBinding {
+class WebGPUUniformBuffer extends WebGPUBuffer {
 
 	constructor( name, buffer = null ) {
 
-		super( name );
-
-		this.bytesPerElement = Float32Array.BYTES_PER_ELEMENT;
-		this.type = GPUBindingType.UniformBuffer;
-		this.visibility = GPUShaderStage.VERTEX;
-
-		this.usage = GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST;
-
-		this.buffer = buffer;
-		this.bufferGPU = null; // set by the renderer
+		super( name, GPUBindingType.UniformBuffer, buffer );
 
-	}
-
-	getByteLength() {
+		this.isUniformBuffer = true;
 
-		return getFloatLength( this.buffer.byteLength );
-
-	}
-
-	getBuffer() {
-
-		return this.buffer;
-
-	}
-
-	update() {
-
-		return true;
+		this.usage |= GPUBufferUsage.UNIFORM;
 
 	}
 
 }
 
-WebGPUUniformBuffer.prototype.isUniformBuffer = true;
-
 export default WebGPUUniformBuffer;

package/examples/jsm/renderers/webgpu/WebGPUUniformsGroup.js

@@ -7,6 +7,8 @@ class WebGPUUniformsGroup extends WebGPUUniformBuffer {
 
 		super( name );
 
+		this.isUniformsGroup = true;
+
 		// the order of uniforms in this array must match the order of uniforms in the shader
 
 		this.uniforms = [];
@@ -294,6 +296,4 @@ function arraysEqual( a, b, offset ) {
 
 }
 
-WebGPUUniformsGroup.prototype.isUniformsGroup = true;
-
 export default WebGPUUniformsGroup;

package/examples/jsm/renderers/webgpu/constants.js

@@ -19,11 +19,12 @@ export const GPUCompareFunction = {
 
 export const GPUStoreOp = {
 	Store: 'store',
-	Clear: 'clear'
+	Discard: 'discard'
 };
 
 export const GPULoadOp = {
-	Load: 'load'
+	Load: 'load',
+	Clear: 'clear'
 };
 
 export const GPUFrontFace = {