super-three 0.181.0 → 0.185.0

package/examples/jsm/utils/SceneOptimizer.js

@@ -442,7 +442,7 @@ class SceneOptimizer {
 	 */
 	toInstancingMesh() {
 
-		throw new Error( 'InstancedMesh optimization not implemented yet' );
+		throw new Error( 'THREE.SceneOptimizer: InstancedMesh optimization not implemented yet' );
 
 	}
 

package/examples/jsm/utils/ShadowMapViewer.js

@@ -6,10 +6,8 @@ import {
 	OrthographicCamera,
 	PlaneGeometry,
 	Scene,
-	ShaderMaterial,
-	UniformsUtils
+	ShaderMaterial
 } from 'three';
-import { UnpackDepthRGBAShader } from '../shaders/UnpackDepthRGBAShader.js';
 
 /**
  * This is a helper for visualising a given light's shadow map.
@@ -57,13 +55,29 @@ class ShadowMapViewer {
 		const scene = new Scene();
 
 		//HUD for shadow map
-		const shader = UnpackDepthRGBAShader;
-
-		const uniforms = UniformsUtils.clone( shader.uniforms );
 		const material = new ShaderMaterial( {
-			uniforms: uniforms,
-			vertexShader: shader.vertexShader,
-			fragmentShader: shader.fragmentShader
+			uniforms: {
+				tDiffuse: { value: null },
+				opacity: { value: 1.0 }
+			},
+			vertexShader: /* glsl */`
+				varying vec2 vUv;
+				void main() {
+					vUv = uv;
+					gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
+				}`,
+			fragmentShader: /* glsl */`
+				uniform float opacity;
+				uniform sampler2D tDiffuse;
+				varying vec2 vUv;
+				void main() {
+					float depth = texture2D( tDiffuse, vUv ).r;
+					#ifdef USE_REVERSED_DEPTH_BUFFER
+						gl_FragColor = vec4( vec3( depth ), opacity );
+					#else
+						gl_FragColor = vec4( vec3( 1.0 - depth ), opacity );
+					#endif
+				}`
 		} );
 		const plane = new PlaneGeometry( frame.width, frame.height );
 		const mesh = new Mesh( plane, material );
@@ -177,7 +191,7 @@ class ShadowMapViewer {
 				//always end up with the scene's first added shadow casting light's shadowMap
 				//in the shader
 				//See: https://github.com/mrdoob/three.js/issues/5932
-				uniforms.tDiffuse.value = light.shadow.map.texture;
+				material.uniforms.tDiffuse.value = light.shadow.map.texture;
 
 				userAutoClearSetting = renderer.autoClear;
 				renderer.autoClear = false; // To allow render overlay

package/examples/jsm/utils/ShadowMapViewerGPU.js

@@ -9,7 +9,7 @@ import {
 	Scene,
 	DepthTexture,
 	Vector2
-} from 'three';
+} from 'three/webgpu';
 import { uv, uniform, textureLoad } from 'three/tsl';
 
 /**

package/examples/jsm/utils/SkeletonUtils.js

@@ -27,11 +27,13 @@ function getBoneName( bone, options ) {
 }
 
 /**
- * Retargets the skeleton from the given source 3D object to the
- * target 3D object.
+ * Retargets the skeleton from the given source to the target.
  *
- * @param {Object3D} target - The target 3D object.
- * @param {Object3D} source - The source 3D object.
+ * Both `target` and `source` can be a 3D object with a skeleton property (e.g. a skinned mesh)
+ * or a {@link Skeleton} directly.
+ *
+ * @param {Object3D|Skeleton} target - The target object.
+ * @param {Object3D|Skeleton} source - The source object.
  * @param {module:SkeletonUtils~RetargetOptions} options - The options.
  */
 function retarget( target, source, options = {} ) {
@@ -210,11 +212,13 @@ function retarget( target, source, options = {} ) {
 }
 
 /**
- * Retargets the animation clip of the source object to the
- * target 3D object.
+ * Retargets the animation clip of the source to the target 3D object.
+ *
+ * The `source` can be a 3D object with a skeleton property (e.g. a skinned mesh)
+ * or a {@link Skeleton} directly.
  *
- * @param {Object3D} target - The target 3D object.
- * @param {Object3D} source - The source 3D object.
+ * @param {Object3D} target - The target 3D object. Must have a `skeleton` property.
+ * @param {Object3D|Skeleton} source - The source object.
  * @param {AnimationClip} clip - The animation clip.
  * @param {module:SkeletonUtils~RetargetOptions} options - The options.
  * @return {AnimationClip} The retargeted animation clip.
@@ -481,6 +485,8 @@ function parallelTraverse( a, b, callback ) {
  * @property {string} [hip='hip'] - The name of the source's hip bone.
  * @property {Vector3} [hipInfluence=(1,1,1)] - The hip influence.
  * @property {number} [scale=1] - The scale.
+ * @property {Object<string,Matrix4>} [localOffsets] - Per-bone local offset matrices, keyed by bone name.
+ * @property {Vector3} [hipPosition] - An additional position offset applied to the hip bone.
  **/
 
 export {

package/examples/jsm/utils/WebGPUTextureUtils.js

@@ -3,7 +3,7 @@ import {
 	NodeMaterial,
 	WebGPURenderer,
 	CanvasTexture
-} from 'three';
+} from 'three/webgpu';
 import { texture, uv } from 'three/tsl';
 
 /**

package/examples/jsm/webxr/ARButton.js

@@ -1,7 +1,7 @@
 /**
  * A utility class for creating a button that allows to initiate
  * immersive AR sessions based on WebXR. The button can be created
- * with a factory method and then appended ot the website's DOM.
+ * with a factory method and then appended to the website's DOM.
  *
  * ```js
  * document.body.appendChild( ARButton.createButton( renderer ) );

package/examples/jsm/webxr/WebGLXRFallback.js

@@ -0,0 +1,89 @@
+/**
+ * Sets up a construction-time WebGL fallback for WebGPU XR examples.
+ *
+ * @param {WebGPURenderer} renderer - The initial renderer.
+ * @param {Function} createFallbackRenderer - A function that returns a new renderer with a WebGL backend.
+ * @param {Function} onFallback - A function that installs the new renderer in the app.
+ */
+function setupWebGLXRFallback( renderer, createFallbackRenderer, onFallback = () => {} ) {
+
+	let currentRenderer = renderer;
+	const patchedRenderers = new WeakSet();
+
+	function patchRenderer( renderer ) {
+
+		if ( patchedRenderers.has( renderer ) ) return;
+
+		patchedRenderers.add( renderer );
+
+		const setSession = renderer.xr.setSession.bind( renderer.xr );
+
+		renderer.xr.setSession = async function ( session ) {
+
+			if ( renderer !== currentRenderer ) {
+
+				return currentRenderer.xr.setSession( session );
+
+			}
+
+			if ( session !== null && renderer.backend.isWebGPUBackend === true && session.enabledFeatures.includes( 'webgpu' ) === false ) {
+
+				return switchToFallbackRenderer( session, renderer );
+
+			}
+
+			try {
+
+				return await setSession( session );
+
+			} catch ( error ) {
+
+				if ( session === null || renderer.backend.isWebGPUBackend !== true ) {
+
+					throw error;
+
+				}
+
+				return switchToFallbackRenderer( session, renderer );
+
+			}
+
+		};
+
+	}
+
+	async function switchToFallbackRenderer( session, renderer ) {
+
+		if ( renderer.initialized === false ) await renderer.init();
+
+		const fallbackRenderer = createFallbackRenderer( renderer );
+
+		if ( fallbackRenderer.backend.isWebGLBackend !== true ) {
+
+			throw new Error( 'THREE.WebGLXRFallback: createFallbackRenderer() must return a renderer with a WebGL backend.' );
+
+		}
+
+		const animationLoop = renderer.getAnimationLoop();
+
+		fallbackRenderer.xr.enabled = renderer.xr.enabled;
+		fallbackRenderer.xr.cameraAutoUpdate = renderer.xr.cameraAutoUpdate;
+		fallbackRenderer.xr.setFramebufferScaleFactor( renderer.xr.getFramebufferScaleFactor() );
+		fallbackRenderer.xr.setReferenceSpaceType( renderer.xr.getReferenceSpaceType() );
+
+		if ( animationLoop !== null ) await fallbackRenderer.setAnimationLoop( animationLoop );
+
+		await onFallback( fallbackRenderer, renderer );
+
+		currentRenderer = fallbackRenderer;
+		patchRenderer( fallbackRenderer );
+
+		return fallbackRenderer.xr.setSession( session );
+
+	}
+
+	patchRenderer( renderer );
+
+}
+
+export { setupWebGLXRFallback };

package/examples/jsm/webxr/XRControllerModelFactory.js

@@ -353,7 +353,7 @@ class XRControllerModelFactory {
 
 					if ( ! this.gltfLoader ) {
 
-						throw new Error( 'GLTFLoader not set.' );
+						throw new Error( 'THREE.XRControllerModelFactory: GLTFLoader not set.' );
 
 					}
 
@@ -372,7 +372,7 @@ class XRControllerModelFactory {
 					null,
 					() => {
 
-						throw new Error( `Asset ${controllerModel.motionController.assetUrl} missing or malformed.` );
+						throw new Error( `THREE.XRControllerModelFactory: Asset ${controllerModel.motionController.assetUrl} missing or malformed.` );
 
 					} );
 

package/examples/jsm/webxr/XRHandMeshModel.js

@@ -1,4 +1,5 @@
 import { GLTFLoader } from '../loaders/GLTFLoader.js';
+import { clone } from '../utils/SkeletonUtils.js';
 
 const DEFAULT_HAND_PROFILE_PATH = 'https://cdn.jsdelivr.net/npm/@webxr-input-profiles/assets@1.0/dist/profiles/generic-hand/';
 
@@ -20,8 +21,9 @@ class XRHandMeshModel {
 	 * @param {XRHandedness} handedness - The handedness of the XR input source.
 	 * @param {?Loader} [loader=null] - The loader. If not provided, an instance of `GLTFLoader` will be used to load models.
 	 * @param {?Function} [onLoad=null] - A callback that is executed when a controller model has been loaded.
+	 * @param {?Object} [customCache=null] - An optional shared cache object for storing and reusing loaded assets across instances.
 	 */
-	constructor( handModel, controller, path, handedness, loader = null, onLoad = null ) {
+	constructor( handModel, controller, path, handedness, loader = null, onLoad = null, customCache = null ) {
 
 		/**
 		 * The WebXR controller.
@@ -45,16 +47,11 @@ class XRHandMeshModel {
 		 */
 		this.bones = [];
 
-		if ( loader === null ) {
+		const pathToUse = path || DEFAULT_HAND_PROFILE_PATH;
 
-			loader = new GLTFLoader();
-			loader.setPath( path || DEFAULT_HAND_PROFILE_PATH );
+		const processAsset = ( gltf ) => {
 
-		}
-
-		loader.load( `${handedness}.glb`, gltf => {
-
-			const object = gltf.scene.children[ 0 ];
+			const object = clone( gltf.scene.children[ 0 ] );
 			this.handModel.add( object );
 
 			const mesh = object.getObjectByProperty( 'type', 'SkinnedMesh' );
@@ -110,7 +107,36 @@ class XRHandMeshModel {
 
 			if ( onLoad ) onLoad( object );
 
-		} );
+		};
+
+		const assetUrl = `${pathToUse}${handedness}.glb`;
+
+		if ( customCache && customCache[ assetUrl ] ) {
+
+			processAsset( customCache[ assetUrl ] );
+
+		} else {
+
+			if ( loader === null ) {
+
+				loader = new GLTFLoader();
+				loader.setPath( pathToUse );
+
+			}
+
+			loader.load( `${handedness}.glb`, gltf => {
+
+				if ( customCache ) {
+
+					customCache[ assetUrl ] = gltf;
+
+				}
+
+				processAsset( gltf );
+
+			} );
+
+		}
 
 	}
 

package/examples/jsm/webxr/XRHandModelFactory.js

@@ -118,6 +118,7 @@ class XRHandModelFactory {
 		 * @default null
 		 */
 		this.path = null;
+		this._assetCache = {};
 
 		/**
 		 * A callback that is executed when a hand model has been loaded.
@@ -173,7 +174,7 @@ class XRHandModelFactory {
 
 				} else if ( profile === 'mesh' ) {
 
-					handModel.motionController = new XRHandMeshModel( handModel, controller, this.path, xrInputSource.handedness, this.gltfLoader, this.onLoad );
+					handModel.motionController = new XRHandMeshModel( handModel, controller, this.path, xrInputSource.handedness, this.gltfLoader, this.onLoad, this._assetCache );
 
 				}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-three",
-  "version": "0.181.0",
+  "version": "0.185.0",
   "description": "JavaScript 3D library",
   "type": "module",
   "main": "./build/three.cjs",
@@ -20,7 +20,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "supermedium/three.js"
+    "url": "https://github.com/supermedium/three.js"
   },
   "sideEffects": [
     "./src/nodes/**/*"
@@ -28,7 +28,6 @@
   "files": [
     "build",
     "examples/jsm",
-    "examples/fonts",
     "LICENSE",
     "package.json",
     "README.md",
@@ -46,25 +45,24 @@
     "start": "npm run dev",
     "test": "npm run lint && npm run test-unit && npm run test-unit-addons",
     "build": "rollup -c utils/build/rollup.config.js",
+    "build-docs": "jsdoc -c utils/docs/jsdoc.config.json && npm run build-llms",
+    "build-llms": "node utils/llms/build.js",
     "build-module": "rollup -c utils/build/rollup.config.js --configOnlyModule",
-    "build-docs": "jsdoc -c utils/docs/jsdoc.config.json",
-    "dev": "node utils/build/dev.js && servez -p 8080",
-    "dev-ssl": "node utils/build/dev.js && servez -p 8080 --ssl",
-    "preview": "concurrently --names \"ROLLUP,HTTP\" -c \"bgBlue.bold,bgGreen.bold\" \"rollup -c utils/build/rollup.config.js -w -m inline\" \"servez -p 8080\"",
-    "preview-ssl": "concurrently --names \"ROLLUP,HTTPS\" -c \"bgBlue.bold,bgGreen.bold\" \"rollup -c utils/build/rollup.config.js -w -m inline\" \"servez -p 8080 --ssl\"",
+    "dev": "node utils/build/dev.js && node utils/server.js -p 8080",
+    "preview": "node utils/build/preview.js",
     "lint-core": "eslint src",
-    "lint-addons": "eslint examples/jsm --ext .js --ignore-pattern libs --ignore-pattern ifc",
-    "lint-examples": "eslint examples --ext .html",
-    "lint-docs": "eslint docs --ignore-pattern prettify.js",
-    "lint-editor": "eslint editor --ignore-pattern libs",
-    "lint-playground": "eslint playground --ignore-pattern libs",
-    "lint-manual": "eslint manual --ignore-pattern 3rdparty --ignore-pattern prettify.js --ignore-pattern shapefile.js",
-    "lint-test": "eslint test --ignore-pattern vendor",
-    "lint-utils": "eslint utils --ignore-pattern prettify --ignore-pattern fuse",
+    "lint-addons": "eslint examples/jsm",
+    "lint-examples": "eslint examples",
+    "lint-editor": "eslint editor",
+    "lint-manual": "eslint manual",
+    "lint-test": "eslint test",
+    "lint-utils": "eslint utils",
     "lint": "npm run lint-core",
-    "lint-fix": "npm run lint-core -- --fix && npm run lint-addons -- --fix && npm run lint-examples -- --fix && npm run lint-docs -- --fix && npm run lint-editor -- --fix && npm run lint-playground -- --fix && npm run lint-manual -- --fix && npm run lint-test -- --fix && npm run lint-utils -- --fix",
-    "test-unit": "qunit test/unit/three.source.unit.js",
-    "test-unit-addons": "qunit test/unit/three.addons.unit.js",
+    "lint-fix": "npm run lint-core -- --fix && npm run lint-addons -- --fix && npm run lint-examples -- --fix && npm run lint-editor -- --fix && npm run lint-manual -- --fix && npm run lint-test -- --fix && npm run lint-utils -- --fix",
+    "test-unit": "node test/unit/puppeteer.unit.js --testPage=UnitTests.html --mode=headless",
+    "test-unit-headful": "node test/unit/puppeteer.unit.js --testPage=UnitTests.html --mode=headful",
+    "test-unit-addons": "node test/unit/puppeteer.unit.js --testPage=UnitTestsAddons.html --mode=headless",
+    "test-unit-addons-headful": "node test/unit/puppeteer.unit.js --testPage=UnitTestsAddons.html --mode=headful",
     "test-e2e": "node test/e2e/puppeteer.js",
     "test-e2e-cov": "node test/e2e/check-coverage.js",
     "test-e2e-webgpu": "node test/e2e/puppeteer.js --webgpu",
@@ -94,26 +92,22 @@
   },
   "homepage": "https://threejs.org/",
   "devDependencies": {
+    "@eslint/js": "^9.0.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
-    "@rollup/plugin-terser": "^0.4.0",
-    "concurrently": "^9.0.0",
-    "eslint": "^8.37.0",
+    "@rollup/plugin-terser": "^1.0.0",
+    "eslint": "^9.0.0",
     "eslint-config-mdcs": "^5.0.0",
-    "eslint-plugin-compat": "^6.0.0",
-    "eslint-plugin-html": "^8.0.0",
-    "eslint-plugin-import": "^2.27.5",
-    "jimp": "^1.6.0",
+    "eslint-plugin-compat": "^7.0.0",
+    "eslint-plugin-html": "^8.1.3",
+    "eslint-plugin-jsdoc": "^63.0.0",
+    "globals": "^17.0.0",
+    "jpeg-js": "^0.4.4",
     "jsdoc": "^4.0.5",
     "magic-string": "^0.30.0",
-    "pixelmatch": "^7.0.0",
-    "puppeteer": "^24.25.0",
-    "qunit": "^2.19.4",
+    "pngjs": "^7.0.0",
+    "puppeteer": "^25.0.0",
     "rollup": "^4.6.0",
-    "rollup-plugin-filesize": "^10.0.0",
-    "servez": "^2.2.4"
-  },
-  "overrides": {
-    "jpeg-js": "^0.4.4"
+    "turndown": "^7.2.2"
   },
   "jspm": {
     "files": [

package/src/Three.Core.js

@@ -3,7 +3,6 @@ import { warn } from './utils.js';
 
 export { WebGLArrayRenderTarget } from './renderers/WebGLArrayRenderTarget.js';
 export { WebGL3DRenderTarget } from './renderers/WebGL3DRenderTarget.js';
-export { WebGLCubeRenderTarget } from './renderers/WebGLCubeRenderTarget.js';
 export { WebGLRenderTarget } from './renderers/WebGLRenderTarget.js';
 export { WebXRController } from './renderers/webxr/WebXRController.js';
 export { FogExp2 } from './scenes/FogExp2.js';
@@ -34,7 +33,9 @@ export { CompressedArrayTexture } from './textures/CompressedArrayTexture.js';
 export { CompressedCubeTexture } from './textures/CompressedCubeTexture.js';
 export { CubeTexture } from './textures/CubeTexture.js';
 export { CanvasTexture } from './textures/CanvasTexture.js';
+export { HTMLTexture } from './textures/HTMLTexture.js';
 export { DepthTexture } from './textures/DepthTexture.js';
+export { CubeDepthTexture } from './textures/CubeDepthTexture.js';
 export { ExternalTexture } from './textures/ExternalTexture.js';
 export { Texture } from './textures/Texture.js';
 export * from './geometries/Geometries.js';
@@ -110,6 +111,7 @@ export { QuaternionLinearInterpolant } from './math/interpolants/QuaternionLinea
 export { LinearInterpolant } from './math/interpolants/LinearInterpolant.js';
 export { DiscreteInterpolant } from './math/interpolants/DiscreteInterpolant.js';
 export { CubicInterpolant } from './math/interpolants/CubicInterpolant.js';
+export { BezierInterpolant } from './math/interpolants/BezierInterpolant.js';
 export { Interpolant } from './math/Interpolant.js';
 export { Triangle } from './math/Triangle.js';
 export { MathUtils } from './math/MathUtils.js';