super-three 0.133.3 → 0.136.0

package/examples/js/interactive/SelectionHelper.js

@@ -12,13 +12,15 @@
 			this.pointTopLeft = new THREE.Vector2();
 			this.pointBottomRight = new THREE.Vector2();
 			this.isDown = false;
-			this.renderer.domElement.addEventListener( 'pointerdown', function ( event ) {
+
+			this.onPointerDown = function ( event ) {
 
 				this.isDown = true;
 				this.onSelectStart( event );
 
-			}.bind( this ) );
-			this.renderer.domElement.addEventListener( 'pointermove', function ( event ) {
+			}.bind( this );
+
+			this.onPointerMove = function ( event ) {
 
 				if ( this.isDown ) {
 
@@ -26,13 +28,26 @@
 
 				}
 
-			}.bind( this ) );
-			this.renderer.domElement.addEventListener( 'pointerup', function ( event ) {
+			}.bind( this );
+
+			this.onPointerUp = function () {
 
 				this.isDown = false;
-				this.onSelectOver( event );
+				this.onSelectOver();
+
+			}.bind( this );
+
+			this.renderer.domElement.addEventListener( 'pointerdown', this.onPointerDown );
+			this.renderer.domElement.addEventListener( 'pointermove', this.onPointerMove );
+			this.renderer.domElement.addEventListener( 'pointerup', this.onPointerUp );
+
+		}
+
+		dispose() {
 
-			}.bind( this ) );
+			this.renderer.domElement.removeEventListener( 'pointerdown', this.onPointerDown );
+			this.renderer.domElement.removeEventListener( 'pointermove', this.onPointerMove );
+			this.renderer.domElement.removeEventListener( 'pointerup', this.onPointerUp );
 
 		}
 

package/examples/js/lights/RectAreaLightUniformsLib.js

@@ -28,6 +28,8 @@
 			const ltc_float_2 = new Float32Array( LTC_MAT_2 );
 			THREE.UniformsLib.LTC_FLOAT_1 = new THREE.DataTexture( ltc_float_1, 64, 64, THREE.RGBAFormat, THREE.FloatType, THREE.UVMapping, THREE.ClampToEdgeWrapping, THREE.ClampToEdgeWrapping, THREE.LinearFilter, THREE.NearestFilter, 1 );
 			THREE.UniformsLib.LTC_FLOAT_2 = new THREE.DataTexture( ltc_float_2, 64, 64, THREE.RGBAFormat, THREE.FloatType, THREE.UVMapping, THREE.ClampToEdgeWrapping, THREE.ClampToEdgeWrapping, THREE.LinearFilter, THREE.NearestFilter, 1 );
+			THREE.UniformsLib.LTC_FLOAT_1.needsUpdate = true;
+			THREE.UniformsLib.LTC_FLOAT_2.needsUpdate = true;
 			const ltc_half_1 = new Uint16Array( LTC_MAT_1.length );
 			LTC_MAT_1.forEach( function ( x, index ) {
 
@@ -42,6 +44,8 @@
 			} );
 			THREE.UniformsLib.LTC_HALF_1 = new THREE.DataTexture( ltc_half_1, 64, 64, THREE.RGBAFormat, THREE.HalfFloatType, THREE.UVMapping, THREE.ClampToEdgeWrapping, THREE.ClampToEdgeWrapping, THREE.LinearFilter, THREE.NearestFilter, 1 );
 			THREE.UniformsLib.LTC_HALF_2 = new THREE.DataTexture( ltc_half_2, 64, 64, THREE.RGBAFormat, THREE.HalfFloatType, THREE.UVMapping, THREE.ClampToEdgeWrapping, THREE.ClampToEdgeWrapping, THREE.LinearFilter, THREE.NearestFilter, 1 );
+			THREE.UniformsLib.LTC_HALF_1.needsUpdate = true;
+			THREE.UniformsLib.LTC_HALF_2.needsUpdate = true;
 
 		}
 

package/examples/js/lines/LineMaterial.js

@@ -7,6 +7,7 @@
  *  dashed: <boolean>,
  *  dashScale: <float>,
  *  dashSize: <float>,
