Skip to content

Commit 22e629a

Browse files
committed
Updating quaternion fromEuler. Tests were failing silently, only showing on console, but throwing an exception makes the tests properly fail.
1 parent 6bc6c1d commit 22e629a

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/math/Quaternion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ THREE.Quaternion.prototype = {
114114

115115
if ( euler instanceof THREE.Euler === false ) {
116116

117-
console.error( 'ERROR: Quaternion\'s .setFromEuler() now expects a Euler rotation rather than a Vector3 and order. Please update your code.' );
117+
throw new Error( 'ERROR: Quaternion\'s .setFromEuler() now expects a Euler rotation rather than a Vector3 and order. Please update your code.' );
118118
}
119119

120120
// http://www.mathworks.com/matlabcentral/fileexchange/

test/unit/math/Quaternion.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
module( "Quaternion" );
66

77
var orders = [ 'XYZ', 'YXZ', 'ZXY', 'ZYX', 'YZX', 'XZY' ];
8-
var eulerAngles = new THREE.Vector3( 0.1, -0.3, 0.25 );
8+
var eulerAngles = new THREE.Euler( 0.1, -0.3, 0.25 );
99

1010

1111

@@ -153,7 +153,7 @@ test( "inverse/conjugate", function() {
153153

154154
test( "multiplyQuaternions/multiply", function() {
155155

156-
var angles = [ new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ), new THREE.Vector3( 0, 0, 1 ) ];
156+
var angles = [ new THREE.Euler( 1, 0, 0 ), new THREE.Euler( 0, 1, 0 ), new THREE.Euler( 0, 0, 1 ) ];
157157

158158
var q1 = new THREE.Quaternion().setFromEuler( angles[0], "XYZ" );
159159
var q2 = new THREE.Quaternion().setFromEuler( angles[1], "XYZ" );
@@ -174,7 +174,7 @@ test( "multiplyQuaternions/multiply", function() {
174174

175175
test( "multiplyVector3", function() {
176176

177-
var angles = [ new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ), new THREE.Vector3( 0, 0, 1 ) ];
177+
var angles = [ new THREE.Euler( 1, 0, 0 ), new THREE.Euler( 0, 1, 0 ), new THREE.Euler( 0, 0, 1 ) ];
178178

179179
// ensure euler conversion for Quaternion matches that of Matrix4
180180
for( var i = 0; i < orders.length; i ++ ) {

0 commit comments

Comments
 (0)