microsoft
/
MixedReality-HolographicRemoting-Samples
зеркало из https://github.com/microsoft/MixedReality-HolographicRemoting-Samples.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #98 from microsoft/Version_2.9.3 

Update readme and packages for 2.9.3
This commit is contained in:
Simon Robl 2023-10-26 18:30:11 +02:00 коммит произвёл GitHub
Родитель 92d07522df 3209209c3e
Коммит d7b91a92b8
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
15 изменённых файлов: 26 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
README.md
Просмотреть файл

@ -16,7 +16,7 @@ products:
| Holographic Remoting version |
:-----------------: |
| 2.9.1 |
| 2.9.3 |
The [Holographic Remoting Samples](https://github.com/microsoft/MixedReality-HolographicRemoting-Samples) repository hosts sample applications for [Holographic Remoting](https://docs.microsoft.com/en-us/windows/mixed-reality/holographic-remoting-player). The two remote samples show how to write an application for streaming content to a Microsoft HoloLens 2 or a PC running Windows Mixed Reality.

4
player/sample/Package.appxmanifest
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" IgnorableNamespaces="uap mp uap2 uap5">
<Identity Name="SampleHolographicRemotingPlayer" Publisher="CN=SampleHolographicRemotingPlayer" Version="2.9.1.0" />
<Identity Name="SampleHolographicRemotingPlayer" Publisher="CN=SampleHolographicRemotingPlayer" Version="2.9.3.0" />
<mp:PhoneIdentity PhoneProductId="b65c9a46-d0b3-4954-829a-6a60bed54d0a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Sample Holographic AppRemoting Player</DisplayName>

2
player/sample/SamplePlayer.vcxproj
Просмотреть файл

@ -378,6 +378,6 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="packages\Microsoft.Holographic.Remoting.2.9.1\build\native\Microsoft.Holographic.Remoting.targets" Condition="Exists('packages\Microsoft.Holographic.Remoting.2.9.1\build\native\Microsoft.Holographic.Remoting.targets')" />
<Import Project="packages\Microsoft.Holographic.Remoting.2.9.3\build\native\Microsoft.Holographic.Remoting.targets" Condition="Exists('packages\Microsoft.Holographic.Remoting.2.9.3\build\native\Microsoft.Holographic.Remoting.targets')" />
</ImportGroup>
</Project>

4
player/sample/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.220929.3" targetFramework="native" />
<package id="Microsoft.Holographic.Remoting" version="2.9.1" targetFramework="native" />
<package id="Microsoft.Holographic.Remoting" version="2.9.3" targetFramework="native" />
</packages>

4
remote/desktop/Package.appxmanifest
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2" IgnorableNamespaces="uap mp uap2">
<Identity Name="b0cf2e39-8f6e-4238-b33a-868c9b1122ce" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.9.1.0" />
<Identity Name="b0cf2e39-8f6e-4238-b33a-868c9b1122ce" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.9.3.0" />
<mp:PhoneIdentity PhoneProductId="b0cf2e39-8f6e-4238-b33a-868c9b1122ce" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>SampleRemote</DisplayName>

2
remote/desktop/SampleRemote.vcxproj
Просмотреть файл

@ -332,6 +332,6 @@
<Import Project="packages\Microsoft.MixedReality.SceneUnderstanding.1.0.14\build\native\Microsoft.MixedReality.SceneUnderstanding.targets" Condition="Exists('packages\Microsoft.MixedReality.SceneUnderstanding.1.0.14\build\native\Microsoft.MixedReality.SceneUnderstanding.targets') And ('$(Configuration)'=='Debug' Or '$(Configuration)'=='RelWithDebInfo' Or '$(Configuration)'=='Release')" />
<Import Project="packages\Microsoft.MixedReality.QR.0.5.3019\build\native\Microsoft.MixedReality.QR.targets" Condition="Exists('packages\Microsoft.MixedReality.QR.0.5.3019\build\native\Microsoft.MixedReality.QR.targets') And ('$(Configuration)'=='Debug' Or '$(Configuration)'=='RelWithDebInfo' Or '$(Configuration)'=='Release')" />
<Import Project="packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="packages\Microsoft.Holographic.Remoting.2.9.1\build\native\Microsoft.Holographic.Remoting.targets" Condition="Exists('packages\Microsoft.Holographic.Remoting.2.9.1\build\native\Microsoft.Holographic.Remoting.targets')" />
<Import Project="packages\Microsoft.Holographic.Remoting.2.9.3\build\native\Microsoft.Holographic.Remoting.targets" Condition="Exists('packages\Microsoft.Holographic.Remoting.2.9.3\build\native\Microsoft.Holographic.Remoting.targets')" />
</ImportGroup>
</Project>

4
remote/desktop/packages.config
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.220929.3" targetFramework="native" />
<package id="Microsoft.Holographic.Remoting" version="2.9.1" targetFramework="native" />
<package id="Microsoft.Holographic.Remoting" version="2.9.3" targetFramework="native" />
<package id="Microsoft.MixedReality.QR" version="0.5.3019" targetFramework="native" />
<package id="Microsoft.MixedReality.SceneUnderstanding" version="1.0.14" targetFramework="native" />
<package id="Microsoft.VCRTForwarders.140" version="1.0.7" targetFramework="native" />

4
remote/uwp/Package.appxmanifest
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2" IgnorableNamespaces="uap mp uap2">
<Identity Name="b0cf2e39-8f6e-4238-b33a-868c9b1122ce" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.9.1.0" />
<Identity Name="b0cf2e39-8f6e-4238-b33a-868c9b1122ce" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.9.3.0" />
<mp:PhoneIdentity PhoneProductId="b0cf2e39-8f6e-4238-b33a-868c9b1122ce" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>SampleRemote</DisplayName>

2
remote/uwp/SampleRemote.vcxproj
Просмотреть файл

@ -389,6 +389,6 @@
<Import Project="packages\Microsoft.MixedReality.SceneUnderstanding.1.0.14\build\native\Microsoft.MixedReality.SceneUnderstanding.targets" Condition="Exists('packages\Microsoft.MixedReality.SceneUnderstanding.1.0.14\build\native\Microsoft.MixedReality.SceneUnderstanding.targets') And ('$(Configuration)'=='Debug' Or '$(Configuration)'=='RelWithDebInfo' Or '$(Configuration)'=='Release')" />
<Import Project="packages\Microsoft.MixedReality.QR.0.5.3019\build\native\Microsoft.MixedReality.QR.targets" Condition="Exists('packages\Microsoft.MixedReality.QR.0.5.3019\build\native\Microsoft.MixedReality.QR.targets') And ('$(Configuration)'=='Debug' Or '$(Configuration)'=='RelWithDebInfo' Or '$(Configuration)'=='Release')" />
<Import Project="packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="packages\Microsoft.Holographic.Remoting.2.9.1\build\native\Microsoft.Holographic.Remoting.targets" Condition="Exists('packages\Microsoft.Holographic.Remoting.2.9.1\build\native\Microsoft.Holographic.Remoting.targets')" />
<Import Project="packages\Microsoft.Holographic.Remoting.2.9.3\build\native\Microsoft.Holographic.Remoting.targets" Condition="Exists('packages\Microsoft.Holographic.Remoting.2.9.3\build\native\Microsoft.Holographic.Remoting.targets')" />
</ImportGroup>
</Project>

4
remote/uwp/packages.config
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.220929.3" targetFramework="native" />
<package id="Microsoft.Holographic.Remoting" version="2.9.1" targetFramework="native" />
<package id="Microsoft.Holographic.Remoting" version="2.9.3" targetFramework="native" />
<package id="Microsoft.MixedReality.QR" version="0.5.3019" targetFramework="native" />
<package id="Microsoft.MixedReality.SceneUnderstanding" version="1.0.14" targetFramework="native" />
</packages>

1
remote_openxr/desktop/OpenXrProgram.cpp
Просмотреть файл

@ -534,7 +534,6 @@ namespace {
createInfo.subactionPath = m_subactionPaths[side];
CHECK_XRCMD(xrCreateActionSpace(m_session.Get(), &createInfo, m_cubesInHand[side].Space.Put(xrDestroySpace)));
}
}
std::tuple<DXGI_FORMAT, DXGI_FORMAT> SelectSwapchainPixelFormats() {

2
remote_openxr/desktop/SampleRemoteOpenXR.vcxproj
Просмотреть файл

@ -254,6 +254,6 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="packages\OpenXR.Loader.1.0.10.2\build\native\OpenXR.Loader.targets" Condition="Exists('packages\OpenXR.Loader.1.0.10.2\build\native\OpenXR.Loader.targets')" />
<Import Project="packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="packages\Microsoft.Holographic.Remoting.OpenXr.2.9.1\build\native\Microsoft.Holographic.Remoting.OpenXr.targets" Condition="Exists('packages\Microsoft.Holographic.Remoting.OpenXr.2.9.1\build\native\Microsoft.Holographic.Remoting.OpenXr.targets')" />
<Import Project="packages\Microsoft.Holographic.Remoting.OpenXr.2.9.3\build\native\Microsoft.Holographic.Remoting.OpenXr.targets" Condition="Exists('packages\Microsoft.Holographic.Remoting.OpenXr.2.9.3\build\native\Microsoft.Holographic.Remoting.OpenXr.targets')" />
</ImportGroup>
</Project>

6
remote_openxr/desktop/XrUtility/XrExtensionDefined.h
Просмотреть файл

@ -89,6 +89,12 @@
#define XR_MSFT_scene_understanding_DEFINED(_, defined, undefined) _(undefined)
#endif
#ifdef XR_MSFT_scene_marker
#define XR_MSFT_scene_marker_DEFINED(_, defined, undefined) _(defined)
#else
#define XR_MSFT_scene_marker_DEFINED(_, defined, undefined) _(undefined)
#endif
#ifdef XR_MSFT_scene_understanding_serialization
#define XR_MSFT_scene_understanding_serialization_DEFINED(_, defined, undefined) _(defined)
#else

3
remote_openxr/desktop/XrUtility/XrListFunctions.h
Просмотреть файл

@ -95,8 +95,7 @@
_(xrCreateHandMeshSpaceMSFT) \
_(xrUpdateHandMeshMSFT)
#define XR_LIST_FUNCTIONS_XR_MSFT_spatial_graph_bridge(_) \
_(xrCreateSpatialGraphNodeSpaceMSFT)
#define XR_LIST_FUNCTIONS_XR_MSFT_spatial_graph_bridge(_) _(xrCreateSpatialGraphNodeSpaceMSFT)
#define XR_LIST_FUNCTIONS_XR_MSFT_holographic_remoting(_) \
_(xrRemotingSetContextPropertiesMSFT) \

4
remote_openxr/desktop/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.220929.3" targetFramework="native" />
<package id="OpenXR.Loader" version="1.0.10.2" targetFramework="native" />
<package id="Microsoft.Holographic.Remoting.OpenXr" version="2.9.1" targetFramework="native" />
<package id="Microsoft.Holographic.Remoting.OpenXr" version="2.9.3" targetFramework="native" />
</packages>