+ *  dashOffset: <float>,
  *  gapSize: <float>,
  *  resolution: <Vector2>, // to be set by renderer
  * }
@@ -21,6 +22,9 @@
 		resolution: {
 			value: new THREE.Vector2( 1, 1 )
 		},
+		dashOffset: {
+			value: 0
+		},
 		dashScale: {
 			value: 1
 		},
@@ -52,10 +56,23 @@
 		attribute vec3 instanceColorStart;
 		attribute vec3 instanceColorEnd;
 
-		varying vec2 vUv;
-		varying vec4 worldPos;
-		varying vec3 worldStart;
-		varying vec3 worldEnd;
+		#ifdef WORLD_UNITS
+
+			varying vec4 worldPos;
+			varying vec3 worldStart;
+			varying vec3 worldEnd;
+
+			#ifdef USE_DASH
+
+				varying vec2 vUv;
+
+			#endif
+
+		#else
+
+			varying vec2 vUv;
+
+		#endif
 
 		#ifdef USE_DASH
 
@@ -92,19 +109,26 @@
 			#ifdef USE_DASH
 
 				vLineDistance = ( position.y < 0.5 ) ? dashScale * instanceDistanceStart : dashScale * instanceDistanceEnd;
+				vUv = uv;
 
 			#endif
 
 			float aspect = resolution.x / resolution.y;
 
-			vUv = uv;
-
 			// camera space
 			vec4 start = modelViewMatrix * vec4( instanceStart, 1.0 );
 			vec4 end = modelViewMatrix * vec4( instanceEnd, 1.0 );
 
-			worldStart = start.xyz;
-			worldEnd = end.xyz;
+			#ifdef WORLD_UNITS
+
+				worldStart = start.xyz;
+				worldEnd = end.xyz;
+
+			#else
+
+				vUv = uv;
+
+			#endif
 
 			// special case for perspective projection, and segments that terminate either in, or behind, the camera plane
 			// clearly the gpu firmware has a way of addressing this issue when projecting into ndc space
@@ -254,15 +278,31 @@
 
 		#ifdef USE_DASH
 
+			uniform float dashOffset;
 			uniform float dashSize;
 			uniform float gapSize;
 
 		#endif
 
 		varying float vLineDistance;
-		varying vec4 worldPos;
-		varying vec3 worldStart;
-		varying vec3 worldEnd;
+
+		#ifdef WORLD_UNITS
+
+			varying vec4 worldPos;
+			varying vec3 worldStart;
+			varying vec3 worldEnd;
+
+			#ifdef USE_DASH
+
+				varying vec2 vUv;
+
+			#endif
+
+		#else
+
+			varying vec2 vUv;
+
+		#endif
 
 		#include <common>
 		#include <color_pars_fragment>
@@ -270,8 +310,6 @@
 		#include <logdepthbuf_pars_fragment>
 		#include <clipping_planes_pars_fragment>
 
-		varying vec2 vUv;
-
 		vec2 closestLineToLine(vec3 p1, vec3 p2, vec3 p3, vec3 p4) {
 
 			float mua;
@@ -309,7 +347,7 @@
 
 				if ( vUv.y < - 1.0 || vUv.y > 1.0 ) discard; // discard endcaps
 
-				if ( mod( vLineDistance, dashSize + gapSize ) > dashSize ) discard; // todo - FIX
+				if ( mod( vLineDistance + dashOffset, dashSize + gapSize ) > dashSize ) discard; // todo - FIX
 
 			#endif
 
@@ -330,7 +368,7 @@
 
 				#ifndef USE_DASH
 
-					#ifdef ALPHA_TO_COVERAGE
+					#ifdef USE_ALPHA_TO_COVERAGE
 
 						float dnorm = fwidth( norm );
 						alpha = 1.0 - smoothstep( 0.5 - dnorm, 0.5 + dnorm, norm );
@@ -349,7 +387,7 @@
 
 			#else
 
-				#ifdef ALPHA_TO_COVERAGE
+				#ifdef USE_ALPHA_TO_COVERAGE
 
 					// artifacts appear on some hardware if a derivative is taken within a conditional
 					float a = vUv.x;
@@ -566,12 +604,12 @@
 					enumerable: true,
 					get: function () {
 
-						return Boolean( 'ALPHA_TO_COVERAGE' in this.defines );
+						return Boolean( 'USE_ALPHA_TO_COVERAGE' in this.defines );
 
 					},
 					set: function ( value ) {
 
-						if ( Boolean( value ) !== Boolean( 'ALPHA_TO_COVERAGE' in this.defines ) ) {
+						if ( Boolean( value ) !== Boolean( 'USE_ALPHA_TO_COVERAGE' in this.defines ) ) {
 
 							this.needsUpdate = true;
 
@@ -579,12 +617,12 @@
 
 						if ( value === true ) {
 
-							this.defines.ALPHA_TO_COVERAGE = '';
+							this.defines.USE_ALPHA_TO_COVERAGE = '';
 							this.extensions.derivatives = true;
 
 						} else {
 
-							delete this.defines.ALPHA_TO_COVERAGE;
+							delete this.defines.USE_ALPHA_TO_COVERAGE;
 							this.extensions.derivatives = false;
 
 						}

package/examples/js/lines/LineSegments2.js

@@ -22,7 +22,29 @@
 
 	const _sphere = new THREE.Sphere();
 
-	const _clipToWorldVector = new THREE.Vector4();
+	const _clipToWorldVector = new THREE.Vector4(); // Returns the margin required to expand by in world space given the distance from the camera,
+	// line width, resolution, and camera projection
+
+
+	function getWorldSpaceHalfWidth( camera, distance, lineWidth, resolution ) {
+
+		// transform into clip space, adjust the x and y values by the pixel width offset, then
+		// transform back into world space to get world offset. Note clip space is [-1, 1] so full
+		// width does not need to be halved.
+		_clipToWorldVector.set( 0, 0, - distance, 1.0 ).applyMatrix4( camera.projectionMatrix );
+
+		_clipToWorldVector.multiplyScalar( 1.0 / _clipToWorldVector.w );
+
+		_clipToWorldVector.x = lineWidth / resolution.width;
+		_clipToWorldVector.y = lineWidth / resolution.height;
+
+		_clipToWorldVector.applyMatrix4( camera.projectionMatrixInverse );
+
+		_clipToWorldVector.multiplyScalar( 1.0 / _clipToWorldVector.w );
+
+		return Math.abs( Math.max( _clipToWorldVector.x, _clipToWorldVector.y ) );
+
+	}
 
 	class LineSegments2 extends THREE.Mesh {
 
@@ -84,10 +106,7 @@
 			const instanceStart = geometry.attributes.instanceStart;
 			const instanceEnd = geometry.attributes.instanceEnd; // camera forward is negative
 
-			const near = - camera.near; // clip space is [ - 1, 1 ] so multiply by two to get the full
-			// width in clip space
-
-			const ssMaxWidth = 2.0 * Math.max( lineWidth / resolution.width, lineWidth / resolution.height ); //
+			const near = - camera.near; //
 			// check if we intersect the sphere bounds
 
 			if ( geometry.boundingSphere === null ) {
@@ -98,16 +117,9 @@
 
 			_sphere.copy( geometry.boundingSphere ).applyMatrix4( matrixWorld );
 
-			const distanceToSphere = Math.max( camera.near, _sphere.distanceToPoint( ray.origin ) ); // get the w component to scale the world space line width
-
-			_clipToWorldVector.set( 0, 0, - distanceToSphere, 1.0 ).applyMatrix4( camera.projectionMatrix );
-
-			_clipToWorldVector.multiplyScalar( 1.0 / _clipToWorldVector.w );
-
-			_clipToWorldVector.applyMatrix4( camera.projectionMatrixInverse ); // increase the sphere bounds by the worst case line screen space width
-
+			const distanceToSphere = Math.max( camera.near, _sphere.distanceToPoint( ray.origin ) ); // increase the sphere bounds by the worst case line screen space width
 
-			const sphereMargin = Math.abs( ssMaxWidth / _clipToWorldVector.w ) * 0.5;
+			const sphereMargin = getWorldSpaceHalfWidth( camera, distanceToSphere, lineWidth, resolution );
 			_sphere.radius += sphereMargin;
 
 			if ( raycaster.ray.intersectsSphere( _sphere ) === false ) {
@@ -126,16 +138,9 @@
 
 			_box.copy( geometry.boundingBox ).applyMatrix4( matrixWorld );
 
-			const distanceToBox = Math.max( camera.near, _box.distanceToPoint( ray.origin ) ); // get the w component to scale the world space line width
-
-			_clipToWorldVector.set( 0, 0, - distanceToBox, 1.0 ).applyMatrix4( camera.projectionMatrix );
-
-			_clipToWorldVector.multiplyScalar( 1.0 / _clipToWorldVector.w );
-
-			_clipToWorldVector.applyMatrix4( camera.projectionMatrixInverse ); // increase the sphere bounds by the worst case line screen space width
-
+			const distanceToBox = Math.max( camera.near, _box.distanceToPoint( ray.origin ) ); // increase the box bounds by the worst case line screen space width
 
-			const boxMargin = Math.abs( ssMaxWidth / _clipToWorldVector.w ) * 0.5;
+			const boxMargin = getWorldSpaceHalfWidth( camera, distanceToBox, lineWidth, resolution );
 			_box.max.x += boxMargin;
 			_box.max.y += boxMargin;
 			_box.max.z += boxMargin;
@@ -276,7 +281,7 @@
 
 	}
 
-	LineSegments2.prototype.LineSegments2 = true;
+	LineSegments2.prototype.isLineSegments2 = true;
 
 	THREE.LineSegments2 = LineSegments2;
 

package/examples/js/loaders/3DMLoader.js

@@ -231,6 +231,10 @@
 
 					}
 
+					map.wrapS = texture.wrapU === 0 ? THREE.RepeatWrapping : THREE.ClampToEdgeWrapping;
+					map.wrapT = texture.wrapV === 0 ? THREE.RepeatWrapping : THREE.ClampToEdgeWrapping;
+					map.repeat.set( texture.repeat[ 0 ], texture.repeat[ 1 ] );
+
 				}
 
 			}
@@ -778,7 +782,8 @@
 			const layers = [];
 			const views = [];
 			const namedViews = [];
-			const groups = []; //Handle objects
+			const groups = [];
+			const strings = []; //Handle objects
 
 			const objs = doc.objects();
 			const cnt = objs.count;
@@ -840,6 +845,13 @@
 							type: textureType
 						};
 						const image = doc.getEmbeddedFileAsBase64( _texture.fileName );
+						texture.wrapU = _texture.wrapU;
+						texture.wrapV = _texture.wrapV;
+						texture.wrapW = _texture.wrapW;
+
+						const uvw = _texture.uvwTransform.toFloatArray( true );
+
+						texture.repeat = [ uvw[ 0 ], uvw[ 5 ] ];
 
 						if ( image ) {
 
@@ -959,18 +971,18 @@
 			// console.log( `Dimstyle Count: ${doc.dimstyles().count()}` );
 			// Handle bitmaps
 			// console.log( `Bitmap Count: ${doc.bitmaps().count()}` );
-			// Handle strings -- this seems to be broken at the moment in rhino3dm
+			// Handle strings
 			// console.log( `Document Strings Count: ${doc.strings().count()}` );
+			// Note: doc.strings().documentUserTextCount() counts any doc.strings defined in a section
+			//console.log( `Document User Text Count: ${doc.strings().documentUserTextCount()}` );
+
+			const strings_count = doc.strings().count();
 
-			/*
-    for( var i = 0; i < doc.strings().count(); i++ ){
-    		var _string= doc.strings().get( i );
-    		console.log(_string);
-    	var string = extractProperties( _group );
-    		strings.push( string );
-    		_string.delete();
-    	}
-    */
+			for ( let i = 0; i < strings_count; i ++ ) {
+
+				strings.push( doc.strings().get( i ) );
+
+			}
 
 			doc.delete();
 			return {
@@ -980,6 +992,7 @@
 				views,
 				namedViews,
 				groups,
+				strings,
 				settings
 			};
 

package/examples/js/loaders/3MFLoader.js

@@ -968,7 +968,7 @@
 				geometry.setIndex( new THREE.BufferAttribute( meshData[ 'triangles' ], 1 ) );
 				geometry.setAttribute( 'position', new THREE.BufferAttribute( meshData[ 'vertices' ], 3 ) );
 				const material = new THREE.MeshPhongMaterial( {
-					color: 0xaaaaff,
+					color: 0xffffff,
 					flatShading: true
 				} );
 				const mesh = new THREE.Mesh( geometry, material );
@@ -1299,7 +1299,7 @@
 				for ( let i = 0; i < buildData.length; i ++ ) {
 
 					const buildItem = buildData[ i ];
-					const object3D = objects[ buildItem[ 'objectId' ] ]; // apply transform
+					const object3D = objects[ buildItem[ 'objectId' ] ].clone(); // apply transform
 
 					const transform = buildItem[ 'transform' ];
 

package/examples/js/loaders/AMFLoader.js

@@ -4,8 +4,6 @@
  * Description: Early release of an AMF THREE.Loader following the pattern of the
  * example loaders in the three.js project.
  *
- * More information about the AMF format: http://amf.wikispaces.com
- *
  * Usage:
  *	const loader = new AMFLoader();
  *	loader.load('/path/to/project.amf', function(objecttree) {

package/examples/js/loaders/ColladaLoader.js

@@ -1110,6 +1110,10 @@
 							data.parameters = parseEffectParameters( child );
 							break;
 
+						case 'extra':
+							data.extra = parseEffectExtra( child );
+							break;
+
 					}
 
 				}
@@ -1141,7 +1145,7 @@
 
 						case 'transparent':
 							data[ child.nodeName ] = {
-								opaque: child.getAttribute( 'opaque' ),
+								opaque: child.hasAttribute( 'opaque' ) ? child.getAttribute( 'opaque' ) : 'A_ONE',
 								data: parseEffectParameter( child )
 							};
 							break;
@@ -1267,6 +1271,10 @@
 
 							break;
 
+						case 'bump':
+							data[ child.nodeName ] = parseEffectExtraTechniqueBump( child );
+							break;
+
 					}
 
 				}
@@ -1311,6 +1319,37 @@
 							data[ child.nodeName ] = parseInt( child.textContent );
 							break;
 
+						case 'bump':
+							data[ child.nodeName ] = parseEffectExtraTechniqueBump( child );
+							break;
+
+					}
+
+				}
+
+				return data;
+
+			}
+
+			function parseEffectExtraTechniqueBump( xml ) {
+
+				var data = {};
+
+				for ( var i = 0, l = xml.childNodes.length; i < l; i ++ ) {
+
+					var child = xml.childNodes[ i ];
+					if ( child.nodeType !== 1 ) continue;
+
+					switch ( child.nodeName ) {
+
+						case 'texture':
+							data[ child.nodeName ] = {
+								id: child.getAttribute( 'texture' ),
+								texcoord: child.getAttribute( 'texcoord' ),
+								extra: parseEffectParameterTexture( child )
+							};
+							break;
+
 					}
 
 				}
@@ -1383,7 +1422,6 @@
 
 				const effect = getEffect( data.url );
 				const technique = effect.profile.technique;
-				const extra = effect.profile.extra;
 				let material;
 
 				switch ( technique.type ) {
@@ -1570,9 +1608,28 @@
 				} //
 
 
-				if ( extra !== undefined && extra.technique !== undefined && extra.technique.double_sided === 1 ) {
+				if ( technique.extra !== undefined && technique.extra.technique !== undefined ) {
+
+					const techniques = technique.extra.technique;
 
-					material.side = THREE.DoubleSide;
+					for ( const k in techniques ) {
+
+						const v = techniques[ k ];
+
+						switch ( k ) {
+
+							case 'double_sided':
+								material.side = v === 1 ? THREE.DoubleSide : THREE.FrontSide;
+								break;
+
+							case 'bump':
+								material.normalMap = getTexture( v.texture );
+								material.normalScale = new THREE.Vector2( 1, 1 );
+								break;
+
+						}
+
+					}
 
 				}