From b3915910c0bbe4efd2e441690e62d5000590d86b Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 22 Sep 2020 06:54:11 -0700 Subject: [PATCH] Unity deployment to HoloLens 2, Network settings --- .../Assets/Scenes/SampleScene.unity | 2 +- .../Assets/WSATestCertificate.pfx | Bin 0 -> 2480 bytes .../Assets/WSATestCertificate.pfx.meta | 7 ++ .../ProjectSettings/GraphicsSettings.asset | 3 + .../ProjectSettings/ProjectSettings.asset | 62 +++++++++++++++--- 5 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 ProjectSetup/RosSharpUnity/Assets/WSATestCertificate.pfx create mode 100644 ProjectSetup/RosSharpUnity/Assets/WSATestCertificate.pfx.meta diff --git a/ProjectSetup/RosSharpUnity/Assets/Scenes/SampleScene.unity b/ProjectSetup/RosSharpUnity/Assets/Scenes/SampleScene.unity index e53f6f111..77fe12990 100644 --- a/ProjectSetup/RosSharpUnity/Assets/Scenes/SampleScene.unity +++ b/ProjectSetup/RosSharpUnity/Assets/Scenes/SampleScene.unity @@ -641,7 +641,7 @@ PrefabInstance: - target: {fileID: 7834562778878916581, guid: 0915935de0a77fc419c95d73d30120ce, type: 3} propertyPath: RosBridgeServerUrl - value: ws://localhost:9090 + value: ws://192.168.1.121:9090 objectReference: {fileID: 0} - target: {fileID: 8072130238423635120, guid: 0915935de0a77fc419c95d73d30120ce, type: 3} diff --git a/ProjectSetup/RosSharpUnity/Assets/WSATestCertificate.pfx b/ProjectSetup/RosSharpUnity/Assets/WSATestCertificate.pfx new file mode 100644 index 0000000000000000000000000000000000000000..25dcf84763007c4b980c520cf3850b317c9569e0 GIT binary patch literal 2480 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 O@z>rbE!}^9ynh3w%#4lz literal 0 HcmV?d00001 diff --git a/ProjectSetup/RosSharpUnity/Assets/WSATestCertificate.pfx.meta b/ProjectSetup/RosSharpUnity/Assets/WSATestCertificate.pfx.meta new file mode 100644 index 000000000..f1b8f7e7d --- /dev/null +++ b/ProjectSetup/RosSharpUnity/Assets/WSATestCertificate.pfx.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 79caf8f07efa0324b8f74e7c173e614b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSetup/RosSharpUnity/ProjectSettings/GraphicsSettings.asset b/ProjectSetup/RosSharpUnity/ProjectSettings/GraphicsSettings.asset index 43369e3c5..4706883cf 100644 --- a/ProjectSetup/RosSharpUnity/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSetup/RosSharpUnity/ProjectSettings/GraphicsSettings.asset @@ -35,6 +35,9 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSetup/RosSharpUnity/ProjectSettings/ProjectSettings.asset b/ProjectSetup/RosSharpUnity/ProjectSettings/ProjectSettings.asset index c5dd342f6..8637dcc97 100644 --- a/ProjectSetup/RosSharpUnity/ProjectSettings/ProjectSettings.asset +++ b/ProjectSetup/RosSharpUnity/ProjectSettings/ProjectSettings.asset @@ -594,13 +594,13 @@ PlayerSettings: apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: Template_3D - metroPackageVersion: - metroCertificatePath: + metroPackageName: Template3D + metroPackageVersion: 1.0.0.0 + metroCertificatePath: Assets\WSATestCertificate.pfx metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: - metroCertificateNotAfter: 0000000000000000 + metroCertificateSubject: DefaultCompany + metroCertificateIssuer: DefaultCompany + metroCertificateNotAfter: 003ef57fe1afd701 metroApplicationDescription: Template_3D wsaImages: {} metroTileShortName: @@ -616,8 +616,54 @@ PlayerSettings: metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 - platformCapabilities: {} - metroTargetDeviceFamilies: {} + platformCapabilities: + WindowsStoreApps: + AllJoyn: False + Appointments: False + BackgroundMediaPlayback: False + BlockedChatMessages: False + Bluetooth: False + Chat: False + CodeGeneration: False + Contacts: False + EnterpriseAuthentication: False + GazeInput: False + HumanInterfaceDevice: False + InputInjectionBrokered: False + InternetClient: True + InternetClientServer: True + Location: False + LowLevelDevices: False + Microphone: False + MusicLibrary: False + Objects3D: False + OfflineMapsManagement: False + PhoneCall: False + PhoneCallHistoryPublic: False + PicturesLibrary: False + PointOfService: False + PrivateNetworkClientServer: False + Proximity: False + RecordedCallsFolder: False + RemoteSystem: False + RemovableStorage: False + SharedUserCertificates: False + SpatialPerception: False + SystemManagement: False + UserAccountInformation: False + UserDataTasks: False + UserNotificationListener: False + VideosLibrary: False + VoipCall: False + WebCam: False + metroTargetDeviceFamilies: + Desktop: False + Holographic: False + IoT: False + IoTHeadless: False + Mobile: False + Team: False + Xbox: False metroFTAName: metroFTAFileTypes: [] metroProtocolName: