Needle Engine 3.22.4

Files changed (6) hide show

src/engine-components/AnimatorController.ts +9 -8
src/engine/debug/debug_overlay.ts +1 -1
src/engine/engine_context.ts +7 -1
src/engine/engine_utils.ts +5 -1
src/engine-components/export/usdz/ThreeUSDZExporter.ts +91 -36
src/engine-components/webxr/WebXRController.ts +27 -14

src/engine-components/AnimatorController.ts CHANGED Viewed

@@ -326,14 +326,6 @@
                 // console.log("All conditions are met", transition);
             }
-            // disable triggers
-            for (const cond of transition.conditions) {
-                const param = this.model.parameters.find(p => p.name === cond.parameter);
-                if (param?.type === AnimatorControllerParameterType.Trigger) {
-                    param.value = false;
-                }
-            }
             if (action) {
                 const dur = state.motion.clip!.duration;
                 const normalizedTime = dur <= 0 ? 1 : Math.abs(action.time / dur);
@@ -346,7 +338,16 @@
                 else {
                     makeTransition = true;
                 }
                 if (makeTransition) {
+                    // disable triggers for this transition
+                    for (const cond of transition.conditions) {
+                        const param = this.model.parameters.find(p => p.name === cond.parameter);
+                        if (param?.type === AnimatorControllerParameterType.Trigger && param.value) {
+                            param.value = false;
+                        }
+                    }
                     // if (transition.hasExitTime && transition.exitTime >= .9999)
                     action.clampWhenFinished = true;
                     // else action.clampWhenFinished = false;

src/engine/debug/debug_overlay.ts CHANGED Viewed

@@ -197,7 +197,7 @@
             padding-top: 0px;
             max-width: 70%;
             max-height: calc(100% - 5px);
-            z-index: 1000;
+            z-index: 9999999999;
             pointer-events: scroll;
             display: flex;
             align-items: end;

src/engine/engine_context.ts CHANGED Viewed

@@ -30,7 +30,7 @@
 import { ContextEvent, ContextRegistry } from './engine_context_registry.js';
 import { delay, getParam } from './engine_utils.js';
 import { VERSION } from './engine_constants.js';
-import { isDevEnvironment, LogType, showBalloonMessage, showBalloonWarning } from './debug/index.js';
+import { isDevEnvironment, LogType, showBalloonError, showBalloonMessage, showBalloonWarning } from './debug/index.js';
 import { getLoader } from './engine_gltf.js';
 import { isLocalNetwork } from './engine_networking_utils.js';
 import { WaitForPromise } from './engine_coroutine.js';
@@ -451,14 +451,20 @@
 	async create(opts?: ContextCreateArgs) {
 		try {
 			this._isCreating = true;
+			window.addEventListener("unhandledrejection", this.onUnhandledRejection)
 			const res = await this.internalOnCreate(opts);
 			return res;
 		}
 		finally {
+			window.removeEventListener("unhandledrejection", this.onUnhandledRejection)
 			this._isCreating = false;
 		}
 	}
+	private onUnhandledRejection = (event: PromiseRejectionEvent) => {
+		this.domElement.dispatchEvent(new CustomEvent("error", { detail: event.reason }));
+	};
 	/** Will destroy all scenes and objects in the scene
 	 */
 	clear() {

src/engine/engine_utils.ts CHANGED Viewed

@@ -586,7 +586,11 @@
     anyFailed: boolean,
     results: Array<T | PromiseErrorResult>
 }> {
-    const results = await Promise.allSettled(promise);
+    const results = await Promise.allSettled(promise).catch(err => {
+        return [
+            new PromiseErrorResult(err.message)
+        ];
+    })
     let anyFailed: boolean = false;
     const res = results.map(x => {
         if ("value" in x) return x.value;

src/engine-components/export/usdz/ThreeUSDZExporter.ts CHANGED Viewed

@@ -462,16 +462,20 @@
 		files[ modelFileName ] = fflate.strToU8( final );
 		context.output = '';
+		const decompressionRenderer = new WebGLRenderer( { antialias: false, alpha: true } );
 		for ( const id in textures ) {
 			let texture = textures[ id ];
-			const isRGBA = texture.format === 1023;
+			const isRGBA = formatsWithAlphaChannel.includes( texture.format );
 			if ( texture.isCompressedTexture ) {
-				texture = copyTexture( texture );
+				texture = decompressGpuTexture( texture, 4096, decompressionRenderer );
 			}
 			// TODO add readback options for textures that don't have texture.image
 			const canvas = await imageToCanvas( texture.image );
@@ -488,6 +492,8 @@
 		}
+		decompressionRenderer.dispose();
 		// 64 byte alignment
 		// https://github.com/101arrowz/fflate/issues/39#issuecomment-777263109
@@ -715,58 +721,80 @@
 	}
 }
+let _renderer: WebGLRenderer | null = null;
+let fullscreenQuadGeometry: PlaneGeometry | null;
+let fullscreenQuadMaterial: ShaderMaterial | null;
+let fullscreenQuad: Mesh | null;
-function copyTexture( texture : Texture ) {
+function decompressGpuTexture( texture, maxTextureSize = Infinity, renderer: WebGLRenderer | null = null ) {
-	const geometry = new PlaneGeometry( 2, 2, 1, 1 );
-	const material = new ShaderMaterial( {
-		uniforms: {
-			blitTexture: new Uniform( texture ),
-		},
-		defines: {
-			IS_SRGB: texture.colorSpace == SRGBColorSpace,
-		},
-        vertexShader: `
+	if ( ! fullscreenQuadGeometry ) fullscreenQuadGeometry = new PlaneGeometry( 2, 2, 1, 1 );
+	if ( ! fullscreenQuadMaterial ) fullscreenQuadMaterial = new ShaderMaterial( {
+		uniforms: { blitTexture: new Uniform( texture ) },
+		vertexShader: `
             varying vec2 vUv;
             void main(){
                 vUv = uv;
 				vUv.y = 1. - vUv.y;
                 gl_Position = vec4(position.xy * 1.0,0.,.999999);
             }`,
-        fragmentShader: `
+		fragmentShader: `
             uniform sampler2D blitTexture;
             varying vec2 vUv;
-            // took from threejs 05fc79cd52b79e8c3e8dec1e7dca72c5c39983a4
-            vec4 conv_LinearTosRGB( in vec4 value ) {
-                return vec4( mix( pow( value.rgb, vec3( 0.41666 ) ) * 1.055 - vec3( 0.055 ), value.rgb * 12.92, vec3( lessThanEqual( value.rgb, vec3( 0.0031308 ) ) ) ), value.a );
-            }
             void main(){
                 gl_FragColor = vec4(vUv.xy, 0, 1);
                 #ifdef IS_SRGB
-                gl_FragColor = conv_LinearTosRGB( texture2D( blitTexture, vUv) );
+                gl_FragColor = LinearTosRGB( texture2D( blitTexture, vUv) );
                 #else
                 gl_FragColor = texture2D( blitTexture, vUv);
                 #endif
             }`
-    } );
+	} );
-	const mesh = new Mesh( geometry, material );
-	mesh.frustumCulled = false;
-	const cam = new PerspectiveCamera();
-	const scene = new Scene();
-	scene.add( mesh );
-	const renderer = new WebGLRenderer( { antialias: false } );
-	renderer.setSize( texture.image.width, texture.image.height );
+	fullscreenQuadMaterial.uniforms.blitTexture.value = texture;
+	fullscreenQuadMaterial.defines.IS_SRGB = texture.colorSpace == SRGBColorSpace;
+	fullscreenQuadMaterial.needsUpdate = true;
+	if ( ! fullscreenQuad ) {
+		fullscreenQuad = new Mesh( fullscreenQuadGeometry, fullscreenQuadMaterial );
+		fullscreenQuad.frustumCulled = false;
+	}
+	const _camera = new PerspectiveCamera();
+	const _scene = new Scene();
+	_scene.add( fullscreenQuad );
+	if ( ! renderer ) {
+		renderer = _renderer = new WebGLRenderer( { antialias: false, alpha: true } );
+	}
+	renderer.setSize( Math.min( texture.image.width, maxTextureSize ), Math.min( texture.image.height, maxTextureSize ) );
 	renderer.clear();
-	renderer.render( scene, cam );
+	renderer.render( _scene, _camera );
-	const tex = new Texture( renderer.domElement );
-	tex.colorSpace = texture.colorSpace;
-	return tex;
+	const readableTexture = new Texture( renderer.domElement );
+	readableTexture.minFilter = texture.minFilter;
+	readableTexture.magFilter = texture.magFilter;
+	readableTexture.wrapS = texture.wrapS;
+	readableTexture.wrapT = texture.wrapT;
+	readableTexture.name = texture.name;
+	if ( _renderer ) {
+		_renderer.dispose();
+		_renderer = null;
+	}
+	return readableTexture;
 }
@@ -1134,13 +1162,13 @@
 	function buildTexture( texture, mapType, color: Color | undefined = undefined, opacity: number | undefined = undefined ) {
-		const id = texture.id + ( color ? '_' + color.getHexString() : '' ) + ( opacity ? '_' + opacity : '' );
+		const id = texture.id + ( color ? '_' + color.getHexString() : '' ) + ( opacity !== undefined ? '_' + opacity : '' );
 		textures[ id ] = texture;
 		const uv = texture.channel > 0 ? 'st' + texture.channel : 'st';
-		const isRGBA = texture.format === 1023;
+		const isRGBA = formatsWithAlphaChannel.includes( texture.format );
 		const WRAPPINGS = {
 			1000: 'repeat', // RepeatWrapping
@@ -1213,7 +1241,7 @@
 			token inputs:sourceColorSpace = "${ texture.colorSpace === 'srgb' ? 'sRGB' : 'raw' }"
             float2 inputs:st.connect = ${needsTextureTransform ? textureTransformOutput : textureTransformInput}
 			${needsTextureScale ? `
-			float4 inputs:scale = (${color ? color.r + ', ' + color.g + ', ' + color.b : '1, 1, 1'}, ${opacity ? opacity : '1'})
+			float4 inputs:scale = (${color ? color.r + ', ' + color.g + ', ' + color.b : '1, 1, 1'}, ${opacity !== undefined ? opacity : '1'})
 			` : `` }
 			${needsNormalScaleAndBias ? `
 			float4 inputs:scale = (${normalScaleValueString}, ${normalScaleValueString}, ${normalScaleValueString}, 1)
@@ -1396,4 +1424,31 @@
 }
-export { USDZExporter, USDZExporterContext, USDWriter, USDObject, buildMatrix, USDDocument, makeNameSafe as makeNameSafeForUSD, imageToCanvas };
+const formatsWithAlphaChannel = [
+	// uncompressed formats with alpha channel
+	1023, // RGBAFormat
+	// compressed formats with alpha channel
+	33777, // RGBA_S3TC_DXT1_Format
+	33778, // RGBA_S3TC_DXT3_Format
+	33779, // RGBA_S3TC_DXT5_Format
+	35842, // RGBA_PVRTC_4BPPV1_Format
+	35843, // RGBA_PVRTC_2BPPV1_Format
+	37496, // RGBA_ETC2_EAC_Format
+	37808, // RGBA_ASTC_4x4_Format
+	37809, // RGBA_ASTC_5x4_Format
+	37810, // RGBA_ASTC_5x5_Format
+	37811, // RGBA_ASTC_6x5_Format
+	37812, // RGBA_ASTC_6x6_Format
+	37813, // RGBA_ASTC_8x5_Format
+	37814, // RGBA_ASTC_8x6_Format
+	37815, // RGBA_ASTC_8x8_Format
+	37816, // RGBA_ASTC_10x5_Format
+	37817, // RGBA_ASTC_10x6_Format
+	37818, // RGBA_ASTC_10x8_Format
+	37819, // RGBA_ASTC_10x10_Format
+	37820, // RGBA_ASTC_12x10_Format
+	37821, // RGBA_ASTC_12x12_Format
+	36492, // RGBA_BPTC_Format
+];
+export { USDZExporter, USDZExporterContext, USDWriter, USDObject, buildMatrix, USDDocument, makeNameSafe as makeNameSafeForUSD, imageToCanvas, decompressGpuTexture };

src/engine-components/webxr/WebXRController.ts CHANGED Viewed

@@ -168,6 +168,8 @@
     public input: XRInputSource | null = null;
     public type: ControllerType = ControllerType.PhysicalDevice;
     public showRaycastLine: boolean = true;
+    public enableRaycasts: boolean = true;
+    public enableDefaultControls: boolean = true;
     get isUsingHands(): boolean {
         const r = this.input?.hand;
@@ -415,14 +417,23 @@
             this.handPointerModel.cursorObject.visible = false;
         }
-        if (this.raycastLine) {
-            this.raycastUpdate(this.raycastLine, wp);
+        // perform raycasts
+        if(this.enableRaycasts)
+        {
+            if (this.raycastLine) {
+                this.raycastUpdate(this.raycastLine, wp);
+            }
+            this.lastHit = this.updateLastHit();
+            if (this.grabbed) {
+                this.grabbed.update();
+            }
         }
-        this.lastHit = this.updateLastHit();
-        if (this.grabbed) {
-            this.grabbed.update();
+        else { // hide line when raycasting is disabled
+            if (this.raycastLine) {
+                this.raycastLine.visible = false;
+            }
         }
         this._selectionPressedLastFrame = this._selectionPressed;
@@ -454,14 +465,16 @@
         const buttons = this.input?.gamepad?.buttons;
-        switch (this.input.handedness) {
-            case "left":
-                this.movementUpdate(rig, buttons);
-                break;
+        if(this.enableDefaultControls) {
+            switch (this.input.handedness) {
+                case "left":
+                    this.movementUpdate(rig, buttons);
+                    break;
-            case "right":
-                this.rotationUpdate(rig, buttons);
-                break;
+                case "right":
+                    this.rotationUpdate(rig, buttons);
+                    break;
+            }
         }
     }