super-three 0.154.0 → 0.155.0

package/src/renderers/webgl/WebGLTextures.js

@@ -157,6 +157,17 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 		}
 
+		if ( glFormat === _gl.RED_INTEGER ) {
+
+			if ( glType === _gl.UNSIGNED_BYTE ) internalFormat = _gl.R8UI;
+			if ( glType === _gl.UNSIGNED_SHORT ) internalFormat = _gl.R16UI;
+			if ( glType === _gl.UNSIGNED_INT ) internalFormat = _gl.R32UI;
+			if ( glType === _gl.BYTE ) internalFormat = _gl.R8I;
+			if ( glType === _gl.SHORT ) internalFormat = _gl.R16I;
+			if ( glType === _gl.INT ) internalFormat = _gl.R32I;
+
+		}
+
 		if ( glFormat === _gl.RG ) {
 
 			if ( glType === _gl.FLOAT ) internalFormat = _gl.RG32F;
@@ -333,14 +344,32 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 			for ( let i = 0; i < 6; i ++ ) {
 
-				_gl.deleteFramebuffer( renderTargetProperties.__webglFramebuffer[ i ] );
+				if ( Array.isArray( renderTargetProperties.__webglFramebuffer[ i ] ) ) {
+
+					for ( let level = 0; level < renderTargetProperties.__webglFramebuffer[ i ].length; level ++ ) _gl.deleteFramebuffer( renderTargetProperties.__webglFramebuffer[ i ][ level ] );
+
+				} else {
+
+					_gl.deleteFramebuffer( renderTargetProperties.__webglFramebuffer[ i ] );
+
+				}
+
 				if ( renderTargetProperties.__webglDepthbuffer ) _gl.deleteRenderbuffer( renderTargetProperties.__webglDepthbuffer[ i ] );
 
 			}
 
 		} else {
 
-			_gl.deleteFramebuffer( renderTargetProperties.__webglFramebuffer );
+			if ( Array.isArray( renderTargetProperties.__webglFramebuffer ) ) {
+
+				for ( let level = 0; level < renderTargetProperties.__webglFramebuffer.length; level ++ ) _gl.deleteFramebuffer( renderTargetProperties.__webglFramebuffer[ level ] );
+
+			} else {
+
+				_gl.deleteFramebuffer( renderTargetProperties.__webglFramebuffer );
+
+			}
+
 			if ( renderTargetProperties.__webglDepthbuffer ) _gl.deleteRenderbuffer( renderTargetProperties.__webglDepthbuffer );
 			if ( renderTargetProperties.__webglMultisampledFramebuffer ) _gl.deleteFramebuffer( renderTargetProperties.__webglMultisampledFramebuffer );
 
@@ -1315,7 +1344,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 	// Render targets
 
 	// Setup storage for target texture and bind it to correct framebuffer
-	function setupFrameBufferTexture( framebuffer, renderTarget, texture, attachment, textureTarget ) {
+	function setupFrameBufferTexture( framebuffer, renderTarget, texture, attachment, textureTarget, level ) {
 
 		const glFormat = utils.convert( texture.format, texture.colorSpace );
 		const glType = utils.convert( texture.type );
@@ -1324,13 +1353,16 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 		if ( ! renderTargetProperties.__hasExternalTextures ) {
 
+			const width = Math.max( 1, renderTarget.width >> level );
+			const height = Math.max( 1, renderTarget.height >> level );
+
 			if ( textureTarget === _gl.TEXTURE_3D || textureTarget === _gl.TEXTURE_2D_ARRAY ) {
 
-				state.texImage3D( textureTarget, 0, glInternalFormat, renderTarget.width, renderTarget.height, renderTarget.depth, 0, glFormat, glType, null );
+				state.texImage3D( textureTarget, level, glInternalFormat, width, height, renderTarget.depth, 0, glFormat, glType, null );
 
 			} else {
 
-				state.texImage2D( textureTarget, 0, glInternalFormat, renderTarget.width, renderTarget.height, 0, glFormat, glType, null );
+				state.texImage2D( textureTarget, level, glInternalFormat, width, height, 0, glFormat, glType, null );
 
 			}
 
@@ -1344,7 +1376,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 		} else if ( textureTarget === _gl.TEXTURE_2D || ( textureTarget >= _gl.TEXTURE_CUBE_MAP_POSITIVE_X && textureTarget <= _gl.TEXTURE_CUBE_MAP_NEGATIVE_Z ) ) { // see #24753
 
-			_gl.framebufferTexture2D( _gl.FRAMEBUFFER, attachment, textureTarget, properties.get( texture ).__webglTexture, 0 );
+			_gl.framebufferTexture2D( _gl.FRAMEBUFFER, attachment, textureTarget, properties.get( texture ).__webglTexture, level );
 
 		}
 
@@ -1565,7 +1597,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 		if ( colorTexture !== undefined ) {
 
-			setupFrameBufferTexture( renderTargetProperties.__webglFramebuffer, renderTarget, renderTarget.texture, _gl.COLOR_ATTACHMENT0, _gl.TEXTURE_2D );
+			setupFrameBufferTexture( renderTargetProperties.__webglFramebuffer, renderTarget, renderTarget.texture, _gl.COLOR_ATTACHMENT0, _gl.TEXTURE_2D, 0 );
 
 		}
 
@@ -1612,13 +1644,41 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 			for ( let i = 0; i < 6; i ++ ) {
 
-				renderTargetProperties.__webglFramebuffer[ i ] = _gl.createFramebuffer();
+				if ( isWebGL2 && texture.mipmaps && texture.mipmaps.length > 0 ) {
+
+					renderTargetProperties.__webglFramebuffer[ i ] = [];
+
+					for ( let level = 0; level < texture.mipmaps.length; level ++ ) {
+
+						renderTargetProperties.__webglFramebuffer[ i ][ level ] = _gl.createFramebuffer();
+
+					}
+
+				} else {
+
+					renderTargetProperties.__webglFramebuffer[ i ] = _gl.createFramebuffer();
+
+				}
 
 			}
 
 		} else {
 
-			renderTargetProperties.__webglFramebuffer = _gl.createFramebuffer();
+			if ( isWebGL2 && texture.mipmaps && texture.mipmaps.length > 0 ) {
+
+				renderTargetProperties.__webglFramebuffer = [];
+
+				for ( let level = 0; level < texture.mipmaps.length; level ++ ) {
+
+					renderTargetProperties.__webglFramebuffer[ level ] = _gl.createFramebuffer();
+
+				}
+
+			} else {
+
+				renderTargetProperties.__webglFramebuffer = _gl.createFramebuffer();
+
+			}
 
 			if ( isMultipleRenderTargets ) {
 
@@ -1698,7 +1758,19 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 			for ( let i = 0; i < 6; i ++ ) {
 
-				setupFrameBufferTexture( renderTargetProperties.__webglFramebuffer[ i ], renderTarget, texture, _gl.COLOR_ATTACHMENT0, _gl.TEXTURE_CUBE_MAP_POSITIVE_X + i );
+				if ( isWebGL2 && texture.mipmaps && texture.mipmaps.length > 0 ) {
+
+					for ( let level = 0; level < texture.mipmaps.length; level ++ ) {
+
+						setupFrameBufferTexture( renderTargetProperties.__webglFramebuffer[ i ][ level ], renderTarget, texture, _gl.COLOR_ATTACHMENT0, _gl.TEXTURE_CUBE_MAP_POSITIVE_X + i, level );
+
+					}
+
+				} else {
+
+					setupFrameBufferTexture( renderTargetProperties.__webglFramebuffer[ i ], renderTarget, texture, _gl.COLOR_ATTACHMENT0, _gl.TEXTURE_CUBE_MAP_POSITIVE_X + i, 0 );
+
+				}
 
 			}
 
@@ -1721,7 +1793,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 				state.bindTexture( _gl.TEXTURE_2D, attachmentProperties.__webglTexture );
 				setTextureParameters( _gl.TEXTURE_2D, attachment, supportsMips );
-				setupFrameBufferTexture( renderTargetProperties.__webglFramebuffer, renderTarget, attachment, _gl.COLOR_ATTACHMENT0 + i, _gl.TEXTURE_2D );
+				setupFrameBufferTexture( renderTargetProperties.__webglFramebuffer, renderTarget, attachment, _gl.COLOR_ATTACHMENT0 + i, _gl.TEXTURE_2D, 0 );
 
 				if ( textureNeedsGenerateMipmaps( attachment, supportsMips ) ) {
 
@@ -1753,7 +1825,20 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 			state.bindTexture( glTextureType, textureProperties.__webglTexture );
 			setTextureParameters( glTextureType, texture, supportsMips );
-			setupFrameBufferTexture( renderTargetProperties.__webglFramebuffer, renderTarget, texture, _gl.COLOR_ATTACHMENT0, glTextureType );
+
+			if ( isWebGL2 && texture.mipmaps && texture.mipmaps.length > 0 ) {
+
+				for ( let level = 0; level < texture.mipmaps.length; level ++ ) {
+
+					setupFrameBufferTexture( renderTargetProperties.__webglFramebuffer[ level ], renderTarget, texture, _gl.COLOR_ATTACHMENT0, glTextureType, level );
+
+				}
+
+			} else {
+
+				setupFrameBufferTexture( renderTargetProperties.__webglFramebuffer, renderTarget, texture, _gl.COLOR_ATTACHMENT0, glTextureType, 0 );
+
+			}
 
 			if ( textureNeedsGenerateMipmaps( texture, supportsMips ) ) {
 

package/src/renderers/webxr/WebXRManager.js

@@ -585,7 +585,7 @@ class WebXRManager extends EventDispatcher {
 
 			}
 
-			updateUserCamera( camera, cameraXR, parent );
+			updateUserCamera( camera, cameraXR, object );
 
 		};
 

package/src/textures/CompressedCubeTexture.js

@@ -0,0 +1,19 @@
+import { CubeReflectionMapping } from '../constants.js';
+import { CompressedTexture } from './CompressedTexture.js';
+
+class CompressedCubeTexture extends CompressedTexture {
+
+	constructor( images, format, type ) {
+
+		super( undefined, images[ 0 ].width, images[ 0 ].height, format, type, CubeReflectionMapping );
+
+		this.isCompressedCubeTexture = true;
+		this.isCubeTexture = true;
+
+		this.image = images;
+
+	}
+
+}
+
+export { CompressedCubeTexture };

package/examples/jsm/nodes/functions/BSDF/BRDF_BlinnPhong.js

@@ -1,30 +0,0 @@
-import F_Schlick from './F_Schlick.js';
-import { shininess, specularColor } from '../../core/PropertyNode.js';
-import { transformedNormalView } from '../../accessors/NormalNode.js';
-import { positionViewDirection } from '../../accessors/PositionNode.js';
-import { tslFn, float } from '../../shadernode/ShaderNode.js';
-
-const G_BlinnPhong_Implicit = () => float( 0.25 );
-
-const D_BlinnPhong = tslFn( ( { dotNH } ) => {
-
-	return shininess.mul( 0.5 / Math.PI ).add( 1.0 ).mul( dotNH.pow( shininess ) );
-
-} );
-
-const BRDF_BlinnPhong = tslFn( ( { lightDirection } ) => {
-
-	const halfDir = lightDirection.add( positionViewDirection ).normalize();
-
-	const dotNH = transformedNormalView.dot( halfDir ).clamp();
-	const dotVH = positionViewDirection.dot( halfDir ).clamp();
-
-	const F = F_Schlick( { f0: specularColor, f90: 1.0, dotVH } );
-	const G = G_BlinnPhong_Implicit();
-	const D = D_BlinnPhong( { dotNH } );
-
-	return F.mul( G ).mul( D );
-
-} );
-
-export default BRDF_BlinnPhong;

package/examples/jsm/renderers/common/RenderTarget.js

@@ -1,15 +0,0 @@
-import { WebGLRenderTarget } from 'three';
-
-// @TODO: Consider rename WebGLRenderTarget to just RenderTarget
-
-class RenderTarget extends WebGLRenderTarget {
-
-	constructor( width, height, options = {} ) {
-
-		super( width, height, options );
-
-	}
-
-}
-
-export default RenderTarget;

package/examples/jsm/renderers/common/nodes/NodeRender.js

@@ -1,302 +0,0 @@
-import WebGPUNodeBuilder from '../../webgpu/backends/webgpu/builder/WGSLNodeBuilder.js';
-import { NoToneMapping, EquirectangularReflectionMapping, EquirectangularRefractionMapping } from 'three';
-import { NodeFrame, cubeTexture, texture, rangeFog, densityFog, reference, toneMapping, positionWorld, modelWorldMatrix, transformDirection, equirectUV, viewportBottomLeft } from '../../../nodes/Nodes.js';
-
-class NodeRender {
-
-	constructor( renderer, properties ) {
-
-		this.renderer = renderer;
-		this.properties = properties;
-
-		this.nodeFrame = new NodeFrame();
-
-	}
-
-	get( renderObject ) {
-
-		const renderObjectProperties = this.properties.get( renderObject );
-
-		let nodeBuilder = renderObjectProperties.nodeBuilder;
-
-		if ( nodeBuilder === undefined ) {
-
-			nodeBuilder = new WebGPUNodeBuilder( renderObject.object, this.renderer );
-			nodeBuilder.material = renderObject.material;
-			nodeBuilder.lightsNode = renderObject.lightsNode;
-			nodeBuilder.environmentNode = this.getEnvironmentNode( renderObject.scene );
-			nodeBuilder.fogNode = this.getFogNode( renderObject.scene );
-			nodeBuilder.toneMappingNode = this.getToneMappingNode();
-			nodeBuilder.build();
-
-			renderObjectProperties.nodeBuilder = nodeBuilder;
-
-		}
-
-		return nodeBuilder;
-
-	}
-
-	getForCompute( computeNode ) {
-
-		const computeProperties = this.properties.get( computeNode );
-
-		let nodeBuilder = computeProperties.nodeBuilder;
-
-		if ( nodeBuilder === undefined ) {
-
-			nodeBuilder = new WebGPUNodeBuilder( computeNode, this.renderer );
-			nodeBuilder.build();
-
-			computeProperties.nodeBuilder = nodeBuilder;
-
-		}
-
-		return nodeBuilder;
-
-	}
-
-	remove( renderObject ) {
-
-		const objectProperties = this.properties.get( renderObject );
-
-		delete objectProperties.nodeBuilder;
-
-	}
-
-	getEnvironmentNode( scene ) {
-
-		return scene.environmentNode || this.properties.get( scene ).environmentNode || null;
-
-	}
-
-	getFogNode( scene ) {
-
-		return scene.fogNode || this.properties.get( scene ).fogNode || null;
-
-	}
-
-	getToneMappingNode() {
-
-		return this.renderer.toneMappingNode || this.properties.get( this.renderer ).toneMappingNode || null;
-
-	}
-
-	getCacheKey( scene, lightsNode ) {
-
-		const environmentNode = this.getEnvironmentNode( scene );
-		const fogNode = this.getFogNode( scene );
-		const toneMappingNode = this.getToneMappingNode();
-
-		const cacheKey = [];
-
-		if ( lightsNode ) cacheKey.push( 'lightsNode:' + lightsNode.getCacheKey() );
-		if ( environmentNode ) cacheKey.push( 'environmentNode:' + environmentNode.getCacheKey() );
-		if ( fogNode ) cacheKey.push( 'fogNode:' + fogNode.getCacheKey() );
-		if ( toneMappingNode ) cacheKey.push( 'toneMappingNode:' + toneMappingNode.getCacheKey() );
-
-		return '{' + cacheKey.join( ',' ) + '}';
-
-	}
-
-	updateToneMapping() {
-
-		const renderer = this.renderer;
-		const rendererProperties = this.properties.get( renderer );
-		const rendererToneMapping = renderer.toneMapping;
-
-		if ( rendererToneMapping !== NoToneMapping ) {
-
-			if ( rendererProperties.toneMapping !== rendererToneMapping ) {
-
-				rendererProperties.toneMappingNode = toneMapping( rendererToneMapping, reference( 'toneMappingExposure', 'float', renderer ) );
-				rendererProperties.toneMapping = rendererToneMapping;
-
-			}
-
-		} else {
-
-			delete rendererProperties.toneMappingNode;
-			delete rendererProperties.toneMapping;
-
-		}
-
-	}
-
-	updateBackground( scene ) {
-
-		const sceneProperties = this.properties.get( scene );
-		const background = scene.background;
-
-		if ( background ) {
-
-			if ( sceneProperties.background !== background ) {
-
-				let backgroundNode = null;
-
-				if ( background.isCubeTexture === true ) {
-
-					backgroundNode = cubeTexture( background, transformDirection( positionWorld, modelWorldMatrix ) );
-
-				} else if ( background.isTexture === true ) {
-
-					let nodeUV = null;
-
-					if ( background.mapping === EquirectangularReflectionMapping || background.mapping === EquirectangularRefractionMapping ) {
-
-						nodeUV = equirectUV();
-
-					} else {
-
-						nodeUV = viewportBottomLeft;
-
-					}
-
-					backgroundNode = texture( background, nodeUV );
-
-				} else if ( background.isColor !== true ) {
-
-					console.error( 'WebGPUNodes: Unsupported background configuration.', background );
-
-				}
-
-				sceneProperties.backgroundNode = backgroundNode;
-				sceneProperties.background = background;
-
-			}
-
-		} else if ( sceneProperties.backgroundNode ) {
-
-			delete sceneProperties.backgroundNode;
-			delete sceneProperties.background;
-
-		}
-
-	}
-
-	updateFog( scene ) {
-
-		const sceneProperties = this.properties.get( scene );
-		const fog = scene.fog;
-
-		if ( fog ) {
-
-			if ( sceneProperties.fog !== fog ) {
-
-				let fogNode = null;
-
-				if ( fog.isFogExp2 ) {
-
-					fogNode = densityFog( reference( 'color', 'color', fog ), reference( 'density', 'float', fog ) );
-
-				} else if ( fog.isFog ) {
-
-					fogNode = rangeFog( reference( 'color', 'color', fog ), reference( 'near', 'float', fog ), reference( 'far', 'float', fog ) );
-
-				} else {
-
-					console.error( 'WebGPUNodes: Unsupported fog configuration.', fog );
-
-				}
-
-				sceneProperties.fogNode = fogNode;
-				sceneProperties.fog = fog;
-
-			}
-
-		} else {
-
-			delete sceneProperties.fogNode;
-			delete sceneProperties.fog;
-
-		}
-
-	}
-
-	updateEnvironment( scene ) {
-
-		const sceneProperties = this.properties.get( scene );
-		const environment = scene.environment;
-
-		if ( environment ) {
-
-			if ( sceneProperties.environment !== environment ) {
-
-				let environmentNode = null;
-
-				if ( environment.isCubeTexture === true ) {
-
-					environmentNode = cubeTexture( environment );
-
-				} else if ( environment.isTexture === true ) {
-
-					environmentNode = texture( environment );
-
-				} else {
-
-					console.error( 'WebGPUNodes: Unsupported environment configuration.', environment );
-
-				}
-
-				sceneProperties.environmentNode = environmentNode;
-				sceneProperties.environment = environment;
-
-			}
-
-		} else if ( sceneProperties.environmentNode ) {
-
-			delete sceneProperties.environmentNode;
-			delete sceneProperties.environment;
-
-		}
-
-	}
-
-	getNodeFrame( renderObject ) {
-
-		const nodeFrame = this.nodeFrame;
-		nodeFrame.scene = renderObject.scene;
-		nodeFrame.object = renderObject.object;
-		nodeFrame.camera = renderObject.camera;
-		nodeFrame.renderer = renderObject.renderer;
-		nodeFrame.material = renderObject.material;
-
-		return nodeFrame;
-
-	}
-
-	updateBefore( renderObject ) {
-
-		const nodeFrame = this.getNodeFrame( renderObject );
-		const nodeBuilder = this.get( renderObject );
-
-		for ( const node of nodeBuilder.updateBeforeNodes ) {
-
-			nodeFrame.updateBeforeNode( node );
-
-		}
-
-	}
-
-	update( renderObject ) {
-
-		const nodeFrame = this.getNodeFrame( renderObject );
-		const nodeBuilder = this.get( renderObject );
-
-		for ( const node of nodeBuilder.updateNodes ) {
-
-			nodeFrame.updateNode( node );
-
-		}
-
-	}
-
-	dispose() {
-
-		this.nodeFrame = new NodeFrame();
-
-	}
-
-}
-
-export default NodeRender;