2
0
Эх сурвалжийг харах

Merge remote-tracking branch 'WestLangley/dev-vec3' into dev

Mr.doob 12 жил өмнө
parent
commit
10a2f6f3c1

+ 2 - 0
src/math/Quaternion.js

@@ -346,3 +346,5 @@ THREE.Quaternion.slerp = function ( qa, qb, qm, t ) {
 	return qm.copy( qa ).slerp( qb, t );
 
 }
+
+THREE.Vector3.__q1 = new THREE.Quaternion(); // to be moved to Vector3.js

+ 20 - 0
src/math/Vector3.js

@@ -252,6 +252,26 @@ THREE.Vector3.prototype = {
 
 	},
 
+	applyEuler: function ( v, eulerOrder ) {
+
+		var quaternion = THREE.Vector3.__q1.setFromEuler( v, eulerOrder );
+
+		this.applyQuaternion( quaternion );
+
+		return this;
+
+	},
+
+	applyAxisAngle: function ( axis, angle ) {
+
+		var quaternion = THREE.Vector3.__q1.setFromAxisAngle( axis, angle );
+
+		this.applyQuaternion( quaternion );
+
+		return this;
+
+	},
+
 	divide: function ( v ) {
 
 		this.x /= v.x;