@needle-tools/three 0.146.5 → 0.146.6

package/examples/jsm/exporters/USDZExporter.js

@@ -375,8 +375,6 @@ class USDZExporter {
 
 		context.output += buildMaterials( materials, textures );
 
-		invokeAll( context, 'onAfterHierarchy' );
-
 		const header = context.document.buildHeader();
 		const final = header + '\n' + context.output;
 
@@ -393,7 +391,6 @@ class USDZExporter {
 		for ( const id in textures ) {
 
 			let texture = textures[ id ];
-			const color = id.split( '_' )[ 1 ];
 			const isRGBA = texture.format === 1023;
 			if ( texture.isCompressedTexture ) {
 
@@ -401,10 +398,20 @@ class USDZExporter {
 
 			}
 
+			// TODO add readback options for textures that don't have texture.image
 			const canvas = await imageToCanvas( texture.image );
-			const blob = await new Promise( resolve => canvas.toBlob( resolve, isRGBA ? 'image/png' : 'image/jpeg', 1 ) );
 
-			files[ `textures/Texture_${id}.${isRGBA ? 'png' : 'jpg'}` ] = new Uint8Array( await blob.arrayBuffer() );
+			if ( canvas ) {
+
+				const blob = await new Promise( resolve => canvas.toBlob( resolve, isRGBA ? 'image/png' : 'image/jpeg', 1 ) );
+				files[ `textures/Texture_${id}.${isRGBA ? 'png' : 'jpg'}` ] = new Uint8Array( await blob.arrayBuffer() );
+
+			}
+			else {
+
+				console.warn( 'Can`t export texture: ', texture );
+
+			}
 
 		}
 
@@ -542,6 +549,8 @@ function parseDocument( context ) {
 
 	}
 
+	invokeAll( context, 'onAfterHierarchy', writer );
+
 	writer.closeBlock();
 	writer.closeBlock();
 	writer.closeBlock();
@@ -590,14 +599,14 @@ function addResources( object, context ) {
 
 }
 
-function invokeAll( context, name ) {
+function invokeAll( context, name, writer = null ) {
 
 	if ( context.extensions ) {
 
 		for ( const ext of context.extensions ) {
 
 			if ( typeof ext[ name ] === 'function' )
-				ext[ name ]( context );
+				ext[ name ]( context, writer );
 
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/three",
-  "version": "0.146.5",
+  "version": "0.146.6",
   "description": "JavaScript 3D library",
   "type": "module",
   "main": "./build/three.js",

package/src/renderers/webxr/WebXRManager.js

@@ -3,6 +3,7 @@ import { EventDispatcher } from '../../core/EventDispatcher.js';
 import { PerspectiveCamera } from '../../cameras/PerspectiveCamera.js';
 import { Vector3 } from '../../math/Vector3.js';
 import { Vector4 } from '../../math/Vector4.js';
+import { RAD2DEG } from '../../math/MathUtils.js';
 import { WebGLAnimation } from '../webgl/WebGLAnimation.js';
 import { WebGLRenderTarget } from '../WebGLRenderTarget.js';
 import { WebXRController } from './WebXRController.js';
@@ -492,6 +493,7 @@ class WebXRManager extends EventDispatcher {
 			const bottom2 = bottomFov * far / far2 * near2;
 
 			camera.projectionMatrix.makePerspective( left2, right2, top2, bottom2, near2, far2 );
+			camera.projectionMatrixInverse.copy( camera.projectionMatrix ).invert();
 
 		}
 
@@ -543,12 +545,42 @@ class WebXRManager extends EventDispatcher {
 
 			}
 
-			cameraVR.matrixWorld.decompose( cameraVR.position, cameraVR.quaternion, cameraVR.scale );
+			// update projection matrix for proper view frustum culling
+
+			if ( cameras.length === 2 ) {
+
+				setProjectionFromUnion( cameraVR, cameraL, cameraR );
+
+			} else {
+
+				// assume single camera setup (AR)
+
+				cameraVR.projectionMatrix.copy( cameraL.projectionMatrix );
+
+			}
 
 			// update user camera and its children
 
-			camera.matrix.copy( cameraVR.matrix );
+			updateUserCamera( camera, cameraVR, parent );
+
+		};
+
+		function updateUserCamera( camera, cameraVR, parent ) {
+
+			if ( parent === null ) {
+
+				camera.matrix.copy( cameraVR.matrixWorld );
+
+			} else {
+
+				camera.matrix.copy( parent.matrixWorld );
+				camera.matrix.invert();
+				camera.matrix.multiply( cameraVR.matrixWorld );
+
+			}
+
 			camera.matrix.decompose( camera.position, camera.quaternion, camera.scale );
+			camera.updateMatrixWorld( true );
 
 			const children = camera.children;
 
@@ -558,21 +590,17 @@ class WebXRManager extends EventDispatcher {
 
 			}
 
-			// update projection matrix for proper view frustum culling
-
-			if ( cameras.length === 2 ) {
+			camera.projectionMatrix.copy( cameraVR.projectionMatrix );
+			camera.projectionMatrixInverse.copy( cameraVR.projectionMatrixInverse );
 
-				setProjectionFromUnion( cameraVR, cameraL, cameraR );
+			if ( camera.isPerspectiveCamera ) {
 
-			} else {
-
-				// assume single camera setup (AR)
-
-				cameraVR.projectionMatrix.copy( cameraL.projectionMatrix );
+				camera.fov = RAD2DEG * 2 * Math.atan( 1 / camera.projectionMatrix.elements[ 5 ] );
+				camera.zoom = 1;
 
 			}
 
-		};
+		}
 
 		this.getCamera = function () {
 
@@ -695,12 +723,15 @@ class WebXRManager extends EventDispatcher {
 					}
 
 					camera.matrix.fromArray( view.transform.matrix );
+					camera.matrix.decompose( camera.position, camera.quaternion, camera.scale );
 					camera.projectionMatrix.fromArray( view.projectionMatrix );
+					camera.projectionMatrixInverse.copy( camera.projectionMatrix ).invert();
 					camera.viewport.set( viewport.x, viewport.y, viewport.width, viewport.height );
 
 					if ( i === 0 ) {
 
 						cameraVR.matrix.copy( camera.matrix );
+						cameraVR.matrix.decompose( cameraVR.position, cameraVR.quaternion, cameraVR.scale );
 
 					}