Browse Source

Merge pull request #12734 from BastiaanOlij/mobilevr_fix_typo

Fix has_gyro and has_grav mixup
Rémi Verschelde 7 years ago
parent
commit
ec77cccb1d
1 changed files with 7 additions and 3 deletions
  1. 7 3
      modules/mobile_vr/mobile_interface.cpp

+ 7 - 3
modules/mobile_vr/mobile_interface.cpp

@@ -122,6 +122,7 @@ void MobileVRInterface::set_position_from_sensors() {
 	Vector3 north(0.0, 0.0, 1.0); // North is Z positive
 	Vector3 north(0.0, 0.0, 1.0); // North is Z positive
 
 
 	// make copies of our inputs
 	// make copies of our inputs
+	bool has_grav = false;
 	Vector3 acc = input->get_accelerometer();
 	Vector3 acc = input->get_accelerometer();
 	Vector3 gyro = input->get_gyroscope();
 	Vector3 gyro = input->get_gyroscope();
 	Vector3 grav = input->get_gravity();
 	Vector3 grav = input->get_gravity();
@@ -143,14 +144,17 @@ void MobileVRInterface::set_position_from_sensors() {
 		// what a stable gravity vector is
 		// what a stable gravity vector is
 		grav = acc;
 		grav = acc;
 		if (grav.length() > 0.1) {
 		if (grav.length() > 0.1) {
-			has_gyro = true;
+			has_grav = true;
 		};
 		};
 	} else {
 	} else {
-		has_gyro = true;
+		has_grav = true;
 	};
 	};
 
 
 	bool has_magneto = magneto.length() > 0.1;
 	bool has_magneto = magneto.length() > 0.1;
-	bool has_grav = grav.length() > 0.1;
+	if (gyro.length() > 0.1) {
+		/* this can return to 0.0 if the user doesn't move the phone, so once on, it's on */
+		has_gyro = true;
+	};
 
 
 #ifdef ANDROID_ENABLED
 #ifdef ANDROID_ENABLED
 	///@TODO needs testing, i don't have a gyro, potentially can be removed depending on what comes out of issue #8101
 	///@TODO needs testing, i don't have a gyro, potentially can be removed depending on what comes out of issue #8101