Răsfoiți Sursa

Merge branch 'updating-quaternion-fromEuler-tests' of https://github.com/danielribeiro/three.js into dev

Mr.doob 12 ani în urmă
părinte
comite
f45faba30d
2 a modificat fișierele cu 4 adăugiri și 4 ștergeri
  1. 1 1
      src/math/Quaternion.js
  2. 3 3
      test/unit/math/Quaternion.js

+ 1 - 1
src/math/Quaternion.js

@@ -114,7 +114,7 @@ THREE.Quaternion.prototype = {
 
 		if ( euler instanceof THREE.Euler === false ) {
 
-			console.error( 'ERROR: Quaternion\'s .setFromEuler() now expects a Euler rotation rather than a Vector3 and order.  Please update your code.' );
+			throw new Error( 'ERROR: Quaternion\'s .setFromEuler() now expects a Euler rotation rather than a Vector3 and order.  Please update your code.' );
 		}
 
 		// http://www.mathworks.com/matlabcentral/fileexchange/

+ 3 - 3
test/unit/math/Quaternion.js

@@ -5,7 +5,7 @@
 module( "Quaternion" );
 
 var orders = [ 'XYZ', 'YXZ', 'ZXY', 'ZYX', 'YZX', 'XZY' ];
-var eulerAngles = new THREE.Vector3( 0.1, -0.3, 0.25 );
+var eulerAngles = new THREE.Euler( 0.1, -0.3, 0.25 );
 
 
 
@@ -153,7 +153,7 @@ test( "inverse/conjugate", function() {
 
 test( "multiplyQuaternions/multiply", function() {
 
-	var angles = [ new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ), new THREE.Vector3( 0, 0, 1 ) ];
+	var angles = [ new THREE.Euler( 1, 0, 0 ), new THREE.Euler( 0, 1, 0 ), new THREE.Euler( 0, 0, 1 ) ];
 
 	var q1 = new THREE.Quaternion().setFromEuler( angles[0], "XYZ" );
 	var q2 = new THREE.Quaternion().setFromEuler( angles[1], "XYZ" );
@@ -174,7 +174,7 @@ test( "multiplyQuaternions/multiply", function() {
 
 test( "multiplyVector3", function() {
 	
-	var angles = [ new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ), new THREE.Vector3( 0, 0, 1 ) ];
+	var angles = [ new THREE.Euler( 1, 0, 0 ), new THREE.Euler( 0, 1, 0 ), new THREE.Euler( 0, 0, 1 ) ];
 
 	// ensure euler conversion for Quaternion matches that of Matrix4
 	for( var i = 0; i < orders.length; i ++ ) {