Browse Source

ObjectLoader backwards compatible temporarily.

Mr.doob 12 years ago
parent
commit
1e321b91a1
2 changed files with 14 additions and 3 deletions
  1. 13 3
      src/loaders/ObjectLoader.js
  2. 1 0
      src/math/Rotation.js

+ 13 - 3
src/loaders/ObjectLoader.js

@@ -260,10 +260,20 @@ THREE.ObjectLoader.prototype = {
 
 			}
 
-			matrix.fromArray( data.matrix );
-			matrix.decompose( object.position, object.quaternion, object.scale );
+			if ( data.matrix !== undefined ) {
 
-			object.rotation.updateEuler();
+				matrix.fromArray( data.matrix );
+				matrix.decompose( object.position, object.quaternion, object.scale );
+
+				object.rotation.updateEuler();
+
+			} else {
+
+				if ( data.position !== undefined ) object.position.fromArray( data.position );
+				if ( data.rotation !== undefined ) object.rotation.fromArray( data.rotation );
+				if ( data.scale !== undefined ) object.scale.fromArray( data.scale );
+
+			}
 
 			if ( data.id !== undefined ) object.id = data.id;
 			if ( data.name !== undefined ) object.name = data.name;

+ 1 - 0
src/math/Rotation.js

@@ -131,6 +131,7 @@ THREE.Rotation.prototype = {
 	fromArray: function ( array ) {
 
 		this.euler.fromArray( array );
+		this.updateQuaternion();
 
 		return this;