Explorar o código

Merge pull request #133 from NASA-AMMOS/update-three

update three to v0.123.0
Garrett Johnson %!s(int64=4) %!d(string=hai) anos
pai
achega
18d242e093
Modificáronse 5 ficheiros con 10 adicións e 12 borrados
  1. 1 1
      example/customMaterial.js
  2. 3 3
      package-lock.json
  3. 2 2
      package.json
  4. 2 2
      src/three/TilesRenderer.js
  5. 2 4
      src/three/raycastTraverse.js

+ 1 - 1
example/customMaterial.js

@@ -96,7 +96,7 @@ const topoShader = {
 
 			// thickness scale
 			float upwardness = dot( worldNormal, vec3( 0.0, 1.0, 0.0 ) );
-			float yInv = saturate( 1.0 - abs( upwardness ) );
+			float yInv = clamp( 1.0 - abs( upwardness ), 0.0, 1.0 );
 			float thicknessScale = pow( yInv, 0.4 );
 			thicknessScale *= 0.25 + 0.5 * ( vViewPosition.z + 1.0 ) / 2.0;
 

+ 3 - 3
package-lock.json

@@ -12286,9 +12286,9 @@
       "dev": true
     },
     "three": {
-      "version": "0.115.0",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.115.0.tgz",
-      "integrity": "sha512-mAV2Ky3RdcbdSbR9capI+tKLvRldWYxd4151PZTT/o7+U2jh9Is3a4KmnYwzyUAhB2ZA3pXSgCd2DOY4Tj5kow==",
+      "version": "0.123.0",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.123.0.tgz",
+      "integrity": "sha512-KNnx/IbilvoHRkxOtL0ouozoDoElyuvAXhFB21RK7F5IPWSmqyFelICK6x3hJerLNSlAdHxR0hkuvMMhH9pqXg==",
       "dev": true
     },
     "throat": {

+ 2 - 2
package.json

@@ -47,10 +47,10 @@
     "jest-cli": "^25.4.0",
     "parcel-bundler": "^1.12.4",
     "static-server": "^2.2.1",
-    "three": ">=0.114.0",
+    "three": ">=0.123.0",
     "typescript": "^3.7.4"
   },
   "peerDependencies": {
-    "three": ">=0.114.0"
+    "three": ">=0.123.0"
   }
 }

+ 2 - 2
src/three/TilesRenderer.js

@@ -307,7 +307,7 @@ export class TilesRenderer extends TilesRendererBase {
 		}
 
 		// extract scale of group container
-		tempMat2.getInverse( group.matrixWorld );
+		tempMat2.copy( group.matrixWorld ).invert();
 
 		let invScale;
 		tempVector.setFromMatrixScale( tempMat2 );
@@ -424,7 +424,7 @@ export class TilesRenderer extends TilesRendererBase {
 				0, 0, 0, 1
 			);
 			boxTransform.premultiply( transform );
-			boxTransformInverse.getInverse( boxTransform );
+			boxTransformInverse.copy( boxTransform ).invert();
 
 			// scale the box by the extents
 			box.min.set( - scaleX, - scaleY, - scaleZ );

+ 2 - 4
src/three/raycastTraverse.js

@@ -84,8 +84,7 @@ export function raycastTraverseFirstHit( root, group, activeTiles, raycaster ) {
 		const obbMat = cached.boxTransform;
 		if ( boundingBox ) {
 
-			_mat.multiply( obbMat );
-			_mat.getInverse( _mat );
+			_mat.multiply( obbMat ).invert();
 			_ray.copy( raycaster.ray );
 			_ray.applyMatrix4( _mat );
 			if ( _ray.intersectBox( boundingBox, _vec ) ) {
@@ -211,8 +210,7 @@ export function raycastTraverse( tile, group, activeTiles, raycaster, intersects
 	const obbMat = cached.boxTransform;
 	if ( boundingBox ) {
 
-		_mat.multiply( obbMat );
-		_mat.getInverse( _mat );
+		_mat.multiply( obbMat ).invert();
 		_ray.copy( raycaster.ray ).applyMatrix4( _mat );
 		if ( ! _ray.intersectsBox( boundingBox ) ) {