super-three 0.141.0 → 0.147.0

package/examples/jsm/exporters/STLExporter.js

@@ -1,6 +1,4 @@
-import {
-	Vector3
-} from 'three';
+import { Vector3 } from 'three';
 
 /**
  * Usage:
@@ -28,12 +26,6 @@ class STLExporter {
 
 				const geometry = object.geometry;
 
-				if ( geometry.isBufferGeometry !== true ) {
-
-					throw new Error( 'THREE.STLExporter: Geometry is not of type THREE.BufferGeometry.' );
-
-				}
-
 				const index = geometry.index;
 				const positionAttribute = geometry.getAttribute( 'position' );
 

package/examples/jsm/exporters/USDZExporter.js

@@ -1,8 +1,12 @@
+import {
+	DoubleSide
+} from 'three';
+
 import * as fflate from '../libs/fflate.module.js';
 
 class USDZExporter {
 
-	async parse( scene ) {
+	async parse( scene, options = { ar: { anchoring: { type: 'plane' }, planeAnchoring: { alignment: 'horizontal' } } } ) {
 
 		const files = {};
 		const modelFileName = 'model.usda';
@@ -12,6 +16,8 @@ class USDZExporter {
 
 		let output = buildHeader();
 
+		output += buildSceneStart( options );
+
 		const materials = {};
 		const textures = {};
 
@@ -19,10 +25,10 @@ class USDZExporter {
 
 			if ( object.isMesh ) {
 
-				if ( object.material.isMeshStandardMaterial ) {
+				const geometry = object.geometry;
+				const material = object.material;
 
-					const geometry = object.geometry;
-					const material = object.material;
+				if ( material.isMeshStandardMaterial ) {
 
 					const geometryFileName = 'geometries/Geometry_' + geometry.id + '.usd';
 
@@ -47,10 +53,17 @@ class USDZExporter {
 
 				}
 
+			} else if ( object.isCamera ) {
+
+				output += buildCamera( object );
+
 			}
 
 		} );
 
+
+		output += buildSceneEnd();
+
 		output += buildMaterials( materials, textures );
 
 		files[ modelFileName ] = fflate.strToU8( output );
@@ -166,6 +179,40 @@ function buildHeader() {
 
 }
 
+function buildSceneStart( options ) {
+
+	return `def Xform "Root"
+{
+    def Scope "Scenes" (
+        kind = "sceneLibrary"
+    )
+    {
+        def Xform "Scene" (
+            customData = {
+                bool preliminary_collidesWithEnvironment = 0
+                string sceneName = "Scene"
+            }
+            sceneName = "Scene"
+        )
+        {
+        token preliminary:anchoring:type = "${options.ar.anchoring.type}"
+        token preliminary:planeAnchoring:alignment = "${options.ar.planeAnchoring.alignment}"
+
+`;
+
+}
+
+function buildSceneEnd() {
+
+	return `
+        }
+    }
+}
+
+`;
+
+}
+
 function buildUSDFileAsString( dataToInsert ) {
 
 	let output = buildHeader();
@@ -407,6 +454,13 @@ function buildMaterial( material, textures ) {
 
 	}
 
+
+	if ( material.side === DoubleSide ) {
+
+		console.warn( 'THREE.USDZExporter: USDZ does not support double sided materials', material );
+
+	}
+
 	if ( material.map !== null ) {
 
 		inputs.push( `${ pad }color3f inputs:diffuseColor.connect = </Materials/Material_${ material.id }/Texture_${ material.map.id }_diffuse.outputs:rgb>` );
@@ -544,4 +598,53 @@ function buildVector2( vector ) {
 
 }
 
+
+function buildCamera( camera ) {
+
+	const name = camera.name ? camera.name : 'Camera_' + camera.id;
+
+	const transform = buildMatrix( camera.matrixWorld );
+
+	if ( camera.matrixWorld.determinant() < 0 ) {
+
+		console.warn( 'THREE.USDZExporter: USDZ does not support negative scales', camera );
+
+	}
+
+	if ( camera.isOrthographicCamera ) {
+
+		return `def Camera "${name}"
+		{
+			matrix4d xformOp:transform = ${ transform }
+			uniform token[] xformOpOrder = ["xformOp:transform"]
+	
+			float2 clippingRange = (${ camera.near.toPrecision( PRECISION ) }, ${ camera.far.toPrecision( PRECISION ) })
+			float horizontalAperture = ${ ( ( Math.abs( camera.left ) + Math.abs( camera.right ) ) * 10 ).toPrecision( PRECISION ) }
+			float verticalAperture = ${ ( ( Math.abs( camera.top ) + Math.abs( camera.bottom ) ) * 10 ).toPrecision( PRECISION ) }
+			token projection = "orthographic"
+		}
+	
+	`;
+
+	} else {
+
+		return `def Camera "${name}"
+		{
+			matrix4d xformOp:transform = ${ transform }
+			uniform token[] xformOpOrder = ["xformOp:transform"]
+	
+			float2 clippingRange = (${ camera.near.toPrecision( PRECISION ) }, ${ camera.far.toPrecision( PRECISION ) })
+			float focalLength = ${ camera.getFocalLength().toPrecision( PRECISION ) }
+			float focusDistance = ${ camera.focus.toPrecision( PRECISION ) }
+			float horizontalAperture = ${ camera.getFilmWidth().toPrecision( PRECISION ) }
+			token projection = "perspective"
+			float verticalAperture = ${ camera.getFilmHeight().toPrecision( PRECISION ) }
+		}
+	
+	`;
+
+	}
+
+}
+
 export { USDZExporter };

package/examples/jsm/geometries/ConvexGeometry.js

@@ -17,7 +17,7 @@ class ConvexGeometry extends BufferGeometry {
 
 		if ( ConvexHull === undefined ) {
 
-			console.error( 'THREE.ConvexBufferGeometry: ConvexBufferGeometry relies on ConvexHull' );
+			console.error( 'THREE.ConvexGeometry: ConvexGeometry relies on ConvexHull' );
 
 		}
 

package/examples/jsm/geometries/ParametricGeometry.js

@@ -37,12 +37,6 @@ class ParametricGeometry extends BufferGeometry {
 		const p0 = new Vector3(), p1 = new Vector3();
 		const pu = new Vector3(), pv = new Vector3();
 
-		if ( func.length < 3 ) {
-
-			console.error( 'THREE.ParametricGeometry: Function must now modify a Vector3 as third parameter.' );
-
-		}
-
 		// generate vertices, normals and uvs
 
 		const sliceCount = slices + 1;

package/examples/jsm/helpers/OctreeHelper.js

@@ -9,6 +9,19 @@ class OctreeHelper extends LineSegments {
 
 	constructor( octree, color = 0xffff00 ) {
 
+		super( new BufferGeometry(), new LineBasicMaterial( { color: color, toneMapped: false } ) );
+
+		this.octree = octree;
+		this.color = color;
+
+		this.type = 'OctreeHelper';
+
+		this.update();
+
+	}
+
+	update() {
+
 		const vertices = [];
 
 		function traverse( tree ) {
@@ -39,20 +52,21 @@ class OctreeHelper extends LineSegments {
 
 		}
 
-		traverse( octree.subTrees );
+		traverse( this.octree.subTrees );
 
-		const geometry = new BufferGeometry();
-		geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
+		this.geometry.dispose();
 
-		super( geometry, new LineBasicMaterial( { color: color, toneMapped: false } ) );
+		this.geometry = new BufferGeometry();
+		this.geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
 
-		this.octree = octree;
-		this.color = color;
+	}
 
-		this.type = 'OctreeHelper';
+	dispose() {
 
-	}
+		this.geometry.dispose();
+		this.material.dispose();
 
+	}
 }
 
 export { OctreeHelper };

package/examples/jsm/helpers/VertexNormalsHelper.js

@@ -84,7 +84,13 @@ class VertexNormalsHelper extends LineSegments {
 
 	}
 
-}
+	dispose() {
+
+		this.geometry.dispose();
+		this.material.dispose();
 
+	}
+
+}
 
 export { VertexNormalsHelper };

package/examples/jsm/helpers/VertexTangentsHelper.js

@@ -76,6 +76,13 @@ class VertexTangentsHelper extends LineSegments {
 
 	}
 
+	dispose() {
+
+		this.geometry.dispose();
+		this.material.dispose();
+
+	}
+
 }
 
 export { VertexTangentsHelper };

package/examples/jsm/helpers/ViewHelper.js

@@ -200,6 +200,30 @@ class ViewHelper extends THREE.Object3D {
 
 		};
 
+		this.dispose = function () {
+
+			geometry.dispose();
+
+			xAxis.material.dispose();
+			yAxis.material.dispose();
+			zAxis.material.dispose();
+
+			posXAxisHelper.material.map.dispose();
+			posYAxisHelper.material.map.dispose();
+			posZAxisHelper.material.map.dispose();
+			negXAxisHelper.material.map.dispose();
+			negYAxisHelper.material.map.dispose();
+			negZAxisHelper.material.map.dispose();
+
+			posXAxisHelper.material.dispose();
+			posYAxisHelper.material.dispose();
+			posZAxisHelper.material.dispose();
+			negXAxisHelper.material.dispose();
+			negYAxisHelper.material.dispose();
+			negZAxisHelper.material.dispose();
+
+		};
+
 		function prepareAnimationData( object, focusPoint ) {
 
 			switch ( object.userData.type ) {

package/examples/jsm/interactive/HTMLMesh.js

@@ -36,6 +36,8 @@ class HTMLMesh extends Mesh {
 			material.dispose();
 
 			material.map.dispose();
+			
+			canvases.delete( dom );
 
 			this.removeEventListener( 'mousedown', onEvent );
 			this.removeEventListener( 'mousemove', onEvent );
@@ -203,7 +205,7 @@ function html2canvas( element ) {
 
 	}
 
-	function buildRectPath(x, y, w, h, r) {
+	function buildRectPath( x, y, w, h, r ) {
 
 		if ( w < 2 * r ) r = w / 2;
 		if ( h < 2 * r ) r = h / 2;
@@ -356,7 +358,7 @@ function html2canvas( element ) {
 				const luminance = Math.sqrt( 0.299 * ( color.r ** 2 ) + 0.587 * ( color.g ** 2 ) + 0.114 * ( color.b ** 2 ) );
 				const accentTextColor = luminance < 0.5 ? 'white' : '#111111';
 
-				if ( element.type  === 'radio' ) {
+				if ( element.type === 'radio' ) {
 
 					buildRectPath( x, y, width, height, height );
 
@@ -380,7 +382,7 @@ function html2canvas( element ) {
 
 				}
 
-				if ( element.type  === 'checkbox' ) {
+				if ( element.type === 'checkbox' ) {
 
 					buildRectPath( x, y, width, height, 2 );
 
@@ -395,7 +397,7 @@ function html2canvas( element ) {
 						const currentTextAlign = context.textAlign;
 
 						context.textAlign = 'center';
-						
+
 						const properties = {
 							color: accentTextColor,
 							fontFamily: style.fontFamily,
@@ -411,10 +413,10 @@ function html2canvas( element ) {
 
 				}
 
-				if ( element.type  === 'range' ) {
+				if ( element.type === 'range' ) {
 
-					const [min,max,value] = ['min','max','value'].map(property => parseFloat(element[property]));
-					const position = ((value-min)/(max-min)) * (width - height);
+					const [ min, max, value ] = [ 'min', 'max', 'value' ].map( property => parseFloat( element[ property ] ) );
+					const position = ( ( value - min ) / ( max - min ) ) * ( width - height );
 
 					buildRectPath( x, y + ( height / 4 ), width, height / 2, height / 4 );
 					context.fillStyle = accentTextColor;
@@ -423,7 +425,7 @@ function html2canvas( element ) {
 					context.fill();
 					context.stroke();
 
-					buildRectPath( x, y + ( height / 4 ),position + ( height / 2 ), height / 2, height / 4 );
+					buildRectPath( x, y + ( height / 4 ), position + ( height / 2 ), height / 2, height / 4 );
 					context.fillStyle = accentColor;
 					context.fill();
 
@@ -469,17 +471,14 @@ function html2canvas( element ) {
 
 	const offset = element.getBoundingClientRect();
 
-	let canvas;
-
-	if ( canvases.has( element ) ) {
-
-		canvas = canvases.get( element );
+	let canvas = canvases.get( element );
 
-	} else {
+	if ( canvas === undefined ) {
 
 		canvas = document.createElement( 'canvas' );
 		canvas.width = offset.width;
 		canvas.height = offset.height;
+		canvases.set( element, canvas );
 
 	}
 
@@ -522,7 +521,7 @@ function htmlevent( element, event, x, y ) {
 
 				element.dispatchEvent( new MouseEvent( event, mouseEventInit ) );
 
-				if ( element instanceof HTMLInputElement && element.type  === 'range' && ( event === 'mousedown' || event === 'click' ) ) {
+				if ( element instanceof HTMLInputElement && element.type === 'range' && ( event === 'mousedown' || event === 'click' ) ) {
 
 					const [ min, max ] = [ 'min', 'max' ].map( property => parseFloat( element[ property ] ) );
 

package/examples/jsm/interactive/InteractiveGroup.js

@@ -27,8 +27,10 @@ class InteractiveGroup extends Group {
 
 			event.stopPropagation();
 
-			_pointer.x = ( event.clientX / element.clientWidth ) * 2 - 1;
-			_pointer.y = - ( event.clientY / element.clientHeight ) * 2 + 1;
+			const rect = renderer.domElement.getBoundingClientRect();
+			
+			_pointer.x = ( event.clientX - rect.left ) / rect.width * 2 - 1;
+			_pointer.y = - ( event.clientY - rect.top ) / rect.height * 2 + 1;
 
 			raycaster.setFromCamera( _pointer, camera );
 

package/examples/jsm/interactive/SelectionHelper.js

@@ -1,6 +1,4 @@
-import {
-	Vector2
-} from 'three';
+import { Vector2 } from 'three';
 
 class SelectionHelper {
 
@@ -58,6 +56,8 @@ class SelectionHelper {
 
 	onSelectStart( event ) {
 
+		this.element.style.display = 'none';
+
 		this.renderer.domElement.parentElement.appendChild( this.element );
 
 		this.element.style.left = event.clientX + 'px';
@@ -72,6 +72,8 @@ class SelectionHelper {
 
 	onSelectMove( event ) {
 
+		this.element.style.display = 'block';
+
 		this.pointBottomRight.x = Math.max( this.startPoint.x, event.clientX );
 		this.pointBottomRight.y = Math.max( this.startPoint.y, event.clientY );
 		this.pointTopLeft.x = Math.min( this.startPoint.x, event.clientX );