complete merge (#68)

Author: chrisfromwork

shared/XrUtility/XrSceneUnderstanding.h

@@ -18,7 +18,8 @@
 #include "XrStruct.h"
 #include "XrHandle.h"
 #include "XrMath.h"
-#include "XrExtensionContext.h"
+#include "XrExtensions.h"
+#include <ostream>
 
 namespace xr {
     class SceneObserverHandle : public xr::UniqueExtHandle<XrSceneObserverMSFT> {};
@@ -29,22 +30,27 @@ namespace xr {
         std::vector<uint32_t> indices;
     };
 
-    inline xr::SceneObserverHandle CreateSceneObserver(const xr::ExtensionContext& extensions, XrSession session) {
+    struct ScenePlane {
+        XrScenePlaneAlignmentTypeMSFT alignment;
+        XrExtent2Df extent;
+    };
+
+    inline xr::SceneObserverHandle CreateSceneObserver(const xr::ExtensionDispatchTable& extensions, XrSession session) {
         xr::SceneObserverHandle sceneObserverHandle;
         XrSceneObserverCreateInfoMSFT createInfo{XR_TYPE_SCENE_OBSERVER_CREATE_INFO_MSFT};
         CHECK_XRCMD(
             extensions.xrCreateSceneObserverMSFT(session, &createInfo, sceneObserverHandle.Put(extensions.xrDestroySceneObserverMSFT)));
         return sceneObserverHandle;
     }
 
-    inline xr::SceneHandle CreateScene(const xr::ExtensionContext& extensions, XrSceneObserverMSFT sceneObserver) {
+    inline xr::SceneHandle CreateScene(const xr::ExtensionDispatchTable& extensions, XrSceneObserverMSFT sceneObserver) {
         xr::SceneHandle sceneHandle;
         XrSceneCreateInfoMSFT createInfo{XR_TYPE_SCENE_CREATE_INFO_MSFT};
         CHECK_XRCMD(extensions.xrCreateSceneMSFT(sceneObserver, &createInfo, sceneHandle.Put(extensions.xrDestroySceneMSFT)));
         return sceneHandle;
     }
 
-    inline std::vector<XrSceneObjectMSFT> GetSceneObjects(const xr::ExtensionContext& extensions, XrSceneMSFT scene) {
+    inline std::vector<XrSceneObjectMSFT> GetSceneObjects(const xr::ExtensionDispatchTable& extensions, XrSceneMSFT scene) {
         // Get list of scene object atoms using 2-call
         uint32_t sceneObjectCountOutput = 0;
         CHECK_XRCMD(extensions.xrGetSceneObjectsMSFT(scene, 0, &sceneObjectCountOutput, nullptr));
@@ -56,7 +62,7 @@ namespace xr {
         return sceneObjectVector;
     }
 
-    inline std::vector<XrSceneMeshKeyMSFT> GetMeshKeys(const xr::ExtensionContext& extensions,
+    inline std::vector<XrSceneMeshKeyMSFT> GetMeshKeys(const xr::ExtensionDispatchTable& extensions,
                                                        XrSceneMSFT scene,
                                                        XrSceneObjectKeyMSFT sceneObjectKey) {
         XrSceneObjectPropertiesGetInfoMSFT getInfo{XR_TYPE_SCENE_OBJECT_PROPERTIES_GET_INFO_MSFT};
@@ -75,7 +81,27 @@ namespace xr {
         return meshKeysVector;
     }
 
-    inline std::vector<XrScenePlaneKeyMSFT> GetPlaneKeys(const xr::ExtensionContext& extensions,
+    inline xr::SceneMesh GetSceneMesh(const xr::ExtensionDispatchTable& extensions, XrSceneMSFT scene, XrSceneMeshKeyMSFT meshKey) {
+        XrSceneMeshGetInfoMSFT meshGetInfo{XR_TYPE_SCENE_MESH_GET_INFO_MSFT};
+        meshGetInfo.sceneMeshKey = meshKey;
+
+        XrSceneMeshMSFT mesh{XR_TYPE_SCENE_MESH_MSFT};
+        CHECK_XRCMD(extensions.xrGetSceneMeshMSFT(scene, &meshGetInfo, &mesh));
+
+        xr::SceneMesh meshData;
+        meshData.positions.resize(mesh.vertexCountOutput);
+        meshData.indices.resize(mesh.indexCountOutput);
+        mesh.vertexCapacityInput = static_cast<uint32_t>(meshData.positions.size());
+        mesh.indexCapacityInput = static_cast<uint32_t>(meshData.indices.size());
+        mesh.vertices = meshData.positions.data();
+        mesh.indices = meshData.indices.data();
+        CHECK_XRCMD(extensions.xrGetSceneMeshMSFT(scene, &meshGetInfo, &mesh));
+        meshData.positions.resize(mesh.vertexCountOutput);
+        meshData.indices.resize(mesh.indexCountOutput);
+        return meshData;
+    }
+
+    inline std::vector<XrScenePlaneKeyMSFT> GetPlaneKeys(const xr::ExtensionDispatchTable& extensions,
                                                          XrSceneMSFT scene,
                                                          XrSceneObjectKeyMSFT sceneObjectKey) {
         XrSceneObjectPropertiesGetInfoMSFT getInfo{XR_TYPE_SCENE_OBJECT_PROPERTIES_GET_INFO_MSFT};
@@ -94,27 +120,22 @@ namespace xr {
         return planeKeysVector;
     }
 
-    inline xr::SceneMesh GetSceneMesh(const xr::ExtensionContext& extensions, XrSceneMSFT scene, XrSceneMeshKeyMSFT meshKey) {
-        XrSceneMeshGetInfoMSFT meshGetInfo{XR_TYPE_SCENE_MESH_GET_INFO_MSFT};
-        meshGetInfo.sceneMeshKey = meshKey;
+    inline xr::ScenePlane GetScenePlane(const xr::ExtensionDispatchTable& extensions, XrSceneMSFT scene, XrScenePlaneKeyMSFT planeKey)
+    {
+        XrScenePlanePropertiesGetInfoMSFT planePropertiesGetInfo{ XR_TYPE_SCENE_PLANE_PROPERTIES_GET_INFO_MSFT };
+        planePropertiesGetInfo.scenePlaneKey = planeKey;
 
-        XrSceneMeshMSFT mesh{XR_TYPE_SCENE_MESH_MSFT};
-        CHECK_XRCMD(extensions.xrGetSceneMeshMSFT(scene, &meshGetInfo, &mesh));
+        XrScenePlanePropertiesMSFT planeProperties{ XR_TYPE_SCENE_PLANE_PROPERTIES_MSFT };
+        CHECK_XRCMD(extensions.xrGetScenePlanePropertiesMSFT(scene, &planePropertiesGetInfo, &planeProperties));
 
-        xr::SceneMesh meshData;
-        meshData.positions.resize(mesh.vertexCountOutput);
-        meshData.indices.resize(mesh.indexCountOutput);
-        mesh.vertexCapacityInput = static_cast<uint32_t>(meshData.positions.size());
-        mesh.indexCapacityInput = static_cast<uint32_t>(meshData.indices.size());
-        mesh.vertices = meshData.positions.data();
-        mesh.indices = meshData.indices.data();
-        CHECK_XRCMD(extensions.xrGetSceneMeshMSFT(scene, &meshGetInfo, &mesh));
-        meshData.positions.resize(mesh.vertexCountOutput);
-        meshData.indices.resize(mesh.indexCountOutput);
-        return meshData;
+        xr::ScenePlane plane;
+        plane.alignment = planeProperties.alignment;
+        plane.extent = planeProperties.extents;
+
+        return plane;
     }
 
-    inline void ReadSerializedScene(const xr::ExtensionContext& extensions, XrSceneMSFT scene, std::basic_ostream<uint8_t>& stream) {
+    inline void ReadSerializedScene(const xr::ExtensionDispatchTable& extensions, XrSceneMSFT scene, std::basic_ostream<uint8_t>& stream) {
         constexpr uint32_t BufferSize = 8192;
         std::array<uint8_t, BufferSize> buffer;
         uint32_t readOutput = 0;