Merge branch 'mvvm_theming' of https://github.com/Zee2/MixedRealityTo…

…olkit-Unity into mvvm_theming

UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset

@@ -324,6 +324,33 @@ MonoBehaviour:
   company: 
   priority: 0
   required: 0
+--- !u!114 &-3640726061400909199
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f8ec2975f18d5e479159feb34b4dc86, type: 3}
+  m_Name: MixedRealityFeaturePlugin WSA
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Mixed Reality Features
+  version: 1.7.0
+  featureIdInternal: com.microsoft.openxr.feature.hololens
+  openxrExtensionStrings: XR_MSFT_holographic_window_attachment XR_KHR_win32_convert_performance_counter_time
+    XR_MSFT_unbounded_reference_space XR_MSFT_spatial_anchor XR_MSFT_secondary_view_configuration
+    XR_MSFT_first_person_observer XR_MSFT_spatial_graph_bridge XR_MSFT_perception_anchor_interop
+    XR_MSFT_spatial_anchor_persistence XR_MSFT_scene_understanding XR_MSFT_scene_understanding_serialization
+    XR_MSFT_spatial_anchor_export_preview XR_MSFT_composition_layer_reprojection
+  company: Microsoft
+  priority: 0
+  required: 1
+  disableFirstPersonObserver: 0
+  enablePoseUpdateOnBeforeRender: 0
+  validationRuleTarget: 0
 --- !u!114 &-3487187961514467631
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -431,6 +458,26 @@ MonoBehaviour:
   company: Microsoft
   priority: 0
   required: 0
+--- !u!114 &-2573285188185019974
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3}
+  m_Name: MotionControllerFeaturePlugin WSA
+  m_EditorClassIdentifier: 
+  m_enabled: 0
+  nameUi: Motion Controller Model
+  version: 1.7.0
+  featureIdInternal: com.microsoft.openxr.feature.controller
+  openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model
+  company: Microsoft
+  priority: 0
+  required: 0
 --- !u!114 &-2526291262117860133
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -489,12 +536,17 @@ MonoBehaviour:
   m_Name: WSA
   m_EditorClassIdentifier: 
   features:
+  - {fileID: 6985165989562250150}
   - {fileID: 667178010646559489}
   - {fileID: 4461283580014220135}
+  - {fileID: 8776837447945000888}
+  - {fileID: 5265891717200277466}
   - {fileID: 866045683342061759}
   - {fileID: 5075327941105393007}
   - {fileID: 4889070891149222267}
   - {fileID: -3487187961514467631}
+  - {fileID: -3640726061400909199}
+  - {fileID: -2573285188185019974}
   - {fileID: -331209064664755431}
   - {fileID: -3299799123796384487}
   - {fileID: 3307583172915860070}
@@ -981,6 +1033,26 @@ MonoBehaviour:
   m_maxBitrate: 20000
   m_videoCodec: 0
   m_enableAudio: 0
+--- !u!114 &5265891717200277466
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3482401f887b8864183e401715462f46, type: 3}
+  m_Name: HPMixedRealityControllerProfile WSA
+  m_EditorClassIdentifier: 
+  m_enabled: 0
+  nameUi: HP Reverb G2 Controller Profile
+  version: 1.7.0
+  featureIdInternal: com.microsoft.openxr.feature.interaction.hpmixedrealitycontroller
+  openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller
+  company: Microsoft
+  priority: 0
+  required: 0
 --- !u!114 &5505120528634519645
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1131,6 +1203,26 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
+--- !u!114 &6985165989562250150
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2d2e2731103cdda44af77955a0b4814c, type: 3}
+  m_Name: AppRemotingPlugin WSA
+  m_EditorClassIdentifier: 
+  m_enabled: 0
+  nameUi: Holographic Remoting remote app
+  version: 1.7.0
+  featureIdInternal: com.microsoft.openxr.feature.appremoting
+  openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech
+  company: Microsoft
+  priority: -100
+  required: 0
 --- !u!114 &7889597174075910257
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1242,6 +1334,31 @@ MonoBehaviour:
   rightHandTrackingOptions:
     motionRange: 0
   questHandTrackingMode: 1
+--- !u!114 &8776837447945000888
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c79c911b38743a649b1c1eddb5097202, type: 3}
+  m_Name: HandTrackingFeaturePlugin WSA
+  m_EditorClassIdentifier: 
+  m_enabled: 0
+  nameUi: Hand Tracking
+  version: 1.7.0
+  featureIdInternal: com.microsoft.openxr.feature.handtracking
+  openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_MSFT_hand_tracking_mesh
+  company: Microsoft
+  priority: 0
+  required: 0
+  leftHandTrackingOptions:
+    motionRange: 0
+  rightHandTrackingOptions:
+    motionRange: 0
+  questHandTrackingMode: 1
 --- !u!114 &8816947741491626372
 MonoBehaviour:
   m_ObjectHideFlags: 0

