first attempt at mixed tracker orientation

SFMLProject/KinectSettings.cpp

@@ -510,6 +510,25 @@ namespace KinectSettings
 					left_tracker_rot = glm::quat(0, 0, 0, 0);
 					right_tracker_rot = glm::quat(0, 0, 0, 0);
 				}
+				else if (feet_rotation_option == k_HipTrackerOrientationMixed)
+				{
+					if (positional_tracking_option == k_KinectFullTracking)
+					{
+						// create quats from the orientation filter and hip direction
+						glm::quat l_quat = glm::vec3(left_foot_raw_pose.x, waist_raw_pose.y, left_foot_raw_pose.x);
+						glm::quat r_quat = glm::vec3(right_foot_raw_pose.x, waist_raw_pose.y, right_foot_raw_pose.x);
+						if (!flip)
+						{
+							left_tracker_rot = l_quat;
+							right_tracker_rot = r_quat;
+						}
+						else
+						{
+							right_tracker_rot = inverse(l_quat);
+							left_tracker_rot = inverse(r_quat);
+						}
+					}
+				}
 
 				/*******************************************************/
 				glm::quat r = glm::vec3(0.f, hmdYaw, 0.f);

SFMLProject/inc/GUIHandler.h

@@ -1995,6 +1995,8 @@ class GUIHandler
 		coptbox->AppendItem("Disable Feet Rotation");
 		coptbox->AppendItem("Disable Feet Yaw (+Y)");
 		coptbox->AppendItem("Use Head Orientation");
+		coptbox->AppendItem("Use Tracker Orientation");
+		coptbox->AppendItem("Mixed Tracker Orientation");
 
 		// Only if we're using kinect v1
 		if(KinectSettings::kinectVersion == 1)

SFMLProject/inc/KinectSettings.h

@@ -32,6 +32,10 @@ enum footRotationFilterOption
 	///don't rotate foots in +y
 	k_EnableOrientationFilter_HeadOrientation,
 	///use headset orientation for foots
+	k_HipTrackerOrientation,
+	///use the kinect/vive/owotrack hip yaw instead of head
+	k_HipTrackerOrientationMixed,
+	///same as previous but keep orientation filter for pitch/roll
 	k_EnableOrientationFilter_Software,
 	///use headset orientation for foots
 };