skip: update test

naver · Mar 25, 2018 · 3e6733b · 3e6733b
1 parent dfb2dc8
commit 3e6733b
Show file tree

Hide file tree

Showing 20 changed files with 49 additions and 32 deletions.
diff --git a/dist/PanoViewer/view360.panoviewer.js b/dist/PanoViewer/view360.panoviewer.js
diff --git a/dist/PanoViewer/view360.panoviewer.js.map b/dist/PanoViewer/view360.panoviewer.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.min.js b/dist/PanoViewer/view360.panoviewer.min.js
diff --git a/dist/PanoViewer/view360.panoviewer.min.js.map b/dist/PanoViewer/view360.panoviewer.min.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.js b/dist/PanoViewer/view360.panoviewer.pkgd.js
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.js.map b/dist/PanoViewer/view360.panoviewer.pkgd.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.min.js b/dist/PanoViewer/view360.panoviewer.pkgd.min.js
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.min.js.map b/dist/PanoViewer/view360.panoviewer.pkgd.min.js.map
diff --git a/dist/SpinViewer/view360.spinviewer.js.map b/dist/SpinViewer/view360.spinviewer.js.map
diff --git a/dist/SpinViewer/view360.spinviewer.pkgd.js.map b/dist/SpinViewer/view360.spinviewer.pkgd.js.map
diff --git a/dist/view360.js b/dist/view360.js
diff --git a/dist/view360.js.map b/dist/view360.js.map
diff --git a/dist/view360.min.js b/dist/view360.min.js
diff --git a/dist/view360.min.js.map b/dist/view360.min.js.map
diff --git a/dist/view360.pkgd.js b/dist/view360.pkgd.js
diff --git a/dist/view360.pkgd.js.map b/dist/view360.pkgd.js.map
diff --git a/dist/view360.pkgd.min.js b/dist/view360.pkgd.min.js
diff --git a/dist/view360.pkgd.min.js.map b/dist/view360.pkgd.min.js.map
diff --git a/src/YawPitchControl/YawPitchControl.js b/src/YawPitchControl/YawPitchControl.js
@@ -240,6 +240,7 @@ const YawPitchControl = class YawPitchControl extends Component {
 
 		if (keys.some(key => key === "gyroMode") && SUPPORT_DEVICEMOTION) {
 			const isVR = this.options.gyroMode === GYRO_MODE.VR;
+			const isYawPitch = this.options.gyroMode === GYRO_MODE.YAWPITCH;
 
 			// Disconnect first
 			if (this.axesTiltMotionInput) {
@@ -255,7 +256,7 @@ const YawPitchControl = class YawPitchControl extends Component {
 
 			if (isVR) {
 				this._initDeviceQuaternion();
-			} else if (!isVR) {
+			} else if (isYawPitch) {
 				this.axesTiltMotionInput = new TiltMotionInput(this._element);
 				this.axes.connect(["yaw", "pitch"], this.axesTiltMotionInput);
 			}

diff --git a/test/unit/YawPitchControl/YawPitchControl.spec.js b/test/unit/YawPitchControl/YawPitchControl.spec.js
@@ -2111,15 +2111,22 @@ describe("YawPitchControl", function() {
 		};
 
 		class MockRotationPanInput extends RotationPanInput {
-			constructor(el, options) {
-				super(el, options);
-
-				this._screenRotationAngle = {
-					getRadian: function() {
-						return glMatrix.toRadian(90); /* 90 degree */
-					},
-					unref: function() {
-						/* Do nothing */
+			setUseRotation(useRotation) {
+				this._useRotation = useRotation;
+
+				if (this._screenRotationAngle) {
+					this._screenRotationAngle.unref();
+					this._screenRotationAngle = null;
+				}
+
+				if (this._useRotation) {
+					this._screenRotationAngle = {
+						getRadian: function() {
+							return glMatrix.toRadian(90); /* 90 degree */
+						},
+						unref: function() {
+							/* Do nothing */
+						}
 					}
 				}
 			}
@@ -2149,17 +2156,22 @@ describe("YawPitchControl", function() {
 				gyroMode: GYRO_MODE.VR /* this makes RotationPanInput as a rotation Mode */
 			});
 
+			inst.on("change", function(e) {
+				console.log(e);
+			});
 			inst.enable();
 
 			const prevYaw = inst.getYaw();
 			const prevPitch = inst.getPitch();
-
+			console.log(prevYaw,prevPitch )
 			// When
 			Simulator.gestures.pan(target, MOVE_VERTICALLY, () => {
 				// Then
-				console.log(inst.getYaw(), inst.getPitch())
-				expect(inst.getYaw()).to.be.not.equal(prevYaw);
-				expect(inst.getPitch()).to.be.equal(prevPitch);
+				const currYaw = inst.getYaw();
+				const currPitch = inst.getPitch();
+				console.log(currYaw, currPitch);
+				expect(currYaw).to.be.not.equal(prevYaw);
+				expect(currPitch).to.be.equal(prevPitch);
 				done();
 			});
 		});