UnityProjects/MRTKDevTemplate/Packages/manifest.json

@@ -8,9 +8,9 @@
     "com.microsoft.mrtk.audio": "file:../../../com.microsoft.mrtk.audio",
     "com.microsoft.mrtk.core": "file:../../../com.microsoft.mrtk.core",
     "com.microsoft.mrtk.data": "file:../../../com.microsoft.mrtk.data",
-    "com.microsoft.mrtk.databinding": "file:C:/Users/finnn/src/MixedRealityToolkit-Unity-TENTED/ExternalDependencies/com.microsoft.mrtk.databinding-0.1.0-preview.0 (1).tgz",
+    "com.microsoft.mrtk.databinding": "file:../../../ExternalDependencies/com.microsoft.mrtk.databinding-0.1.0-preview.2.tgz",
     "com.microsoft.mrtk.diagnostics": "file:../../../com.microsoft.mrtk.diagnostics",
-    "com.microsoft.mrtk.editortools": "file:C:/Users/finnn/src/MixedRealityToolkit-Unity-TENTED/ExternalDependencies/com.microsoft.mrtk.editortools-0.1.1-preview.1 (1).tgz",
+    "com.microsoft.mrtk.editortools": "file:../../../ExternalDependencies/com.microsoft.mrtk.editortools-0.1.1-preview.1.tgz",
     "com.microsoft.mrtk.extendedassets": "file:../../../com.microsoft.mrtk.extendedassets",
     "com.microsoft.mrtk.graphicstools.unity": "https://github.com/microsoft/MixedReality-GraphicsTools-Unity.git?path=/com.microsoft.mrtk.graphicstools.unity#v0.4.0",
     "com.microsoft.mrtk.input": "file:../../../com.microsoft.mrtk.input",

UnityProjects/MRTKDevTemplate/Packages/packages-lock.json

@@ -79,7 +79,7 @@
       }
     },
     "com.microsoft.mrtk.databinding": {
-      "version": "file:C:/Users/finnn/src/MixedRealityToolkit-Unity-TENTED/ExternalDependencies/com.microsoft.mrtk.databinding-0.1.0-preview.0 (1).tgz",
+      "version": "file:../../../ExternalDependencies/com.microsoft.mrtk.databinding-0.1.0-preview.2.tgz",
       "depth": 0,
       "source": "local-tarball",
       "dependencies": {
@@ -97,7 +97,7 @@
       }
     },
     "com.microsoft.mrtk.editortools": {
-      "version": "file:C:/Users/finnn/src/MixedRealityToolkit-Unity-TENTED/ExternalDependencies/com.microsoft.mrtk.editortools-0.1.1-preview.1 (1).tgz",
+      "version": "file:../../../ExternalDependencies/com.microsoft.mrtk.editortools-0.1.1-preview.1.tgz",
       "depth": 0,
       "source": "local-tarball",
       "dependencies": {}

com.microsoft.mrtk.uxcomponents/Button/Prefabs/Action Button.prefab

@@ -162,29 +162,20 @@ MonoBehaviour:
   m_GameObject: {fileID: 201938300658660728}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 12f1486c4a2482d46abfddc88e1354bc, type: 3}
