Sfoglia il codice sorgente

Fixed TransformControls.

Mr.doob 11 anni fa
parent
commit
f8a8d4177d
2 ha cambiato i file con 5 aggiunte e 3 eliminazioni
  1. 4 2
      examples/js/controls/TransformControls.js
  2. 1 1
      src/core/Geometry.js

+ 4 - 2
examples/js/controls/TransformControls.js

@@ -149,9 +149,11 @@
 			// reset Transformations
 
 			this.traverse(function ( child ) {
-				if (child instanceof THREE.Mesh) {			
+				if (child instanceof THREE.Mesh) {
+					child.updateMatrix();
+
 					var tempGeometry = new THREE.Geometry();
-					tempGeometry.merge( child );
+					tempGeometry.merge( child.geometry, child.matrix );
 
 					child.geometry = tempGeometry;
 					child.position.set( 0, 0, 0 );

+ 1 - 1
src/core/Geometry.js

@@ -457,7 +457,7 @@ THREE.Geometry.prototype = {
 
 		if ( geometry instanceof THREE.Geometry === false ) {
 
-			console.error( 'THREE.Geometry.merge():', 'geometry supplied is not an instance of THREE.Geometry' );
+			console.error( 'THREE.Geometry.merge(): geometry not an instance of THREE.Geometry.', geometry );
 			return;
 
 		}