@needle-tools/three 0.145.1 → 0.145.4

package/examples/jsm/exporters/USDZExporter.js

@@ -783,9 +783,14 @@ function buildMesh( geometry ) {
             interpolation = "vertex"
         )
         point3f[] points = [${buildVector3Array( attributes.position, count )}]
-        float2[] primvars:st = [${buildVector2Array( attributes.uv, count )}] (
+        ${attributes.uv ? 
+		`float2[] primvars:st = [${buildVector2Array( attributes.uv, count )}] (
             interpolation = "vertex"
-        )
+        )` : '' }
+		${attributes.uv2 ? 
+        `float2[] primvars:st2 = [${buildVector2Array( attributes.uv2, count )}] (
+            interpolation = "vertex"
+        )` : '' }
         uniform token subdivisionScheme = "none"
     }
 `;
@@ -934,26 +939,31 @@ function buildMaterial( material, textures ) {
 		}
 
 		textures[ id ] = texture;
+		const uvReader = mapType == 'occlusion' ? 'uvReader_st2' : 'uvReader_st';
+
+		const needsTextureTransform = ( repeat.x != 1 || repeat.y != 1 || offset.x != 0 || offset.y != 0 );
+		const textureTransformInput = `</Materials/Material_${material.id}/${uvReader}.outputs:result>`;
+		const textureTransformOutput = `</Materials/Material_${material.id}/Transform2d_${mapType}.outputs:result>`;
 
 		return `
-        def Shader "Transform2d_${mapType}" (
+        ${needsTextureTransform ? `def Shader "Transform2d_${mapType}" (
             sdrMetadata = {
                 string role = "math"
             }
         )
         {
             uniform token info:id = "UsdTransform2d"
-            float2 inputs:in.connect = </Materials/Material_${material.id}/uvReader_st.outputs:result>
+            float2 inputs:in.connect = ${textureTransformInput}
             float2 inputs:scale = ${buildVector2( repeat )}
             float2 inputs:translation = ${buildVector2( offset )}
             float2 outputs:result
         }
-
-        def Shader "Texture_${texture.id}_${mapType}"
+		` : '' }
+		def Shader "Texture_${texture.id}_${mapType}"
         {
             uniform token info:id = "UsdUVTexture"
             asset inputs:file = @textures/Texture_${id}.${isRGBA ? 'png' : 'jpg'}@
-            float2 inputs:st.connect = </Materials/Material_${material.id}/Transform2d_${mapType}.outputs:result>
+            float2 inputs:st.connect = ${needsTextureTransform ? textureTransformOutput : textureTransformInput}
 			float4 inputs:scale = (${color ? color.r + ', ' + color.g + ', ' + color.b : '1, 1, 1'}, ${opacity ? opacity : '1'})
             token inputs:wrapS = "${wrapS}"
             token inputs:wrapT = "${wrapT}"
@@ -966,6 +976,8 @@ function buildMaterial( material, textures ) {
 
 	}
 
+	const effectiveOpacity = (material.transparent || material.alphaTest) ? material.opacity : 1;
+
 	if ( material.side === DoubleSide ) {
 
 		console.warn( 'THREE.USDZExporter: USDZ does not support double sided materials', material );
@@ -987,7 +999,7 @@ function buildMaterial( material, textures ) {
 
 		}
 
-		samplers.push( buildTexture( material.map, 'diffuse', material.color, material.opacity ) );
+		samplers.push( buildTexture( material.map, 'diffuse', material.color, effectiveOpacity ) );
 
 	} else {
 
@@ -1056,7 +1068,7 @@ function buildMaterial( material, textures ) {
 
 	} else {
 
-		inputs.push( `${pad}float inputs:opacity = ${material.opacity}` );
+		inputs.push( `${pad}float inputs:opacity = ${effectiveOpacity}` );
 
 	}
 
@@ -1080,12 +1092,19 @@ ${inputs.join( '\n' )}
         }
 
         token outputs:surface.connect = </Materials/Material_${material.id}/PreviewSurface.outputs:surface>
-        token inputs:frame:stPrimvarName = "st"
 
         def Shader "uvReader_st"
         {
             uniform token info:id = "UsdPrimvarReader_float2"
-            token inputs:varname.connect = </Materials/Material_${material.id}.inputs:frame:stPrimvarName>
+            token inputs:varname = "st"
+            float2 inputs:fallback = (0.0, 0.0)
+            float2 outputs:result
+        }
+
+		def Shader "uvReader_st2"
+        {
+            uniform token info:id = "UsdPrimvarReader_float2"
+            token inputs:varname = "st2"
             float2 inputs:fallback = (0.0, 0.0)
             float2 outputs:result
         }

package/examples/jsm/webxr/OculusHandModel.js

@@ -6,13 +6,14 @@ const POINTING_JOINT = 'index-finger-tip';
 
 class OculusHandModel extends Object3D {
 
-	constructor( controller ) {
+	constructor( controller, loader ) {
 
 		super();
 
 		this.controller = controller;
 		this.motionController = null;
 		this.envMap = null;
+		this.loader = loader;
 
 		this.mesh = null;
 
@@ -24,7 +25,7 @@ class OculusHandModel extends Object3D {
 
 				this.xrInputSource = xrInputSource;
 
-				this.motionController = new XRHandMeshModel( this, controller, this.path, xrInputSource.handedness );
+				this.motionController = new XRHandMeshModel( this, controller, this.path, xrInputSource.handedness, this.loader );
 
 			}
 

package/examples/jsm/webxr/XRHandMeshModel.js

@@ -4,15 +4,17 @@ const DEFAULT_HAND_PROFILE_PATH = 'https://cdn.jsdelivr.net/npm/@webxr-input-pro
 
 class XRHandMeshModel {
 
-	constructor( handModel, controller, path, handedness ) {
+	constructor( handModel, controller, path, handedness, loader ) {
 
 		this.controller = controller;
 		this.handModel = handModel;
 
 		this.bones = [];
 
-		const loader = new GLTFLoader();
-		loader.setPath( path || DEFAULT_HAND_PROFILE_PATH );
+		if (!loader) {
+			loader = new GLTFLoader();
+			loader.setPath( DEFAULT_HAND_PROFILE_PATH );
+		}
 		loader.load( `${handedness}.glb`, gltf => {
 
 			const object = gltf.scene.children[ 0 ];

package/package.json

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

package/src/renderers/webgl/WebGLCubeUVMaps.js

@@ -45,7 +45,7 @@ function WebGLCubeUVMaps( renderer ) {
 
 						if ( ( isEquirectMap && image && image.height > 0 ) || ( isCubeMap && image && isCubeTextureComplete( image ) ) ) {
 
-							if ( pmremGenerator === null ) pmremGenerator = new PMREMGenerator( renderer );
+							pmremGenerator = new PMREMGenerator( renderer );
 
 							const renderTarget = isEquirectMap ? pmremGenerator.fromEquirectangular( texture ) : pmremGenerator.fromCubemap( texture );
 							cubeUVmaps.set( texture, renderTarget );