Adding Quest 3S as device

Summary: Quest 3S has been released today. Moving the definition of the device from metaonly to public. Reviewed By: enpe Differential Revision: D64405580 fbshipit-source-id: 32afa03d879107e6bc2b6ad3c4569e7f38eef1ab
facebookresearch · Oct 15, 2024 · 774bd4c · 774bd4c
1 parent cd85fe8
commit 774bd4c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/impl/ocean/platform/meta/quest/Device.cpp b/impl/ocean/platform/meta/quest/Device.cpp
@@ -50,6 +50,11 @@ Device::DeviceType Device::deviceType()
 		return DT_QUEST_3;
 	}
 
+	if (productModel == "quest 3s")
+	{
+		return DT_QUEST_3S;
+	}
+
 	if (productModel == "quest pro")
 	{
 		return DT_QUEST_PRO;
@@ -100,6 +105,9 @@ std::string Device::deviceName(const DeviceType deviceType)
 		case DT_QUEST_3:
 			return std::string("Quest 3");
 
+		case DT_QUEST_3S:
+			return std::string("Quest 3S");
+
 		case DT_QUEST_PRO:
 			return std::string("Quest Pro");
 

diff --git a/impl/ocean/platform/meta/quest/Device.h b/impl/ocean/platform/meta/quest/Device.h
@@ -43,6 +43,8 @@ class Device
 			DT_QUEST_2,
 			/// Quest device, version 3.
 			DT_QUEST_3,
+			// Quest device, version 3S.
+			DT_QUEST_3S,
 			/// Quest Pro device.
 			DT_QUEST_PRO,
 

diff --git a/impl/ocean/platform/meta/quest/application/VRControllerVisualizer.cpp b/impl/ocean/platform/meta/quest/application/VRControllerVisualizer.cpp
@@ -10,10 +10,10 @@
 #include "ocean/io/Directory.h"
 #include "ocean/io/File.h"
 
-#include "ocean/rendering/AbsoluteTransform.h"
+#include "ocean/rendering/AttributeSet.h"
 #include "ocean/rendering/Cylinder.h"
-#include "ocean/rendering/Manager.h"
-#include "ocean/rendering/Utilities.h"
+#include "ocean/rendering/Geometry.h"
+#include "ocean/rendering/Material.h"
 
 #include "ocean/scenedescription/Manager.h"
 #include "ocean/scenedescription/Scene.h"
@@ -321,8 +321,9 @@ bool VRControllerVisualizer::loadModels(const Device::DeviceType deviceType, con
 			rightRenderModelFile = renderModelDirectory + IO::File("quest2_controller_right.obj");
 			break;
 
-		case Device::DT_QUEST_PRO:
 		case Device::DT_QUEST_3:
+		case Device::DT_QUEST_3S:
+		case Device::DT_QUEST_PRO:
 			leftRenderModelFile = renderModelDirectory + IO::File("quest3_controller_left.obj");
 			rightRenderModelFile = renderModelDirectory + IO::File("quest3_controller_right.obj");
 			break;

diff --git a/impl/ocean/platform/meta/quest/openxr/application/VRControllerVisualizer.cpp b/impl/ocean/platform/meta/quest/openxr/application/VRControllerVisualizer.cpp
@@ -40,6 +40,7 @@ VRControllerVisualizer::VRControllerVisualizer(const Rendering::EngineRef& engin
 
 		case Device::DT_QUEST_2:
 		case Device::DT_QUEST_3:
+		case Device::DT_QUEST_3S:
 		case Device::DT_QUEST_PRO:
 			controllerAim_t_controllerModel_ = Vector3(0, 0, Scalar(0.055));
 			break;