+  m_Script: {fileID: 11500000, guid: ae636f225d21c9a4b8c7089de3fe6f1d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   binders:
     _items:
-    - rid: 2096456570607239177
-  themeViewModelRecord: {fileID: 0}
-  materialSwaps:
-    _items: []
-  objectVisibilityToggles:
-    _items: []
-  colorSwaps:
-    _items: []
-  textureSwaps:
-    _items: []
+    - rid: 1017220187265171461
   references:
     version: 2
     RefIds:
-    - rid: 2096456570607239177
-      type: {class: ThemedColorBinder, ns: Microsoft.MixedReality.Toolkit.Theming, asm: MRTK.DataBinding}
+    - rid: 1017220187265171461
+      type: {class: ThemedColorBinder, ns: Microsoft.MixedReality.Toolkit.Theming, asm: Microsoft.MixedReality.Toolkit.DataBinding}
       data:
-        themeRecord: {fileID: 11400000, guid: 0a194e5338265b74d9a51f8dbae65837, type: 2}
-        TargetValueName: Primary Text Color
+        dataSourceRecord: {fileID: 11400000, guid: 0a194e5338265b74d9a51f8dbae65837, type: 2}
+        itemName: Primary Text Color
         targetValueId: 629473106
         ColorSwapTarget: {fileID: 5095746839500215027}
         AlsoSetAlpha: 1
@@ -539,32 +530,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 2142167140070017856}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 12f1486c4a2482d46abfddc88e1354bc, type: 3}
+  m_Script: {fileID: 11500000, guid: ae636f225d21c9a4b8c7089de3fe6f1d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   binders:
     _items:
-    - rid: 2096456570607239179
-  themeViewModelRecord: {fileID: 0}
-  materialSwaps:
-    _items: []
-  objectVisibilityToggles:
-    _items: []
-  colorSwaps:
-    _items: []
-  textureSwaps:
-    _items: []
+    - rid: 1017220187265171463
   references:
     version: 2
     RefIds:
-    - rid: 2096456570607239179
-      type: {class: ThemedColorBinder, ns: Microsoft.MixedReality.Toolkit.Theming, asm: MRTK.DataBinding}
+    - rid: 1017220187265171463
+      type: {class: ThemedColorBinder, ns: Microsoft.MixedReality.Toolkit.Theming, asm: Microsoft.MixedReality.Toolkit.DataBinding}
       data:
-        themeRecord: {fileID: 11400000, guid: 0a194e5338265b74d9a51f8dbae65837, type: 2}
-        TargetValueName: Primary Text Color
+        dataSourceRecord: {fileID: 11400000, guid: 0a194e5338265b74d9a51f8dbae65837, type: 2}
+        itemName: Primary Text Color
         targetValueId: 629473106
         ColorSwapTarget: {fileID: 1922220768106560367}
-        AlsoSetAlpha: 0
+        AlsoSetAlpha: 1
 --- !u!1 &2302024426645924609
 GameObject:
   m_ObjectHideFlags: 0
@@ -820,32 +802,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 7594107385585372191}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 12f1486c4a2482d46abfddc88e1354bc, type: 3}
+  m_Script: {fileID: 11500000, guid: ae636f225d21c9a4b8c7089de3fe6f1d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   binders:
     _items:
-    - rid: 2096456570607239179
-  themeViewModelRecord: {fileID: 0}
-  materialSwaps:
-    _items: []
-  objectVisibilityToggles:
-    _items: []
-  colorSwaps:
-    _items: []
-  textureSwaps:
-    _items: []
+    - rid: 1017220187265171462
   references:
     version: 2
     RefIds:
-    - rid: 2096456570607239179
-      type: {class: ThemedColorBinder, ns: Microsoft.MixedReality.Toolkit.Theming, asm: MRTK.DataBinding}
+    - rid: 1017220187265171462
+      type: {class: ThemedColorBinder, ns: Microsoft.MixedReality.Toolkit.Theming, asm: Microsoft.MixedReality.Toolkit.DataBinding}
       data:
-        themeRecord: {fileID: 11400000, guid: 0a194e5338265b74d9a51f8dbae65837, type: 2}
-        TargetValueName: Primary Text Color
+        dataSourceRecord: {fileID: 11400000, guid: 0a194e5338265b74d9a51f8dbae65837, type: 2}
+        itemName: Primary Text Color
         targetValueId: 629473106
         ColorSwapTarget: {fileID: 8493469810320727241}
-        AlsoSetAlpha: 0
+        AlsoSetAlpha: 1
 --- !u!1001 &5139722473249402816
 PrefabInstance:
   m_ObjectHideFlags: 0

com.microsoft.mrtk.uxcomponents/Button/Prefabs/Empty Button.prefab

@@ -947,6 +947,7 @@ GameObject:
   - component: {fileID: 9026472854072389799}
   - component: {fileID: 9026472854072389792}
   - component: {fileID: 9026472854072389793}
+  - component: {fileID: 6961646179209836937}
   m_Layer: 5
   m_Name: Backplate
   m_TagString: Untagged
@@ -1021,3 +1022,29 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0fda4953718e0264291c42cb2a637fb5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &6961646179209836937
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9026472854072389795}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae636f225d21c9a4b8c7089de3fe6f1d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  binders:
+    _items:
+    - rid: 1017220187265171468
+  references:
+    version: 2
+    RefIds:
+    - rid: 1017220187265171468
+      type: {class: ThemedColorBinder, ns: Microsoft.MixedReality.Toolkit.Theming, asm: Microsoft.MixedReality.Toolkit.DataBinding}
+      data:
+        dataSourceRecord: {fileID: 11400000, guid: 0a194e5338265b74d9a51f8dbae65837, type: 2}
+        itemName: Panel Color
+        targetValueId: 1194890048
+        ColorSwapTarget: {fileID: 9026472854072389792}
+        AlsoSetAlpha: 1

com.microsoft.mrtk.uxcomponents/ToggleIndicators/Checkbox.prefab

@@ -258,7 +258,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7189414470030404245}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 12f1486c4a2482d46abfddc88e1354bc, type: 3}
+  m_Script: {fileID: 11500000, guid: ae636f225d21c9a4b8c7089de3fe6f1d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   binders: