diff --git a/.gitignore b/.gitignore
index 55835228153..158198f8c51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
[Aa]pp/
UWP/
WindowsStoreApp/
+WSA/
UnityGenerated/
UnityPackageManager/
.out/
@@ -74,10 +75,19 @@ Assets/StreamingAssets.meta
# =============== #
doc/
+# This is only needed because docfx chooses the first alphabetically occurring
+# .cs file's folder to create an obj/xdoc cache folder inside.
+# When https://github.com/dotnet/docfx/issues/1156 is addressed, it should be
+# possible to remove the rule on the following line and update our docfx
+# configuration to place its cache in a deterministic folder.
+[Oo]bj.meta
+
# ============================= #
# NuGet Build Process Generated #
# ============================= #
-/NuGet/
+/NuGet/*
+!/NuGet/BuildSource.proj
/MRTKBuild/
/MSBuild/
-/PackagesCopy/
\ No newline at end of file
+/PackagesCopy/
+!/scripts/Packaging/NuGetRestoreProject.csproj
diff --git a/Assets/MixedReality.Toolkit.Foundation.nuspec b/Assets/MixedReality.Toolkit.Foundation.nuspec
index 2cef8656564..7e2af747087 100644
--- a/Assets/MixedReality.Toolkit.Foundation.nuspec
+++ b/Assets/MixedReality.Toolkit.Foundation.nuspec
@@ -12,31 +12,39 @@
© Microsoft Corporation. All rights reserved.
$releaseNotes$
Unity MixedReality
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
+
+
-
+
+
-
+
+
-
+
+
+
\ No newline at end of file
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/Coffee.mat b/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/Coffee.mat
index 0a7de261f52..8c94f6f8eba 100644
--- a/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/Coffee.mat
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/Coffee.mat
@@ -45,6 +45,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 659a33cb4a7138343ae519b13efd2375, type: 3}
m_Scale: {x: 1, y: 1}
@@ -69,12 +73,17 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
- _BorderLightUsesHoverColor: 1
- _BorderMinValue: 0.1
- _BorderWidth: 0.1
- _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
- _ClippingPlane: 0
- _ClippingPlaneBorder: 0
- _ClippingPlaneBorderWidth: 0.025
@@ -92,25 +101,38 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 1
- _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 0
+ - _InnerGlowPower: 4
- _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
- _Metallic: 0
- _Mode: 0
+ - _NearLightFade: 0
- _NearPlaneFade: 0
- _NormalMapScale: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
- _Reflections: 1
- _Refraction: 0
- _RefractiveIndex: 0
@@ -123,6 +145,7 @@ Material:
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
- _SrcBlend: 1
- _Stencil: 0
- _StencilComparison: 0
@@ -130,10 +153,17 @@ Material:
- _StencilReference: 0
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
@@ -144,4 +174,7 @@ Material:
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/ExampleHubCube.mat b/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/ExampleHubCube.mat
new file mode 100644
index 00000000000..bd30388c0e0
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/ExampleHubCube.mat
@@ -0,0 +1,136 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: ExampleHubCube
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _BORDER_LIGHT _BORDER_LIGHT_USES_HOVER_COLOR _DISABLE_ALBEDO_MAP
+ _HOVER_LIGHT _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _NEAR_PLANE_FADE_REVERSE _PROXIMITY_LIGHT
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 1
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 1
+ - _BorderMinValue: 1
+ - _BorderWidth: 0.02
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingSphere: 0
+ - _ColorWriteMask: 15
+ - _CullMode: 0
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DirectionalLight: 0
+ - _DstBlend: 1
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOpaqueOverride: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.06
+ - _FadeCompleteDistance: 0.1
+ - _FadeMinValue: 0.06
+ - _FluentLightIntensity: 1
+ - _HoverLight: 1
+ - _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 14.8
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 4
+ - _NearLightFade: 1
+ - _NearPlaneFade: 1
+ - _NearPlaneFadeReverse: 1
+ - _NormalMapScale: 1
+ - _ProximityLight: 1
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 0
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 0.66226417, g: 0.66226417, b: 0.66226417, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 0.3962264, g: 0.3962264, b: 0.3962264, a: 1}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/ExampleHubCube.mat.meta b/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/ExampleHubCube.mat.meta
new file mode 100644
index 00000000000..12a2076cb4b
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/ExampleHubCube.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5f113c86f1a963d47bdc2d07049d272d
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/PianoKeys.mat b/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/PianoKeys.mat
index 2f9e8e27c69..6aaa70b64c8 100644
--- a/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/PianoKeys.mat
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Materials/PianoKeys.mat
@@ -72,6 +72,7 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -98,16 +99,20 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 1
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 1
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -123,6 +128,7 @@ Material:
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 1
- _Refraction: 0
@@ -145,6 +151,11 @@ Material:
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
@@ -157,4 +168,7 @@ Material:
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Models/EarthCore.fbm/MaterialEarth.mat b/Assets/MixedRealityToolkit.Examples/StandardAssets/Models/EarthCore.fbm/MaterialEarth.mat
index 57968290f01..3e25d7ec396 100644
--- a/Assets/MixedRealityToolkit.Examples/StandardAssets/Models/EarthCore.fbm/MaterialEarth.mat
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Models/EarthCore.fbm/MaterialEarth.mat
@@ -72,6 +72,7 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -98,16 +99,20 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _HoverLight: 1
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -123,6 +128,8 @@ Material:
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
- _RefractiveIndex: 0
@@ -144,6 +151,11 @@ Material:
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
@@ -156,4 +168,7 @@ Material:
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Models/Materials/Cheese2.mat b/Assets/MixedRealityToolkit.Examples/StandardAssets/Models/Materials/Cheese2.mat
index 2a8b87085e7..35f5a70c5b6 100644
--- a/Assets/MixedRealityToolkit.Examples/StandardAssets/Models/Materials/Cheese2.mat
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Models/Materials/Cheese2.mat
@@ -72,6 +72,7 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -98,16 +99,20 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _HoverLight: 1
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -123,6 +128,8 @@ Material:
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
- _Reflections: 1
- _Refraction: 0
- _RefractiveIndex: 0
@@ -144,6 +151,11 @@ Material:
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
@@ -156,4 +168,7 @@ Material:
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Cheese.prefab b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Cheese.prefab
index 2dc46ba5d93..cd59c3dd3e1 100644
--- a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Cheese.prefab
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Cheese.prefab
@@ -206,7 +206,7 @@ MonoBehaviour:
oneHandRotationModeNear: 5
oneHandRotationModeFar: 5
releaseBehavior: 3
- constraintOnRotation: 0
+ constraintOnRotation: 2
constraintOnMovement: 0
smoothingActive: 1
smoothingAmountOneHandManip: 0.001
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus.meta b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus.meta
new file mode 100644
index 00000000000..339405d8577
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2d722e77d29e60349b2d1f9cd9edc68c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x1.prefab b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x1.prefab
new file mode 100644
index 00000000000..0524ffd3f94
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x1.prefab
@@ -0,0 +1,241 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &6377029234736188893
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3515418990045158255, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Name
+ value: MenuExample3x1
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.1826
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0289
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548483, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318640, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481018, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233728, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2903483535519064383, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: e28b3473906c8764a948650d42b975c1, type: 2}
+ - target: {fileID: 1211877100676093704, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: e28b3473906c8764a948650d42b975c1, type: 2}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 40b588bd40632eb41a0af374d91c4fc9, type: 3}
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x1.prefab.meta b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x1.prefab.meta
new file mode 100644
index 00000000000..8ca5dad2de6
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x1.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9a7c24f281a2c3d45a9b8befe608bf77
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x2.prefab b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x2.prefab
new file mode 100644
index 00000000000..ade3d86b7e5
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x2.prefab
@@ -0,0 +1,740 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &1305021998768734079
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 7545364183608891058, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_Name
+ value: NearMenuExample3x2
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0279
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0628
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6497819335467242799, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8195971257274765725, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.116
+ objectReference: {fileID: 0}
+ - target: {fileID: 8195971257274765725, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.04735
+ objectReference: {fileID: 0}
+ - target: {fileID: 1697582316351518837, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.128
+ objectReference: {fileID: 0}
+ - target: {fileID: 1697582316351518837, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.096
+ objectReference: {fileID: 0}
+ - target: {fileID: 5486559457699078303, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: rows
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5486559457699078303, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: sortType
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 765132141809081969, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.031999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 765132141809081969, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 765132142816463134, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 765132142816463200, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 765132142816463200, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 765132142816463200, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 765132142816463200, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 765132142816463200, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2110343544553890915, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonFour
+ objectReference: {fileID: 0}
+ - target: {fileID: 2110343543999718018, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.031999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 2110343543999718018, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2110343545006650861, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 2110343545006650771, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 2110343545006650771, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2110343545006650771, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2110343545006650771, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2110343545006650771, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2110343545006650771, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Four
+ objectReference: {fileID: 0}
+ - target: {fileID: 8927709778025061097, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonTwo
+ objectReference: {fileID: 0}
+ - target: {fileID: 8927709776431750152, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0000000018626451
+ objectReference: {fileID: 0}
+ - target: {fileID: 8927709776431750152, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 8927709777571842919, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 8927709777571842841, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 8927709777571842841, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8927709777571842841, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8927709777571842841, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8927709777571842841, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8927709777571842841, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Two
+ objectReference: {fileID: 0}
+ - target: {fileID: 1724012943537014227, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1724012942983889714, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0000000018626451
+ objectReference: {fileID: 0}
+ - target: {fileID: 1724012942983889714, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 1724012943990297693, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 1724012943990297635, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Five
+ objectReference: {fileID: 0}
+ - target: {fileID: 1724012943990297635, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 1724012942949067129, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 23b680d6c13ccad4ba5004f1b6a22462, type: 2}
+ - target: {fileID: 8318523732878419829, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.02
+ objectReference: {fileID: 0}
+ - target: {fileID: 8318523732878419829, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.045
+ objectReference: {fileID: 0}
+ - target: {fileID: 4428800054153513564, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 15c4e4b880f2be34790dce1a74139d27, type: 2}
+ - target: {fileID: 1405010526223381333, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0912
+ objectReference: {fileID: 0}
+ - target: {fileID: 1405010526223381333, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.045
+ objectReference: {fileID: 0}
+ - target: {fileID: 2616990973746753615, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 15c4e4b880f2be34790dce1a74139d27, type: 2}
+ - target: {fileID: 9031692146085159010, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0523
+ objectReference: {fileID: 0}
+ - target: {fileID: 3780678651424202612, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0267
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 9a7c24f281a2c3d45a9b8befe608bf77, type: 3}
+--- !u!4 &7883149401895181706 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 9185878736382567157, guid: 9a7c24f281a2c3d45a9b8befe608bf77,
+ type: 3}
+ m_PrefabInstance: {fileID: 1305021998768734079}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2638714683172248581
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 7883149401895181706}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonThree
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.032000005
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ToggleRecording
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
+ value: SaveRecordedInput
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: c3ec3f87c678f3d48bc51f5625647104, type: 2}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Three
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
+--- !u!1001 &7581267722130571106
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 7883149401895181706}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonSix
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.032000005
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ToggleRecording
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
+ value: SaveRecordedInput
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 5a9ff3bf27bd2f14eb87222e2d2761b8, type: 2}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Six
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x2.prefab.meta b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x2.prefab.meta
new file mode 100644
index 00000000000..32fca7a7b03
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x2.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e969038e4d67d9b498de2ef538969506
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x3.prefab b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x3.prefab
new file mode 100644
index 00000000000..2d461ca17ac
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x3.prefab
@@ -0,0 +1,1006 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2014175836473893122
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4187654251277012703}
+ - component: {fileID: 4368828526413463362}
+ - component: {fileID: 537805699084123880}
+ m_Layer: 0
+ m_Name: GrabVisualCueHorizontalTop (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4187654251277012703
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2014175836473893122}
+ m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
+ m_LocalPosition: {x: 0.0745, y: -0.0202, z: -0.001}
+ m_LocalScale: {x: 0.074928366, y: 0.003631132, z: 0.009433999}
+ m_Children: []
+ m_Father: {fileID: 3432580279223920010}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+--- !u!33 &4368828526413463362
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2014175836473893122}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &537805699084123880
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2014175836473893122}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 13a6bafb89ca6414895d965b2fdb2041, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1 &5041026673607867330
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6535572241115846799}
+ - component: {fileID: 7214590449798827232}
+ - component: {fileID: 7096623161688875146}
+ m_Layer: 0
+ m_Name: GrabVisualCueHorizontalTop (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &6535572241115846799
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5041026673607867330}
+ m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
+ m_LocalPosition: {x: -0.037, y: -0.0202, z: -0.001}
+ m_LocalScale: {x: 0.074928366, y: 0.003631132, z: 0.009433999}
+ m_Children: []
+ m_Father: {fileID: 3432580279223920010}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+--- !u!33 &7214590449798827232
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5041026673607867330}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &7096623161688875146
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5041026673607867330}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 13a6bafb89ca6414895d965b2fdb2041, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1001 &3172113211659197008
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1333129552543361702, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Name
+ value: MenuExample3x3
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.11524798
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.1231
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2313261133033253179, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8118008112290837770, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 8118008112290837876, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 8118008112290837876, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8118008112290837876, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8118008112290837876, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8118008112290837876, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904604369537529, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904604369537415, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904604369537415, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904604369537415, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904604369537415, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904604369537415, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904604369537415, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Four
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904604369537415, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904604369537415, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490876616161139, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490876616161037, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490876616161037, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490876616161037, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490876616161037, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490876616161037, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490876616161037, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Seven
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490876616161037, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490876616161037, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729866667665481, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729866667665463, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729866667665463, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729866667665463, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729866667665463, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729866667665463, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729866667665463, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Two
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729866667665463, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729866667665463, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1630636061323851062, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 1630636061323851080, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 1630636061323851080, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1630636061323851080, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1630636061323851080, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1630636061323851080, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033265155075085, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033265155075187, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033265155075187, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033265155075187, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033265155075187, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033265155075187, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033265155075187, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Five
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033265155075187, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033265155075187, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875915651602512, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875915651602478, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875915651602478, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875915651602478, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875915651602478, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875915651602478, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875915651602478, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Eight
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875915651602478, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875915651602478, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768286833687537, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768286833687439, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768286833687439, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768286833687439, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768286833687439, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768286833687439, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768286833687439, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Six
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768286833687439, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768286833687439, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 831844951614958985, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0995
+ objectReference: {fileID: 0}
+ - target: {fileID: 381806469407776481, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0196
+ objectReference: {fileID: 0}
+ - target: {fileID: 381806469407776481, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.019
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033264147626850, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0000000018626451
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033264147626850, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0000000018626451
+ objectReference: {fileID: 0}
+ - target: {fileID: 531911681204149366, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.019199997
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490875475075100, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.031999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490875475075100, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.032000005
+ objectReference: {fileID: 0}
+ - target: {fileID: 1630636062464991833, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.032000005
+ objectReference: {fileID: 0}
+ - target: {fileID: 1630636062464991833, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.031999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 7906553909899379809, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0187
+ objectReference: {fileID: 0}
+ - target: {fileID: 7906553909899379809, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0192
+ objectReference: {fileID: 0}
+ - target: {fileID: 7906553909899379809, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.128
+ objectReference: {fileID: 0}
+ - target: {fileID: 7906553909899379809, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.128
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729865660284710, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0000000018626451
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729865660284710, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.031999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904603363729046, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.031999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904603363729046, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0000000018626451
+ objectReference: {fileID: 0}
+ - target: {fileID: 8118008111284429413, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.031999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 8118008111284429413, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.031999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 5638812189093552992, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0192
+ objectReference: {fileID: 0}
+ - target: {fileID: 5638812189093552992, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.074
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875916792745791, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0000000018626451
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875916792745791, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.032000005
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768285827345566, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.032000005
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768285827345566, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0000000018626451
+ objectReference: {fileID: 0}
+ - target: {fileID: 3015033265741987203, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonFive
+ objectReference: {fileID: 0}
+ - target: {fileID: 3896337419547188363, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: rows
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 131490875995694845, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonSeven
+ objectReference: {fileID: 0}
+ - target: {fileID: 1630636060837078200, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonThree
+ objectReference: {fileID: 0}
+ - target: {fileID: 1236209809734304333, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7915729867288197575, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonTwo
+ objectReference: {fileID: 0}
+ - target: {fileID: 7457904604990593143, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonFour
+ objectReference: {fileID: 0}
+ - target: {fileID: 7459335863129266358, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684875916272126430, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonEight
+ objectReference: {fileID: 0}
+ - target: {fileID: 6475768286380468863, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonSix
+ objectReference: {fileID: 0}
+ - target: {fileID: 908485784614504773, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Materials.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 908485784614504773, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_Materials.Array.data[1]
+ value:
+ objectReference: {fileID: 2100000, guid: 1d3d3b8b33373be4ba8d3b1676d2b5ba, type: 2}
+ - target: {fileID: 3033285473209203161, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.05
+ objectReference: {fileID: 0}
+ - target: {fileID: 3033285473209203161, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.012429999
+ objectReference: {fileID: 0}
+ - target: {fileID: 1781641201505502866, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.01243
+ objectReference: {fileID: 0}
+ - target: {fileID: 7823404504485184496, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0067000007
+ objectReference: {fileID: 0}
+ - target: {fileID: 7823404504485184496, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0324
+ objectReference: {fileID: 0}
+ - target: {fileID: 8323502268126346333, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0067
+ objectReference: {fileID: 0}
+ - target: {fileID: 2058207710863321824, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0192
+ objectReference: {fileID: 0}
+ - target: {fileID: 2058207710863321824, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0745
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 6dfc5f0a5fe04f94ab15177720f4bf05, type: 3}
+--- !u!4 &2975171669690811569 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 381806469407776481, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ m_PrefabInstance: {fileID: 3172113211659197008}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &3432580279223920010 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 263290957567508442, guid: 6dfc5f0a5fe04f94ab15177720f4bf05,
+ type: 3}
+ m_PrefabInstance: {fileID: 3172113211659197008}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4972606301337347178
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2975171669690811569}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonNine
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.032000005
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.032000005
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ToggleRecording
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
+ value: SaveRecordedInput
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Nine
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: e6ab953dc933471489f5ebff6791a886, type: 2}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x3.prefab.meta b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x3.prefab.meta
new file mode 100644
index 00000000000..b33d4810276
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample3x3.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d82e2f09994ad2f4fb43359bfb977f64
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x1.prefab b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x1.prefab
new file mode 100644
index 00000000000..4df0c1cc278
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x1.prefab
@@ -0,0 +1,1960 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!65 &8730868853488533197
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1712153382927011348}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 0.99999994, z: 1}
+ m_Center: {x: 0.00000004856583, y: 0, z: 3.0616168e-17}
+--- !u!114 &864135512269338377
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1712153382927011348}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5afd5316c63705643b3daba5a6e923bd, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ShowTetherWhenManipulating: 1
+--- !u!114 &2152278905257414432
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1712153382927011348}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5afd5316c63705643b3daba5a6e923bd, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ShowTetherWhenManipulating: 1
+--- !u!114 &7460458928787289386
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1712153382927011348}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 03daa81ea5f685f4ebf6e32038d058ca, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ hostTransform: {fileID: 167519458813532402}
+ manipulationType: 2
+ twoHandedManipulationType: 5
+ allowFarManipulation: 1
+ oneHandRotationModeNear: 6
+ oneHandRotationModeFar: 6
+ releaseBehavior: 3
+ constraintOnRotation: 2
+ constraintOnMovement: 0
+ smoothingActive: 1
+ smoothingAmountOneHandManip: 0.001
+ OnManipulationStarted:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 3374018212467406988}
+ m_MethodName: set_material
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 2100000, guid: 16526572b35ecaa4ba781a0bff18ab12,
+ type: 2}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 6376582067664713665}
+ m_MethodName: set_enabled
+ m_Mode: 6
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 5656867131449373698}
+ m_MethodName: SetToggled
+ m_Mode: 6
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 1
+ m_CallState: 2
+ - m_Target: {fileID: 6191257353991019938}
+ m_MethodName: PlayOneShot
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 8300000, guid: 72d90092d0f1a734eb1cfcf71b8fa2e4,
+ type: 3}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 1
+ m_CallState: 2
+ m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ OnManipulationEnded:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 3374018212467406988}
+ m_MethodName: set_material
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 2100000, guid: ec72a3a105768f746b556a8dfdae61a8,
+ type: 2}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 6191257353991019938}
+ m_MethodName: PlayOneShot
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 8300000, guid: ec33d8a6027c1574390812966f8aef94,
+ type: 3}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ OnHoverEntered:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ OnHoverExited:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+--- !u!1 &2827255906976489158
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2444919182723370515}
+ m_Layer: 0
+ m_Name: GravVisualCue
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2444919182723370515
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2827255906976489158}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 3102583286860655272}
+ - {fileID: 5404420624087121544}
+ - {fileID: 2677608141246180799}
+ - {fileID: 7784587948190700201}
+ m_Father: {fileID: 167519458813532402}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3515418990045158255
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 167519458813532402}
+ - component: {fileID: 8727868426842763079}
+ - component: {fileID: 6376582067664713665}
+ - component: {fileID: 6379754230260484954}
+ - component: {fileID: 6191257353991019938}
+ m_Layer: 0
+ m_Name: NearMenuExample4x1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &167519458813532402
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3515418990045158255}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0.114347965, y: 0.067, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 3009022624284531776}
+ - {fileID: 8159790426146837936}
+ - {fileID: 2811669244316413736}
+ - {fileID: 2444919182723370515}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8727868426842763079
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3515418990045158255}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ trackedTargetType: 0
+ trackedHandness: 3
+ trackedHandJoint: 2
+ transformOverride: {fileID: 0}
+ additionalOffset: {x: 0, y: 0, z: 0}
+ additionalRotation: {x: 0, y: 0, z: 0}
+ updateSolvers: 1
+--- !u!114 &6376582067664713665
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3515418990045158255}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4684083f6dff4a1d8a790bccc354fcf4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ updateLinkedTransform: 0
+ moveLerpTime: 0.5
+ rotateLerpTime: 0.5
+ scaleLerpTime: 0
+ maintainScale: 1
+ smoothing: 1
+ lifetime: 0
+ referenceDirection: 1
+ minDistance: 0.3
+ maxDistance: 0.6
+ minViewDegrees: 0
+ maxViewDegrees: 20
+ aspectV: 1
+ ignoreAngleClamp: 0
+ ignoreDistanceClamp: 0
+ useFixedVerticalPosition: 1
+ fixedVerticalPosition: -0.4
+ orientToReferenceDirection: 0
+--- !u!114 &6379754230260484954
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3515418990045158255}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2d1fea68463e4e84b86c395b654f950d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ visualizationObject: {fileID: 0}
+ interactableObject: {fileID: 0}
+ autoFollowAtDistance: 0
+ autoFollowDistance: 2
+ autoFollowTransformTarget: {fileID: 0}
+--- !u!82 &6191257353991019938
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3515418990045158255}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 0}
+ m_PlayOnAwake: 1
+ m_Volume: 1
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+--- !u!1 &3706069917505745796
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3102583286860655272}
+ - component: {fileID: 7789604522273328862}
+ - component: {fileID: 7280491432823375745}
+ m_Layer: 0
+ m_Name: GrabVisualCueVerticalLeft
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &3102583286860655272
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3706069917505745796}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0.03571999, y: 0.012699999, z: -0.001}
+ m_LocalScale: {x: 0.0034266084, y: 0.023154724, z: 0.0039000595}
+ m_Children: []
+ m_Father: {fileID: 2444919182723370515}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &7789604522273328862
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3706069917505745796}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &7280491432823375745
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3706069917505745796}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: e28b3473906c8764a948650d42b975c1, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1 &5029850922931923327
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5404420624087121544}
+ - component: {fileID: 5950183910367845185}
+ - component: {fileID: 8948275471115582866}
+ m_Layer: 0
+ m_Name: GrabVisualCueVerticalRight
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5404420624087121544
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5029850922931923327}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.1075, y: 0.012699999, z: -0.001}
+ m_LocalScale: {x: 0.0034266084, y: 0.023154724, z: 0.0039000595}
+ m_Children: []
+ m_Father: {fileID: 2444919182723370515}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5950183910367845185
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5029850922931923327}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8948275471115582866
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5029850922931923327}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: e28b3473906c8764a948650d42b975c1, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1 &5783768059060930389
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7784587948190700201}
+ - component: {fileID: 9121616848755800026}
+ - component: {fileID: 2315532816781448867}
+ m_Layer: 0
+ m_Name: GrabVisualCueHorizontalBottom
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &7784587948190700201
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5783768059060930389}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.0355, y: -0.0111, z: -0.001}
+ m_LocalScale: {x: 0.074928366, y: 0.0036311317, z: 0.009433999}
+ m_Children: []
+ m_Father: {fileID: 2444919182723370515}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &9121616848755800026
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5783768059060930389}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &2315532816781448867
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5783768059060930389}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 13a6bafb89ca6414895d965b2fdb2041, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1 &6006386279615139285
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2677608141246180799}
+ - component: {fileID: 9093237781593506467}
+ - component: {fileID: 8498958383991768906}
+ m_Layer: 0
+ m_Name: GrabVisualCueHorizontalTop
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2677608141246180799
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6006386279615139285}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.0355, y: 0.0362, z: -0.001}
+ m_LocalScale: {x: 0.074928366, y: 0.0036311317, z: 0.009433999}
+ m_Children: []
+ m_Father: {fileID: 2444919182723370515}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &9093237781593506467
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6006386279615139285}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8498958383991768906
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6006386279615139285}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 13a6bafb89ca6414895d965b2fdb2041, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1 &6583616640145107801
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2811669244316413736}
+ - component: {fileID: 1467028391546711362}
+ m_Layer: 0
+ m_Name: ButtonCollection
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2811669244316413736
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6583616640145107801}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.0356, y: 0.0126, z: -1.0104}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 5972206229126697900}
+ - {fileID: 4987367190003920735}
+ - {fileID: 2565462927989821909}
+ - {fileID: 5733978352390262511}
+ m_Father: {fileID: 167519458813532402}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1467028391546711362
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6583616640145107801}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cf12ee76e7e00a44a9a84256760020e6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ignoreInactiveTransforms: 1
+ sortType: 0
+ surfaceType: 1
+ orientType: 0
+ layout: 0
+ radius: 2
+ radialRange: 180
+ distance: 1
+ rows: 1
+ cellWidth: 0.032
+ cellHeight: 0.032
+--- !u!1001 &4398951770875455511
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2811669244316413736}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonThree
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: OnToggleHandJoint
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Three
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: fa419ab56051229449e3b813df8f295f, type: 2}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
+--- !u!4 &2565462927989821909 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4398951770875455511}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5510123669686839918
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2811669244316413736}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonOne
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.048
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ToggleProfiler
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu One
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 85b164de2cfcb854cbbcb9c82670749d, type: 2}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
+--- !u!4 &5972206229126697900 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ m_PrefabInstance: {fileID: 5510123669686839918}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5838146479216097069
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2811669244316413736}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonFour
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.048
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ToggleRecording
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
+ value: SaveRecordedInput
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Four
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: e6ab953dc933471489f5ebff6791a886, type: 2}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
+--- !u!4 &5733978352390262511 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ m_PrefabInstance: {fileID: 5838146479216097069}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6602520784541849245
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2811669244316413736}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonTwo
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: OnToggleHandMesh
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Two
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 7344413e86980e943b39f9d8080ed99f, type: 2}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
+--- !u!4 &4987367190003920735 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ m_PrefabInstance: {fileID: 6602520784541849245}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8381912901132042046
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 167519458813532402}
+ m_Modifications:
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.1324
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0316
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.0082
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094791252829599, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonPin
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.size
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.size
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Name
+ value: OnSelect
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 6379754230260484954}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ToggleFollowMeBehavior
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_TypeName
+ value: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].ClassName
+ value: InteractableOnToggleReceiver
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].AssemblyQualifiedName
+ value: Microsoft.MixedReality.Toolkit.UI.InteractableOnToggleReceiver, Microsoft.MixedReality.Toolkit.SDK
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].Type
+ value: 18
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].Label
+ value: On Deselect
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].Name
+ value: OnDeselect
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].Tooltip
+ value: The toggle is deselected
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 6376582067664713665}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: set_enabled
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_TypeName
+ value: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: StartDimensionIndex
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ToggleFollowMeBehavior
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 6379754230260484954}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: startDimensionIndex
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8495876841678131188, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6413889394266691908, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094791873819757, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094791873819759, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094791873819759, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790700452149, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 983d124b2920b4e4499bfc42d1bee8d2, type: 2}
+ - target: {fileID: 2689703347428627497, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 416caa6b57bb22c40ab9f1a4c12b304e, type: 2}
+ - target: {fileID: 2521141002669455045, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2521141002669455045, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 64790b91b91094d49942373c4e83c237, type: 3}
+--- !u!4 &3009022624284531776 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ m_PrefabInstance: {fileID: 8381912901132042046}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &5656867131449373698 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ m_PrefabInstance: {fileID: 8381912901132042046}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1001 &8727868428328536033
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 167519458813532402}
+ m_Modifications:
+ - target: {fileID: 538639403742340272, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_Name
+ value: Backplate
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0126
+ objectReference: {fileID: 0}
+ - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.064
+ objectReference: {fileID: 0}
+ - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.16
+ objectReference: {fileID: 0}
+ - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.0358
+ objectReference: {fileID: 0}
+ - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.010599999
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 9215a7c858170d74fb2257375d5feaf1, type: 3}
+--- !u!4 &8159790426146837936 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ m_PrefabInstance: {fileID: 8727868428328536033}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1712153382927011348 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7988634196090784245, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ m_PrefabInstance: {fileID: 8727868428328536033}
+ m_PrefabAsset: {fileID: 0}
+--- !u!23 &3374018212467406988 stripped
+MeshRenderer:
+ m_CorrespondingSourceObject: {fileID: 6326842415924641645, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ m_PrefabInstance: {fileID: 8727868428328536033}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x1.prefab.meta b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x1.prefab.meta
new file mode 100644
index 00000000000..fbaadacd7fb
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x1.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 40b588bd40632eb41a0af374d91c4fc9
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x2.prefab b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x2.prefab
new file mode 100644
index 00000000000..5d26762f699
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x2.prefab
@@ -0,0 +1,1178 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &592016088786918299
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 381806469407776481}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonFour
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.048
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: OnToggleHandJoint
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Four
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: fa419ab56051229449e3b813df8f295f, type: 2}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
+--- !u!1001 &2470642974009192905
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3515418990045158255, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Name
+ value: MenuExample4x2
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.11524798
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.068085335
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 167519458813532402, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548483, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206227985548477, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318640, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367188862318670, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Five
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481018, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462926983481028, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Two
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233728, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978351250233854, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Six
+ objectReference: {fileID: 0}
+ - target: {fileID: 3009022624284531776, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0316
+ objectReference: {fileID: 0}
+ - target: {fileID: 2811669244316413736, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.004
+ objectReference: {fileID: 0}
+ - target: {fileID: 3102583286860655272, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.005
+ objectReference: {fileID: 0}
+ - target: {fileID: 3102583286860655272, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.045
+ objectReference: {fileID: 0}
+ - target: {fileID: 5404420624087121544, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.005
+ objectReference: {fileID: 0}
+ - target: {fileID: 5404420624087121544, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.045
+ objectReference: {fileID: 0}
+ - target: {fileID: 2677608141246180799, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0357
+ objectReference: {fileID: 0}
+ - target: {fileID: 2677608141246180799, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.003631132
+ objectReference: {fileID: 0}
+ - target: {fileID: 7784587948190700201, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0437
+ objectReference: {fileID: 0}
+ - target: {fileID: 5972206229126697900, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367190003920735, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.048
+ objectReference: {fileID: 0}
+ - target: {fileID: 4987367190003920735, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462927989821909, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2565462927989821909, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978352390262511, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 5733978352390262511, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 5760319780102256040, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0037
+ objectReference: {fileID: 0}
+ - target: {fileID: 5760319780102256040, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.096
+ objectReference: {fileID: 0}
+ - target: {fileID: 5760319780102256040, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.16
+ objectReference: {fileID: 0}
+ - target: {fileID: 1467028391546711362, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: rows
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3374018212467406988, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Materials.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3374018212467406988, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Materials.Array.data[1]
+ value:
+ objectReference: {fileID: 2100000, guid: 1d3d3b8b33373be4ba8d3b1676d2b5ba, type: 2}
+ - target: {fileID: 7280491432823375745, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 15c4e4b880f2be34790dce1a74139d27, type: 2}
+ - target: {fileID: 8948275471115582866, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 15c4e4b880f2be34790dce1a74139d27, type: 2}
+ - target: {fileID: 2565462927957621662, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 943fce092bd9aea49808ff09b520bf74, type: 2}
+ - target: {fileID: 5733978352425690276, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 23b680d6c13ccad4ba5004f1b6a22462, type: 2}
+ - target: {fileID: 4247129238707009371, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0060300003
+ objectReference: {fileID: 0}
+ - target: {fileID: 599288404636420112, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.00603
+ objectReference: {fileID: 0}
+ - target: {fileID: 5682184024230343225, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.02
+ objectReference: {fileID: 0}
+ - target: {fileID: 8440988102217858020, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.02018
+ objectReference: {fileID: 0}
+ - target: {fileID: 4096411482608858163, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.00528
+ objectReference: {fileID: 0}
+ - target: {fileID: 8431916313651470639, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0052799988
+ objectReference: {fileID: 0}
+ - target: {fileID: 4528727539549182761, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0439
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 40b588bd40632eb41a0af374d91c4fc9, type: 3}
+--- !u!4 &381806469407776481 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2811669244316413736, guid: 40b588bd40632eb41a0af374d91c4fc9,
+ type: 3}
+ m_PrefabInstance: {fileID: 2470642974009192905}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3981711362968404640
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 381806469407776481}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonOne (1)
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ToggleProfiler
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Three
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 467ed030160339e4b8ec795630ed12aa, type: 2}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
+--- !u!1001 &5136603138125829468
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 381806469407776481}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonEight
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.048
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 7
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ToggleRecording
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
+ value: SaveRecordedInput
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Eight
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: c3ec3f87c678f3d48bc51f5625647104, type: 2}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
+--- !u!1001 &5796925615156623101
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 381806469407776481}
+ m_Modifications:
+ - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Name
+ value: ButtonSeven
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.016
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: OnToggleHandMesh
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Menu Seven
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 57717538759a71948975aa7be8c2a3cb, type: 2}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
diff --git a/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x2.prefab.meta b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x2.prefab.meta
new file mode 100644
index 00000000000..d6ace575664
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Examples/StandardAssets/Prefabs/Menus/NearMenuExample4x2.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6dfc5f0a5fe04f94ab15177720f4bf05
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.Examples/Version.txt b/Assets/MixedRealityToolkit.Examples/Version.txt
index e670c2aeaab..4df313d1cc0 100644
--- a/Assets/MixedRealityToolkit.Examples/Version.txt
+++ b/Assets/MixedRealityToolkit.Examples/Version.txt
@@ -1 +1 @@
-Microsoft Mixed Reality Toolkit 2.0.0
\ No newline at end of file
+Microsoft Mixed Reality Toolkit 2.1.0
\ No newline at end of file
diff --git a/Assets/MixedRealityToolkit.Extensions/MRTK.Extensions.sentinel b/Assets/MixedRealityToolkit.Extensions/MRTK.Extensions.sentinel
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Assets/MixedRealityToolkit.Extensions/MRTK.Extensions.sentinel.meta b/Assets/MixedRealityToolkit.Extensions/MRTK.Extensions.sentinel.meta
new file mode 100644
index 00000000000..a89b3c0d7a1
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Extensions/MRTK.Extensions.sentinel.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 354da3282d4f2d3449f6145955984ed5
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.Extensions/MixedReality.Toolkit.Extensions.nuspec b/Assets/MixedRealityToolkit.Extensions/MixedReality.Toolkit.Extensions.nuspec
index a16927c21e7..020d85b4bfc 100644
--- a/Assets/MixedRealityToolkit.Extensions/MixedReality.Toolkit.Extensions.nuspec
+++ b/Assets/MixedRealityToolkit.Extensions/MixedReality.Toolkit.Extensions.nuspec
@@ -15,13 +15,18 @@
+
+
+
-
+
+
+
\ No newline at end of file
diff --git a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/DefaultSceneTransitionServiceProfile.asset b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/DefaultSceneTransitionServiceProfile.asset
index f58e9bccd7d..6bd20f139ad 100644
--- a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/DefaultSceneTransitionServiceProfile.asset
+++ b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/DefaultSceneTransitionServiceProfile.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8d8965cb7573e04429e22a5a476b4703, type: 3}
m_Name: DefaultSceneTransitionServiceProfile
m_EditorClassIdentifier:
- isCustomProfile: 1
+ isCustomProfile: 0
useDefaultProgressIndicator: 1
defaultProgressIndicatorPrefab: {fileID: 1993071269674472, guid: 57d2436112e7d424da7e9a8e41c608dc,
type: 3}
diff --git a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/ISceneTransitionService.cs b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/ISceneTransitionService.cs
index b6aaba7f4cc..881aeb2f2d2 100644
--- a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/ISceneTransitionService.cs
+++ b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/ISceneTransitionService.cs
@@ -65,16 +65,11 @@ public interface ISceneTransitionService : IMixedRealityExtensionService
///
/// A set of tasks from the Scene System.
/// If null, default progress indicator prefab will be used (or none if default is disabled in profile)
- ///
Task DoSceneTransition(IEnumerable> sceneOperations, IProgressIndicator progressIndicator = null);
///
/// Fades out, enables progress indicator, executes scene op 1, executes scene op 2, disables progress indicator, fades back in
///
- ///
- ///
- ///
- ///
Task DoSceneTransition(Func sceneOp1, Func sceneOp2, IProgressIndicator progressIndicator = null);
///
@@ -82,31 +77,26 @@ public interface ISceneTransitionService : IMixedRealityExtensionService
///
/// A set of tasks from the Scene System.
/// If null, default progress indicator prefab will be used (or none if default is disabled in profile)
- ///
Task DoSceneTransition(Func sceneOperation, IProgressIndicator progressIndicator = null);
///
/// If FadeTargets is set to custom, you will need to provide a custom set of cameras for fading using this function PRIOR to calling DoSceneTransition.
///
- ///
void SetCustomFadeTargetCameras(IEnumerable customFadeTargetCameras);
///
/// Fades target cameras out to color. Can be used independently of scene transitions provided no transition is taking place.
///
- ///
Task FadeOut();
///
/// Fades target cameras in. Instant fade-out will occur if fade state is not opaque. Can be used independently of scene transitions provided no transition is taking place.
///
- ///
Task FadeIn();
///
/// Instantiates the default progress indicator and returns its main transform. Can be used independently of scene transitions provided no transition is taking place.
///
- ///
Transform ShowDefaultProgressIndicator();
///
@@ -117,13 +107,11 @@ public interface ISceneTransitionService : IMixedRealityExtensionService
///
/// Sets progress to value from 0-1. If no progress indicator exists, has no effect.
///
- ///
void SetProgressValue(float progress);
///
/// Sets the message on displayed progress indicator. If no progress indicator exists, has no effect.
///
- ///
void SetProgressMessage(string message);
}
}
\ No newline at end of file
diff --git a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/SceneTransitionService.cs b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/SceneTransitionService.cs
index 4a48f88e677..6a568a43484 100644
--- a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/SceneTransitionService.cs
+++ b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/SceneTransitionService.cs
@@ -393,14 +393,7 @@ private void CleanUpDefaultProgressIndicator()
{
if (progressIndicatorObject != null)
{
- if (Application.isPlaying)
- {
- GameObject.Destroy(progressIndicatorObject);
- }
- else
- {
- GameObject.DestroyImmediate(progressIndicatorObject);
- }
+ GameObjectExtensions.DestroyGameObject(progressIndicatorObject);
}
}
diff --git a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/SceneTransitionServiceProfile.cs b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/SceneTransitionServiceProfile.cs
index b938991d4e8..54467e43471 100644
--- a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/SceneTransitionServiceProfile.cs
+++ b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/SceneTransitionServiceProfile.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.
using Microsoft.MixedReality.Toolkit.Utilities;
-using UnityEditor;
using UnityEngine;
namespace Microsoft.MixedReality.Toolkit.Extensions.SceneTransitions
diff --git a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/CameraFaderQuad.cs b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/CameraFaderQuad.cs
index f42c279f41d..6a0215bf5cf 100644
--- a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/CameraFaderQuad.cs
+++ b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/CameraFaderQuad.cs
@@ -13,7 +13,7 @@ namespace Microsoft.MixedReality.Toolkit.Extensions.SceneTransitions
///
public class CameraFaderQuad : ICameraFader
{
- const string QuadMaterialShaderName = "UI/Unlit/Transparent";
+ const string QuadMaterialShaderName = "Sprites/Default";
const string QuadMaterialColorName = "_Color";
///
diff --git a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/ICameraFader.cs b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/ICameraFader.cs
index d5444dde618..77654de211b 100644
--- a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/ICameraFader.cs
+++ b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/ICameraFader.cs
@@ -20,14 +20,12 @@ public interface ICameraFader
/// The duration of the fade
/// The color of the fade
/// Which cameras will receive the effect
- ///
Task FadeOutAsync(float fadeOutTime, Color color, IEnumerable targets);
///
/// Applies a fade-in effect over time. Must be called after FadeOutAsync has completed.
///
/// The duration of the fade
- ///
Task FadeInAsync(float fadeInTime);
///
diff --git a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/LoadContentScene.cs b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/LoadContentScene.cs
new file mode 100644
index 00000000000..a78aa13768a
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/LoadContentScene.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.MixedReality.Toolkit.SceneSystem;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace Microsoft.MixedReality.Toolkit.Extensions.SceneTransitions
+{
+ ///
+ /// Utility class to load scenes through MRTK Scene System using a scene transition.
+ /// Otherwise, it uses Scene System's LoadContent()
+ ///
+ public class LoadContentScene : MonoBehaviour
+ {
+ [SerializeField]
+ private LoadSceneMode loadSceneMode = LoadSceneMode.Single;
+ [SerializeField]
+ private SceneInfo contentScene = SceneInfo.Empty;
+ [SerializeField]
+ private bool loadOnStartup = false;
+
+ private void Start()
+ {
+ if (loadOnStartup)
+ {
+ LoadContent();
+ }
+ }
+
+ ///
+ /// Load a scene with contentScene.Name
+ ///
+ public void LoadContent()
+ {
+ ISceneTransitionService transitions = MixedRealityToolkit.Instance.GetService();
+ if (transitions.TransitionInProgress)
+ {
+ return;
+ }
+ transitions.DoSceneTransition(() => CoreServices.SceneSystem.LoadContent(contentScene.Name, loadSceneMode));
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/LoadContentScene.cs.meta b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/LoadContentScene.cs.meta
new file mode 100644
index 00000000000..a6b8e3537f2
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Extensions/SceneTransitionService/Scripts/LoadContentScene.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ae67cd8a02f7ce94e9565614536df803
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.Extensions/Version.txt b/Assets/MixedRealityToolkit.Extensions/Version.txt
index e670c2aeaab..4df313d1cc0 100644
--- a/Assets/MixedRealityToolkit.Extensions/Version.txt
+++ b/Assets/MixedRealityToolkit.Extensions/Version.txt
@@ -1 +1 @@
-Microsoft Mixed Reality Toolkit 2.0.0
\ No newline at end of file
+Microsoft Mixed Reality Toolkit 2.1.0
\ No newline at end of file
diff --git a/Assets/MixedRealityToolkit.Providers/MRTK.Providers.sentinel b/Assets/MixedRealityToolkit.Providers/MRTK.Providers.sentinel
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Assets/MixedRealityToolkit.Providers/MRTK.Providers.sentinel.meta b/Assets/MixedRealityToolkit.Providers/MRTK.Providers.sentinel.meta
new file mode 100644
index 00000000000..a0f437b1580
--- /dev/null
+++ b/Assets/MixedRealityToolkit.Providers/MRTK.Providers.sentinel.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: efc47659760747d4d80477aa049ee71e
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/Profiles/DefaultObjectMeshObserverProfile.asset b/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/Profiles/DefaultObjectMeshObserverProfile.asset
index c519fb6a8ab..688c13af04e 100644
--- a/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/Profiles/DefaultObjectMeshObserverProfile.asset
+++ b/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/Profiles/DefaultObjectMeshObserverProfile.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e3c1af9621e40064b907d18085e21fb7, type: 3}
m_Name: DefaultObjectMeshObserverProfile
m_EditorClassIdentifier:
- isCustomProfile: 1
+ isCustomProfile: 0
startupBehavior: 0
isStationaryObserver: 0
observationExtents: {x: 3, y: 3, z: 3}
diff --git a/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/SpatialObjectMeshObserver.cs b/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/SpatialObjectMeshObserver.cs
index 9ce739cba45..7da3c0a0f15 100644
--- a/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/SpatialObjectMeshObserver.cs
+++ b/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/SpatialObjectMeshObserver.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.
using System.Collections.Generic;
-using Boo.Lang;
using Microsoft.MixedReality.Toolkit.SpatialAwareness;
using Microsoft.MixedReality.Toolkit.Utilities;
using UnityEngine;
@@ -133,7 +132,7 @@ public override void Disable()
// Remember if we are currently running when Disable is called.
autoResume = IsRunning;
- // If we are disbled while running...
+ // If we are disabled while running...
if (IsRunning)
{
// Suspend the observer
@@ -240,7 +239,6 @@ private void SendMeshObjects()
///
/// Removes an observation.
///
- ///
private void RemoveMeshObject(int meshId)
{
SpatialAwarenessMeshObject meshObject = null;
diff --git a/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/SpatialObjectMeshObserverProfileInspector.cs b/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/SpatialObjectMeshObserverProfileInspector.cs
index 248a0dba911..63674141977 100644
--- a/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/SpatialObjectMeshObserverProfileInspector.cs
+++ b/Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/SpatialObjectMeshObserverProfileInspector.cs
@@ -78,7 +78,8 @@ public override void OnInspectorGUI()
serializedObject.Update();
EditorGUILayout.PropertyField(spatialMeshObject);
- MeshFilter[] filters = (spatialMeshObject.objectReferenceValue as GameObject)?.GetComponentsInChildren();
+ GameObject parent = spatialMeshObject.objectReferenceValue as GameObject;
+ MeshFilter[] filters = (parent != null) ? parent.GetComponentsInChildren() : null;
if ((filters == null) ||
(filters.Length == 0))
{
diff --git a/Assets/MixedRealityToolkit.Providers/OpenVR/GenericOpenVRController.cs b/Assets/MixedRealityToolkit.Providers/OpenVR/GenericOpenVRController.cs
index c8c54b96ea5..053e7b890b2 100644
--- a/Assets/MixedRealityToolkit.Providers/OpenVR/GenericOpenVRController.cs
+++ b/Assets/MixedRealityToolkit.Providers/OpenVR/GenericOpenVRController.cs
@@ -47,7 +47,7 @@ public GenericOpenVRController(TrackingState trackingState, Handedness controlle
// Oculus Touch Controller - Axis1D.PrimaryIndexTrigger
// Valve Knuckles Controller - Left Controller Trigger
// Windows Mixed Reality Controller - Left Trigger Press (Select)
- new MixedRealityInteractionMapping(2, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.TriggerPress, KeyCode.JoystickButton14),
+ new MixedRealityInteractionMapping(2, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.Select, KeyCode.JoystickButton14),
// HTC Vive Controller - Left Controller Trigger (7)
// Oculus Touch Controller - Axis1D.PrimaryIndexTrigger
// Valve Knuckles Controller - Left Controller Trigger
@@ -98,7 +98,7 @@ public GenericOpenVRController(TrackingState trackingState, Handedness controlle
// Oculus Touch Controller - Axis1D.SecondaryIndexTrigger
// Valve Knuckles Controller - Right Controller Trigger
// Windows Mixed Reality Controller - Right Trigger Press (Select)
- new MixedRealityInteractionMapping(2, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.TriggerPress, KeyCode.JoystickButton15),
+ new MixedRealityInteractionMapping(2, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.Select, KeyCode.JoystickButton15),
// HTC Vive Controller - Right Controller Trigger (7)
// Oculus Touch Controller - Axis1D.SecondaryIndexTrigger
// Valve Knuckles Controller - Right Controller Trigger
@@ -168,7 +168,6 @@ public override void UpdateController()
///
/// Update the "Controller" input from the device
///
- ///
protected void UpdateControllerData(XRNodeState state)
{
var lastState = TrackingState;
diff --git a/Assets/MixedRealityToolkit.Providers/OpenVR/OculusRemoteController.cs b/Assets/MixedRealityToolkit.Providers/OpenVR/OculusRemoteController.cs
index c55dee565cf..7c56b0bc0bc 100644
--- a/Assets/MixedRealityToolkit.Providers/OpenVR/OculusRemoteController.cs
+++ b/Assets/MixedRealityToolkit.Providers/OpenVR/OculusRemoteController.cs
@@ -16,10 +16,6 @@ public class OculusRemoteController : GenericOpenVRController
///
/// Constructor.
///
- ///
- ///
- ///
- ///
public OculusRemoteController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
: base(trackingState, controllerHandedness, inputSource, interactions)
{
diff --git a/Assets/MixedRealityToolkit.Providers/OpenVR/OculusTouchController.cs b/Assets/MixedRealityToolkit.Providers/OpenVR/OculusTouchController.cs
index 54c0f816bc5..2d1c53e9bbc 100644
--- a/Assets/MixedRealityToolkit.Providers/OpenVR/OculusTouchController.cs
+++ b/Assets/MixedRealityToolkit.Providers/OpenVR/OculusTouchController.cs
@@ -16,10 +16,6 @@ public class OculusTouchController : GenericOpenVRController
///
/// Constructor.
///
- ///
- ///
- ///
- ///
public OculusTouchController(TrackingState trackingState, Handedness controllerHandedness,
IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
: base(trackingState, controllerHandedness, inputSource, interactions)
@@ -33,7 +29,7 @@ public OculusTouchController(TrackingState trackingState, Handedness controllerH
new MixedRealityInteractionMapping(1, "Axis1D.PrimaryIndexTrigger", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_9),
new MixedRealityInteractionMapping(2, "Axis1D.PrimaryIndexTrigger Touch", AxisType.Digital, DeviceInputType.TriggerTouch, KeyCode.JoystickButton14),
new MixedRealityInteractionMapping(3, "Axis1D.PrimaryIndexTrigger Near Touch", AxisType.Digital, DeviceInputType.TriggerNearTouch, ControllerMappingLibrary.AXIS_13),
- new MixedRealityInteractionMapping(4, "Axis1D.PrimaryIndexTrigger Press", AxisType.Digital, DeviceInputType.TriggerPress, KeyCode.JoystickButton14),
+ new MixedRealityInteractionMapping(4, "Axis1D.PrimaryIndexTrigger Press", AxisType.Digital, DeviceInputType.TriggerPress, ControllerMappingLibrary.AXIS_9),
new MixedRealityInteractionMapping(5, "Axis1D.PrimaryHandTrigger Press", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_11),
new MixedRealityInteractionMapping(6, "Axis2D.PrimaryThumbstick", AxisType.DualAxis, DeviceInputType.ThumbStick, ControllerMappingLibrary.AXIS_1, ControllerMappingLibrary.AXIS_2),
new MixedRealityInteractionMapping(7, "Button.PrimaryThumbstick Touch", AxisType.Digital, DeviceInputType.ThumbStickTouch, KeyCode.JoystickButton16),
@@ -41,7 +37,7 @@ public OculusTouchController(TrackingState trackingState, Handedness controllerH
new MixedRealityInteractionMapping(9, "Button.PrimaryThumbstick Press", AxisType.Digital, DeviceInputType.ThumbStickPress, KeyCode.JoystickButton8),
new MixedRealityInteractionMapping(10, "Button.Three Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton2),
new MixedRealityInteractionMapping(11, "Button.Four Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton3),
- new MixedRealityInteractionMapping(12, "Button.Start Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton7),
+ new MixedRealityInteractionMapping(12, "Button.Start Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton6),
new MixedRealityInteractionMapping(13, "Button.Three Touch", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton12),
new MixedRealityInteractionMapping(14, "Button.Four Touch", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton13),
new MixedRealityInteractionMapping(15, "Touch.PrimaryThumbRest Touch", AxisType.Digital, DeviceInputType.ThumbTouch, KeyCode.JoystickButton18),
@@ -55,7 +51,7 @@ public OculusTouchController(TrackingState trackingState, Handedness controllerH
new MixedRealityInteractionMapping(1, "Axis1D.SecondaryIndexTrigger", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_10),
new MixedRealityInteractionMapping(2, "Axis1D.SecondaryIndexTrigger Touch", AxisType.Digital, DeviceInputType.TriggerTouch, KeyCode.JoystickButton15),
new MixedRealityInteractionMapping(3, "Axis1D.SecondaryIndexTrigger Near Touch", AxisType.Digital, DeviceInputType.TriggerNearTouch, ControllerMappingLibrary.AXIS_14),
- new MixedRealityInteractionMapping(4, "Axis1D.SecondaryIndexTrigger Press", AxisType.Digital, DeviceInputType.TriggerPress, KeyCode.JoystickButton15),
+ new MixedRealityInteractionMapping(4, "Axis1D.SecondaryIndexTrigger Press", AxisType.Digital, DeviceInputType.TriggerPress, ControllerMappingLibrary.AXIS_10),
new MixedRealityInteractionMapping(5, "Axis1D.SecondaryHandTrigger Press", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_12),
new MixedRealityInteractionMapping(6, "Axis2D.SecondaryThumbstick", AxisType.DualAxis, DeviceInputType.ThumbStick, ControllerMappingLibrary.AXIS_4, ControllerMappingLibrary.AXIS_5),
new MixedRealityInteractionMapping(7, "Button.SecondaryThumbstick Touch", AxisType.Digital, DeviceInputType.ThumbStickTouch, KeyCode.JoystickButton17),
diff --git a/Assets/MixedRealityToolkit.Providers/OpenVR/ViveKnucklesController.cs b/Assets/MixedRealityToolkit.Providers/OpenVR/ViveKnucklesController.cs
index b39a97a8f2a..b321ce91d38 100644
--- a/Assets/MixedRealityToolkit.Providers/OpenVR/ViveKnucklesController.cs
+++ b/Assets/MixedRealityToolkit.Providers/OpenVR/ViveKnucklesController.cs
@@ -15,10 +15,6 @@ public class ViveKnucklesController : GenericOpenVRController
///
/// Constructor.
///
- ///
- ///
- ///
- ///
public ViveKnucklesController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
: base(trackingState, controllerHandedness, inputSource, interactions)
{
@@ -29,7 +25,7 @@ public ViveKnucklesController(TrackingState trackingState, Handedness controller
{
new MixedRealityInteractionMapping(0, "Spatial Pointer", AxisType.SixDof, DeviceInputType.SpatialPointer, MixedRealityInputAction.None),
new MixedRealityInteractionMapping(1, "Trigger Position", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_9),
- new MixedRealityInteractionMapping(2, "Trigger Press", AxisType.Digital, DeviceInputType.TriggerPress, KeyCode.JoystickButton14),
+ new MixedRealityInteractionMapping(2, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.Select, KeyCode.JoystickButton14),
new MixedRealityInteractionMapping(3, "Trigger Touch", AxisType.Digital, DeviceInputType.TriggerTouch, ControllerMappingLibrary.AXIS_9),
new MixedRealityInteractionMapping(4, "Grip Average", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_11),
new MixedRealityInteractionMapping(5, "Trackpad Position", AxisType.DualAxis, DeviceInputType.Touchpad, ControllerMappingLibrary.AXIS_1, ControllerMappingLibrary.AXIS_2),
@@ -49,7 +45,7 @@ public ViveKnucklesController(TrackingState trackingState, Handedness controller
{
new MixedRealityInteractionMapping(0, "Spatial Pointer", AxisType.SixDof, DeviceInputType.SpatialPointer, MixedRealityInputAction.None),
new MixedRealityInteractionMapping(1, "Trigger Position", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_10),
- new MixedRealityInteractionMapping(2, "Trigger Press", AxisType.Digital, DeviceInputType.TriggerPress, KeyCode.JoystickButton15),
+ new MixedRealityInteractionMapping(2, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.Select, KeyCode.JoystickButton15),
new MixedRealityInteractionMapping(3, "Trigger Touch", AxisType.Digital, DeviceInputType.TriggerTouch, ControllerMappingLibrary.AXIS_10),
new MixedRealityInteractionMapping(4, "Grip Average", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_12),
new MixedRealityInteractionMapping(5, "Trackpad Position", AxisType.DualAxis, DeviceInputType.Touchpad, ControllerMappingLibrary.AXIS_4, ControllerMappingLibrary.AXIS_5),
diff --git a/Assets/MixedRealityToolkit.Providers/OpenVR/ViveWandController.cs b/Assets/MixedRealityToolkit.Providers/OpenVR/ViveWandController.cs
index 2cc52a064a7..fe8d152f652 100644
--- a/Assets/MixedRealityToolkit.Providers/OpenVR/ViveWandController.cs
+++ b/Assets/MixedRealityToolkit.Providers/OpenVR/ViveWandController.cs
@@ -16,10 +16,6 @@ public class ViveWandController : GenericOpenVRController
///
/// Constructor.
///
- ///
- ///
- ///
- ///
public ViveWandController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
: base(trackingState, controllerHandedness, inputSource, interactions)
{
@@ -30,7 +26,7 @@ public ViveWandController(TrackingState trackingState, Handedness controllerHand
{
new MixedRealityInteractionMapping(0, "Spatial Pointer", AxisType.SixDof, DeviceInputType.SpatialPointer, MixedRealityInputAction.None),
new MixedRealityInteractionMapping(1, "Trigger Position", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_9),
- new MixedRealityInteractionMapping(2, "Trigger Press", AxisType.Digital, DeviceInputType.TriggerPress, KeyCode.JoystickButton14),
+ new MixedRealityInteractionMapping(2, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.Select, KeyCode.JoystickButton14),
new MixedRealityInteractionMapping(3, "Trigger Touch", AxisType.Digital, DeviceInputType.TriggerTouch, ControllerMappingLibrary.AXIS_9),
new MixedRealityInteractionMapping(4, "Grip Press", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_11),
new MixedRealityInteractionMapping(5, "Trackpad Position", AxisType.DualAxis, DeviceInputType.Touchpad, ControllerMappingLibrary.AXIS_1, ControllerMappingLibrary.AXIS_2),
@@ -44,7 +40,7 @@ public ViveWandController(TrackingState trackingState, Handedness controllerHand
{
new MixedRealityInteractionMapping(0, "Spatial Pointer", AxisType.SixDof, DeviceInputType.SpatialPointer, MixedRealityInputAction.None),
new MixedRealityInteractionMapping(1, "Trigger Position", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_10),
- new MixedRealityInteractionMapping(2, "Trigger Press", AxisType.Digital, DeviceInputType.TriggerPress, KeyCode.JoystickButton15),
+ new MixedRealityInteractionMapping(2, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.Select, KeyCode.JoystickButton15),
new MixedRealityInteractionMapping(3, "Trigger Touch", AxisType.Digital, DeviceInputType.TriggerTouch, ControllerMappingLibrary.AXIS_10),
new MixedRealityInteractionMapping(4, "Grip Press", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_12),
new MixedRealityInteractionMapping(5, "Trackpad Position", AxisType.DualAxis, DeviceInputType.Touchpad, ControllerMappingLibrary.AXIS_4, ControllerMappingLibrary.AXIS_5),
diff --git a/Assets/MixedRealityToolkit.Providers/OpenVR/WindowsMixedRealityOpenVRMotionController.cs b/Assets/MixedRealityToolkit.Providers/OpenVR/WindowsMixedRealityOpenVRMotionController.cs
index 803ce07a627..68383b0e2c3 100644
--- a/Assets/MixedRealityToolkit.Providers/OpenVR/WindowsMixedRealityOpenVRMotionController.cs
+++ b/Assets/MixedRealityToolkit.Providers/OpenVR/WindowsMixedRealityOpenVRMotionController.cs
@@ -4,6 +4,7 @@
using Microsoft.MixedReality.Toolkit.Input;
using Microsoft.MixedReality.Toolkit.Utilities;
using UnityEngine;
+using UnityEngine.Assertions;
namespace Microsoft.MixedReality.Toolkit.OpenVR.Input
{
@@ -19,10 +20,6 @@ public class WindowsMixedRealityOpenVRMotionController : GenericOpenVRController
///
/// Constructor.
///
- ///
- ///
- ///
- ///
public WindowsMixedRealityOpenVRMotionController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
: base(trackingState, controllerHandedness, inputSource, interactions)
{
@@ -37,7 +34,7 @@ public WindowsMixedRealityOpenVRMotionController(TrackingState trackingState, Ha
new MixedRealityInteractionMapping(2, "Grip Press", AxisType.SingleAxis, DeviceInputType.TriggerPress, ControllerMappingLibrary.AXIS_11),
new MixedRealityInteractionMapping(3, "Trigger Position", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_9),
new MixedRealityInteractionMapping(4, "Trigger Touch", AxisType.SingleAxis, DeviceInputType.TriggerTouch, ControllerMappingLibrary.AXIS_9),
- new MixedRealityInteractionMapping(5, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.TriggerPress, KeyCode.JoystickButton14),
+ new MixedRealityInteractionMapping(5, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.Select, KeyCode.JoystickButton14),
new MixedRealityInteractionMapping(6, "Touchpad Position", AxisType.DualAxis, DeviceInputType.Touchpad, ControllerMappingLibrary.AXIS_17, ControllerMappingLibrary.AXIS_18, false, true),
new MixedRealityInteractionMapping(7, "Touchpad Touch", AxisType.Digital, DeviceInputType.TouchpadTouch, KeyCode.JoystickButton16),
new MixedRealityInteractionMapping(8, "Touchpad Press", AxisType.Digital, DeviceInputType.TouchpadPress, KeyCode.JoystickButton8),
@@ -51,10 +48,10 @@ public WindowsMixedRealityOpenVRMotionController(TrackingState trackingState, Ha
{
new MixedRealityInteractionMapping(0, "Spatial Pointer", AxisType.SixDof, DeviceInputType.SpatialPointer, MixedRealityInputAction.None),
new MixedRealityInteractionMapping(1, "Spatial Grip", AxisType.SixDof, DeviceInputType.SpatialGrip, MixedRealityInputAction.None),
- new MixedRealityInteractionMapping(2, "Grip Press", AxisType.SingleAxis, DeviceInputType.ButtonPress, ControllerMappingLibrary.AXIS_12),
+ new MixedRealityInteractionMapping(2, "Grip Press", AxisType.SingleAxis, DeviceInputType.TriggerPress, ControllerMappingLibrary.AXIS_12),
new MixedRealityInteractionMapping(3, "Trigger Position", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_10),
new MixedRealityInteractionMapping(4, "Trigger Touch", AxisType.SingleAxis, DeviceInputType.TriggerTouch, ControllerMappingLibrary.AXIS_10),
- new MixedRealityInteractionMapping(5, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.TriggerPress, KeyCode.JoystickButton15),
+ new MixedRealityInteractionMapping(5, "Trigger Press (Select)", AxisType.Digital, DeviceInputType.Select, KeyCode.JoystickButton15),
new MixedRealityInteractionMapping(6, "Touchpad Position", AxisType.DualAxis, DeviceInputType.Touchpad, ControllerMappingLibrary.AXIS_19, ControllerMappingLibrary.AXIS_20, false, true),
new MixedRealityInteractionMapping(7, "Touchpad Touch", AxisType.Digital, DeviceInputType.TouchpadTouch, KeyCode.JoystickButton17),
new MixedRealityInteractionMapping(8, "Touchpad Press", AxisType.Digital, DeviceInputType.TouchpadPress, KeyCode.JoystickButton9),
@@ -63,10 +60,18 @@ public WindowsMixedRealityOpenVRMotionController(TrackingState trackingState, Ha
new MixedRealityInteractionMapping(11, "Thumbstick Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton19),
};
- ///
+ ///
+ /// Setup the default interactions, then update the spatial pointer rotation with the preconfigured offset angle.
+ ///
public override void SetupDefaultInteractions(Handedness controllerHandedness)
{
- AssignControllerMappings(controllerHandedness == Handedness.Left ? DefaultLeftHandedInteractions : DefaultRightHandedInteractions);
+ base.SetupDefaultInteractions(controllerHandedness);
+
+ Assert.AreEqual(Interactions[0].Description, "Spatial Pointer", "The first interaction mapping is no longer the Spatial Pointer. Please update.");
+
+ MixedRealityPose startingRotation = MixedRealityPose.ZeroIdentity;
+ startingRotation.Rotation *= Quaternion.AngleAxis(PointerOffsetAngle, Vector3.left);
+ Interactions[0].PoseData = startingRotation;
}
}
}
\ No newline at end of file
diff --git a/Assets/MixedRealityToolkit.Providers/Version.txt b/Assets/MixedRealityToolkit.Providers/Version.txt
index e670c2aeaab..4df313d1cc0 100644
--- a/Assets/MixedRealityToolkit.Providers/Version.txt
+++ b/Assets/MixedRealityToolkit.Providers/Version.txt
@@ -1 +1 @@
-Microsoft Mixed Reality Toolkit 2.0.0
\ No newline at end of file
+Microsoft Mixed Reality Toolkit 2.1.0
\ No newline at end of file
diff --git a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/BaseWindowsMixedRealitySource.cs b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/BaseWindowsMixedRealitySource.cs
index 9ee907da426..0376c87b792 100644
--- a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/BaseWindowsMixedRealitySource.cs
+++ b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/BaseWindowsMixedRealitySource.cs
@@ -19,10 +19,6 @@ public abstract class BaseWindowsMixedRealitySource : BaseController
///
/// Constructor.
///
- ///
- ///
- ///
- ///
public BaseWindowsMixedRealitySource(TrackingState trackingState, Handedness sourceHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
: base(trackingState, sourceHandedness, inputSource, interactions)
{
@@ -190,7 +186,6 @@ private void UpdateSourceData(InteractionSourceState interactionSourceState)
/// Update the spatial pointer input from the device.
///
/// The InteractionSourceState retrieved from the platform.
- ///
private void UpdatePointerData(InteractionSourceState interactionSourceState, MixedRealityInteractionMapping interactionMapping)
{
if (interactionSourceState.source.supportsPointing)
@@ -219,7 +214,6 @@ private void UpdatePointerData(InteractionSourceState interactionSourceState, Mi
/// Update the spatial grip input from the device.
///
/// The InteractionSourceState retrieved from the platform.
- ///
private void UpdateGripData(InteractionSourceState interactionSourceState, MixedRealityInteractionMapping interactionMapping)
{
switch (interactionMapping.AxisType)
@@ -249,7 +243,6 @@ private void UpdateGripData(InteractionSourceState interactionSourceState, Mixed
/// Update the trigger and grasped input from the device.
///
/// The InteractionSourceState retrieved from the platform.
- ///
private void UpdateTriggerData(InteractionSourceState interactionSourceState, MixedRealityInteractionMapping interactionMapping)
{
switch (interactionMapping.InputType)
@@ -344,6 +337,10 @@ private void UpdateTriggerData(InteractionSourceState interactionSourceState, Mi
private bool GetSelectPressedWorkaround(InteractionSourceState interactionSourceState)
{
bool selectPressed = interactionSourceState.selectPressed;
+ // Only do this workaround inside the Unity editor (in holographic remoting scenarios).
+ // When this is invoked on device, this will display an error attempting to load the
+ // remoting binaries.
+#if UNITY_EDITOR
if (interactionSourceState.source.kind == InteractionSourceKind.Hand &&
UnityEngine.XR.WSA.HolographicRemoting.ConnectionState == UnityEngine.XR.WSA.HolographicStreamerConnectionState.Connected)
{
@@ -357,6 +354,7 @@ private bool GetSelectPressedWorkaround(InteractionSourceState interactionSource
selectPressed = interactionSourceState.anyPressed;
}
+#endif // UNITY_EDITOR
return selectPressed;
}
diff --git a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityArticulatedHand.cs b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityArticulatedHand.cs
index 99c01382ce9..ad2e108d6ab 100644
--- a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityArticulatedHand.cs
+++ b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityArticulatedHand.cs
@@ -28,22 +28,12 @@ namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input
new[] { Handedness.Left, Handedness.Right })]
public class WindowsMixedRealityArticulatedHand : BaseWindowsMixedRealitySource, IMixedRealityHand
{
- ///
+ ///
/// Constructor.
///
- ///
- ///
- ///
- ///
public WindowsMixedRealityArticulatedHand(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
: base(trackingState, controllerHandedness, inputSource, interactions)
{
-#if WINDOWS_UWP
- UnityEngine.WSA.Application.InvokeOnUIThread(() =>
- {
- spatialInteractionManager = SpatialInteractionManager.GetForCurrentView();
- }, true);
-#endif // WINDOWS_UWP
}
///
@@ -107,6 +97,22 @@ public override bool IsInPointingPose
private readonly HandRay handRay = new HandRay();
#if WINDOWS_UWP
+ private SpatialInteractionManager SpatialInteractionManager
+ {
+ get
+ {
+ if (spatialInteractionManager == null)
+ {
+ UnityEngine.WSA.Application.InvokeOnUIThread(() =>
+ {
+ spatialInteractionManager = SpatialInteractionManager.GetForCurrentView();
+ }, true);
+ }
+
+ return spatialInteractionManager;
+ }
+ }
+
private SpatialInteractionManager spatialInteractionManager = null;
private HandMeshObserver handMeshObserver = null;
private int[] handMeshTriangleIndices = null;
@@ -206,7 +212,7 @@ private void UpdateHandData(InteractionSourceState interactionSourceState)
}
PerceptionTimestamp perceptionTimestamp = PerceptionTimestampHelper.FromHistoricalTargetTime(DateTimeOffset.Now);
- IReadOnlyList sources = spatialInteractionManager?.GetDetectedSourcesAtTimestamp(perceptionTimestamp);
+ IReadOnlyList sources = SpatialInteractionManager?.GetDetectedSourcesAtTimestamp(perceptionTimestamp);
foreach (SpatialInteractionSourceState sourceState in sources)
{
if (sourceState.Source.Id.Equals(interactionSourceState.source.id))
diff --git a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityController.cs b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityController.cs
index 87f6e3b055d..1bcb4ca02e0 100644
--- a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityController.cs
+++ b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityController.cs
@@ -32,10 +32,6 @@ public class WindowsMixedRealityController : BaseWindowsMixedRealitySource
///
/// Constructor.
///
- ///
- ///
- ///
- ///
public WindowsMixedRealityController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
: base(trackingState, controllerHandedness, inputSource, interactions)
{
@@ -106,7 +102,6 @@ public override void UpdateController(InteractionSourceState interactionSourceSt
/// Update the touchpad input from the device.
///
/// The InteractionSourceState retrieved from the platform.
- ///
private void UpdateTouchpadData(InteractionSourceState interactionSourceState, MixedRealityInteractionMapping interactionMapping)
{
switch (interactionMapping.InputType)
@@ -171,7 +166,6 @@ private void UpdateTouchpadData(InteractionSourceState interactionSourceState, M
/// Update the thumbstick input from the device.
///
/// The InteractionSourceState retrieved from the platform.
- ///
private void UpdateThumbstickData(InteractionSourceState interactionSourceState, MixedRealityInteractionMapping interactionMapping)
{
switch (interactionMapping.InputType)
@@ -216,7 +210,6 @@ private void UpdateThumbstickData(InteractionSourceState interactionSourceState,
/// Update the menu button state.
///
/// The InteractionSourceState retrieved from the platform.
- ///
private void UpdateMenuData(InteractionSourceState interactionSourceState, MixedRealityInteractionMapping interactionMapping)
{
// Update the interaction data source
diff --git a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs
index 169d01d3b6a..5a877d6623c 100644
--- a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs
+++ b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs
@@ -235,7 +235,7 @@ public static WindowsGestureSettings NavigationSettings
{
navigationSettings = value;
- if (Application.isPlaying)
+ if (Application.isPlaying && !useRailsNavigation)
{
navigationGestureRecognizer?.UpdateAndResetGestures(WSANavigationSettings);
}
@@ -254,7 +254,7 @@ public static WindowsGestureSettings RailsNavigationSettings
{
railsNavigationSettings = value;
- if (Application.isPlaying)
+ if (Application.isPlaying && useRailsNavigation)
{
navigationGestureRecognizer?.UpdateAndResetGestures(WSARailsNavigationSettings);
}
@@ -275,7 +275,7 @@ public static bool UseRailsNavigation
if (Application.isPlaying)
{
- navigationGestureRecognizer?.UpdateAndResetGestures(useRailsNavigation ? WSANavigationSettings : WSARailsNavigationSettings);
+ navigationGestureRecognizer?.UpdateAndResetGestures(useRailsNavigation ? WSARailsNavigationSettings : WSANavigationSettings);
}
}
}
@@ -283,6 +283,7 @@ public static bool UseRailsNavigation
private MixedRealityInputAction holdAction = MixedRealityInputAction.None;
private MixedRealityInputAction navigationAction = MixedRealityInputAction.None;
private MixedRealityInputAction manipulationAction = MixedRealityInputAction.None;
+ private MixedRealityInputAction selectAction = MixedRealityInputAction.None;
private static GestureRecognizer gestureRecognizer;
private static WsaGestureSettings WSAGestureSettings => (WsaGestureSettings)gestureSettings;
@@ -304,9 +305,6 @@ public override void Enable()
IMixedRealityInputSystem inputSystem = Service as IMixedRealityInputSystem;
- RegisterGestureEvents();
- RegisterNavigationEvents();
-
if ((inputSystem != null) &&
InputSystemProfile.GesturesProfile != null)
{
@@ -331,10 +329,16 @@ public override void Enable()
case GestureInputType.Navigation:
navigationAction = gesture.Action;
break;
+ case GestureInputType.Select:
+ selectAction = gesture.Action;
+ break;
}
}
}
+ RegisterGestureEvents();
+ RegisterNavigationEvents();
+
InteractionManager.InteractionSourceDetected += InteractionManager_InteractionSourceDetected;
InteractionManager.InteractionSourceLost += InteractionManager_InteractionSourceLost;
InteractionManager.InteractionSourcePressed += InteractionManager_InteractionSourcePressed;
@@ -386,64 +390,96 @@ public override void Update()
private void RegisterGestureEvents()
{
- if (gestureRecognizer == null)
+ if (holdAction != MixedRealityInputAction.None ||
+ manipulationAction != MixedRealityInputAction.None ||
+ selectAction != MixedRealityInputAction.None)
{
- try
+ if (gestureRecognizer == null)
{
- gestureRecognizer = new GestureRecognizer();
+ try
+ {
+ gestureRecognizer = new GestureRecognizer();
+ }
+ catch (Exception ex)
+ {
+ Debug.LogWarning($"Failed to create gesture recognizer. OS version might not support it. Exception: {ex}");
+ gestureRecognizer = null;
+ return;
+ }
+ gestureRecognizer.SetRecognizableGestures(WSAGestureSettings);
}
- catch (Exception ex)
+
+ if (holdAction != MixedRealityInputAction.None)
{
- Debug.LogWarning($"Failed to create gesture recognizer. OS version might not support it. Exception: {ex}");
- gestureRecognizer = null;
- return;
+ gestureRecognizer.HoldStarted += GestureRecognizer_HoldStarted;
+ gestureRecognizer.HoldCompleted += GestureRecognizer_HoldCompleted;
+ gestureRecognizer.HoldCanceled += GestureRecognizer_HoldCanceled;
}
- }
- gestureRecognizer.HoldStarted += GestureRecognizer_HoldStarted;
- gestureRecognizer.HoldCompleted += GestureRecognizer_HoldCompleted;
- gestureRecognizer.HoldCanceled += GestureRecognizer_HoldCanceled;
+ if (manipulationAction != MixedRealityInputAction.None)
+ {
+ gestureRecognizer.ManipulationStarted += GestureRecognizer_ManipulationStarted;
+ gestureRecognizer.ManipulationUpdated += GestureRecognizer_ManipulationUpdated;
+ gestureRecognizer.ManipulationCompleted += GestureRecognizer_ManipulationCompleted;
+ gestureRecognizer.ManipulationCanceled += GestureRecognizer_ManipulationCanceled;
+ }
- gestureRecognizer.ManipulationStarted += GestureRecognizer_ManipulationStarted;
- gestureRecognizer.ManipulationUpdated += GestureRecognizer_ManipulationUpdated;
- gestureRecognizer.ManipulationCompleted += GestureRecognizer_ManipulationCompleted;
- gestureRecognizer.ManipulationCanceled += GestureRecognizer_ManipulationCanceled;
+ if (selectAction != MixedRealityInputAction.None)
+ {
+ gestureRecognizer.Tapped += GestureRecognizer_Tapped;
+ }
+ }
}
private void UnregisterGestureEvents()
{
if (gestureRecognizer == null) { return; }
- gestureRecognizer.HoldStarted -= GestureRecognizer_HoldStarted;
- gestureRecognizer.HoldCompleted -= GestureRecognizer_HoldCompleted;
- gestureRecognizer.HoldCanceled -= GestureRecognizer_HoldCanceled;
+ if (holdAction != MixedRealityInputAction.None)
+ {
+ gestureRecognizer.HoldStarted -= GestureRecognizer_HoldStarted;
+ gestureRecognizer.HoldCompleted -= GestureRecognizer_HoldCompleted;
+ gestureRecognizer.HoldCanceled -= GestureRecognizer_HoldCanceled;
+ }
- gestureRecognizer.ManipulationStarted -= GestureRecognizer_ManipulationStarted;
- gestureRecognizer.ManipulationUpdated -= GestureRecognizer_ManipulationUpdated;
- gestureRecognizer.ManipulationCompleted -= GestureRecognizer_ManipulationCompleted;
- gestureRecognizer.ManipulationCanceled -= GestureRecognizer_ManipulationCanceled;
+ if (manipulationAction != MixedRealityInputAction.None)
+ {
+ gestureRecognizer.ManipulationStarted -= GestureRecognizer_ManipulationStarted;
+ gestureRecognizer.ManipulationUpdated -= GestureRecognizer_ManipulationUpdated;
+ gestureRecognizer.ManipulationCompleted -= GestureRecognizer_ManipulationCompleted;
+ gestureRecognizer.ManipulationCanceled -= GestureRecognizer_ManipulationCanceled;
+ }
+
+ if (selectAction != MixedRealityInputAction.None)
+ {
+ gestureRecognizer.Tapped -= GestureRecognizer_Tapped;
+ }
}
private void RegisterNavigationEvents()
{
- if (navigationGestureRecognizer == null)
+ if (navigationAction != MixedRealityInputAction.None)
{
- try
- {
- navigationGestureRecognizer = new GestureRecognizer();
- }
- catch (Exception ex)
+ if (navigationGestureRecognizer == null)
{
- Debug.LogWarning($"Failed to create gesture recognizer. OS version might not support it. Exception: {ex}");
- navigationGestureRecognizer = null;
- return;
+ try
+ {
+ navigationGestureRecognizer = new GestureRecognizer();
+ }
+ catch (Exception ex)
+ {
+ Debug.LogWarning($"Failed to create gesture recognizer. OS version might not support it. Exception: {ex}");
+ navigationGestureRecognizer = null;
+ return;
+ }
+ navigationGestureRecognizer.SetRecognizableGestures(useRailsNavigation ? WSARailsNavigationSettings : WSANavigationSettings);
}
- }
- navigationGestureRecognizer.NavigationStarted += NavigationGestureRecognizer_NavigationStarted;
- navigationGestureRecognizer.NavigationUpdated += NavigationGestureRecognizer_NavigationUpdated;
- navigationGestureRecognizer.NavigationCompleted += NavigationGestureRecognizer_NavigationCompleted;
- navigationGestureRecognizer.NavigationCanceled += NavigationGestureRecognizer_NavigationCanceled;
+ navigationGestureRecognizer.NavigationStarted += NavigationGestureRecognizer_NavigationStarted;
+ navigationGestureRecognizer.NavigationUpdated += NavigationGestureRecognizer_NavigationUpdated;
+ navigationGestureRecognizer.NavigationCompleted += NavigationGestureRecognizer_NavigationCompleted;
+ navigationGestureRecognizer.NavigationCanceled += NavigationGestureRecognizer_NavigationCanceled;
+ }
}
private void UnregisterNavigationEvents()
@@ -769,6 +805,16 @@ private void GestureRecognizer_ManipulationCanceled(ManipulationCanceledEventArg
}
}
+ private void GestureRecognizer_Tapped(TappedEventArgs args)
+ {
+ var controller = GetController(args.source, false);
+ if (controller != null)
+ {
+ IMixedRealityInputSystem inputSystem = Service as IMixedRealityInputSystem;
+ inputSystem.RaiseGestureCompleted(controller, selectAction);
+ }
+ }
+
#endregion Gesture Recognizer Events
#region Navigation Recognizer Events
@@ -860,4 +906,4 @@ private void UpdateInteractionManagerReading()
#endif // UNITY_WSA
}
-}
\ No newline at end of file
+}
diff --git a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs
index b4bed2ff3f8..911c621c133 100644
--- a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs
+++ b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs
@@ -5,11 +5,11 @@
using Microsoft.MixedReality.Toolkit.Utilities;
using Microsoft.MixedReality.Toolkit.Windows.Utilities;
using System.Collections.Generic;
-using System.Globalization;
using UnityEngine;
using UnityEngine.EventSystems;
#if UNITY_WSA
+using UnityEngine.XR;
using UnityEngine.XR.WSA;
#endif // UNITY_WSA
@@ -23,12 +23,12 @@ namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.SpatialAwareness
typeof(IMixedRealitySpatialAwarenessSystem),
SupportedPlatforms.WindowsUniversal,
"Windows Mixed Reality Spatial Mesh Observer",
- "Profiles/DefaultMixedRealitySpatialAwarenessMeshObserverProfile.asset",
+ "Profiles/DefaultMixedRealitySpatialAwarenessMeshObserverProfile.asset",
"MixedRealityToolkit.SDK")]
[HelpURL("https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/SpatialAwareness/SpatialAwarenessGettingStarted.html")]
- public class WindowsMixedRealitySpatialMeshObserver :
- BaseSpatialObserver,
- IMixedRealitySpatialAwarenessMeshObserver,
+ public class WindowsMixedRealitySpatialMeshObserver :
+ BaseSpatialObserver,
+ IMixedRealitySpatialAwarenessMeshObserver,
IMixedRealityCapabilityCheck
{
///
@@ -254,7 +254,7 @@ private int LookupTriangleDensity(SpatialAwarenessMeshLevelOfDetail levelOfDetai
{
int triangleDensity = 0;
- switch(levelOfDetail)
+ switch (levelOfDetail)
{
case SpatialAwarenessMeshLevelOfDetail.Coarse:
triangleDensity = 0;
@@ -361,7 +361,7 @@ public override void Resume()
Debug.LogWarning("The Windows Mixed Reality spatial observer is currently running.");
return;
}
-
+
// We want the first update immediately.
lastUpdated = 0;
@@ -427,11 +427,6 @@ private void CleanupObservedObjects()
{
if (Application.isPlaying)
{
- // Cleanup the scene objects are managing
- if (observedObjectParent != null)
- {
- observedObjectParent.transform.DetachChildren();
- }
foreach (SpatialAwarenessMeshObject meshObject in meshes.Values)
{
@@ -478,10 +473,7 @@ private void DisposeObserver()
///
private void UpdateObserver()
{
- if (SpatialAwarenessSystem == null)
- {
- return;
- }
+ if (SpatialAwarenessSystem == null || HolographicSettings.IsDisplayOpaque || !XRDevice.isPresent) { return; }
// Only update the observer if it is running.
if (IsRunning && (outstandingMeshObject == null))
@@ -528,7 +520,6 @@ private class PlayspaceAdapter : MonoBehaviour
///
/// Second transform to apply
/// First transform to apply
- ///
private static Pose Concatenate(Pose lhs, Pose rhs)
{
return rhs.GetTransformedBy(lhs);
@@ -561,9 +552,9 @@ private void RequestMesh(SurfaceId surfaceId)
if (spareMeshObject == null)
{
newMesh = SpatialAwarenessMeshObject.Create(
- null,
- MeshPhysicsLayer,
- meshName,
+ null,
+ MeshPhysicsLayer,
+ meshName,
surfaceId.handle,
ObservedObjectParent);
@@ -652,7 +643,6 @@ protected void RemoveMeshObject(int id)
///
/// Reclaims the to allow for later reuse.
///
- ///
protected void ReclaimMeshObject(SpatialAwarenessMeshObject availableMeshObject)
{
if (spareMeshObject == null)
@@ -685,13 +675,16 @@ private void ConfigureObserverVolume()
return;
}
+ // If we aren't using a HoloLens or there isn't an XR device present, return.
+ if (observer == null || HolographicSettings.IsDisplayOpaque || !XRDevice.isPresent) { return; }
+
// The observer's origin is in world space, we need it in the camera's parent's space
// to set the volume. The MixedRealityPlayspace provides that space that the camera/head moves around in.
Vector3 observerOriginPlayspace = MixedRealityPlayspace.InverseTransformPoint(ObserverOrigin);
Quaternion observerRotationPlayspace = Quaternion.Inverse(MixedRealityPlayspace.Rotation) * ObserverRotation;
// Update the observer
- switch(ObserverVolumeType)
+ switch (ObserverVolumeType)
{
case VolumeType.AxisAlignedCube:
observer.SetVolumeAsAxisAlignedBox(observerOriginPlayspace, ObservationExtents);
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell.meta b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell.meta
new file mode 100644
index 00000000000..933066edb05
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2ef06169bddeaa44db21595720bd89e2
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellHandler.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellHandler.cs
new file mode 100644
index 00000000000..ddfe95ff1c9
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellHandler.cs
@@ -0,0 +1,253 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.MixedReality.Toolkit.Input;
+using System;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.Experimental.Dwell
+{
+ ///
+ /// Use this component to add a Dwell modality (https://docs.microsoft.com/en-us/windows/mixed-reality/gaze-and-dwell) to the UI target.
+ ///
+ public class DwellHandler : MonoBehaviour, IMixedRealityFocusHandler
+ {
+ ///
+ /// None = 0 - Default state
+ /// FocusGained - State reached when Focus enters target
+ /// DwellIntended - State reached when Focus stays on target for dwellIntentDelay seconds. Signifies user's intent to interact with the target.
+ /// DwellStarted - State reached when Focus stays on target for dwellIntentDelay + dwellStartDelay seconds. Typically tied to invoke feedback for dwell.
+ /// DwellCompleted - State reached when Focus stays on target for dwellIntentDelay + dwellStartDelay + timeToCompleteDwell seconds. Typically invokes the button clicked event.
+ /// DwellCanceled - State reached when DwellStarted state is reached but focus exits the target before timeToCompleteDwell.
+ ///
+ protected enum DwellStateType
+ {
+ None = 0,
+ FocusGained,
+ DwellIntended,
+ DwellStarted,
+ DwellCompleted,
+ DwellCanceled,
+ }
+
+ [Header("Dwell Settings")]
+ [SerializeField]
+ protected DwellProfile dwellProfile = null;
+
+ [Header("Dwell Events")]
+ [SerializeField]
+ private DwellUnityEvent DwellIntended = new DwellUnityEvent();
+
+ [SerializeField]
+ private DwellUnityEvent DwellStarted = new DwellUnityEvent();
+
+ [SerializeField]
+ private DwellUnityEvent DwellCompleted = new DwellUnityEvent();
+
+ [SerializeField]
+ private DwellUnityEvent DwellCanceled = new DwellUnityEvent();
+
+ ///
+ /// Property exposing the computation for what percentage of dwell has progressed.
+ ///
+ public virtual float DwellProgress
+ {
+ get
+ {
+ switch (CurrentDwellState)
+ {
+ case DwellStateType.None:
+ case DwellStateType.FocusGained:
+ return 0;
+ case DwellStateType.DwellStarted:
+ return GetCurrentDwellProgress();
+ case DwellStateType.DwellCompleted:
+ return 1;
+ case DwellStateType.DwellCanceled:
+ if (dwellProfile.TimeToAllowDwellResume > TimeSpan.Zero)
+ {
+ return GetCurrentDwellProgress();
+ }
+ break;
+ default:
+ return 0;
+ }
+
+ return 0;
+ }
+ }
+
+ ///
+ /// Cached pointer reference to track focus events maps to the same pointer id that initiated dwell
+ ///
+ private IMixedRealityPointer pointer;
+
+ private DateTime focusEnterTime = DateTime.MaxValue;
+ private DateTime focusExitTime = DateTime.MaxValue;
+
+ ///
+ /// Exposes whether the target has focus from the pointer type defined in dwell profile settings
+ ///
+ protected bool HasFocus { get; private set; }
+
+ ///
+ /// Captures the dwell status
+ ///
+ protected DwellStateType CurrentDwellState = DwellStateType.None;
+
+ ///
+ /// Abstracted value for the how long the dwelled object still needs to be focused to complete the dwell action
+ /// Value ranges from 0 to "TimeToCompleteDwell" setting in the dwellprofile. This picks up the same unit as TimeToCompleteDwell
+ ///
+ protected float FillTimer = 0;
+
+ private void Awake()
+ {
+ Debug.Assert(dwellProfile != null, "DwellProfile is null, creating default profile.");
+
+ if (dwellProfile == null)
+ {
+ dwellProfile = ScriptableObject.CreateInstance();
+ }
+ }
+
+ ///
+ /// Valid state transitions for default implementation
+ /// Current State | Valid Transitions | Condition (if any)
+ /// None | FocusGained
+ /// FocusGained | None
+ /// FocusGained | DwellIntended
+ /// DwellIntended | DwellStarted
+ /// DwellIntended | None
+ /// DwellCanceled | None
+ /// DwellCanceled | DwellStarted | dwellProfile.TimeToAllowDwellResume > 0
+ /// DwellStarted | DwellCompleted
+ /// DwellStarted | DwellCanceled
+ ///
+ private void Update()
+ {
+ UpdateFillTimer();
+
+ if (HasFocus && CurrentDwellState != DwellStateType.DwellCompleted)
+ {
+ TimeSpan focusDuration = (DateTime.UtcNow - this.focusEnterTime);
+
+ if (CurrentDwellState == DwellStateType.FocusGained && focusDuration >= dwellProfile.DwellIntentDelay)
+ {
+ CurrentDwellState = DwellStateType.DwellIntended;
+ DwellIntended.Invoke(pointer);
+ }
+ else if (CurrentDwellState == DwellStateType.DwellIntended && (focusDuration - dwellProfile.DwellIntentDelay) >= dwellProfile.DwellStartDelay)
+ {
+ CurrentDwellState = DwellStateType.DwellStarted;
+ DwellStarted.Invoke(pointer);
+ }
+ else if (CurrentDwellState == DwellStateType.DwellStarted && (focusDuration - dwellProfile.DwellIntentDelay - dwellProfile.DwellStartDelay) >= dwellProfile.TimeToCompleteDwell)
+ {
+ CurrentDwellState = DwellStateType.DwellCompleted;
+ DwellCompleted.Invoke(pointer);
+ }
+ }
+ }
+
+ private float GetCurrentDwellProgress()
+ {
+ return Mathf.Clamp(FillTimer / (float)dwellProfile.TimeToCompleteDwell.TotalSeconds, 0f, 1f);
+ }
+
+ ///
+ /// Default FillTimer computation based on profile settings
+ ///
+ protected virtual void UpdateFillTimer()
+ {
+ switch (CurrentDwellState)
+ {
+ case DwellStateType.None:
+ case DwellStateType.FocusGained:
+ case DwellStateType.DwellIntended:
+ FillTimer = 0;
+ break;
+ case DwellStateType.DwellStarted:
+ FillTimer += Time.deltaTime;
+ break;
+ case DwellStateType.DwellCompleted:
+ break;
+ case DwellStateType.DwellCanceled:
+ // this is a conditional state transition and can be overriden by the deriving class as per profile settings.
+ if ((DateTime.UtcNow - focusExitTime) > dwellProfile.TimeToAllowDwellResume)
+ {
+ FillTimer = 0;
+ CurrentDwellState = DwellStateType.None;
+ }
+ break;
+ default:
+ FillTimer = 0;
+ break;
+ }
+ }
+
+ public void OnFocusEnter(FocusEventData eventData)
+ {
+ if (eventData.NewFocusedObject == gameObject
+ && eventData.Pointer.InputSourceParent.SourceType == dwellProfile.DwellPointerType)
+ {
+ HasFocus = true;
+
+ // check intent to resume
+ if (CurrentDwellState == DwellStateType.DwellCanceled
+ && pointer.InputSourceParent.SourceId == eventData.Pointer.InputSourceParent.SourceId //make sure the returning pointer id is the same
+ && (DateTime.UtcNow - focusExitTime) <= dwellProfile.TimeToAllowDwellResume)
+ {
+ // Add the time duration focus was away since this is a dwell resume and we need to account for the time that focus was lost for the target.
+ // Assigning this the current time would restart computation for dwell progress.
+ focusEnterTime = focusEnterTime.AddSeconds((DateTime.UtcNow - focusExitTime).TotalSeconds);
+ CurrentDwellState = DwellStateType.DwellStarted;
+ DwellStarted.Invoke(pointer);
+ }
+ // dwell state machine re-starts
+ else if (CurrentDwellState <= DwellStateType.DwellIntended)
+ {
+ focusEnterTime = DateTime.UtcNow;
+ CurrentDwellState = DwellStateType.FocusGained;
+ pointer = eventData.Pointer;
+ FillTimer = 0;
+ }
+ }
+ }
+
+ public void OnFocusExit(FocusEventData eventData)
+ {
+ if (eventData.OldFocusedObject == gameObject
+ && eventData.Pointer.InputSourceParent.SourceType == dwellProfile.DwellPointerType
+ && pointer.InputSourceParent.SourceId == eventData.Pointer.InputSourceParent.SourceId)
+ {
+ HasFocus = false;
+
+ if (CurrentDwellState == DwellStateType.DwellStarted)
+ {
+ DwellCanceled.Invoke(eventData.Pointer);
+ CurrentDwellState = DwellStateType.DwellCanceled;
+ focusExitTime = DateTime.UtcNow;
+ }
+ else
+ {
+ CurrentDwellState = DwellStateType.None;
+ focusExitTime = DateTime.MaxValue;
+ }
+ }
+ }
+
+ ///
+ /// Method that can be invoked if external factors (eg. alternate input modality pre-emptively invoked the target) force the dwell action to prematurely end
+ ///
+ public virtual void CancelDwell()
+ {
+ DwellCanceled.Invoke(pointer);
+ focusEnterTime = DateTime.MaxValue;
+ CurrentDwellState = DwellStateType.None;
+ focusExitTime = DateTime.MaxValue;
+ FillTimer = 0;
+ }
+ }
+}
+
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellHandler.cs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellHandler.cs.meta
new file mode 100644
index 00000000000..d1f006bff0c
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellHandler.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 54277e9e7b297324880fa818608ea979
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellProfile.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellProfile.cs
new file mode 100644
index 00000000000..9577e25dc4c
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellProfile.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.MixedReality.Toolkit.Input;
+using System;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.Experimental.Dwell
+{
+ [MixedRealityServiceProfile(typeof(DwellProfile))]
+ [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Dwell Profile", fileName = "DwellProfile", order = 100)]
+ [Serializable]
+ public class DwellProfile : ScriptableObject
+ {
+ [Tooltip("Pointer type to use for triggering a dwell interaction")]
+ [SerializeField]
+ private InputSourceType dwellTriggerPointerType = InputSourceType.Head;
+
+ [Tooltip("Delay in seconds until it is determined that the user intends to interact with the target.")]
+ [SerializeField]
+ [Range(0, 2)]
+ private float dwellIntentDelay = 0;
+
+ [Tooltip("Delay in seconds until DwellStarted event is invoked.")]
+ [SerializeField]
+ [Range(0, 5)]
+ private float dwellStartDelay = 0.5f;
+
+ [Tooltip("Additional time in seconds (not including the dwellStartDelay) the user needs to keep looking at the UI to trigger select on it. Raises DwellCompleted event.")]
+ [SerializeField]
+ [Range(0, 20)]
+ private float timeToCompleteDwell = 4;
+
+ [Tooltip("Time in seconds when focus can fall off the target and come back to resume an ongoing dwell.This only comes into play after DwellStarted state but before DwellCompleted is invoked.")]
+ [SerializeField]
+ [Range(0, 20)]
+ private float timeToAllowDwellResume = 0;
+
+ public InputSourceType DwellPointerType
+ {
+ get
+ {
+ return dwellTriggerPointerType;
+ }
+ }
+
+ public TimeSpan DwellIntentDelay
+ {
+ get
+ {
+ return TimeSpan.FromSeconds(dwellIntentDelay);
+ }
+ }
+
+ public TimeSpan DwellStartDelay
+ {
+ get
+ {
+ return TimeSpan.FromSeconds(dwellStartDelay);
+ }
+ }
+
+ public TimeSpan TimeToCompleteDwell
+ {
+ get
+ {
+ return TimeSpan.FromSeconds(timeToCompleteDwell);
+ }
+ }
+
+ public TimeSpan TimeToAllowDwellResume
+ {
+ get
+ {
+ return TimeSpan.FromSeconds(timeToAllowDwellResume);
+ }
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellProfile.cs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellProfile.cs.meta
new file mode 100644
index 00000000000..1ced9bc4669
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellProfile.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f3db035c6526baa42b9beae76c31a814
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellUnityEvent.cs b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellUnityEvent.cs
new file mode 100644
index 00000000000..e2ae1c80c5d
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellUnityEvent.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.MixedReality.Toolkit.Input;
+using System;
+using UnityEngine.Events;
+
+namespace Microsoft.MixedReality.Toolkit.Experimental.Dwell
+{
+ ///
+ /// Unity event for a dwell event. Contains the pointer reference.
+ ///
+ [Serializable]
+ public class DwellUnityEvent : UnityEvent { }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellUnityEvent.cs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellUnityEvent.cs.meta
new file mode 100644
index 00000000000..3aecf8ad772
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellUnityEvent.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: be6eca3f0be3ba141934148a21147b5c
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers.meta
new file mode 100644
index 00000000000..3f70e1c9b2d
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 58560e123a1d4ad4ebf67fdaf141ac88
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Prefabs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Prefabs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Prefabs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Prefabs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Prefabs/BoundarySystem.prefab b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Prefabs/BoundarySystem.prefab
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Prefabs/BoundarySystem.prefab
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Prefabs/BoundarySystem.prefab
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Prefabs/BoundarySystem.prefab.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Prefabs/BoundarySystem.prefab.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Prefabs/BoundarySystem.prefab.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Prefabs/BoundarySystem.prefab.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Scripts.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Scripts.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Scripts.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Scripts.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Scripts/BoundarySystemManager.cs b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Scripts/BoundarySystemManager.cs
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Scripts/BoundarySystemManager.cs
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Scripts/BoundarySystemManager.cs
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Scripts/BoundarySystemManager.cs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Scripts/BoundarySystemManager.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Boundary/Scripts/BoundarySystemManager.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Boundary/Scripts/BoundarySystemManager.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Prefabs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Prefabs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Prefabs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Prefabs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Prefabs/CameraSystem.prefab b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Prefabs/CameraSystem.prefab
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Prefabs/CameraSystem.prefab
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Prefabs/CameraSystem.prefab
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Prefabs/CameraSystem.prefab.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Prefabs/CameraSystem.prefab.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Prefabs/CameraSystem.prefab.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Prefabs/CameraSystem.prefab.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Scripts.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Scripts.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Scripts.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Scripts.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Scripts/CameraSystemManager.cs b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Scripts/CameraSystemManager.cs
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Scripts/CameraSystemManager.cs
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Scripts/CameraSystemManager.cs
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Scripts/CameraSystemManager.cs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Scripts/CameraSystemManager.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Camera/Scripts/CameraSystemManager.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Camera/Scripts/CameraSystemManager.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Prefabs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Prefabs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Prefabs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Prefabs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Prefabs/DiagnosticsSystem.prefab b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Prefabs/DiagnosticsSystem.prefab
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Prefabs/DiagnosticsSystem.prefab
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Prefabs/DiagnosticsSystem.prefab
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Prefabs/DiagnosticsSystem.prefab.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Prefabs/DiagnosticsSystem.prefab.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Prefabs/DiagnosticsSystem.prefab.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Prefabs/DiagnosticsSystem.prefab.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Scripts.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Scripts.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Scripts.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Scripts.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Scripts/DiagnosticsSystemManager.cs b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Scripts/DiagnosticsSystemManager.cs
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Scripts/DiagnosticsSystemManager.cs
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Scripts/DiagnosticsSystemManager.cs
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Scripts/DiagnosticsSystemManager.cs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Scripts/DiagnosticsSystemManager.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Diagnostics/Scripts/DiagnosticsSystemManager.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Diagnostics/Scripts/DiagnosticsSystemManager.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Input.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Input.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Prefabs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Prefabs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Prefabs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Prefabs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Prefabs/InputSystem.prefab b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Prefabs/InputSystem.prefab
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Prefabs/InputSystem.prefab
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Prefabs/InputSystem.prefab
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Prefabs/InputSystem.prefab.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Prefabs/InputSystem.prefab.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Prefabs/InputSystem.prefab.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Prefabs/InputSystem.prefab.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Scripts.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Scripts.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Scripts.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Scripts.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Scripts/InputSystemManager.cs b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Scripts/InputSystemManager.cs
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Scripts/InputSystemManager.cs
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Scripts/InputSystemManager.cs
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Scripts/InputSystemManager.cs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Scripts/InputSystemManager.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Input/Scripts/InputSystemManager.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Input/Scripts/InputSystemManager.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Prefabs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Prefabs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Prefabs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Prefabs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Prefabs/SpatialAwarenessSystem.prefab b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Prefabs/SpatialAwarenessSystem.prefab
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Prefabs/SpatialAwarenessSystem.prefab
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Prefabs/SpatialAwarenessSystem.prefab
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Prefabs/SpatialAwarenessSystem.prefab.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Prefabs/SpatialAwarenessSystem.prefab.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Prefabs/SpatialAwarenessSystem.prefab.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Prefabs/SpatialAwarenessSystem.prefab.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Scripts.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Scripts.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Scripts.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Scripts.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Scripts/SpatialAwarenessSystemManager.cs b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Scripts/SpatialAwarenessSystemManager.cs
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Scripts/SpatialAwarenessSystemManager.cs
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Scripts/SpatialAwarenessSystemManager.cs
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Scripts/SpatialAwarenessSystemManager.cs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Scripts/SpatialAwarenessSystemManager.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/SpatialAwareness/Scripts/SpatialAwarenessSystemManager.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/SpatialAwareness/Scripts/SpatialAwarenessSystemManager.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Support.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Support.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Support.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Support.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Support/Scripts.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Support/Scripts.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Support/Scripts.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Support/Scripts.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Support/Scripts/BaseServiceManager.cs b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Support/Scripts/BaseServiceManager.cs
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Support/Scripts/BaseServiceManager.cs
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Support/Scripts/BaseServiceManager.cs
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Support/Scripts/BaseServiceManager.cs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Support/Scripts/BaseServiceManager.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Support/Scripts/BaseServiceManager.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Support/Scripts/BaseServiceManager.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Prefabs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Prefabs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Prefabs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Prefabs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Prefabs/TeleportSystem.prefab b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Prefabs/TeleportSystem.prefab
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Prefabs/TeleportSystem.prefab
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Prefabs/TeleportSystem.prefab
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Prefabs/TeleportSystem.prefab.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Prefabs/TeleportSystem.prefab.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Prefabs/TeleportSystem.prefab.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Prefabs/TeleportSystem.prefab.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Scripts.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Scripts.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Scripts.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Scripts.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Scripts/TeleportSystemManager.cs b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Scripts/TeleportSystemManager.cs
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Scripts/TeleportSystemManager.cs
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Scripts/TeleportSystemManager.cs
diff --git a/Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Scripts/TeleportSystemManager.cs.meta b/Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Scripts/TeleportSystemManager.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Experimental/Features/Teleport/Scripts/TeleportSystemManager.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Experimental/ServiceManagers/Teleport/Scripts/TeleportSystemManager.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Audio/Influencers/AudioLoFiEffect.cs b/Assets/MixedRealityToolkit.SDK/Features/Audio/Influencers/AudioLoFiEffect.cs
index 000f845f4ee..6bd44a95268 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/Audio/Influencers/AudioLoFiEffect.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/Audio/Influencers/AudioLoFiEffect.cs
@@ -202,7 +202,6 @@ public bool Equals(AudioLoFiFilterSettings other)
///
/// Generates a hash code representing this FilterSettings.
///
- ///
public override int GetHashCode()
{
string s = $"[{GetType().ToString()}] Low: {LowPassCutoff}, High: {HighPassCutoff}";
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ControllerPoseSynchronizer.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ControllerPoseSynchronizer.cs
index 9d75281e492..0c1ed7026fb 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ControllerPoseSynchronizer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ControllerPoseSynchronizer.cs
@@ -89,11 +89,13 @@ public MixedRealityInputAction PoseAction
#region InputSystemGlobalHandlerListener Implementation
+ ///
protected override void RegisterHandlers()
{
InputSystem?.RegisterHandler(this);
}
+ ///
protected override void UnregisterHandlers()
{
InputSystem?.UnregisterHandler(this);
@@ -117,14 +119,7 @@ public virtual void OnSourceLost(SourceStateEventData eventData)
if (destroyOnSourceLost)
{
- if (!Application.isPlaying)
- {
- DestroyImmediate(gameObject);
- }
- else
- {
- Destroy(gameObject);
- }
+ GameObjectExtensions.DestroyGameObject(gameObject);
}
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/DictationHandler.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/DictationHandler.cs
index 06e46b41f33..39504c35caf 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/DictationHandler.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/DictationHandler.cs
@@ -77,11 +77,13 @@ public void StopRecording()
#region InputSystemGlobalHandlerListener Implementation
+ ///
protected override void RegisterHandlers()
{
InputSystem?.RegisterHandler(this);
}
+ ///
protected override void UnregisterHandlers()
{
InputSystem?.UnregisterHandler(this);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/EyeTrackingTarget.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/EyeTrackingTarget.cs
index 3ed1cf129e9..707bffb3edb 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/EyeTrackingTarget.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/EyeTrackingTarget.cs
@@ -186,12 +186,14 @@ protected override void OnDisable()
OnEyeFocusStop();
}
+ ///
protected override void RegisterHandlers()
{
InputSystem?.RegisterHandler(this);
InputSystem?.RegisterHandler(this);
}
+ ///
protected override void UnregisterHandlers()
{
InputSystem?.UnregisterHandler(this);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/FocusHandler.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/FocusHandler.cs
new file mode 100644
index 00000000000..5b4b128e8ba
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/FocusHandler.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
+using UnityEngine.Events;
+
+namespace Microsoft.MixedReality.Toolkit.Input
+{
+ ///
+ /// Utility component to hook up Unity events to the OnFocusEnter and OnFocusExit events.
+ ///
+ public class FocusHandler : MonoBehaviour, IMixedRealityFocusHandler
+ {
+ [SerializeField]
+ [Tooltip("Whether input events should be marked as used after handling so other handlers in the same game object ignore them.")]
+ private bool markEventsAsUsed = false;
+
+ ///
+ /// Whether input events should be marked as used after handling so other handlers in the same game object ignore them.
+ ///
+ public bool MarkEventsAsUsed
+ {
+ get { return markEventsAsUsed; }
+ set { markEventsAsUsed = value; }
+ }
+
+ [SerializeField]
+ [Tooltip("Event which is triggered when focus begins.")]
+ private UnityEvent onFocusEnterEvent = new UnityEvent();
+
+ ///
+ /// Event which is triggered when focus begins.
+ ///
+ public UnityEvent OnFocusEnterEvent
+ {
+ get { return onFocusEnterEvent; }
+ set { onFocusEnterEvent = value; }
+ }
+
+ [SerializeField]
+ [Tooltip("Event which is triggered when focus ends.")]
+ private UnityEvent onFocusExitEvent = new UnityEvent();
+
+ ///
+ /// Event which is triggered when focus ends.
+ ///
+ public UnityEvent OnFocusExitEvent
+ {
+ get { return onFocusExitEvent; }
+ set { onFocusExitEvent = value; }
+ }
+
+ ///
+ public void OnFocusEnter(FocusEventData eventData)
+ {
+ if (!eventData.used)
+ {
+ onFocusEnterEvent.Invoke();
+
+ if (markEventsAsUsed)
+ {
+ eventData.Use();
+ }
+ }
+ }
+
+ ///
+ public void OnFocusExit(FocusEventData eventData)
+ {
+ if (!eventData.used)
+ {
+ onFocusExitEvent.Invoke();
+
+ if (markEventsAsUsed)
+ {
+ eventData.Use();
+ }
+ }
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/FocusHandler.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/FocusHandler.cs.meta
new file mode 100644
index 00000000000..85a35e3ea66
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/FocusHandler.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 69935ecfe76b9574b8576db8631a802e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/InputActionHandler.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/InputActionHandler.cs
index ffa5fdf3cf9..a95d702c63c 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/InputActionHandler.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/InputActionHandler.cs
@@ -33,11 +33,13 @@ public class InputActionHandler : BaseInputHandler, IMixedRealityInputActionHand
#region InputSystemGlobalHandlerListener Implementation
+ ///
protected override void RegisterHandlers()
{
InputSystem?.RegisterHandler(this);
}
+ ///
protected override void UnregisterHandlers()
{
InputSystem?.UnregisterHandler(this);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs
index a385c52615c..34badce833f 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs
@@ -263,6 +263,10 @@ private void Start()
scaleHandler = this.GetComponent();
}
+ private void OnDisable()
+ {
+ ForceEndManipulation();
+ }
#endregion MonoBehaviour Functions
#region Private Methods
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/PointerClickHandler.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/PointerClickHandler.cs
index 7c45805a9a2..53e05fbb9dc 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/PointerClickHandler.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/PointerClickHandler.cs
@@ -31,11 +31,13 @@ private void Awake()
#region InputSystemGlobalHandlerListener Implementation
+ ///
protected override void RegisterHandlers()
{
InputSystem?.RegisterHandler(this);
}
+ ///
protected override void UnregisterHandlers()
{
InputSystem?.UnregisterHandler(this);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/SpeechInputHandler.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/SpeechInputHandler.cs
index eba16db40ab..b3265180dc2 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/SpeechInputHandler.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/SpeechInputHandler.cs
@@ -1,7 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using Microsoft.MixedReality.Toolkit.UI;
+using System;
using System.Collections.Generic;
+using TMPro;
using UnityEngine;
using UnityEngine.Events;
@@ -26,6 +29,21 @@ public class SpeechInputHandler : BaseInputHandler, IMixedRealitySpeechHandler
[Tooltip("Keywords are persistent across all scenes. This Speech Input Handler instance will not be destroyed when loading a new scene.")]
private bool persistentKeywords = false;
+ [SerializeField]
+ [Tooltip("Assign SpeechConfirmationTooltip.prefab here to display confirmation label. Optional.")]
+ private SpeechConfirmationTooltip speechConfirmationTooltipPrefab = null;
+
+ ///
+ /// Tooltip prefab used to display confirmation label. Optional.
+ ///
+ public SpeechConfirmationTooltip SpeechConfirmationTooltipPrefab
+ {
+ get { return speechConfirmationTooltipPrefab; }
+ set { speechConfirmationTooltipPrefab = value; }
+ }
+
+ private SpeechConfirmationTooltip speechConfirmationTooltipPrefabInstance = null;
+
private readonly Dictionary responses = new Dictionary();
#region MonoBehaviour Implementation
@@ -108,9 +126,26 @@ void IMixedRealitySpeechHandler.OnSpeechKeywordRecognized(SpeechEventData eventD
{
keywordResponse.Invoke();
eventData.Use();
+
+ // Instantiate the Speech Confirmation Tooltip prefab if assigned
+ // Ignore "Select" keyword since OS will display the tooltip.
+ if (SpeechConfirmationTooltipPrefab != null
+ && speechConfirmationTooltipPrefabInstance == null
+ && !eventData.Command.Keyword.Equals("select", StringComparison.CurrentCultureIgnoreCase))
+ {
+ speechConfirmationTooltipPrefabInstance = Instantiate(speechConfirmationTooltipPrefab);
+
+ // Update the text label with recognized keyword
+ speechConfirmationTooltipPrefabInstance.SetText(eventData.Command.Keyword);
+
+ // Trigger animation of the Speech Confirmation Tooltip prefab
+ speechConfirmationTooltipPrefabInstance.TriggerConfirmedAnimation();
+
+ // Tooltip prefab instance will be destroyed on animation complete
+ // by DestroyOnAnimationComplete.cs in the SpeechConfirmationTooltip.prefab
+ }
}
}
-
#endregion IMixedRealitySpeechHandler Implementation
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/InputSimulationIndicators.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/InputSimulationIndicators.cs
new file mode 100644
index 00000000000..1e62591261a
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/InputSimulationIndicators.cs
@@ -0,0 +1,149 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+// Input simulation service is only built on editor platforms
+
+using Microsoft.MixedReality.Toolkit.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.Input
+{
+ ///
+ /// A row of indicator buttons to control input simulation features.
+ ///
+ [Serializable]
+ public class InputSimulationIndicators : MonoBehaviour
+ {
+ ///
+ /// Component displaying the left hand icon.
+ ///
+ public UnityEngine.UI.Image imageHandLeft = null;
+ ///
+ /// Component displaying the right hand icon.
+ ///
+ public UnityEngine.UI.Image imageHandRight = null;
+
+ ///
+ /// Icon for left hand when under user control.
+ ///
+ public Sprite iconHandActiveLeft = null;
+ ///
+ /// Icon for right hand when under user control.
+ ///
+ public Sprite iconHandActiveRight = null;
+ ///
+ /// Icon for left hand when visible but not actively controlled.
+ ///
+ public Sprite iconHandIdleLeft = null;
+ ///
+ /// Icon for right hand when visible but not actively controlled.
+ ///
+ public Sprite iconHandIdleRight = null;
+ ///
+ /// Icon for left hand when untracked.
+ ///
+ public Sprite iconHandUntrackedLeft = null;
+ ///
+ /// Icon for right hand when untracked.
+ ///
+ public Sprite iconHandUntrackedRight = null;
+
+#if UNITY_EDITOR
+
+ private IInputSimulationService inputSimService = null;
+ private IInputSimulationService InputSimService
+ {
+ get
+ {
+ if (inputSimService == null)
+ {
+ if (MixedRealityServiceRegistry.TryGetService(out IMixedRealityInputSystem inputSystem))
+ {
+ inputSimService = (inputSystem as IMixedRealityDataProviderAccess).GetDataProvider();
+ }
+ }
+ return inputSimService;
+ }
+ }
+
+ ///
+ /// Updates the left and right hand images according to the tracked state
+ ///
+ void Update()
+ {
+ if (imageHandLeft)
+ {
+ Sprite iconHandLeft;
+ if (InputSimService.IsSimulatingHandLeft)
+ {
+ iconHandLeft = iconHandActiveLeft;
+ }
+ else if (InputSimService.HandDataLeft.IsTracked)
+ {
+ iconHandLeft = iconHandIdleLeft;
+ }
+ else
+ {
+ iconHandLeft = iconHandUntrackedLeft;
+ }
+
+ imageHandLeft.sprite = iconHandLeft;
+ }
+
+ if (imageHandRight)
+ {
+ Sprite iconHandRight;
+ if (InputSimService.IsSimulatingHandRight)
+ {
+ iconHandRight = iconHandActiveRight;
+ }
+ else if (InputSimService.HandDataRight.IsTracked)
+ {
+ iconHandRight = iconHandIdleRight;
+ }
+ else
+ {
+ iconHandRight = iconHandUntrackedRight;
+ }
+
+ imageHandRight.sprite = iconHandRight;
+ }
+ }
+
+ ///
+ /// Toggle permanent visibility of the left hand.
+ ///
+ public void ToggleLeftHand()
+ {
+ InputSimService.IsAlwaysVisibleHandLeft = !InputSimService.IsAlwaysVisibleHandLeft;
+ }
+
+ ///
+ /// Toggle permanent visibility of the right hand.
+ ///
+ public void ToggleRightHand()
+ {
+ InputSimService.IsAlwaysVisibleHandRight = !InputSimService.IsAlwaysVisibleHandRight;
+ }
+
+ ///
+ /// Reset the state of the left hand to default.
+ ///
+ public void ResetLeftHand()
+ {
+ InputSimService.ResetHandLeft();
+ }
+
+ ///
+ /// Reset the state of the right hand to default.
+ ///
+ public void ResetRightHand()
+ {
+ InputSimService.ResetHandRight();
+ }
+#endif
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/InputSimulationIndicators.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/Input/InputSimulationIndicators.cs.meta
new file mode 100644
index 00000000000..b3e621f6a34
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/Input/InputSimulationIndicators.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 09d59cd26ba94244d98c1c39c5f79a87
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel.meta
new file mode 100644
index 00000000000..25ab3b401a3
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 22df37575315cb649a045c5c69374dfb
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.anim b/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.anim
new file mode 100644
index 00000000000..3adb4b0ea59
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.anim
@@ -0,0 +1,789 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SpeechConfirmationLabel
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 0, y: -0.0011, z: 0.001}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.25
+ value: {x: 0, y: 0.0017, z: 0.001}
+ inSlope: {x: -0, y: 0.0112, z: -0}
+ outSlope: {x: 0, y: 0.023314286, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 2
+ value: {x: 0, y: 0.0425, z: 0.001}
+ inSlope: {x: -0, y: 0.023314286, z: -0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path: Pivot/ContentParent/TipBackground
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 0, y: 0.25, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 2
+ value: {x: 0, y: 0.2908, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path: Pivot
+ m_ScaleCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 4
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 1
+ inSlope: 4
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_fontColor.a
+ path: Pivot/ContentParent/Label
+ classID: 114
+ script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.0011000037
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0.001699999
+ inSlope: 0.011200011
+ outSlope: 0.023314288
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0.042500004
+ inSlope: 0.023314288
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_AnchoredPosition.y
+ path: Pivot/ContentParent/Label
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: -0.0069204154
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: material._Color.r
+ path: Pivot/ContentParent/TipBackground
+ classID: 23
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: -0.0069204154
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: material._Color.g
+ path: Pivot/ContentParent/TipBackground
+ classID: 23
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: -0.0069204154
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: material._Color.b
+ path: Pivot/ContentParent/TipBackground
+ classID: 23
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: -0.0069204154
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: material._Color.a
+ path: Pivot/ContentParent/TipBackground
+ classID: 23
+ script: {fileID: 0}
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 296289653
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 1567512304
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 1224958901
+ attribute: 4185109675
+ script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 1224958901
+ attribute: 538195251
+ script: {fileID: 0}
+ typeID: 224
+ customType: 28
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 296289653
+ attribute: 1303350129
+ script: {fileID: 0}
+ typeID: 23
+ customType: 22
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 296289653
+ attribute: 1571785585
+ script: {fileID: 0}
+ typeID: 23
+ customType: 22
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 296289653
+ attribute: 1840221041
+ script: {fileID: 0}
+ typeID: 23
+ customType: 22
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 296289653
+ attribute: 2108656497
+ script: {fileID: 0}
+ typeID: 23
+ customType: 22
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 2
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 4
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 1
+ inSlope: 4
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_fontColor.a
+ path: Pivot/ContentParent/Label
+ classID: 114
+ script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0
+ inSlope: -0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0
+ inSlope: -0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path: Pivot/ContentParent/TipBackground
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.0011
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0.0017
+ inSlope: 0.0112
+ outSlope: 0.023314286
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0.0425
+ inSlope: 0.023314286
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path: Pivot/ContentParent/TipBackground
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.001
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0.001
+ inSlope: -0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0.001
+ inSlope: -0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path: Pivot/ContentParent/TipBackground
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.0011000037
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0.001699999
+ inSlope: 0.011200011
+ outSlope: 0.023314288
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0.042500004
+ inSlope: 0.023314288
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_AnchoredPosition.y
+ path: Pivot/ContentParent/Label
+ classID: 224
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: -0.0069204154
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: material._Color.r
+ path: Pivot/ContentParent/TipBackground
+ classID: 23
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: -0.0069204154
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: material._Color.g
+ path: Pivot/ContentParent/TipBackground
+ classID: 23
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: -0.0069204154
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: material._Color.b
+ path: Pivot/ContentParent/TipBackground
+ classID: 23
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.5
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: -0.0069204154
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: material._Color.a
+ path: Pivot/ContentParent/TipBackground
+ classID: 23
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path: Pivot
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.25
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0.2908
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path: Pivot
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 2
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path: Pivot
+ classID: 4
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.anim.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.anim.meta
new file mode 100644
index 00000000000..aa9014e0c17
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8fc037eb4002e014786880d426e30a3e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.controller b/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.controller
new file mode 100644
index 00000000000..e30ab9ed27f
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.controller
@@ -0,0 +1,198 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SpeechConfirmationLabel
+ serializedVersion: 5
+ m_AnimatorParameters:
+ - m_Name: Confirmed
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 9100000}
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: 1107719379045675228}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1101 &1101042331802134824
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102974063829595410}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 0
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &1101637969343362202
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: Confirmed
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102146739960886048}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 0
+ m_HasExitTime: 0
+ m_HasFixedDuration: 0
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &1102146739960886048
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SpeechConfirmationLabel
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 1101042331802134824}
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 8fc037eb4002e014786880d426e30a3e, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &1102974063829595410
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: New State
+ m_Speed: 5
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 1101637969343362202}
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 0}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1107 &1107719379045675228
+AnimatorStateMachine:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: 1102146739960886048}
+ m_Position: {x: 264, y: 48, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102974063829595410}
+ m_Position: {x: 264, y: 180, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 492, y: 108, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 1102974063829595410}
+--- !u!1109 &1109433786390056210
+AnimatorTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102974063829595410}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 1
+--- !u!1109 &1109812312464233522
+AnimatorTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102974063829595410}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 1
+--- !u!1109 &1109951497226031868
+AnimatorTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1102974063829595410}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 1
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.controller.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.controller.meta
new file mode 100644
index 00000000000..764b3a835fe
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Animations/SpeechConfirmationLabel/SpeechConfirmationLabel.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 393b0cc1083725f44837b3a1efc4e229
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 9100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/ColorButtonProximity.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/ColorButtonProximity.mat
index 552d4b0d1e2..b7f2988a5e7 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/ColorButtonProximity.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/ColorButtonProximity.mat
@@ -41,6 +41,7 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -65,13 +66,17 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _HoverLight: 1
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 6.9
- _InstancedColor: 0
@@ -81,9 +86,12 @@ Material:
- _IridescenceThreshold: 0.05
- _Metallic: 0
- _Mode: 0
+ - _NearLightFade: 0
- _NearPlaneFade: 0
- _NormalMapScale: 1
- _ProximityLight: 1
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
- _RefractiveIndex: 0
@@ -103,6 +111,11 @@ Material:
- _StencilReference: 0
- _TriplanarMappingBlendSharpness: 4
- _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
@@ -114,4 +127,7 @@ Material:
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 0.8113208, g: 0.55612487, b: 0.057404764, a: 1}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlate.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlate.mat
index 15b7e848e08..28a90725367 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlate.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlate.mat
@@ -78,13 +78,14 @@ Material:
- _AlbedoAlphaSmoothness: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 1
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
- _BorderLightReplacesAlbedo: 1
- _BorderLightUsesHoverColor: 0
- _BorderMinValue: 0.6
- - _BorderWidth: 0.12
+ - _BorderWidth: 0.2
- _BorderWidthHorizontal: 0.1
- _BorderWidthVertical: 0.1
- _BumpScale: 1
@@ -124,6 +125,7 @@ Material:
- _GlossyReflections: 1
- _HoverLight: 0
- _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -163,6 +165,7 @@ Material:
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateBorderOnly.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateBorderOnly.mat
new file mode 100644
index 00000000000..4933e73f837
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateBorderOnly.mat
@@ -0,0 +1,190 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicBackPlateBorderOnly
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _BORDER_LIGHT _BORDER_LIGHT_OPAQUE _BORDER_LIGHT_REPLACES_ALBEDO
+ _DISABLE_ALBEDO_MAP _METALLIC_TEXTURE_ALBEDO_CHANNEL_A _NEAR_PLANE_FADE _ROUND_CORNERS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 2800000, guid: 86609bdc7f4c43d42991f96373fb8081, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _LightMapTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 1
+ - _AlbedoAlphaSmoothness: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 1
+ - _BorderLightOpaque: 1
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 1
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.42
+ - _BorderWidth: 0.2
+ - _BorderWidthHorizontal: 0.1
+ - _BorderWidthVertical: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingPlaneBorder: 0
+ - _ClippingPlaneBorderWidth: 0.025
+ - _ClippingSphere: 0
+ - _ColorWriteMask: 15
+ - _CullMode: 0
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.0002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOpaqueOverride: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLightMap: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _HoverLight: 0
+ - _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.75
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 0
+ - _NearPlaneFade: 1
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 1.1
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 5.83
+ - _RoundCornerMargin: 0
+ - _RoundCornerRadius: 0.1
+ - _RoundCorners: 1
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 0
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 0, g: 0, b: 0, a: 0}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColor: {r: 1, g: 0, b: 0, a: 1}
+ - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 0.566}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.522}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateBorderOnly.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateBorderOnly.mat.meta
new file mode 100644
index 00000000000..26dce0b1044
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateBorderOnly.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 416caa6b57bb22c40ab9f1a4c12b304e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateCircular.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateCircular.mat
index 096aee23caf..a842cb6ab84 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateCircular.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateCircular.mat
@@ -165,6 +165,7 @@ Material:
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbable.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbable.mat
new file mode 100644
index 00000000000..2f5a38bd832
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbable.mat
@@ -0,0 +1,191 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicBackPlateGrabbable
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _BORDER_LIGHT _BORDER_LIGHT_REPLACES_ALBEDO _DISABLE_ALBEDO_MAP
+ _HOVER_LIGHT _IRIDESCENCE _METALLIC_TEXTURE_ALBEDO_CHANNEL_A _PROXIMITY_LIGHT
+ _ROUND_CORNERS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ RenderType: Opaque
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 2800000, guid: 86609bdc7f4c43d42991f96373fb8081, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _LightMapTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 1
+ - _AlbedoAlphaSmoothness: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 1
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 1
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.6
+ - _BorderWidth: 0.2
+ - _BorderWidthHorizontal: 0.1
+ - _BorderWidthVertical: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingPlaneBorder: 0
+ - _ClippingPlaneBorderWidth: 0.025
+ - _ClippingSphere: 0
+ - _ColorWriteMask: 15
+ - _CullMode: 0
+ - _CustomMode: 0
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 0
+ - _EdgeSmoothingValue: 0.0002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOpaqueOverride: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLightMap: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _HoverLight: 1
+ - _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 1
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.75
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 0
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 1
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 1.1
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 5.83
+ - _RoundCornerMargin: 0
+ - _RoundCornerRadius: 0.5
+ - _RoundCorners: 1
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 0
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 1
+ m_Colors:
+ - _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColor: {r: 1, g: 0, b: 0, a: 1}
+ - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 0.566}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.522}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbable.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbable.mat.meta
new file mode 100644
index 00000000000..708468689fd
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbable.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b422ff31060379342bb34bf8c22239e6
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbableProximity.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbableProximity.mat
new file mode 100644
index 00000000000..bad2daa0190
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbableProximity.mat
@@ -0,0 +1,191 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicBackPlateGrabbableProximity
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _BORDER_LIGHT _BORDER_LIGHT_REPLACES_ALBEDO _DISABLE_ALBEDO_MAP
+ _HOVER_LIGHT _IRIDESCENCE _METALLIC_TEXTURE_ALBEDO_CHANNEL_A _NEAR_LIGHT_FADE
+ _NEAR_PLANE_FADE _PROXIMITY_LIGHT _ROUND_CORNERS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 2800000, guid: 86609bdc7f4c43d42991f96373fb8081, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _LightMapTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 1
+ - _AlbedoAlphaSmoothness: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 1
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 1
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.6
+ - _BorderWidth: 0.2
+ - _BorderWidthHorizontal: 0.1
+ - _BorderWidthVertical: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingPlaneBorder: 0
+ - _ClippingPlaneBorderWidth: 0.025
+ - _ClippingSphere: 0
+ - _ColorWriteMask: 15
+ - _CullMode: 0
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.0002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOpaqueOverride: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLightMap: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0
+ - _FadeCompleteDistance: 0.18
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _HoverLight: 1
+ - _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 1
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.75
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 1
+ - _NearPlaneFade: 1
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 1
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 1.1
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 5.83
+ - _RoundCornerMargin: 0
+ - _RoundCornerRadius: 0.5
+ - _RoundCorners: 1
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 0
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColor: {r: 1, g: 0, b: 0, a: 1}
+ - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 0.566}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.522}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbableProximity.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbableProximity.mat.meta
new file mode 100644
index 00000000000..aca4d03fb3e
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbableProximity.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7bb46fe0291383e41b1cd86f2a9b2479
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbed.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbed.mat
new file mode 100644
index 00000000000..62b183ed630
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbed.mat
@@ -0,0 +1,190 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicBackPlateGrabbed
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _BORDER_LIGHT _BORDER_LIGHT_REPLACES_ALBEDO _DISABLE_ALBEDO_MAP
+ _IRIDESCENCE _METALLIC_TEXTURE_ALBEDO_CHANNEL_A _ROUND_CORNERS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ RenderType: Opaque
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 2800000, guid: 86609bdc7f4c43d42991f96373fb8081, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _LightMapTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 1
+ - _AlbedoAlphaSmoothness: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 1
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 1
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 1
+ - _BorderWidth: 0.25
+ - _BorderWidthHorizontal: 0.1
+ - _BorderWidthVertical: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingPlaneBorder: 0
+ - _ClippingPlaneBorderWidth: 0.025
+ - _ClippingSphere: 0
+ - _ColorWriteMask: 15
+ - _CullMode: 0
+ - _CustomMode: 0
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 0
+ - _EdgeSmoothingValue: 0.0002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOpaqueOverride: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLightMap: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _HoverLight: 0
+ - _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 1
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.75
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 0
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 1.1
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 5.83
+ - _RoundCornerMargin: 0
+ - _RoundCornerRadius: 0.1
+ - _RoundCorners: 1
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 0
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 1
+ m_Colors:
+ - _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 0.095007114, g: 0.2125979, b: 0.3301887, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColor: {r: 1, g: 0, b: 0, a: 1}
+ - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 0.566}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.522}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbed.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbed.mat.meta
new file mode 100644
index 00000000000..52d5875d80a
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateGrabbed.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 16526572b35ecaa4ba781a0bff18ab12
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateHover.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateHover.mat
new file mode 100644
index 00000000000..87989706785
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateHover.mat
@@ -0,0 +1,190 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicBackPlateHover
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _BORDER_LIGHT _BORDER_LIGHT_REPLACES_ALBEDO _DISABLE_ALBEDO_MAP
+ _IRIDESCENCE _METALLIC_TEXTURE_ALBEDO_CHANNEL_A _ROUND_CORNERS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ RenderType: Opaque
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 2800000, guid: 86609bdc7f4c43d42991f96373fb8081, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _LightMapTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 1
+ - _AlbedoAlphaSmoothness: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 1
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 1
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.6
+ - _BorderWidth: 0.2
+ - _BorderWidthHorizontal: 0.1
+ - _BorderWidthVertical: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingPlaneBorder: 0
+ - _ClippingPlaneBorderWidth: 0.025
+ - _ClippingSphere: 0
+ - _ColorWriteMask: 15
+ - _CullMode: 0
+ - _CustomMode: 0
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 0
+ - _EdgeSmoothingValue: 0.0002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOpaqueOverride: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLightMap: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _HoverLight: 0
+ - _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 1
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.75
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 0
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 1.1
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 5.83
+ - _RoundCornerMargin: 0
+ - _RoundCornerRadius: 0.1
+ - _RoundCorners: 1
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 0
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 1
+ m_Colors:
+ - _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 0.08499465, g: 0.08842018, b: 0.09433961, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColor: {r: 1, g: 0, b: 0, a: 1}
+ - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 0.566}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.522}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateHover.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateHover.mat.meta
new file mode 100644
index 00000000000..7229c81588a
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateHover.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c3faec7fe20fa049a963e86c6a92a3f
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateLabel.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateLabel.mat
new file mode 100644
index 00000000000..6c7a0af4427
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateLabel.mat
@@ -0,0 +1,191 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicBackPlateLabel
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _BORDER_LIGHT _BORDER_LIGHT_REPLACES_ALBEDO _DISABLE_ALBEDO_MAP
+ _IRIDESCENCE _METALLIC_TEXTURE_ALBEDO_CHANNEL_A _ROUND_CORNERS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 2800000, guid: 86609bdc7f4c43d42991f96373fb8081, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _LightMapTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 1
+ - _AlbedoAlphaSmoothness: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 1
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 1
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.6
+ - _BorderWidth: 0.12
+ - _BorderWidthHorizontal: 0.1
+ - _BorderWidthVertical: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingPlaneBorder: 0
+ - _ClippingPlaneBorderWidth: 0.025
+ - _ClippingSphere: 0
+ - _ColorWriteMask: 15
+ - _CullMode: 0
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.0002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOpaqueOverride: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLightMap: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _HoverLight: 0
+ - _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 1
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.75
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 5
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 1.1
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 5.83
+ - _RoundCornerMargin: 0
+ - _RoundCornerRadius: 0.1
+ - _RoundCorners: 1
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 0
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 1
+ m_Colors:
+ - _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 0, g: 0, b: 0, a: 0}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColor: {r: 1, g: 0, b: 0, a: 1}
+ - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 0.566}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.522}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateLabel.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateLabel.mat.meta
new file mode 100644
index 00000000000..946c5f85546
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateLabel.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 33bd7ed5b0c7fbf458af3e21dc58c192
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateNoBorder.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateNoBorder.mat
new file mode 100644
index 00000000000..0dad5084b02
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateNoBorder.mat
@@ -0,0 +1,190 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicBackPlateNoBorder
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _BORDER_LIGHT_REPLACES_ALBEDO _DISABLE_ALBEDO_MAP _IRIDESCENCE
+ _METALLIC_TEXTURE_ALBEDO_CHANNEL_A
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ RenderType: Opaque
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 2800000, guid: 86609bdc7f4c43d42991f96373fb8081, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _LightMapTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 1
+ - _AlbedoAlphaSmoothness: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 1
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.6
+ - _BorderWidth: 0.2
+ - _BorderWidthHorizontal: 0.1
+ - _BorderWidthVertical: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingPlaneBorder: 0
+ - _ClippingPlaneBorderWidth: 0.025
+ - _ClippingSphere: 0
+ - _ColorWriteMask: 15
+ - _CullMode: 0
+ - _CustomMode: 0
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 0
+ - _EdgeSmoothingValue: 0.0002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOpaqueOverride: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLightMap: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _HoverLight: 0
+ - _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 1
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.75
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 0
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 1.1
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 5.83
+ - _RoundCornerMargin: 0
+ - _RoundCornerRadius: 0.1
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 0
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 1
+ m_Colors:
+ - _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColor: {r: 1, g: 0, b: 0, a: 1}
+ - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 0.566}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.522}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateNoBorder.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateNoBorder.mat.meta
new file mode 100644
index 00000000000..360d7e75c82
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateNoBorder.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 40261cd01d861f241b945b4fb6609cff
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateThickBorder.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateThickBorder.mat
new file mode 100644
index 00000000000..11080251353
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateThickBorder.mat
@@ -0,0 +1,190 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicBackPlateThickBorder
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _BORDER_LIGHT _BORDER_LIGHT_REPLACES_ALBEDO _DISABLE_ALBEDO_MAP
+ _IRIDESCENCE _METALLIC_TEXTURE_ALBEDO_CHANNEL_A _ROUND_CORNERS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ RenderType: Opaque
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 2800000, guid: 86609bdc7f4c43d42991f96373fb8081, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _LightMapTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 1
+ - _AlbedoAlphaSmoothness: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 1
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 1
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.6
+ - _BorderWidth: 0.12
+ - _BorderWidthHorizontal: 0.1
+ - _BorderWidthVertical: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingPlaneBorder: 0
+ - _ClippingPlaneBorderWidth: 0.025
+ - _ClippingSphere: 0
+ - _ColorWriteMask: 15
+ - _CullMode: 0
+ - _CustomMode: 0
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 0
+ - _EdgeSmoothingValue: 0.0002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOpaqueOverride: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLightMap: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _HoverLight: 0
+ - _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 1
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.75
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 0
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 1.1
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 5.83
+ - _RoundCornerMargin: 0
+ - _RoundCornerRadius: 0.1
+ - _RoundCorners: 1
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 0
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 1
+ m_Colors:
+ - _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColor: {r: 1, g: 0, b: 0, a: 1}
+ - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 0.566}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.522}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateThickBorder.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateThickBorder.mat.meta
new file mode 100644
index 00000000000..bbdf397538f
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateThickBorder.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f9326c3bd04b792498b7ba61c1aaeeb9
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCage.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCage.mat
index 58770bf0889..968ea2f4bd7 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCage.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCage.mat
@@ -125,6 +125,7 @@ Material:
- _GlossyReflections: 1
- _HoverLight: 0
- _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 1
- _InnerGlowPower: 9
- _InstancedColor: 0
@@ -164,6 +165,7 @@ Material:
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximity.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximity.mat
index 660776209a7..decce376b4c 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximity.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximity.mat
@@ -126,6 +126,7 @@ Material:
- _GlossyReflections: 1
- _HoverLight: 1
- _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 12
- _InstancedColor: 0
@@ -165,6 +166,7 @@ Material:
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximityCircular.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximityCircular.mat
index 42ee1679826..e01ed64b5ba 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximityCircular.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximityCircular.mat
@@ -110,6 +110,7 @@ Material:
- _TriplanarMappingBlendSharpness: 4
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconAdd.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconAdd.mat
new file mode 100644
index 00000000000..92693fa69b9
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconAdd.mat
@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconAdd
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: d6a8d6d764af76740ad06383ee810941, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingSphere: 0
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconAdd.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconAdd.mat.meta
new file mode 100644
index 00000000000..4f4980bcb2c
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconAdd.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ccf34f78a6419584fa9cea97b5e46131
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconCamera.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconCamera.mat
new file mode 100644
index 00000000000..96b18c321ae
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconCamera.mat
@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconCamera
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 114589bc5b891c3488cbb8607b6b9171, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingSphere: 0
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconCamera.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconCamera.mat.meta
new file mode 100644
index 00000000000..89a3275d09c
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconCamera.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 943fce092bd9aea49808ff09b520bf74
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconClose.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconClose.mat
index ea769e107ed..83034c279b9 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconClose.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconClose.mat
@@ -72,6 +72,7 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -100,6 +101,7 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
@@ -107,8 +109,10 @@ Material:
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
- _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _Glossiness: 0.5
- _HoverLight: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -124,6 +128,7 @@ Material:
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
@@ -153,6 +158,7 @@ Material:
- _UseUIAlphaClip: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
@@ -168,4 +174,7 @@ Material:
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconFollowMe.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconFollowMe.mat
index 914744ff16f..3f5f8f806e8 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconFollowMe.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconFollowMe.mat
@@ -72,6 +72,7 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -100,6 +101,7 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
@@ -107,8 +109,10 @@ Material:
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
- _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _Glossiness: 0.5
- _HoverLight: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -124,6 +128,7 @@ Material:
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
@@ -153,6 +158,7 @@ Material:
- _UseUIAlphaClip: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
@@ -168,4 +174,7 @@ Material:
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconFontMaterial.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconFontMaterial.mat
index 2635c52986f..9d0c6747939 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconFontMaterial.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconFontMaterial.mat
@@ -158,6 +158,7 @@ Material:
- _UseUIAlphaClip: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDouble.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDouble.mat
new file mode 100644
index 00000000000..6b3050faa30
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDouble.mat
@@ -0,0 +1,177 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconGrabAreaDouble
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _NEAR_LIGHT_FADE _SPECULAR_HIGHLIGHTS _USECOLOR_ON
+ _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: ed822fedd9a3ed640a9a7aaedabcaef4, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0
+ - _FadeCompleteDistance: 0.18
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 1
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDouble.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDouble.mat.meta
new file mode 100644
index 00000000000..9de693d7287
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDouble.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 562472529ff7b124fb4142dc857bcda7
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDoubleProximity.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDoubleProximity.mat
new file mode 100644
index 00000000000..f29413605cb
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDoubleProximity.mat
@@ -0,0 +1,177 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconGrabAreaDoubleProximity
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _SPECULAR_HIGHLIGHTS
+ _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: ed822fedd9a3ed640a9a7aaedabcaef4, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0
+ - _FadeCompleteDistance: 0.18
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 1
+ - _NearPlaneFade: 1
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDoubleProximity.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDoubleProximity.mat.meta
new file mode 100644
index 00000000000..ce6487637dc
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaDoubleProximity.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6fa3adcc7cedfc8408bf18cf21ea68c0
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaVertical.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaVertical.mat
new file mode 100644
index 00000000000..072ee4157fd
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaVertical.mat
@@ -0,0 +1,177 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconGrabAreaVertical
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _SPECULAR_HIGHLIGHTS
+ _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: f1fd3fdd34a654947a68d8526ab133e5, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0
+ - _FadeCompleteDistance: 0.18
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 1
+ - _NearPlaneFade: 1
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaVertical.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaVertical.mat.meta
new file mode 100644
index 00000000000..064615df947
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconGrabAreaVertical.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b491e50f6adf1ad4485d30f9d945271c
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHandJoint.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHandJoint.mat
index d588edb4815..0c5fcaa0a88 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHandJoint.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHandJoint.mat
@@ -155,6 +155,7 @@ Material:
- _UseUIAlphaClip: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHandMesh.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHandMesh.mat
index a7a76802c8c..eb766bd0afb 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHandMesh.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHandMesh.mat
@@ -155,6 +155,7 @@ Material:
- _UseUIAlphaClip: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHome.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHome.mat
new file mode 100644
index 00000000000..e929a8849dd
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHome.mat
@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconHome
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 85835ae0b6c3c1c418a57400fcbb788c, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingSphere: 0
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHome.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHome.mat.meta
new file mode 100644
index 00000000000..c0e7f777753
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconHome.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d3ec6f10c2cd7564693e6e59ca3239be
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMRTKLogo.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMRTKLogo.mat
new file mode 100644
index 00000000000..300f7da5498
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMRTKLogo.mat
@@ -0,0 +1,176 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconMRTKLogo
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHATEST_ON _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 2450
+ stringTagMap:
+ RenderType: TransparentCutout
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 74ebfa89af37aba43b08982d7f97eb7d, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 0
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 1
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 1
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMRTKLogo.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMRTKLogo.mat.meta
new file mode 100644
index 00000000000..9a33898dc7a
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMRTKLogo.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a733cc411dc53cc4794e0f29c2ca990b
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMessage.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMessage.mat
new file mode 100644
index 00000000000..0c88841b250
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMessage.mat
@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconMessage
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 937867e9be7912d4a903cd401ee0a959, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingSphere: 0
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMessage.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMessage.mat.meta
new file mode 100644
index 00000000000..da18604e1e5
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMessage.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c3ec3f87c678f3d48bc51f5625647104
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMicrophone.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMicrophone.mat
new file mode 100644
index 00000000000..162989c058a
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMicrophone.mat
@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconMicrophone
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 49a59150fd8a7c1438828c262032e023, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingSphere: 0
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMicrophone.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMicrophone.mat.meta
new file mode 100644
index 00000000000..563283fdb7f
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconMicrophone.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 23b680d6c13ccad4ba5004f1b6a22462
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconPin.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconPin.mat
index 35507b597cb..45ef460ea3f 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconPin.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconPin.mat
@@ -155,6 +155,7 @@ Material:
- _UseUIAlphaClip: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconProfiler.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconProfiler.mat
index 713ad5d6434..a02de71a96b 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconProfiler.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconProfiler.mat
@@ -155,6 +155,7 @@ Material:
- _UseUIAlphaClip: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconRefresh.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconRefresh.mat
new file mode 100644
index 00000000000..d1179d79f73
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconRefresh.mat
@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconRefresh
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 559e1da0e65611c4f93ec931e1e6a8a2, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingSphere: 0
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconRefresh.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconRefresh.mat.meta
new file mode 100644
index 00000000000..f028c6022ec
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconRefresh.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 467ed030160339e4b8ec795630ed12aa
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSearch.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSearch.mat
new file mode 100644
index 00000000000..974a77a661e
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSearch.mat
@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconSearch
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: ed2f699f32ec17f4cad3423d2c449119, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingSphere: 0
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSearch.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSearch.mat.meta
new file mode 100644
index 00000000000..e8577b2cf13
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSearch.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 57717538759a71948975aa7be8c2a3cb
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSettings.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSettings.mat
new file mode 100644
index 00000000000..78a9ea05a5f
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSettings.mat
@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconSettings
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: ac8550a474419054d9621216812fd098, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingSphere: 0
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSettings.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSettings.mat.meta
new file mode 100644
index 00000000000..610aca5f2c9
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconSettings.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5a9ff3bf27bd2f14eb87222e2d2761b8
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconStar.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconStar.mat
new file mode 100644
index 00000000000..d294782d7f5
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconStar.mat
@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: HolographicButtonIconStar
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+ m_LightmapFlags: 5
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: ea677436af9004848a7f20878e38257c, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _BumpScale: 1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ClippingBox: 0
+ - _ClippingPlane: 0
+ - _ClippingSphere: 0
+ - _ColorMask: 15
+ - _ColorWriteMask: 15
+ - _Cull: 2
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.85
+ - _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _Glossiness: 0.5
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 0
+ - _NearPlaneFade: 0
+ - _NormalMapScale: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilComparison: 0
+ - _StencilOp: 0
+ - _StencilOperation: 0
+ - _StencilReadMask: 255
+ - _StencilReference: 0
+ - _StencilWriteMask: 255
+ - _TriplanarMappingBlendSharpness: 4
+ - _UVSec: 0
+ - _UseColor: 1
+ - _UseMainTex: 1
+ - _UseUIAlphaClip: 0
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconStar.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconStar.mat.meta
new file mode 100644
index 00000000000..7eaee08a194
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonIconStar.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6f0c1af0718ce6d4abe8b90d6e2c283f
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonPlate.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonPlate.mat
index a8e72dcd193..5040cd983b7 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonPlate.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonPlate.mat
@@ -78,6 +78,7 @@ Material:
- _AlbedoAlphaSmoothness: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -110,17 +111,21 @@ Material:
- _EnableLightMap: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 0
- _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -136,6 +141,7 @@ Material:
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 1
+ - _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
@@ -158,6 +164,11 @@ Material:
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
@@ -174,4 +185,7 @@ Material:
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 0.566}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.522}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots.mat
new file mode 100644
index 00000000000..2fc25fde000
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots.mat
@@ -0,0 +1,128 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: MRTK_GrabbableDots
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _SPECULAR_HIGHLIGHTS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 2e264b2035e178e4dac9e40cfcf38662, type: 3}
+ m_Scale: {x: 100, y: 30}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ColorWriteMask: 15
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.01
+ - _FadeCompleteDistance: 0.04
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 1
+ - _NearPlaneFade: 1
+ - _NormalMapScale: 1
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots.mat.meta
new file mode 100644
index 00000000000..c8ccc071192
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1d3d3b8b33373be4ba8d3b1676d2b5ba
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsH.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsH.mat
new file mode 100644
index 00000000000..b0dedea6aac
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsH.mat
@@ -0,0 +1,128 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: MRTK_GrabbableDots2RowsH
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _SPECULAR_HIGHLIGHTS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 2e264b2035e178e4dac9e40cfcf38662, type: 3}
+ m_Scale: {x: 40, y: 2}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ColorWriteMask: 15
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.01
+ - _FadeCompleteDistance: 0.08
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 1
+ - _NearPlaneFade: 1
+ - _NormalMapScale: 1
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsH.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsH.mat.meta
new file mode 100644
index 00000000000..c052da66734
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsH.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 13a6bafb89ca6414895d965b2fdb2041
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV1.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV1.mat
new file mode 100644
index 00000000000..ecdbe59ead2
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV1.mat
@@ -0,0 +1,128 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: MRTK_GrabbableDots2RowsV1
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _SPECULAR_HIGHLIGHTS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 2e264b2035e178e4dac9e40cfcf38662, type: 3}
+ m_Scale: {x: 2, y: 13}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ColorWriteMask: 15
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.01
+ - _FadeCompleteDistance: 0.08
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 1
+ - _NearPlaneFade: 1
+ - _NormalMapScale: 1
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV1.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV1.mat.meta
new file mode 100644
index 00000000000..589257f5c7a
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV1.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e28b3473906c8764a948650d42b975c1
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV2.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV2.mat
new file mode 100644
index 00000000000..fff16f89dee
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV2.mat
@@ -0,0 +1,128 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: MRTK_GrabbableDots2RowsV2
+ m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ m_ShaderKeywords: _ALPHABLEND_ON _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _SPECULAR_HIGHLIGHTS
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _ChannelMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _IridescentSpectrumMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 2e264b2035e178e4dac9e40cfcf38662, type: 3}
+ m_Scale: {x: 2, y: 25}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlbedoAlphaMode: 0
+ - _AlbedoAssignedAtRuntime: 0
+ - _BlendOp: 0
+ - _BlendedClippingWidth: 1
+ - _BorderLight: 0
+ - _BorderLightOpaque: 0
+ - _BorderLightOpaqueAlpha: 1
+ - _BorderLightReplacesAlbedo: 0
+ - _BorderLightUsesHoverColor: 0
+ - _BorderMinValue: 0.1
+ - _BorderWidth: 0.1
+ - _ClippingBorder: 0
+ - _ClippingBorderWidth: 0.025
+ - _ColorWriteMask: 15
+ - _CullMode: 2
+ - _CustomMode: 2
+ - _Cutoff: 0.5
+ - _DirectionalLight: 0
+ - _DstBlend: 10
+ - _EdgeSmoothingValue: 0.002
+ - _EnableChannelMap: 0
+ - _EnableEmission: 0
+ - _EnableHoverColorOverride: 0
+ - _EnableLocalSpaceTriplanarMapping: 0
+ - _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
+ - _EnableTriplanarMapping: 0
+ - _EnvironmentColorIntensity: 0.5
+ - _EnvironmentColorThreshold: 1.5
+ - _EnvironmentColoring: 0
+ - _FadeBeginDistance: 0.01
+ - _FadeCompleteDistance: 0.08
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
+ - _HoverLight: 0
+ - _IgnoreZScale: 0
+ - _InnerGlow: 0
+ - _InnerGlowPower: 4
+ - _InstancedColor: 0
+ - _Iridescence: 0
+ - _IridescenceAngle: -0.78
+ - _IridescenceIntensity: 0.5
+ - _IridescenceThreshold: 0.05
+ - _Metallic: 0
+ - _Mode: 2
+ - _NearLightFade: 1
+ - _NearPlaneFade: 1
+ - _NormalMapScale: 1
+ - _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
+ - _Reflections: 0
+ - _Refraction: 0
+ - _RefractiveIndex: 0
+ - _RenderQueueOverride: -1
+ - _RimLight: 0
+ - _RimPower: 0.25
+ - _RoundCornerMargin: 0.01
+ - _RoundCornerRadius: 0.25
+ - _RoundCorners: 0
+ - _Smoothness: 0.5
+ - _SpecularHighlights: 1
+ - _SphericalHarmonics: 0
+ - _SrcBlend: 5
+ - _Stencil: 0
+ - _StencilComparison: 0
+ - _StencilOperation: 0
+ - _StencilReference: 0
+ - _TriplanarMappingBlendSharpness: 4
+ - _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
+ - _ZTest: 4
+ - _ZWrite: 0
+ m_Colors:
+ - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+ - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+ - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+ - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+ - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+ - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV2.mat.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV2.mat.meta
new file mode 100644
index 00000000000..8bf7a5bfd10
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV2.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15c4e4b880f2be34790dce1a74139d27
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/AnimationButton.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/AnimationButton.prefab
index 622ffba8541..45141ccd9ca 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/AnimationButton.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/AnimationButton.prefab
@@ -352,7 +352,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 65169310230401214}
localForward: {x: 0, y: 0, z: -1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/Button.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/Button.prefab
index 73e1dee0b9a..98a36076a09 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/Button.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/Button.prefab
@@ -214,7 +214,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 65501967504898374}
localForward: {x: 0, y: 0, z: -1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ButtonHoloLens1.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ButtonHoloLens1.prefab
index a0888d538f6..308c9a218a6 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ButtonHoloLens1.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ButtonHoloLens1.prefab
@@ -181,7 +181,6 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 514
- m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
@@ -208,12 +207,13 @@ MonoBehaviour:
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
- textComponent: {fileID: 0}
+ textComponent: {fileID: 114041511408948086}
characterCount: 12
spriteCount: 0
spaceCount: 1
@@ -222,12 +222,9 @@ MonoBehaviour:
lineCount: 1
pageCount: 1
materialCount: 1
- m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
- m_isInputParsingRequired: 0
- m_inputSource: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 23944836463606822}
m_subTextObjects:
@@ -399,23 +396,19 @@ MonoBehaviour:
- Target: {fileID: 1264397046495974}
Themes:
- {fileID: 11400000, guid: d37afabc007bf774d9431b9a7cbe6fba, type: 2}
- HadDefaultTheme: 1
- Target: {fileID: 1447780916617028}
Themes:
- {fileID: 11400000, guid: cbde7890146c3024d928b7afc2e16065, type: 2}
- HadDefaultTheme: 1
- Target: {fileID: 1078241679539432}
Themes:
- - {fileID: 11400000, guid: 0c4c73f326f602744bdcfff481fd6f20, type: 2}
- HadDefaultTheme: 1
+ - {fileID: 11400000, guid: 6a4ada4b285469047946e8662531da54, type: 2}
OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
Events:
- - Name: AudioEvent
- Event:
+ - Event:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
@@ -455,81 +448,6 @@ MonoBehaviour:
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
Options: []
- HideUnityEvents: 1
- - Name: OnClick
- Event:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- ClassName: InteractableOnClickEffect
- AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableOnClickEffect,
- Microsoft.MixedReality.Toolkit.SDK
- Settings:
- - Type: 7
- Label: Effect Prefab
- Name: EffectPrefab
- Tooltip: The effect prefab, should destroy itself
- IntValue: 0
- StringValue:
- FloatValue: 0
- BoolValue: 0
- GameObjectValue: {fileID: 7275193594166404570, guid: 2d4fa118014b9b1428c0ca3dda4d01b3,
- type: 3}
- ScriptableObjectValue: {fileID: 0}
- ObjectValue: {fileID: 0}
- MaterialValue: {fileID: 0}
- TextureValue: {fileID: 0}
- ColorValue: {r: 0, g: 0, b: 0, a: 0}
- Vector2Value: {x: 0, y: 0}
- Vector3Value: {x: 0, y: 0, z: 0}
- Vector4Value: {x: 0, y: 0, z: 0, w: 0}
- CurveValue:
- serializedVersion: 2
- m_Curve: []
- m_PreInfinity: 0
- m_PostInfinity: 0
- m_RotationOrder: 0
- AudioClipValue: {fileID: 0}
- QuaternionValue: {x: 0, y: 0, z: 0, w: 0}
- EventValue:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- Options: []
- - Type: 13
- Label: Offset Position
- Name: EffectOffset
- Tooltip: Spawn the prefab relative to the Interactive position
- IntValue: 0
- StringValue:
- FloatValue: 0
- BoolValue: 0
- GameObjectValue: {fileID: 0}
- ScriptableObjectValue: {fileID: 0}
- ObjectValue: {fileID: 0}
- MaterialValue: {fileID: 0}
- TextureValue: {fileID: 0}
- ColorValue: {r: 0, g: 0, b: 0, a: 0}
- Vector2Value: {x: 0, y: 0}
- Vector3Value: {x: 0, y: 0, z: -0.01}
- Vector4Value: {x: 0, y: 0, z: 0, w: 0}
- CurveValue:
- serializedVersion: 2
- m_Curve: []
- m_PreInfinity: 0
- m_PostInfinity: 0
- m_RotationOrder: 0
- AudioClipValue: {fileID: 0}
- QuaternionValue: {x: 0, y: 0, z: 0, w: 0}
- EventValue:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- Options: []
- HideUnityEvents: 1
dimensionIndex: 0
--- !u!114 &5253365468919551739
MonoBehaviour:
@@ -544,13 +462,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
- touchableCollider: {fileID: 65091470401894616}
localForward: {x: 0, y: 0, z: -1}
localUp: {x: 0, y: 1, z: 0}
localCenter: {x: 0, y: 0, z: -0.01}
bounds: {x: 0.12, y: 0.12}
+ touchableCollider: {fileID: 65091470401894616}
--- !u!114 &4750325155802407204
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -980,7 +897,6 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 514
- m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
@@ -1007,12 +923,13 @@ MonoBehaviour:
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
- textComponent: {fileID: 0}
+ textComponent: {fileID: 8113455685942058736}
characterCount: 6
spriteCount: 0
spaceCount: 0
@@ -1021,12 +938,9 @@ MonoBehaviour:
lineCount: 1
pageCount: 1
materialCount: 1
- m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
- m_isInputParsingRequired: 0
- m_inputSource: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 4585359218178484297}
m_subTextObjects:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ButtonHoloLens1Toggle.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ButtonHoloLens1Toggle.prefab
index 959308989ac..df3fc1a48f2 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ButtonHoloLens1Toggle.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ButtonHoloLens1Toggle.prefab
@@ -83,25 +83,21 @@ MonoBehaviour:
Themes:
- {fileID: 11400000, guid: d37afabc007bf774d9431b9a7cbe6fba, type: 2}
- {fileID: 11400000, guid: 29b20ecfcc16eef4dad8989c360f2988, type: 2}
- HadDefaultTheme: 1
- Target: {fileID: 1925978215027266}
Themes:
- {fileID: 11400000, guid: cbde7890146c3024d928b7afc2e16065, type: 2}
- {fileID: 11400000, guid: cbde7890146c3024d928b7afc2e16065, type: 2}
- HadDefaultTheme: 1
- Target: {fileID: 1687922239424002}
Themes:
- - {fileID: 11400000, guid: 0c4c73f326f602744bdcfff481fd6f20, type: 2}
- - {fileID: 11400000, guid: 0c4c73f326f602744bdcfff481fd6f20, type: 2}
- HadDefaultTheme: 1
+ - {fileID: 11400000, guid: 6a4ada4b285469047946e8662531da54, type: 2}
+ - {fileID: 11400000, guid: 6a4ada4b285469047946e8662531da54, type: 2}
OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
Events:
- - Name: AudioEvent
- Event:
+ - Event:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
@@ -141,81 +137,6 @@ MonoBehaviour:
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
Options: []
- HideUnityEvents: 1
- - Name: OnClick
- Event:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- ClassName: InteractableOnClickEffect
- AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableOnClickEffect,
- Microsoft.MixedReality.Toolkit.SDK
- Settings:
- - Type: 7
- Label: Effect Prefab
- Name: EffectPrefab
- Tooltip: The effect prefab, should destroy itself
- IntValue: 0
- StringValue:
- FloatValue: 0
- BoolValue: 0
- GameObjectValue: {fileID: 7275193594166404570, guid: 2d4fa118014b9b1428c0ca3dda4d01b3,
- type: 3}
- ScriptableObjectValue: {fileID: 0}
- ObjectValue: {fileID: 0}
- MaterialValue: {fileID: 0}
- TextureValue: {fileID: 0}
- ColorValue: {r: 0, g: 0, b: 0, a: 0}
- Vector2Value: {x: 0, y: 0}
- Vector3Value: {x: 0, y: 0, z: 0}
- Vector4Value: {x: 0, y: 0, z: 0, w: 0}
- CurveValue:
- serializedVersion: 2
- m_Curve: []
- m_PreInfinity: 0
- m_PostInfinity: 0
- m_RotationOrder: 0
- AudioClipValue: {fileID: 0}
- QuaternionValue: {x: 0, y: 0, z: 0, w: 0}
- EventValue:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- Options: []
- - Type: 13
- Label: Offset Position
- Name: EffectOffset
- Tooltip: Spawn the prefab relative to the Interactive position
- IntValue: 0
- StringValue:
- FloatValue: 0
- BoolValue: 0
- GameObjectValue: {fileID: 0}
- ScriptableObjectValue: {fileID: 0}
- ObjectValue: {fileID: 0}
- MaterialValue: {fileID: 0}
- TextureValue: {fileID: 0}
- ColorValue: {r: 0, g: 0, b: 0, a: 0}
- Vector2Value: {x: 0, y: 0}
- Vector3Value: {x: 0, y: 0, z: -0.01}
- Vector4Value: {x: 0, y: 0, z: 0, w: 0}
- CurveValue:
- serializedVersion: 2
- m_Curve: []
- m_PreInfinity: 0
- m_PostInfinity: 0
- m_RotationOrder: 0
- AudioClipValue: {fileID: 0}
- QuaternionValue: {x: 0, y: 0, z: 0, w: 0}
- EventValue:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- Options: []
- HideUnityEvents: 1
dimensionIndex: 0
--- !u!114 &4389918657735180436
MonoBehaviour:
@@ -230,13 +151,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
- touchableCollider: {fileID: 65155074209115082}
localForward: {x: 0, y: 0, z: -1}
localUp: {x: 0, y: 1, z: 0}
localCenter: {x: 0, y: 0, z: -0.01}
bounds: {x: 0.12, y: 0.12}
+ touchableCollider: {fileID: 65155074209115082}
--- !u!114 &1576028632456365133
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -435,7 +355,6 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 514
- m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
@@ -462,6 +381,7 @@ MonoBehaviour:
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
@@ -476,12 +396,9 @@ MonoBehaviour:
lineCount: 1
pageCount: 1
materialCount: 1
- m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
- m_isInputParsingRequired: 0
- m_inputSource: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 23859773054077766}
m_subTextObjects:
@@ -983,7 +900,6 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 514
- m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
@@ -1010,6 +926,7 @@ MonoBehaviour:
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
@@ -1024,12 +941,9 @@ MonoBehaviour:
lineCount: 1
pageCount: 1
materialCount: 1
- m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
- m_isInputParsingRequired: 0
- m_inputSource: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 7620952272536114864}
m_subTextObjects:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/CheckBox.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/CheckBox.prefab
index 229216e30da..bacd6ff0ef7 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/CheckBox.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/CheckBox.prefab
@@ -689,7 +689,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 65394494458541452}
localForward: {x: 0, y: 0, z: -1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/GrabHandle.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/GrabHandle.prefab
index 99ea7a103e0..259ded8f3ae 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/GrabHandle.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/GrabHandle.prefab
@@ -77,11 +77,9 @@ MonoBehaviour:
- Target: {fileID: 6956884834071603112}
Themes:
- {fileID: 11400000, guid: d7354f15f868b394f9c15dc5c1209056, type: 2}
- HadDefaultTheme: 1
- Target: {fileID: 6956884834527463984}
Themes:
- {fileID: 11400000, guid: d5acbeaf80ef1244bbf7ec3a5ab9de10, type: 2}
- HadDefaultTheme: 1
OnClick:
m_PersistentCalls:
m_Calls: []
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonCube.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonCube.prefab
index d151f550dbc..fc2348f6b91 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonCube.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonCube.prefab
@@ -147,7 +147,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 289694440342955798}
localForward: {x: 0, y: 0, z: -1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHoloLens2Toggle.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHoloLens2Toggle.prefab
index b6d91a20e77..c77e48649c8 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHoloLens2Toggle.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHoloLens2Toggle.prefab
@@ -187,6 +187,26 @@ PrefabInstance:
propertyPath: Profiles.Array.data[2].Themes.Array.size
value: 2
objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: profiles.Array.data[0].Themes.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: profiles.Array.data[1].Themes.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: profiles.Array.size
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: profiles.Array.data[2].Themes.Array.size
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: Dimensions
@@ -236,6 +256,35 @@ PrefabInstance:
propertyPath: Profiles.Array.data[2].Target
value:
objectReference: {fileID: 265745453840856759}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: profiles.Array.data[0].Themes.Array.data[1]
+ value:
+ objectReference: {fileID: 11400000, guid: 0c4c73f326f602744bdcfff481fd6f20,
+ type: 2}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: profiles.Array.data[1].Themes.Array.data[1]
+ value:
+ objectReference: {fileID: 11400000, guid: 8f8cfb3041153fa45bccb6d664a563ec,
+ type: 2}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: profiles.Array.data[2].Target
+ value:
+ objectReference: {fileID: 265745453840856759}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: profiles.Array.data[2].Themes.Array.data[0]
+ value:
+ objectReference: {fileID: 11400000, guid: 452ab0b768e73aa45a65adeb08147cec,
+ type: 2}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: profiles.Array.data[2].Themes.Array.data[1]
+ value:
+ objectReference: {fileID: 11400000, guid: c020ebf06513a084caa57aa68a245a6b,
+ type: 2}
- target: {fileID: 4607504470098667674, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_Mesh
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHoloLens2Unplated.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHoloLens2Unplated.prefab
index 4f7b366facf..46622632ecd 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHoloLens2Unplated.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHoloLens2Unplated.prefab
@@ -507,7 +507,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 316800722}
localForward: {x: 0, y: 0, z: -1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHololens2UnityUI.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHololens2UnityUI.prefab
new file mode 100644
index 00000000000..164865925b6
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHololens2UnityUI.prefab
@@ -0,0 +1,793 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2882314507082225600
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 767361046734328591}
+ - component: {fileID: 5040708075129034592}
+ - component: {fileID: 2425490457390524329}
+ m_Layer: 5
+ m_Name: UIButtonSquareIcon
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &767361046734328591
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2882314507082225600}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0.000100000296, z: 0}
+ m_LocalScale: {x: 32, y: 32, z: 32}
+ m_Children: []
+ m_Father: {fileID: 5171175689000978014}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5040708075129034592
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2882314507082225600}
+ m_Mesh: {fileID: 4300010, guid: b566bbce04d66f4428421e81a3af0299, type: 3}
+--- !u!23 &2425490457390524329
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2882314507082225600}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RenderingLayerMask: 4294967295
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: fa419ab56051229449e3b813df8f295f, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1 &4117306204827652223
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6015630713004859278}
+ m_Layer: 0
+ m_Name: CompressableVisual
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6015630713004859278
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4117306204827652223}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 3294941786992218696}
+ m_Father: {fileID: 3223503683246946309}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &4716031617915946492
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1914098639805987745}
+ - component: {fileID: 448654273136647793}
+ - component: {fileID: 3078934259714054176}
+ - component: {fileID: 6643496050371014491}
+ - component: {fileID: 7765793373352522057}
+ m_Layer: 0
+ m_Name: Cube
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1914098639805987745
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4716031617915946492}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 32, y: 32, z: 32}
+ m_Children: []
+ m_Father: {fileID: 3294941786992218696}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!33 &448654273136647793
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4716031617915946492}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3078934259714054176
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4716031617915946492}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 329cdefad4cf0f14e9b6767d0af094b0, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!114 &6643496050371014491
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4716031617915946492}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4ea7dc4a5a95cb84584659cbc5279700, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &7765793373352522057
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4716031617915946492}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 36065390e01a3cd40b87e4bf4acd02f9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &7205869594250961695
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3294941786992218696}
+ m_Layer: 0
+ m_Name: CubeScaler
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3294941786992218696
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7205869594250961695}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -7.6}
+ m_LocalScale: {x: 1, y: 1, z: 0.48}
+ m_Children:
+ - {fileID: 1914098639805987745}
+ m_Father: {fileID: 6015630713004859278}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1270314221950268463
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3223503683246946314}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f98e7663599230e419addf153615c144, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ movingButtonVisuals: {fileID: 3223503683169235570}
+ distanceSpaceMode: 1
+ startPushDistance: 0
+ maxPushDistance: 14
+ pressDistance: 8.5
+ releaseDistanceDelta: 2
+ returnSpeed: 25
+ releaseOnTouchEnd: 1
+ enforceFrontPush: 1
+ TouchBegin:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ TouchEnd:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ ButtonPressed:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1922179712112255870}
+ m_MethodName: PlayOneShot
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 8300000, guid: 291bf9326e517b0489c2ee53d0a6a63f,
+ type: 3}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ ButtonReleased:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1922179712112255870}
+ m_MethodName: PlayOneShot
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 8300000, guid: 40ae713ddf420714bbc1a3b5c3f2eac1,
+ type: 3}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 6229073104108989701}
+ m_MethodName: Submit
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ movingButtonIconText: {fileID: 7813901746064736085}
+ compressableButtonVisuals: {fileID: 4117306204827652223}
+ minCompressPercentage: 0.25
+ highlightPlate: {fileID: 0}
+ highlightPlateAnimationTime: 0.25
+--- !u!1 &7813901746064736085
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5171175689000978014}
+ m_Layer: 0
+ m_Name: IconAndText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5171175689000978014
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7813901746064736085}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -3}
+ m_LocalScale: {x: 10, y: 10, z: 10}
+ m_Children:
+ - {fileID: 2761560060636545628}
+ - {fileID: 767361046734328591}
+ m_Father: {fileID: 3223503683246946309}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8530779549958272963
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2761560060636545628}
+ - component: {fileID: 395745670083757076}
+ - component: {fileID: 2887137240106937465}
+ - component: {fileID: 302805927429812628}
+ - component: {fileID: 6703145284943914786}
+ m_Layer: 0
+ m_Name: TextMeshPro
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2761560060636545628
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8530779549958272963}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 5171175689000978014}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: -0.935}
+ m_SizeDelta: {x: 2.8, y: 0.8}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!23 &395745670083757076
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8530779549958272963}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RenderingLayerMask: 4294967295
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 21202819797275496, guid: 6a84f857bec7e7345843ae29404c57ce, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!33 &2887137240106937465
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8530779549958272963}
+ m_Mesh: {fileID: 0}
+--- !u!222 &302805927429812628
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8530779549958272963}
+ m_CullTransparentMesh: 0
+--- !u!114 &6703145284943914786
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8530779549958272963}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_text: Button
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 6a84f857bec7e7345843ae29404c57ce, type: 2}
+ m_sharedMaterial: {fileID: 21202819797275496, guid: 6a84f857bec7e7345843ae29404c57ce,
+ type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_outlineColor:
+ serializedVersion: 2
+ rgba: 4278190080
+ m_fontSize: 4
+ m_fontSizeBase: 4
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_textAlignment: 514
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_firstOverflowCharacterIndex: -1
+ m_linkedTextComponent: {fileID: 0}
+ m_isLinkedTextComponent: 0
+ m_isTextTruncated: 0
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 0
+ m_isCullingEnabled: 0
+ m_ignoreRectMaskCulling: 0
+ m_ignoreCulling: 1
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
+ m_firstVisibleCharacter: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: -0.0022691963, z: 0, w: 0}
+ m_textInfo:
+ textComponent: {fileID: 6703145284943914786}
+ characterCount: 6
+ spriteCount: 0
+ spaceCount: 0
+ wordCount: 1
+ linkCount: 0
+ lineCount: 1
+ pageCount: 1
+ materialCount: 1
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_spriteAnimator: {fileID: 0}
+ m_hasFontAssetChanged: 0
+ m_renderer: {fileID: 395745670083757076}
+ m_subTextObjects:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ m_maskType: 0
+--- !u!1001 &7212590361910740038
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 5234426576715676748, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Name
+ value: PressableButtonHololens2UnityUI
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 32
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 32
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426577712821803, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426577528310583, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 2.02
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426577712821812, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426577712821812, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Name
+ value: FrontPlate
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426577528310576, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6037486589368256570, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Name
+ value: BackPlate
+ objectReference: {fileID: 0}
+ - target: {fileID: 9130116940813133624, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426577528310582, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426577528310582, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_fontSize
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426577528310582, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_fontSizeBase
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426577528310582, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_margin.y
+ value: 22.371887
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676743, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Material
+ value:
+ objectReference: {fileID: 2100000, guid: ec72a3a105768f746b556a8dfdae61a8, type: 2}
+ m_RemovedComponents:
+ - {fileID: 5234426576715676738, guid: df89e360642c6fc46abbc1c2656856f6, type: 3}
+ m_SourcePrefab: {fileID: 100100000, guid: df89e360642c6fc46abbc1c2656856f6, type: 3}
+--- !u!1 &3223503683246946314 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5234426576715676748, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ m_PrefabInstance: {fileID: 7212590361910740038}
+ m_PrefabAsset: {fileID: 0}
+--- !u!224 &3223503683246946309 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ m_PrefabInstance: {fileID: 7212590361910740038}
+ m_PrefabAsset: {fileID: 0}
+--- !u!82 &1922179712112255870 stripped
+AudioSource:
+ m_CorrespondingSourceObject: {fileID: 9130116940813133624, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ m_PrefabInstance: {fileID: 7212590361910740038}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &6229073104108989701 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 3632813099888912707, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ m_PrefabInstance: {fileID: 7212590361910740038}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3223503683246946314}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 724341da07c2e1742a82bcc156a2461d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &3223503683169235570 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5234426577712821812, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ m_PrefabInstance: {fileID: 7212590361910740038}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHololens2UnityUI.prefab.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHololens2UnityUI.prefab.meta
new file mode 100644
index 00000000000..ffa028096ae
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonHololens2UnityUI.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2f626628bde0879488068de0e9f25f8d
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUI.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUI.prefab
new file mode 100644
index 00000000000..1163c1cb2f8
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUI.prefab
@@ -0,0 +1,626 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5234426576715676748
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5234426576715676739}
+ - component: {fileID: 5234426576715676742}
+ - component: {fileID: 5234426576715676736}
+ - component: {fileID: 5234426576715676737}
+ - component: {fileID: 5234426576715676738}
+ - component: {fileID: 9130116940813133624}
+ - component: {fileID: 3632813099888912707}
+ m_Layer: 0
+ m_Name: PressableButtonUnityUI
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5234426576715676739
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426576715676748}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 5234426577528310583}
+ - {fileID: 4703832778049971774}
+ - {fileID: 5234426577712821803}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 32, y: 32}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5234426576715676742
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426576715676748}
+ m_CullTransparentMesh: 0
+--- !u!114 &5234426576715676736
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426576715676748}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 0
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 0}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!114 &5234426576715676737
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426576715676748}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2fcaf896491074042b7ed7684454a412, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ eventsToReceive: 0
+ debounceThreshold: 0.01
+--- !u!114 &5234426576715676738
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426576715676748}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 63c897c097799da4a900032ad3471c47, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ movingButtonVisuals: {fileID: 5234426577712821812}
+ distanceSpaceMode: 1
+ startPushDistance: 0
+ maxPushDistance: 14
+ pressDistance: 8.5
+ releaseDistanceDelta: 2
+ returnSpeed: 25
+ releaseOnTouchEnd: 1
+ enforceFrontPush: 1
+ TouchBegin:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ TouchEnd:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ ButtonPressed:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 9130116940813133624}
+ m_MethodName: PlayOneShot
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 8300000, guid: 291bf9326e517b0489c2ee53d0a6a63f,
+ type: 3}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ ButtonReleased:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 9130116940813133624}
+ m_MethodName: PlayOneShot
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 8300000, guid: 40ae713ddf420714bbc1a3b5c3f2eac1,
+ type: 3}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 3632813099888912707}
+ m_MethodName: Submit
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!82 &9130116940813133624
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426576715676748}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 0}
+ m_PlayOnAwake: 1
+ m_Volume: 1
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+--- !u!114 &3632813099888912707
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426576715676748}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 724341da07c2e1742a82bcc156a2461d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &5234426577528310576
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5234426577528310583}
+ - component: {fileID: 5234426577528310581}
+ - component: {fileID: 5234426577528310582}
+ m_Layer: 0
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5234426577528310583
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426577528310576}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -3.5}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 5234426576715676739}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5234426577528310581
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426577528310576}
+ m_CullTransparentMesh: 0
+--- !u!114 &5234426577528310582
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426577528310576}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_text: Button
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
+ m_sharedMaterial: {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217,
+ type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_outlineColor:
+ serializedVersion: 2
+ rgba: 4278190080
+ m_fontSize: 4
+ m_fontSizeBase: 4
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_textAlignment: 514
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_firstOverflowCharacterIndex: -1
+ m_linkedTextComponent: {fileID: 0}
+ m_isLinkedTextComponent: 0
+ m_isTextTruncated: 0
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_ignoreRectMaskCulling: 0
+ m_ignoreCulling: 1
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
+ m_firstVisibleCharacter: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_textInfo:
+ textComponent: {fileID: 5234426577528310582}
+ characterCount: 6
+ spriteCount: 0
+ spaceCount: 0
+ wordCount: 1
+ linkCount: 0
+ lineCount: 1
+ pageCount: 1
+ materialCount: 1
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_spriteAnimator: {fileID: 0}
+ m_hasFontAssetChanged: 0
+ m_subTextObjects:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &5234426577712821812
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5234426577712821803}
+ - component: {fileID: 5234426577712821801}
+ - component: {fileID: 5234426577712821802}
+ - component: {fileID: 7066721728451557091}
+ m_Layer: 0
+ m_Name: Front Plate
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5234426577712821803
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426577712821812}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -15.2}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 5234426576715676739}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5234426577712821801
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426577712821812}
+ m_CullTransparentMesh: 0
+--- !u!114 &5234426577712821802
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426577712821812}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 2100000, guid: 329cdefad4cf0f14e9b6767d0af094b0, type: 2}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!114 &7066721728451557091
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5234426577712821812}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3d5970893ef64ed4aa155d71e6c515ca, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &6037486589368256570
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4703832778049971774}
+ - component: {fileID: 4782931143528438246}
+ - component: {fileID: 5215530967309281004}
+ - component: {fileID: 9062648910478887000}
+ m_Layer: 0
+ m_Name: Back Plate
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4703832778049971774
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6037486589368256570}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 0.01}
+ m_Children: []
+ m_Father: {fileID: 5234426576715676739}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4782931143528438246
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6037486589368256570}
+ m_CullTransparentMesh: 0
+--- !u!114 &5215530967309281004
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6037486589368256570}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 2100000, guid: ec72a3a105768f746b556a8dfdae61a8, type: 2}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!114 &9062648910478887000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6037486589368256570}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3d5970893ef64ed4aa155d71e6c515ca, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUI.prefab.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUI.prefab.meta
new file mode 100644
index 00000000000..06f69f7e82c
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUI.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: df89e360642c6fc46abbc1c2656856f6
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUICircular.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUICircular.prefab
new file mode 100644
index 00000000000..bbf8454eb08
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUICircular.prefab
@@ -0,0 +1,146 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &2486209284698229024
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 48
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 48
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676739, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676748, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Name
+ value: PressableButtonUnityUICircular
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426576715676743, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Material
+ value:
+ objectReference: {fileID: 2100000, guid: 68f0ad9fadae8b3438ebd66cdba2b20f, type: 2}
+ - target: {fileID: 5234426577712821803, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5234426577712821802, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Material
+ value:
+ objectReference: {fileID: 2100000, guid: ed88a1368a3ad7248b15504ada5915a6, type: 2}
+ - target: {fileID: 4703832778049971774, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5215530967309281004, guid: df89e360642c6fc46abbc1c2656856f6,
+ type: 3}
+ propertyPath: m_Material
+ value:
+ objectReference: {fileID: 2100000, guid: 68f0ad9fadae8b3438ebd66cdba2b20f, type: 2}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: df89e360642c6fc46abbc1c2656856f6, type: 3}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUICircular.prefab.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUICircular.prefab.meta
new file mode 100644
index 00000000000..4868ce794ea
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/PressableButtonUnityUICircular.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c31734863d3bf254191878828a9e17e6
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/RadialSet.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/RadialSet.prefab
index 6921c6a4e40..ecae55292d8 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/RadialSet.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/RadialSet.prefab
@@ -937,7 +937,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 65613013962320470}
localForward: {x: 0, y: 0, z: -1}
@@ -1108,7 +1107,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 65735667765749806}
localForward: {x: 0, y: 0, z: -1}
@@ -1461,7 +1459,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 65959922074838590}
localForward: {x: 0, y: 0, z: -1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ToggleButton.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ToggleButton.prefab
index f85f6ee48ed..b5ee30442fa 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ToggleButton.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ToggleButton.prefab
@@ -786,7 +786,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 65451765068380320}
localForward: {x: 0, y: 0, z: -1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ToggleSwitch.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ToggleSwitch.prefab
index bbc3c689620..007efadc440 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ToggleSwitch.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/ToggleSwitch.prefab
@@ -437,7 +437,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 65620022048249504}
localForward: {x: 0, y: 0, z: -1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/IInteractableHandler.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/IInteractableHandler.cs
index 8b358674c98..9c77a9123ce 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/IInteractableHandler.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/IInteractableHandler.cs
@@ -12,19 +12,11 @@ public interface IInteractableHandler
///
/// A voice command was called
///
- ///
- ///
- ///
- ///
- ///
void OnVoiceCommand(InteractableStates state, Interactable source, string command, int index = 0, int length = 1);
///
/// A click event happened
///
- ///
- ///
- ///
void OnClick(InteractableStates state, Interactable source, IMixedRealityPointer pointer = null);
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableAudioReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableAudioReceiver.cs
index e004aa194b0..bcb74c24652 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableAudioReceiver.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableAudioReceiver.cs
@@ -13,22 +13,27 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
public class InteractableAudioReceiver : ReceiverBase
{
+ ///
+ /// AudioClip to play when event is selected
+ ///
[InspectorField(Type = InspectorField.FieldTypes.AudioClip, Label = "Audio Clip", Tooltip = "Assign an audioclip to play on click")]
public AudioClip AudioClip;
+ ///
+ public override bool HideUnityEvents => true;
+
private State lastState;
-
- public InteractableAudioReceiver(UnityEvent ev) : base(ev)
+
+ ///
+ /// Creates and AudioReceiver, which plays sounds on Click
+ ///
+ public InteractableAudioReceiver(UnityEvent ev) : base(ev, "AudioEvent")
{
- Name = "AudioEvent";
- HideUnityEvents = true; // hides Unity events in the receiver - meant to be code only
}
-
+
///
/// Called on update, check to see if the state has changed sense the last call
///
- ///
- ///
public override void OnUpdate(InteractableStates state, Interactable source)
{
if (state.CurrentState() != lastState)
@@ -41,7 +46,6 @@ public override void OnUpdate(InteractableStates state, Interactable source)
///
/// assign the clip to the audio source and play
///
- ///
private void PlayAudio(Interactable source)
{
AudioSource audioSource = source.GetComponent();
@@ -57,9 +61,6 @@ private void PlayAudio(Interactable source)
///
/// click happened
///
- ///
- ///
- ///
public override void OnClick(InteractableStates state, Interactable source, IMixedRealityPointer pointer = null)
{
base.OnClick(state, source);
@@ -69,11 +70,6 @@ public override void OnClick(InteractableStates state, Interactable source, IMix
///
/// voice command called
///
- ///
- ///
- ///
- ///
- ///
public override void OnVoiceCommand(InteractableStates state, Interactable source, string command, int index = 0, int length = 1)
{
base.OnVoiceCommand(state, source, command, index, length);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableEvent.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableEvent.cs
index 543372686b1..abc4c72b9f4 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableEvent.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableEvent.cs
@@ -1,10 +1,12 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using Microsoft.MixedReality.Toolkit.Utilities;
using Microsoft.MixedReality.Toolkit.Utilities.Editor;
using System;
using System.Collections.Generic;
-using System.Reflection;
+using System.Linq;
+using UnityEngine;
using UnityEngine.Events;
namespace Microsoft.MixedReality.Toolkit.UI
@@ -15,103 +17,81 @@ namespace Microsoft.MixedReality.Toolkit.UI
[System.Serializable]
public class InteractableEvent
{
- public string Name;
- public UnityEvent Event;
- public string ClassName;
- public string AssemblyQualifiedName;
- public ReceiverBase Receiver;
- public List Settings;
- public bool HideUnityEvents;
-
- public struct ReceiverData
- {
- public string Name;
- public bool HideUnityEvents;
- public List Fields;
- }
-
///
- /// The list of base classes whose derived classes will be included in interactable event
- /// selection dropdowns.
+ /// Base Event used to initialize EventReceiver class
///
- private static readonly List candidateEventTypes = new List() { typeof(ReceiverBase) };
+ public UnityEvent Event = new UnityEvent();
- public ReceiverData AddOnClick()
- {
- return AddReceiver(typeof(InteractableOnClickReceiver));
- }
+ ///
+ /// ReceiverBase instantiation for this InteractableEvent. Used at runtime by Interactable class
+ ///
+ [NonSerialized]
+ public ReceiverBase Receiver;
///
- /// Add new events/receivers to the list and grab all the InspectorFields so we can render them in the inspector
+ /// Defines the type of Receiver to associate. Type must be a class that extends ReceiverBase
///
- ///
- ///
- public ReceiverData AddReceiver(Type type)
+ public Type ReceiverType
{
- ReceiverBase receiver = (ReceiverBase)Activator.CreateInstance(type, Event);
- // get the settings for the inspector
-
- List fields = new List();
-
- Type myType = receiver.GetType();
- int index = 0;
-
- ReceiverData data = new ReceiverData();
-
- foreach (PropertyInfo prop in myType.GetProperties())
+ get
{
- var attrs = (InspectorField[])prop.GetCustomAttributes(typeof(InspectorField), false);
- foreach (var attr in attrs)
+ if (receiverType == null)
{
- fields.Add(new InspectorFieldData() { Name = prop.Name, Attributes = attr, Value = prop.GetValue(receiver, null)});
+ if (string.IsNullOrEmpty(AssemblyQualifiedName))
+ {
+ return null;
+ }
+
+ receiverType = Type.GetType(AssemblyQualifiedName);
}
- index++;
+ return receiverType;
}
-
- index = 0;
- foreach (FieldInfo field in myType.GetFields())
+ set
{
- var attrs = (InspectorField[])field.GetCustomAttributes(typeof(InspectorField), false);
- foreach (var attr in attrs)
+ if (!value.IsSubclassOf(typeof(ReceiverBase)))
{
- fields.Add(new InspectorFieldData() { Name = field.Name, Attributes = attr, Value = field.GetValue(receiver) });
+ Debug.LogWarning($"Cannot assign type {value} that does not extend {typeof(ReceiverBase)} to ThemeDefinition");
+ return;
}
- index++;
+ if (receiverType != value)
+ {
+ receiverType = value;
+ ClassName = receiverType.Name;
+ AssemblyQualifiedName = receiverType.AssemblyQualifiedName;
+ }
}
+ }
- data.Fields = fields;
- data.Name = receiver.Name;
- data.HideUnityEvents = receiver.HideUnityEvents;
+ // Unity cannot serialize System.Type, thus must save AssemblyQualifiedName
+ // Field here for Runtime use
+ [NonSerialized]
+ private Type receiverType;
- return data;
- }
+ [SerializeField]
+ private string ClassName;
+
+ [SerializeField]
+ private string AssemblyQualifiedName;
+
+ [SerializeField]
+ private List Settings = new List();
- ///
- /// Get the recieverBase types that contain event logic
- ///
- ///
- public static InteractableTypesContainer GetEventTypes()
- {
- return InteractableTypeFinder.Find(candidateEventTypes, TypeRestriction.DerivedOnly);
- }
-
///
/// Create the event and setup the values from the inspector
///
- ///
- ///
- public static ReceiverBase GetReceiver(InteractableEvent iEvent, InteractableTypesContainer interactableTypes)
+ public static ReceiverBase CreateReceiver(InteractableEvent iEvent)
{
-#if UNITY_EDITOR
- int index = InspectorField.ReverseLookup(iEvent.ClassName, interactableTypes.ClassNames);
- Type eventType = interactableTypes.Types[index];
-#else
- Type eventType = Type.GetType(iEvent.AssemblyQualifiedName);
-#endif
- // apply the settings?
- ReceiverBase newEvent = (ReceiverBase)Activator.CreateInstance(eventType, iEvent.Event);
+ // Temporary workaround
+ // This is to fix a bug in GA where the AssemblyQualifiedName was never actually saved. Functionality would work in editor...but never on device player
+ if (iEvent.ReceiverType == null)
+ {
+ var correctType = TypeCacheUtility.GetSubClasses().Where(s => s?.Name == iEvent.ClassName).First();
+ iEvent.ReceiverType = correctType;
+ }
+
+ ReceiverBase newEvent = (ReceiverBase)Activator.CreateInstance(iEvent.ReceiverType, iEvent.Event);
InspectorGenericFields.LoadSettings(newEvent, iEvent.Settings);
return newEvent;
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnClickReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnClickReceiver.cs
index 537d0e6aa92..00edca19a81 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnClickReceiver.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnClickReceiver.cs
@@ -11,16 +11,23 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
public class InteractableOnClickReceiver : ReceiverBase
{
- public InteractableOnClickReceiver(UnityEvent ev): base(ev)
- {
- Name = "OnClick";
- }
+ ///
+ /// Invoked on pointer clicked
+ ///
+ public UnityEvent OnClicked => uEvent;
+
+ ///
+ /// Creates receiver for raising OnClick events
+ ///
+ public InteractableOnClickReceiver(UnityEvent ev): base(ev, "OnClick") { }
+ ///
public override void OnUpdate(InteractableStates state, Interactable source)
{
// using onClick
}
+ ///
public override void OnClick(InteractableStates state, Interactable source, IMixedRealityPointer pointer = null)
{
uEvent.Invoke();
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnFocusReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnFocusReceiver.cs
index a718b36ac89..a89f92b5f3c 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnFocusReceiver.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnFocusReceiver.cs
@@ -11,24 +11,35 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
public class InteractableOnFocusReceiver : ReceiverBase
{
+ ///
+ /// Creates receiver that raises focus enter and exit unity events
+ ///
+ public InteractableOnFocusReceiver() : this(new UnityEvent()) { }
+
+ ///
+ /// Creates receiver that raises focus enter and exit unity events
+ ///
+ public InteractableOnFocusReceiver(UnityEvent ev) : base(ev, "OnFocusOn") { }
+
+ ///
+ /// Raised when focus has left the object
+ ///
[InspectorField(Type = InspectorField.FieldTypes.Event, Label = "On Focus Off", Tooltip = "Focus has left the object")]
public UnityEvent OnFocusOff = new UnityEvent();
- private bool hadFocus;
- private State lastState;
+ ///
+ /// Raised when focus has entered the object
+ ///
+ public UnityEvent OnFocusOn => uEvent;
- public InteractableOnFocusReceiver(UnityEvent ev) : base(ev)
- {
- Name = "OnFocus";
- }
+ private bool hadFocus;
+ ///
public override void OnUpdate(InteractableStates state, Interactable source)
{
- bool changed = state.CurrentState() != lastState;
-
bool hasFocus = state.GetState(InteractableStates.InteractableStateEnum.Focus).Value > 0;
- if (hadFocus != hasFocus && changed)
+ if (hadFocus != hasFocus)
{
if (hasFocus)
{
@@ -41,7 +52,6 @@ public override void OnUpdate(InteractableStates state, Interactable source)
}
hadFocus = hasFocus;
- lastState = state.CurrentState();
}
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnGrabReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnGrabReceiver.cs
index c0b5a35f0d3..8e3601ede17 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnGrabReceiver.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnGrabReceiver.cs
@@ -12,17 +12,30 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
public class InteractableOnGrabReceiver : ReceiverBase
{
+ ///
+ /// Invoked on grab release
+ ///
[InspectorField(Type = InspectorField.FieldTypes.Event, Label = "On Release", Tooltip = "Grab was released")]
public UnityEvent OnRelease = new UnityEvent();
+ ///
+ /// Invoked on grab start
+ ///
+ public UnityEvent OnGrab => uEvent;
+
private bool hadGrab;
- private State lastState;
- public InteractableOnGrabReceiver(UnityEvent ev) : base(ev)
- {
- Name = "OnGrab";
- }
+ ///
+ /// Creates a receiver that raises grab start and end events.
+ ///
+ public InteractableOnGrabReceiver(UnityEvent ev) : base(ev, "OnGrab") { }
+
+ ///
+ /// Creates a receiver that raises grab start and end events.
+ ///
+ public InteractableOnGrabReceiver() : this( new UnityEvent()) { }
+ ///
public override void OnUpdate(InteractableStates state, Interactable source)
{
bool hasGrab = state.GetState(InteractableStates.InteractableStateEnum.Grab).Value > 0;
@@ -40,7 +53,6 @@ public override void OnUpdate(InteractableStates state, Interactable source)
}
hadGrab = hasGrab;
- lastState = state.CurrentState();
}
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnHoldReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnHoldReceiver.cs
index 85a04c2cb31..23288256d0a 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnHoldReceiver.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnHoldReceiver.cs
@@ -12,6 +12,9 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
public class InteractableOnHoldReceiver : ReceiverBase
{
+ ///
+ /// The amount of time to press before triggering event
+ ///
[InspectorField(Type = InspectorField.FieldTypes.Float, Label = "Hold Time", Tooltip = "The amount of time to press before triggering event")]
public float HoldTime = 1f;
@@ -19,11 +22,22 @@ public class InteractableOnHoldReceiver : ReceiverBase
private bool hasDown;
- public InteractableOnHoldReceiver(UnityEvent ev): base(ev)
- {
- Name = "OnHold";
- }
+ ///
+ /// Invoked when interactable has been pressed for HoldTime
+ ///
+ public UnityEvent OnHold => uEvent;
+
+ ///
+ /// Creates receiver that raises OnHold events
+ ///
+ public InteractableOnHoldReceiver(UnityEvent ev): base(ev, "OnHold") { }
+
+ ///
+ /// Creates receiver that raises OnHold events
+ ///
+ public InteractableOnHoldReceiver() : this(new UnityEvent()) { }
+ ///
public override void OnUpdate(InteractableStates state, Interactable source)
{
if (state.GetState(InteractableStates.InteractableStateEnum.Pressed).Value > 0 && !hasDown)
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnPressReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnPressReceiver.cs
index 91a691f118c..69a20787fd1 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnPressReceiver.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnPressReceiver.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.
using Microsoft.MixedReality.Toolkit.Utilities.Editor;
-using UnityEngine;
using UnityEngine.Events;
namespace Microsoft.MixedReality.Toolkit.UI
@@ -12,29 +11,57 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
public class InteractableOnPressReceiver : ReceiverBase
{
-
+ ///
+ /// Invoked on pointer release
+ ///
[InspectorField(Type = InspectorField.FieldTypes.Event, Label = "On Release", Tooltip = "The button is released")]
public UnityEvent OnRelease = new UnityEvent();
+ ///
+ /// Invoked on pointer press
+ ///
+ public UnityEvent OnPress => uEvent;
+
+ ///
+ /// Type of valid interaction distances to fire press events
+ ///
public enum InteractionType
{
+ ///
+ /// Support Near and Far press interactions
+ ///
NearAndFar = 0,
+ ///
+ /// Support Near press interactions only
+ ///
NearOnly = 1,
+ ///
+ /// Support Far press interactions only
+ ///
FarOnly = 2
}
- [InspectorField(Label = "Interaction Filter", Tooltip = "Specify whether press event is for near or far interaction", Type = InspectorField.FieldTypes.DropdownInt, Options = new string[] { "Near and Far", "Near Only", "Far Only" })]
+ ///
+ /// Specify whether press event is for near or far interaction
+ ///
+ [InspectorField(Label = "Interaction Filter",
+ Tooltip = "Specify whether press event is for near or far interaction",
+ Type = InspectorField.FieldTypes.DropdownInt, Options = new string[] { "Near and Far", "Near Only", "Far Only" })]
public int InteractionFilter = (int)InteractionType.NearAndFar;
private bool hasDown;
- private State lastState;
private bool isNear = false;
- public InteractableOnPressReceiver(UnityEvent ev) : base(ev)
- {
- Name = "OnPress";
- }
+ ///
+ /// Receiver that raises press and release unity events
+ ///
+ public InteractableOnPressReceiver(UnityEvent ev) : base(ev, "OnPress") { }
+
+ ///
+ /// Receiver that raises press and release unity events
+ ///
+ public InteractableOnPressReceiver() : this(new UnityEvent()) { }
///
/// checks if the received interactable state matches the press filter
@@ -53,15 +80,15 @@ private bool IsFilterValid()
}
}
+
+ ///
public override void OnUpdate(InteractableStates state, Interactable source)
{
- bool changed = state.CurrentState() != lastState;
-
bool hadDown = hasDown;
hasDown = state.GetState(InteractableStates.InteractableStateEnum.Pressed).Value > 0;
- if (changed && hasDown != hadDown)
+ if (hasDown != hadDown)
{
if (hasDown)
{
@@ -79,8 +106,6 @@ public override void OnUpdate(InteractableStates state, Interactable source)
}
}
}
-
- lastState = state.CurrentState();
}
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnToggleReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnToggleReceiver.cs
index 57cf426af88..077476f0d04 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnToggleReceiver.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnToggleReceiver.cs
@@ -1,41 +1,57 @@
-using Microsoft.MixedReality.Toolkit.Input;
-using Microsoft.MixedReality.Toolkit.Utilities.Editor;
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using Microsoft.MixedReality.Toolkit.Input;
+using Microsoft.MixedReality.Toolkit.Utilities.Editor;
using UnityEngine.Events;
namespace Microsoft.MixedReality.Toolkit.UI
{
///
- /// a receiver that listens to toggle events
+ /// An event receiver that listens to toggle events
///
public class InteractableOnToggleReceiver : ReceiverBase
{
+ ///
+ /// Invoked when toggle is deselected
+ ///
[InspectorField(Type = InspectorField.FieldTypes.Event, Label = "On Deselect", Tooltip = "The toggle is deselected")]
public UnityEvent OnDeselect = new UnityEvent();
- public InteractableOnToggleReceiver(UnityEvent ev) : base(ev)
- {
- Name = "OnSelect";
- }
+ ///
+ /// Invoked when toggle is checked
+ ///
+ public UnityEvent OnSelect => uEvent;
+ ///
+ /// Creates a receiver that raises events for toggle button states
+ ///
+ public InteractableOnToggleReceiver(UnityEvent ev) : base(ev, "OnSelect") { }
+
+ ///
+ /// Creates a receiver that raises events for toggle button states
+ ///
+ public InteractableOnToggleReceiver() : this(new UnityEvent()) { }
+
+ ///
public override void OnUpdate(InteractableStates state, Interactable source)
{
// using onClick
}
+ ///
public override void OnClick(InteractableStates state, Interactable source, IMixedRealityPointer pointer = null)
{
- int currentIndex = source.GetDimensionIndex();
-
- if (currentIndex % 2 == 0)
- {
- OnDeselect.Invoke();
- }
- else
+ if (source.ButtonMode == SelectionModes.Toggle)
{
- uEvent.Invoke();
+ if (source.IsToggled)
+ {
+ OnSelect.Invoke();
+ }
+ else
+ {
+ OnDeselect.Invoke();
+ }
}
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnTouchReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnTouchReceiver.cs
index 0b3f88d9b0d..1106e90950e 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnTouchReceiver.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableOnTouchReceiver.cs
@@ -12,17 +12,30 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
public class InteractableOnTouchReceiver : ReceiverBase
{
+ ///
+ /// Invoked when touch has left the object
+ ///
[InspectorField(Type = InspectorField.FieldTypes.Event, Label = "On Touch End", Tooltip = "Touch has left the object")]
public UnityEvent OnTouchEnd = new UnityEvent();
+ ///
+ /// Invoked when touch begins
+ ///
+ public UnityEvent OnTouchStart => uEvent;
+
private bool hadTouch;
- private State lastState;
- public InteractableOnTouchReceiver(UnityEvent ev) : base(ev)
- {
- Name = "OnTouch";
- }
+ ///
+ /// Receiver for raising touch begin and end events
+ ///
+ public InteractableOnTouchReceiver(UnityEvent ev) : base(ev, "OnTouch") { }
+
+ ///
+ /// Receiver for raising touch begin and end events
+ ///
+ public InteractableOnTouchReceiver() : this(new UnityEvent()) { }
+ ///
public override void OnUpdate(InteractableStates state, Interactable source)
{
bool hadTouch = state.GetState(InteractableStates.InteractableStateEnum.PhysicalTouch).Value > 0;
@@ -40,7 +53,6 @@ public override void OnUpdate(InteractableStates state, Interactable source)
}
this.hadTouch = hadTouch;
- lastState = state.CurrentState();
}
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableReceiver.cs
index 356f8427d0d..9cfc72f824f 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableReceiver.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableReceiver.cs
@@ -28,8 +28,7 @@ protected virtual void SetupEvents()
{
if (Events.Count > 0)
{
- InteractableTypesContainer interactableTypes = InteractableEvent.GetEventTypes();
- Events[0].Receiver = InteractableEvent.GetReceiver(Events[0], interactableTypes);
+ Events[0].Receiver = InteractableEvent.CreateReceiver(Events[0]);
Events[0].Receiver.Host = this;
}
}
@@ -37,8 +36,6 @@ protected virtual void SetupEvents()
///
/// A state has changed
///
- ///
- ///
public override void OnStateChange(InteractableStates state, Interactable source)
{
base.OnStateChange(state, source);
@@ -54,9 +51,6 @@ public override void OnStateChange(InteractableStates state, Interactable source
///
/// click happened
///
- ///
- ///
- ///
public override void OnClick(InteractableStates state, Interactable source, IMixedRealityPointer pointer = null)
{
base.OnClick(state, source, pointer);
@@ -73,11 +67,6 @@ public override void OnClick(InteractableStates state, Interactable source, IMix
///
/// voice command happened
///
- ///
- ///
- ///
- ///
- ///
public override void OnVoiceCommand(InteractableStates state, Interactable source, string command, int index = 0, int length = 1)
{
base.OnVoiceCommand(state, source, command, index, length);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableReceiverList.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableReceiverList.cs
index a9195732afd..ff39e0a01e6 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableReceiverList.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableReceiverList.cs
@@ -9,11 +9,12 @@ namespace Microsoft.MixedReality.Toolkit.UI
{
///
/// An example of building an Interactable receiver that uses built-in receivers that extend ReceiverBase
- /// This is a mono behavior, place on a gameObject and assign the Interactable
///
public class InteractableReceiverList : ReceiverBaseMonoBehavior
{
- // list of events added to this interactable
+ ///
+ /// List of events added to this interactable
+ ///
[HideInInspector]
public List Events = new List();
@@ -27,11 +28,9 @@ protected virtual void Awake()
///
protected virtual void SetupEvents()
{
- InteractableTypesContainer interactableTypes = InteractableEvent.GetEventTypes();
-
for (int i = 0; i < Events.Count; i++)
{
- Events[i].Receiver = InteractableEvent.GetReceiver(Events[i], interactableTypes);
+ Events[i].Receiver = InteractableEvent.CreateReceiver(Events[i]);
Events[i].Receiver.Host = this;
}
}
@@ -39,8 +38,6 @@ protected virtual void SetupEvents()
///
/// .A state has changed
///
- ///
- ///
public override void OnStateChange(InteractableStates state, Interactable source)
{
base.OnStateChange(state, source);
@@ -52,15 +49,11 @@ public override void OnStateChange(InteractableStates state, Interactable source
Events[i].Receiver.OnUpdate(state, source);
}
}
-
}
///
/// captures click events
///
- ///
- ///
- ///
public override void OnClick(InteractableStates state, Interactable source, IMixedRealityPointer pointer = null)
{
base.OnClick(state, source, pointer);
@@ -77,9 +70,6 @@ public override void OnClick(InteractableStates state, Interactable source, IMix
///
/// captures voice commands
///
- ///
- ///
- ///
/// index of the voice command
/// voice command array length
public override void OnVoiceCommand(InteractableStates state, Interactable source, string command, int index = 0, int length = 1)
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/ReceiverBase.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/ReceiverBase.cs
index 6a471b0138a..f71f32df15c 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/ReceiverBase.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/ReceiverBase.cs
@@ -2,6 +2,7 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.
using Microsoft.MixedReality.Toolkit.Input;
+using System;
using UnityEngine;
using UnityEngine.Events;
@@ -12,46 +13,55 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
public abstract class ReceiverBase
{
- public string Name;
+ ///
+ /// Name of Event Receiver
+ ///
+ public string Name { get; protected set; }
+
+ ///
+ /// Defines whether Unity Events should be hidden in inspector for this type of EventReceiver
+ ///
+ public virtual bool HideUnityEvents => false;
- public bool HideUnityEvents;
protected UnityEvent uEvent;
- public MonoBehaviour Host;
+ ///
+ /// Each Receiver has a base Event it raises, (in addition to others).
+ ///
+ public UnityEvent Event { get => uEvent; set => uEvent = value; }
+
+ ///
+ /// Targeted component for Event Receiver at runtime
+ ///
+ public MonoBehaviour Host { get; set; }
- public ReceiverBase(UnityEvent ev)
+ ///
+ /// Constructs an interaction receiver that will raise unity event when triggered.
+ ///
+ /// Unity event to invoke. Add more events in deriving class.
+ /// Name of the unity event that will get invoked (visible in editor).
+ public ReceiverBase(UnityEvent ev, string name)
{
uEvent = ev;
+ Name = name;
}
///
/// The state has changed
///
- ///
- ///
public abstract void OnUpdate(InteractableStates state, Interactable source);
///
/// A voice command was called
///
- ///
- ///
- ///
- ///
- ///
public virtual void OnVoiceCommand(InteractableStates state, Interactable source, string command, int index = 0, int length = 1)
{
- // voice command called
}
///
/// A click event happened
///
- ///
- ///
- ///
public virtual void OnClick(InteractableStates state, Interactable source, IMixedRealityPointer pointer = null)
{
- // click called
}
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/ReceiverBaseMonoBehavior.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/ReceiverBaseMonoBehavior.cs
index 09923a65051..0c4ad804781 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/ReceiverBaseMonoBehavior.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/ReceiverBaseMonoBehavior.cs
@@ -14,9 +14,21 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
public class ReceiverBaseMonoBehavior : MonoBehaviour, IInteractableHandler
{
+ ///
+ /// Types of directions to search for Interactable component in transform heirachy
+ ///
public enum SearchScopes { Self, Parent, Children };
+
+ ///
+ /// Interactable to target
+ ///
public Interactable Interactable;
+
+ ///
+ /// directions to search for Interactable component in transform heirachy if none assigned
+ ///
public SearchScopes InteractableSearchScope;
+
protected State lastState;
///
@@ -51,7 +63,6 @@ protected virtual void OnEnable()
///
/// Add an interactable and add it as a handler
///
- ///
public void AddInteractable(Interactable interactable)
{
if (Interactable != null)
@@ -90,8 +101,6 @@ protected virtual void Update()
///
/// a state has changed
///
- ///
- ///
public virtual void OnStateChange(InteractableStates state, Interactable source)
{
// the state has changed, do something new
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Interactable.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Interactable.cs
index 24ef12526c4..53f4c228939 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Interactable.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Interactable.cs
@@ -7,6 +7,8 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Events;
+using UnityEngine.EventSystems;
+using UnityEngine.Serialization;
namespace Microsoft.MixedReality.Toolkit.UI
{
@@ -15,8 +17,6 @@ namespace Microsoft.MixedReality.Toolkit.UI
/// Maintains a collection of themes that react to state changes and provide sensory feedback
/// Passes state information and input data on to receivers that detect patterns and does stuff.
///
- // TODO: Make sure all shader values are batched by theme
-
[System.Serializable]
[HelpURL("https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/README_Interactable.html")]
public class Interactable :
@@ -30,74 +30,178 @@ public class Interactable :
IMixedRealityInputHandler,
IMixedRealityInputHandler
{
- ///
- /// Setup the input system
- ///
- private static IMixedRealityInputSystem inputSystem = null;
- protected static IMixedRealityInputSystem InputSystem
- {
- get
- {
- if (inputSystem == null)
- {
- MixedRealityServiceRegistry.TryGetService(out inputSystem);
- }
- return inputSystem;
- }
- }
-
- protected readonly List focusingPointers = new List();
-
///
/// Pointers that are focusing the interactable
///
public List FocusingPointers => focusingPointers;
+ protected readonly List focusingPointers = new List();
- protected readonly HashSet pressingInputSources = new HashSet();
///
/// Input sources that are pressing the interactable
///
public HashSet PressingInputSources => pressingInputSources;
-
- ///
- /// Is the interactable enabled?
- ///
- public bool Enabled = true;
+ protected readonly HashSet pressingInputSources = new HashSet();
+
+ [FormerlySerializedAs("States")]
+ [SerializeField]
+ private States states;
///
/// A collection of states and basic state logic
///
- public States States;
+ public States States
+ {
+ get { return states; }
+ set
+ {
+ states = value;
+ SetupStates();
+ }
+ }
///
/// The state logic for comparing state
///
- public InteractableStates StateManager;
+ public InteractableStates StateManager { get; protected set; }
///
/// Which action is this interactable listening for
///
- public MixedRealityInputAction InputAction;
+ public MixedRealityInputAction InputAction { get; set; }
- // the id of the selected inputAction, for serialization
+ ///
+ /// The id of the selected inputAction, for serialization
+ ///
[HideInInspector]
- public int InputActionId;
+ [SerializeField]
+ private int InputActionId = -1;
+ [FormerlySerializedAs("IsGlobal")]
+ [SerializeField]
+ protected bool isGlobal = false;
///
/// Is the interactable listening to global events (input only)
///
- public bool IsGlobal = false;
+ public bool IsGlobal
+ {
+ get { return isGlobal; }
+ set
+ {
+ if (isGlobal != value)
+ {
+ isGlobal = value;
+
+ // If we are active, then register or unregister our the global input handler with the InputSystem
+ // If we are disabled, then we will re-register OnEnable()
+ if (gameObject.activeInHierarchy)
+ {
+ RegisterHandler(isGlobal);
+ }
+ }
+ }
+ }
+ ///
+ /// A way of adding more layers of states for controls like toggles.
+ /// This is capitalized and doesn't match conventions for backwards compatability
+ /// (to not break people using Interactable). We tried using FormerlySerializedAs("Dimensions)
+ /// and renaming to "dimensions", however Unity did not properly pick up the former serialization,
+ /// so we maintained the old value. See https://github.com/microsoft/MixedRealityToolkit-Unity/issues/6169
+ ///
+ [SerializeField]
+ protected int Dimensions = 1;
///
/// A way of adding more layers of states for controls like toggles
///
- public int Dimensions = 1;
+ public int NumOfDimensions
+ {
+ get { return Dimensions; }
+ set
+ {
+ if (Dimensions != value)
+ {
+ // Value cannot be negative or zero
+ if (value > 0)
+ {
+ // If we are currently in Toggle mode, we are about to not be
+ // Auto-turn off state
+ if (ButtonMode == SelectionModes.Toggle)
+ {
+ IsToggled = false;
+ }
+
+ Dimensions = value;
+
+ CurrentDimension = Mathf.Clamp(CurrentDimension, 0, Dimensions - 1);
+ }
+ else
+ {
+ Debug.LogWarning($"Value {value} for Dimensions property setter cannot be negative or zero.");
+ }
+ }
+ }
+ }
+
+ // cache of current dimension
+ [SerializeField]
+ protected int dimensionIndex = 0;
+ ///
+ /// Current Dimension index based zero and must be less than Dimensions
+ ///
+ public int CurrentDimension
+ {
+ get { return dimensionIndex; }
+ set
+ {
+ if (dimensionIndex != value)
+ {
+ // If valid value and not our current value, then update
+ if (value >= 0 && value < NumOfDimensions)
+ {
+ dimensionIndex = value;
+
+ // If we are in toggle mode, update IsToggled state based on current dimension
+ // This needs to happen after updating dimensionIndex, since IsToggled.set will call CurrentDimension.set again
+ if (ButtonMode == SelectionModes.Toggle)
+ {
+ IsToggled = dimensionIndex > 0;
+ }
+
+ UpdateActiveThemes();
+ forceUpdate = true;
+ }
+ else
+ {
+ Debug.LogWarning($"Value {value} for property setter CurrentDimension cannot be less than 0 and cannot be greater than or equal to Dimensions={NumOfDimensions}");
+ }
+ }
+ }
+ }
+
+ ///
+ /// Returns the current selection mode of the Interactable based on the number of Dimensions available
+ ///
+ ///
+ /// Returns the following under the associated conditions:
+ /// SelectionModes.Invalid => Dimensions less than or equal to 0
+ /// SelectionModes.Button => Dimensions == 1
+ /// SelectionModes.Toggle => Dimensions == 2
+ /// SelectionModes.MultiDimension => Dimensions > 2
+ ///
+ public SelectionModes ButtonMode
+ {
+ get
+ {
+ return ConvertToSelectionMode(NumOfDimensions);
+ }
+ }
///
/// The Dimension value to set on start
///
+ [FormerlySerializedAs("StartDimensionIndex")]
[SerializeField]
- private int StartDimensionIndex = 0;
+ private int startDimensionIndex = 0;
///
/// Is the interactive selectable?
@@ -116,394 +220,415 @@ protected static IMixedRealityInputSystem InputSystem
///
public string VoiceCommand = "";
+ [FormerlySerializedAs("RequiresFocus")]
+ [SerializeField]
+ public bool voiceRequiresFocus = true;
///
/// Does the voice command require this to have focus?
/// Registers as a global listener for speech commands, ignores input events
///
- public bool RequiresFocus = true;
+ public bool VoiceRequiresFocus
+ {
+ get { return voiceRequiresFocus; }
+ set
+ {
+ if (voiceRequiresFocus != value)
+ {
+ voiceRequiresFocus = value;
- ///
- /// Does this interactable require focus
- ///
- public bool FocusEnabled { get { return !IsGlobal; } set { IsGlobal = !value; } }
+ // If we are active, then change global speech registeration.
+ // Register handle if we do not require focus, unregister otherwise
+ if (gameObject.activeInHierarchy)
+ {
+ RegisterHandler(!voiceRequiresFocus);
+ }
+ }
+ }
+ }
+ [FormerlySerializedAs("Profiles")]
+ [SerializeField]
+ private List profiles = new List();
///
- /// List of profiles can match themes with gameObjects
+ /// List of profile configurations that match Visual Themes with GameObjects targets
+ /// Setting at runtime will re-create the runtime Theme Engines (i.e ActiveThemes property) being used by this class
///
- public List Profiles = new List();
+ public List Profiles
+ {
+ get { return profiles; }
+ set
+ {
+ profiles = value;
+ SetupThemes();
+ }
+ }
///
/// Base onclick event
///
public UnityEvent OnClick = new UnityEvent();
+ [SerializeField]
+ private List Events = new List();
///
/// List of events added to this interactable
///
- public List Events = new List();
+ public List InteractableEvents
+ {
+ get { return Events; }
+ set
+ {
+ Events = value;
+ SetupEvents();
+ }
+ }
+
+ private List activeThemes = new List();
///
/// The list of running theme instances to receive state changes
- /// When the dimension index changes, the list of themes that are updated changes to those assigned to that dimension.
+ /// When the dimension index changes, activeThemes updates to those assigned to that dimension.
///
- public List runningThemesList = new List();
+ public IReadOnlyList ActiveThemes => activeThemes.AsReadOnly();
- // the list of profile settings, so theme values are not directly effected
- protected List runningProfileSettings = new List();
- // directly manipulate a theme value, skip blending
- protected bool forceUpdate = false;
+ ///
+ /// List of (dimension index, InteractableThemeBase) pairs that describe all possible themes the
+ /// interactable can have. First element in the tuple represents dimension index for the theme.
+ /// This list gets initialized on startup, or whenever the profiles for the interactable changes.
+ /// The list of active themes inspects this list to determine which themes to use based on current dimension.
+ ///
+ private List> allThemeDimensionPairs = new List>();
- //
- // States
- //
+ ///
+ /// How many times this interactable was clicked
+ ///
+ ///
+ /// Useful for checking when a click event occurs.
+ ///
+ public int ClickCount { get; private set; }
+
+ #region States
+
+ // Field just used for serialization to save if the Interactable should start enabled or disabled
+ [FormerlySerializedAs("Enabled")]
+ [SerializeField]
+ private bool enabledOnStart = true;
///
- /// Has focus
+ /// Defines whether the Interactable is enabled or not internally
+ /// This is different than the Enabled property at the GameObject/Component level
+ /// When false, Interactable will continue to run in Unity but not respond to Input.
///
- public bool HasFocus { get; private set; }
+ ///
+ /// Property is useful for disabling UX, such as greying out a button, until a user completes some pre-mandatory step such as fill out their name, etc
+ ///
+ public virtual bool IsEnabled
+ {
+ // Note the inverse setting since targeting "Disable" state but property is concerning "Enabled"
+ get { return !(GetStateValue(InteractableStates.InteractableStateEnum.Disabled) > 0); }
+ set
+ {
+ if (IsEnabled != value)
+ {
+ // If we are disabling input, we should reset our base input tracking states since we will not be responding to input while disabled
+ if (!value)
+ {
+ ResetInputTrackingStates();
+ }
+
+ SetState(InteractableStates.InteractableStateEnum.Disabled, !value);
+ }
+ }
+ }
///
- /// Currently being pressed
+ /// Has focus
///
- public bool HasPress { get; private set; }
+ public virtual bool HasFocus
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.Focus) > 0; }
+ set
+ {
+ if (HasFocus != value)
+ {
+ if (!value && HasPress)
+ {
+ rollOffTimer = 0;
+ }
+ else
+ {
+ rollOffTimer = rollOffTime;
+ }
+
+ SetState(InteractableStates.InteractableStateEnum.Focus, value);
+ }
+ }
+ }
///
- /// Is disabled
+ /// Currently being pressed
///
- public bool IsDisabled { get; private set; }
+ public virtual bool HasPress
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.Pressed) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.Pressed, value); }
+ }
- // advanced button states from InteractableStates.InteractableStateEnum
///
- /// Has focus, finger up - custom: not set by Interactable
+ /// Targeted means the item has focus and finger is up
+ /// Currently not controlled by Interactable directly
///
- public bool IsTargeted { get; private set; }
+ public virtual bool IsTargeted
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.Targeted) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.Targeted, value); }
+ }
///
- /// No focus, finger is up - custom: not set by Interactable
+ /// State that corresponds to no focus,and finger is up.
+ /// Currently not controlled by Interactable directly
///
- public bool IsInteractive { get; private set; }
+ public virtual bool IsInteractive
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.Interactive) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.Interactive, value); }
+ }
///
- /// Has focus, finger down - custom: not set by Interactable
+ /// State that corresponds to has focus,and finger down.
+ /// Currently not controlled by Interactable directly
///
- public bool HasObservationTargeted { get; private set; }
+ public virtual bool HasObservationTargeted
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.ObservationTargeted) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.ObservationTargeted, value); }
+ }
///
- /// No focus, finger down - custom: not set by Interactable
+ /// State that corresponds to no focus,and finger is down.
+ /// Currently not controlled by Interactable directly
///
- public bool HasObservation { get; private set; }
+ public virtual bool HasObservation
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.Observation) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.Observation, value); }
+ }
///
/// The Interactable has been clicked
///
- public bool IsVisited { get; private set; }
+ public virtual bool IsVisited
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.Visited) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.Visited, value); }
+ }
///
- /// True if SelectionMode is "Toggle" (Dimensions == 2) and the dimension index is not zero.
+ /// Determines whether Interactable is toggled or not. If true, CurrentDimension should be 1 and if false, CurrentDimension should be 0
///
- public bool IsToggled { get { return Dimensions == 2 && dimensionIndex > 0; } }
+ ///
+ /// Only valid when ButtonMode == SelectionMode.Toggle (i.e Dimensions == 2)
+ ///
+ public virtual bool IsToggled
+ {
+ get
+ {
+ return GetStateValue(InteractableStates.InteractableStateEnum.Toggled) > 0;
+ }
+ set
+ {
+ if (IsToggled != value)
+ {
+ // We can only change Toggle state if we are in Toggle mode
+ if (ButtonMode == SelectionModes.Toggle)
+ {
+ SetState(InteractableStates.InteractableStateEnum.Toggled, value);
+
+ CurrentDimension = value ? 1 : 0;
+ }
+ else
+ {
+ Debug.LogWarning($"SetToggled(bool) called, but SelectionMode is set to {ButtonMode}, so Current Dimension was unchanged.");
+ }
+ }
+ }
+ }
///
/// Currently pressed and some movement has occurred
///
- public bool HasGesture { get; private set; }
+ public virtual bool HasGesture
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.Gesture) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.Gesture, value); }
+ }
///
- /// Gesture reached max threshold or limits - custom: not set by Interactable
+ /// State that corresponds to Gesture reaching max threshold or limits
+ /// Currently not controlled by Interactable directly
///
- public bool HasGestureMax { get; private set; }
+ public virtual bool HasGestureMax
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.GestureMax) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.GestureMax, value); }
+ }
///
- /// Interactable is touching another object - custom: not set by Interactable
+ /// State that corresponds to Interactable is touching another object
+ /// Currently not controlled by Interactable directly
///
- public bool HasCollision { get; private set; }
+ public virtual bool HasCollision
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.Collision) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.Collision, value); }
+ }
///
- /// A voice command has occurred, this does not automatically reset
- /// Can be reset using the SetVoiceCommand(bool) method.
+ /// A voice command has just occurred
///
- public bool HasVoiceCommand { get; private set; }
+ public virtual bool HasVoiceCommand
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.VoiceCommand) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.VoiceCommand, value); }
+ }
///
/// A near interaction touchable is actively being touched
///
- public bool HasPhysicalTouch { get; private set; }
+ public virtual bool HasPhysicalTouch
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.PhysicalTouch) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.PhysicalTouch, value); }
+ }
///
- /// Misc - custom: not set by Interactable
+ /// State that corresponds to miscellaneous/custom use by consumers
+ /// Currently not controlled by Interactable directly
///
- public bool HasCustom { get; private set; }
+ public virtual bool HasCustom
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.Custom) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.Custom, value); }
+ }
///
- /// A near interaction grabbable is actively being grabbed/
+ /// A near interaction grabbable is actively being grabbed
///
- public bool HasGrab { get; private set; }
+ public virtual bool HasGrab
+ {
+ get { return GetStateValue(InteractableStates.InteractableStateEnum.Grab) > 0; }
+ set { SetState(InteractableStates.InteractableStateEnum.Grab, value); }
+ }
- // internal cached states
- protected State lastState;
- protected bool wasDisabled = false;
+ #endregion
- // check for isGlobal or RequiresFocus changes
- protected bool requiresFocusValueCheck;
- protected bool isGlobalValueCheck;
+ protected State lastState;
- // cache of current dimension
- [SerializeField]
- protected int dimensionIndex = 0;
+ // directly manipulate a theme value, skip blending
+ protected bool forceUpdate = false;
// allows for switching colliders without firing a lose focus immediately
// for advanced controls like drop-downs
protected float rollOffTime = 0.25f;
protected float rollOffTimer = 0.25f;
- // cache voice commands
- protected string[] voiceCommands;
-
- // IInteractableEvents
protected List handlers = new List();
- protected Coroutine globalTimer;
-
- //
- // Clicking
- //
-
- // A click must occur within this many seconds after an input down
+ ///
+ /// A click must occur within this many seconds after an input down
+ ///
protected float clickTime = 1.5f;
protected Coroutine clickValidTimer;
- // how many clicks does it take?
- protected int clickCount = 0;
- protected float globalFeedbackClickTime = 0.3f;
-
+
///
- /// how many times this interactable was clicked
- /// good for checking when a click event occurs.
+ /// Amount of time to "simulate" press states for interactions that do not utilize input up/down such as voice command
+ /// This allows for visual feedbacks and other typical UX responsiveness and behavior to occur
///
- public int ClickCount => clickCount;
+ protected const float globalFeedbackClickTime = 0.3f;
+ protected Coroutine globalTimer;
- //
- // Variables for determining gesture state
- //
+ #region Gesture State Variables
///
/// The position of the controller when input down occurs.
/// Used to determine when controller has moved far enough to trigger gesture
///
protected Vector3? dragStartPosition = null;
+
// Input must move at least this distance before a gesture is considered started, for 2D input like thumbstick
static readonly float gestureStartThresholdVector2 = 0.1f;
+
// Input must move at least this distance before a gesture is considered started, for 3D input
static readonly float gestureStartThresholdVector3 = 0.05f;
+
// Input must move at least this distance before a gesture is considered started, for
// mixed reality pose input. This is the distance and hand or controller needs to move
static readonly float gestureStartThresholdMixedRealityPose = 0.1f;
- ///
- /// Register OnClick extra handlers
- ///
- ///
- public void AddHandler(IInteractableHandler handler)
+ #endregion
+
+ #region MonoBehaviorImplementation
+
+ protected virtual void Awake()
{
- if (!handlers.Contains(handler))
+ if (States == null)
{
- handlers.Add(handler);
+ States = GetDefaultInteractableStates();
}
+
+ IsEnabled = enabledOnStart;
+
+ InputAction = ResolveInputAction(InputActionId);
+
+ CurrentDimension = startDimensionIndex;
+
+ RefreshSetup();
}
- ///
- /// Remove onClick handlers
- ///
- ///
- public void RemoveHandler(IInteractableHandler handler)
+ protected virtual void OnEnable()
{
- if (handlers.Contains(handler))
+ if (!VoiceRequiresFocus)
{
- handlers.Remove(handler);
+ RegisterHandler(true);
}
- }
- #region InspectorHelpers
- ///
- /// Get a list of Mixed Reality Input Actions from the input actions profile.
- ///
- ///
- ///
- public static bool TryGetInputActions(out string[] descriptionsArray)
- {
- if (!MixedRealityToolkit.ConfirmInitialized() || !MixedRealityToolkit.Instance.HasActiveProfile)
+ if (IsGlobal)
{
- descriptionsArray = null;
- return false;
+ RegisterHandler(true);
}
- MixedRealityInputAction[] actions = InputSystem.InputSystemProfile.InputActionsProfile.InputActions;
+ focusingPointers.RemoveAll((focusingPointer) => (focusingPointer.FocusTarget as Interactable) != this);
- descriptionsArray = new string[actions.Length];
- for (int i = 0; i < actions.Length; i++)
+ if (focusingPointers.Count == 0)
{
- descriptionsArray[i] = actions[i].Description;
+ ResetInputTrackingStates();
}
-
- return true;
}
- ///
- /// Try to get a list of speech commands from the MRTK/Input/SpeechCommands profile
- ///
- ///
- ///
- public static bool TryGetMixedRealitySpeechCommands(out SpeechCommands[] commands)
+ protected virtual void OnDisable()
{
- if (!MixedRealityToolkit.ConfirmInitialized() || !MixedRealityToolkit.Instance.HasActiveProfile)
+ // If we registered to receive global events, remove ourselves when disabled
+ if (!VoiceRequiresFocus)
{
- commands = null;
- return false;
+ RegisterHandler(false);
}
- commands = InputSystem.InputSystemProfile.SpeechCommandsProfile?.SpeechCommands;
-
- if (commands == null || commands.Length < 1)
+ if (IsGlobal)
{
- commands = null;
- return false;
+ RegisterHandler(false);
}
- return true;
+ ResetInputTrackingStates();
}
- ///
- /// Look for speech commands in the MRTK Speech Command profile
- /// Adds a blank value at index zero so the developer can turn the feature off.
- ///
- ///
- ///
- public static bool TryGetSpeechKeywords(out string[] keywords)
+ protected virtual void Start()
{
- SpeechCommands[] commands;
- if (!TryGetMixedRealitySpeechCommands(out commands))
- {
- keywords = null;
- return false;
- }
-
- List keys = new List
- {
- "(No Selection)"
- };
-
- for (var i = 0; i < commands.Length; i++)
- {
- keys.Add(commands[i].Keyword);
- }
+ InternalUpdate();
+ }
- keywords = keys.ToArray();
- return true;
- }
-
- ///
- /// Returns a list of states assigned to the Interactable
- ///
- ///
- public State[] GetStates()
- {
- if (States != null)
- {
- return States.GetStates();
- }
-
- return new State[0];
- }
- #endregion InspectorHelpers
-
- #region MonoBehaviorImplementation
-
- protected virtual void Awake()
- {
-
- if (States == null)
- {
- States = States.GetDefaultInteractableStates();
- }
- InputAction = ResolveInputAction(InputActionId);
- SetupEvents();
- SetupThemes();
- SetupStates();
-
- if(StartDimensionIndex > 0)
- {
- SetDimensionIndex(StartDimensionIndex);
- }
- }
-
- private void OnEnable()
- {
- if (!RequiresFocus)
- {
- RegisterGlobalSpeechHandler(true);
- }
-
- if (IsGlobal)
- {
- RegisterGlobalInputHandler(true);
- }
-
- requiresFocusValueCheck = RequiresFocus;
- isGlobalValueCheck = IsGlobal;
-
- focusingPointers.RemoveAll((focusingPointer) => (Interactable)focusingPointer.FocusTarget != this);
-
- if (focusingPointers.Count == 0)
- {
- ResetBaseStates();
- ForceUpdateThemes();
- }
- }
-
- private void OnDisable()
- {
- if (!RequiresFocus)
- {
- RegisterGlobalSpeechHandler(false);
- }
-
- if (IsGlobal)
- {
- RegisterGlobalInputHandler(false);
- }
- }
-
- private void RegisterGlobalInputHandler(bool globalInput)
- {
- if (globalInput)
- {
- InputSystem.RegisterHandler(this);
- }
- else
- {
- InputSystem.UnregisterHandler(this);
- }
- }
-
- private void RegisterGlobalSpeechHandler(bool globalSpeech)
- {
- if (globalSpeech)
- {
- InputSystem.RegisterHandler(this);
- }
- else
- {
- InputSystem.UnregisterHandler(this);
- }
- }
-
- protected virtual void Start()
- {
- InternalUpdate();
- }
-
- protected virtual void Update()
- {
- InternalUpdate();
+ protected virtual void Update()
+ {
+ InternalUpdate();
}
private void InternalUpdate()
@@ -514,23 +639,23 @@ private void InternalUpdate()
if (rollOffTimer >= rollOffTime)
{
- SetPress(false);
+ HasPress = false;
}
}
- for (int i = 0; i < Events.Count; i++)
+ for (int i = 0; i < InteractableEvents.Count; i++)
{
- if (Events[i].Receiver != null)
+ if (InteractableEvents[i].Receiver != null)
{
- Events[i].Receiver.OnUpdate(StateManager, this);
+ InteractableEvents[i].Receiver.OnUpdate(StateManager, this);
}
}
- for (int i = 0; i < runningThemesList.Count; i++)
+ for (int i = 0; i < activeThemes.Count; i++)
{
- if (runningThemesList[i].Loaded)
+ if (activeThemes[i].Loaded)
{
- runningThemesList[i].OnUpdate(StateManager.CurrentState().ActiveIndex, this, forceUpdate);
+ activeThemes[i].OnUpdate(StateManager.CurrentState().ActiveIndex, forceUpdate);
}
}
@@ -550,36 +675,34 @@ private void InternalUpdate()
forceUpdate = false;
}
- if (IsDisabled == Enabled)
- {
- SetDisabled(!Enabled);
- }
-
lastState = StateManager.CurrentState();
-
- if (isGlobalValueCheck != IsGlobal)
- {
- isGlobalValueCheck = IsGlobal;
- RegisterGlobalInputHandler(IsGlobal);
- }
-
- if (requiresFocusValueCheck != RequiresFocus)
- {
- requiresFocusValueCheck = RequiresFocus;
- RegisterGlobalSpeechHandler(!RequiresFocus);
- }
}
- #endregion MonoBehaviorImplimentation
+ #endregion MonoBehavior Implimentation
- #region InteractableInitiation
+ #region Interactable Initiation
+
+ ///
+ /// Force re-initialization of Interactable from events, themes and state references
+ ///
+ public void RefreshSetup()
+ {
+ SetupEvents();
+ SetupThemes();
+ SetupStates();
+ }
///
/// starts the StateManager
///
protected virtual void SetupStates()
{
- StateManager = States.SetupLogic();
+ // Note that statemanager will clear states by allocating a new object
+ // But resetting states directly will call setters which may perform necessary steps to enter appropriate state
+ ResetAllStates();
+
+ Debug.Assert(typeof(InteractableStates).IsAssignableFrom(States.StateModelType), $"Invalid state model of type {States.StateModelType}. State model must extend from {typeof(InteractableStates)}");
+ StateManager = (InteractableStates)States.CreateStateModel();
}
///
@@ -587,66 +710,73 @@ protected virtual void SetupStates()
///
protected virtual void SetupEvents()
{
- InteractableTypesContainer interactableTypes = InteractableEvent.GetEventTypes();
+ for (int i = 0; i < InteractableEvents.Count; i++)
+ {
+ InteractableEvents[i].Receiver = InteractableEvent.CreateReceiver(InteractableEvents[i]);
+ InteractableEvents[i].Receiver.Host = this;
+ }
+ }
+
+ ///
+ /// Updates the list of active themes based the current dimensions index
+ ///
+ protected virtual void UpdateActiveThemes()
+ {
+ activeThemes.Clear();
- for (int i = 0; i < Events.Count; i++)
+ for (int i = 0; i < allThemeDimensionPairs.Count; i++)
{
- Events[i].Receiver = InteractableEvent.GetReceiver(Events[i], interactableTypes);
- Events[i].Receiver.Host = this;
+ if (allThemeDimensionPairs[i].Item1 == CurrentDimension)
+ {
+ activeThemes.Add(allThemeDimensionPairs[i].Item2);
+ }
}
}
///
- /// Creates the list of theme instances based on all the theme settings
+ /// At startup or whenever a profile changes, creates all
+ /// possible themes that interactable can be in. We then update
+ /// the set of active themes by inspecting this list, looking for
+ /// only themes whose index matched CurrentDimensionIndex.
///
- protected virtual void SetupThemes()
+ private void SetupThemes()
{
- runningThemesList = new List();
- runningProfileSettings = new List();
- for (int i = 0; i < Profiles.Count; i++)
+ allThemeDimensionPairs.Clear();
+ // Profiles are one per GameObject/ThemeContainer
+ // ThemeContainers are one per dimension
+ // ThemeDefinitions are one per desired effect (i.e theme)
+ foreach (var profile in Profiles)
{
- ProfileSettings profileSettings = new ProfileSettings();
- List themeSettingsList = new List();
- for (int j = 0; j < Profiles[i].Themes.Count; j++)
+ if (profile.Target != null && profile.Themes != null)
{
- Theme theme = Profiles[i].Themes[j];
- ThemeSettings themeSettings = new ThemeSettings();
- if (Profiles[i].Target != null && theme != null)
+ for (int i = 0; i < profile.Themes.Count; i++)
{
- List tempSettings = new List();
- for (int n = 0; n < theme.Settings.Count; n++)
+ var themeContainer = profile.Themes[i];
+ if (themeContainer.States.Equals(States))
{
- InteractableThemePropertySettings settings = theme.Settings[n];
- settings.Theme = InteractableProfileItem.GetTheme(settings, Profiles[i].Target);
-
- // add themes to theme list based on dimension
- if (j == dimensionIndex)
+ foreach (var themeDefinition in themeContainer.Definitions)
{
- runningThemesList.Add(settings.Theme);
+ allThemeDimensionPairs.Add(new System.Tuple(
+ i,
+ InteractableThemeBase.CreateAndInitTheme(themeDefinition, profile.Target)));
}
-
- tempSettings.Add(settings);
}
-
- themeSettings.Settings = tempSettings;
- themeSettingsList.Add(themeSettings);
+ else
+ {
+ Debug.LogWarning($"Could not use {themeContainer.name} in Interactable on {gameObject.name} because Theme's States does not match {States.name}");
+ }
}
}
-
- profileSettings.ThemeSettings = themeSettingsList;
- runningProfileSettings.Add(profileSettings);
}
+ UpdateActiveThemes();
}
+ #endregion Interactable Initiation
- #endregion InteractableInitiation
-
- #region SetButtonStates
+ #region State Utilities
///
- /// Grabs the state value index
+ /// Grabs the state value index, returns -1 if no StateManager available
///
- ///
- ///
public int GetStateValue(InteractableStates.InteractableStateEnum state)
{
if (StateManager != null)
@@ -654,338 +784,242 @@ public int GetStateValue(InteractableStates.InteractableStateEnum state)
return StateManager.GetStateValue((int)state);
}
- return 0;
+ return -1;
}
///
- /// Handle focus state changes
+ /// a public way to set state directly
///
- ///
- public virtual void SetFocus(bool focus)
+ public void SetState(InteractableStates.InteractableStateEnum state, bool value)
{
- HasFocus = focus;
- if (!focus && HasPress)
- {
- rollOffTimer = 0;
- }
- else
+ if (StateManager != null)
{
- rollOffTimer = rollOffTime;
+ StateManager.SetStateValue(state, value ? 1 : 0);
+ UpdateState();
}
-
- SetState(InteractableStates.InteractableStateEnum.Focus, focus);
}
///
- /// Change the press state
+ /// runs the state logic and sets state based on the current state values
///
- ///
- public virtual void SetPress(bool press)
+ protected virtual void UpdateState()
{
- HasPress = press;
- SetState(InteractableStates.InteractableStateEnum.Pressed, press);
+ StateManager.CompareStates();
}
///
- /// Change the disabled state, will override the Enabled property
+ /// Reset the input tracking states directly managed by Interactable such as whether the component has focus or is being grabbed
+ /// Useful for when needing to reset input interactions
///
- ///
- public virtual void SetDisabled(bool disabled)
+ public void ResetInputTrackingStates()
{
- IsDisabled = disabled;
- Enabled = !disabled;
- SetState(InteractableStates.InteractableStateEnum.Disabled, disabled);
- }
+ HasFocus = false;
+ HasPress = false;
+ HasPhysicalTouch = false;
+ HasGrab = false;
+ HasGesture = false;
+ HasGestureMax = false;
+ HasVoiceCommand = false;
- ///
- /// Change the targeted state
- ///
- ///
- public virtual void SetTargeted(bool targeted)
- {
- IsTargeted = targeted;
- SetState(InteractableStates.InteractableStateEnum.Targeted, targeted);
- }
+ if (globalTimer != null)
+ {
+ StopCoroutine(globalTimer);
+ globalTimer = null;
+ }
- ///
- /// Change the Interactive state
- ///
- ///
- public virtual void SetInteractive(bool interactive)
- {
- IsInteractive = interactive;
- SetState(InteractableStates.InteractableStateEnum.Interactive, interactive);
+ dragStartPosition = null;
}
///
- /// Change the observation targeted state
+ /// Reset all states in the Interactable and pointer information
///
- ///
- public virtual void SetObservationTargeted(bool targeted)
+ public void ResetAllStates()
{
- HasObservationTargeted = targeted;
- SetState(InteractableStates.InteractableStateEnum.ObservationTargeted, targeted);
+ focusingPointers.Clear();
+ pressingInputSources.Clear();
+
+ ResetInputTrackingStates();
+
+ IsEnabled = true;
+ HasObservation = false;
+ HasObservationTargeted = false;
+ IsInteractive = false;
+ IsTargeted = false;
+ IsToggled = false;
+ IsVisited = false;
+ HasCollision = false;
+ HasCustom = false;
}
+ #endregion State Utilities
+
+ #region Dimensions Utilities
+
///
- /// Change the observation state
+ /// Increases the Current Dimension by 1. If at end (i.e Dimensions - 1), then loop around to beginning (i.e 0)
///
- ///
- public virtual void SetObservation(bool observation)
+ public void IncreaseDimension()
{
- HasObservation = observation;
- SetState(InteractableStates.InteractableStateEnum.Observation, observation);
+ if (CurrentDimension == NumOfDimensions - 1)
+ {
+ CurrentDimension = 0;
+ }
+ else
+ {
+ CurrentDimension++;
+ }
}
///
- /// Change the visited state
+ /// Decreases the Current Dimension by 1. If at zero, then loop around to end (i.e Dimensions - 1)
///
- ///
- public virtual void SetVisited(bool visited)
+ public void DecreaseDimension()
{
- IsVisited = visited;
- SetState(InteractableStates.InteractableStateEnum.Visited, visited);
+ if (CurrentDimension == 0)
+ {
+ CurrentDimension = NumOfDimensions - 1;
+ }
+ else
+ {
+ CurrentDimension--;
+ }
}
///
- /// Change the toggled state
+ /// Helper method to convert number of dimensions to the appropriate SelectionModes
///
- ///
- public virtual void SetToggled(bool toggled)
+ /// number of dimensions
+ /// SelectionModes for corresponding number of dimensions
+ public static SelectionModes ConvertToSelectionMode(int dimensions)
{
- SetState(InteractableStates.InteractableStateEnum.Toggled, toggled);
-
- // if in toggle mode
- if (Dimensions == 2)
+ if (dimensions <= 0)
{
- SetDimensionIndex(toggled ? 1 : 0);
+ return SelectionModes.Invalid;
+ }
+ else if (dimensions == 1)
+ {
+ return SelectionModes.Button;
+ }
+ else if (dimensions == 2)
+ {
+ return SelectionModes.Toggle;
}
else
{
- int selectedMode = Mathf.Clamp(Dimensions, 1, 3);
- Debug.Log("SetToggled(bool) called, but SelectionMode is set to " + (SelectionModes)(selectedMode - 1) + ", so DimensionIndex was unchanged.");
+ return SelectionModes.MultiDimension;
}
}
+ #endregion Dimensions Utilities
+
+ #region Events
+
///
- /// Change the gesture state
+ /// Register OnClick extra handlers
///
- ///
- public virtual void SetGesture(bool gesture)
+ public void AddHandler(IInteractableHandler handler)
{
- HasGesture = gesture;
- SetState(InteractableStates.InteractableStateEnum.Gesture, gesture);
+ if (!handlers.Contains(handler))
+ {
+ handlers.Add(handler);
+ }
}
///
- /// Change the gesture max state
+ /// Remove onClick handlers
///
- ///
- public virtual void SetGestureMax(bool gesture)
+ public void RemoveHandler(IInteractableHandler handler)
{
- HasGestureMax = gesture;
- SetState(InteractableStates.InteractableStateEnum.GestureMax, gesture);
+ if (handlers.Contains(handler))
+ {
+ handlers.Remove(handler);
+ }
}
///
- /// Change the collision state
+ /// Event receivers can be used to listen for different
+ /// events at runtime. This method allows receivers to be dynamically added at runtime.
///
- ///
- public virtual void SetCollision(bool collision)
+ /// The new event receiver
+ public T AddReceiver() where T : ReceiverBase, new()
{
- HasCollision = collision;
- SetState(InteractableStates.InteractableStateEnum.Collision, collision);
+ var interactableEvent = new InteractableEvent();
+ var result = new T();
+ result.Event = interactableEvent.Event;
+ interactableEvent.Receiver = result;
+ InteractableEvents.Add(interactableEvent);
+ return result;
}
///
- /// Change the custom state
+ /// Returns the first receiver of type T on the interactable,
+ /// or null if nothing is found.
///
- ///
- public virtual void SetCustom(bool custom)
+ public T GetReceiver() where T : ReceiverBase
{
- HasCustom = custom;
- SetState(InteractableStates.InteractableStateEnum.Custom, custom);
+ for (int i = 0; i < InteractableEvents.Count; i++)
+ {
+ if (InteractableEvents[i] != null && InteractableEvents[i].Receiver is T)
+ {
+ return (T)InteractableEvents[i].Receiver;
+ }
+ }
+ return null;
}
///
- /// Change the voice command state
+ /// Returns all receivers of type T on the interactable.
+ /// If nothing is found, returns empty list.
///
- ///
- public virtual void SetVoiceCommand(bool voice)
+ public List GetReceivers() where T : ReceiverBase
{
- HasVoiceCommand = voice;
- SetState(InteractableStates.InteractableStateEnum.VoiceCommand, voice);
+ List result = new List();
+ for (int i = 0; i < InteractableEvents.Count; i++)
+ {
+ if (InteractableEvents[i] != null && InteractableEvents[i].Receiver is T)
+ {
+ result.Add((T)InteractableEvents[i].Receiver);
+ }
+ }
+ return result;
}
+ #endregion
+
+ #region Input Timers
+
///
- /// Change the physical touch state
+ /// Starts a timer to check if input is in progress
+ /// - Make sure global pointer events are not double firing
+ /// - Make sure Global Input events are not double firing
+ /// - Make sure pointer events are not duplicating an input event
///
- ///
- public virtual void SetPhysicalTouch(bool touch)
+ protected void StartClickTimer(bool isFromInputDown = false)
{
- HasPhysicalTouch = touch;
- SetState(InteractableStates.InteractableStateEnum.PhysicalTouch, touch);
+ if (IsGlobal || isFromInputDown)
+ {
+ if (clickValidTimer != null)
+ {
+ StopClickTimer();
+ }
+
+ clickValidTimer = StartCoroutine(InputDownTimer(clickTime));
+ }
}
- ///
- /// Change the grab state
- ///
- ///
- public virtual void SetGrab(bool grab)
+ protected void StopClickTimer()
{
- HasGrab = grab;
- SetState(InteractableStates.InteractableStateEnum.Grab, grab);
+ Debug.Assert(clickValidTimer != null, "StopClickTimer called but no click timer is running");
+ StopCoroutine(clickValidTimer);
+ clickValidTimer = null;
}
///
- /// a public way to set state directly
+ /// A timer for the MixedRealityInputHandlers, clicks should occur within a certain time.
///
- ///
- ///
- public void SetState(InteractableStates.InteractableStateEnum state, bool value)
- {
- if (StateManager != null)
- {
- StateManager.SetStateValue(state, value ? 1 : 0);
- }
-
- UpdateState();
- }
-
- ///
- /// runs the state logic and sets state based on the current state values
- ///
- protected virtual void UpdateState()
- {
- StateManager.CompareStates();
- }
-
- ///
- /// Reset the basic interaction states
- ///
- public void ResetBaseStates()
- {
- // reset states
- SetFocus(false);
- SetPress(false);
- SetPhysicalTouch(false);
- SetGrab(false);
- SetGesture(false);
- SetGestureMax(false);
- SetVoiceCommand(false);
-
- if (globalTimer != null)
- {
- StopCoroutine(globalTimer);
- globalTimer = null;
- }
-
- dragStartPosition = null;
- }
-
- ///
- /// Reset all states in the Interactable and pointer information
- ///
- public void ResetAllStates()
- {
- focusingPointers.Clear();
- pressingInputSources.Clear();
- ResetBaseStates();
- SetCollision(false);
- SetCustom(false);
- SetObservation(false);
- SetObservationTargeted(false);
- SetInteractive(false);
- SetTargeted(false);
- SetToggled(false);
- SetVisited(false);
- }
-
- #endregion SetButtonStates
-
- #region PointerManagement
-
- #endregion PointerManagement
-
- #region MixedRealityFocusChangedHandlers
-
- public void OnBeforeFocusChange(FocusEventData eventData)
- {
- if (!CanInteract())
- {
- return;
- }
-
- if (eventData.NewFocusedObject == null)
- {
- focusingPointers.Remove(eventData.Pointer);
- }
- else if (eventData.NewFocusedObject.transform.IsChildOf(gameObject.transform))
- {
- if (!focusingPointers.Contains(eventData.Pointer))
- {
- focusingPointers.Add(eventData.Pointer);
- }
- }
- else if (eventData.OldFocusedObject.transform.IsChildOf(gameObject.transform))
- {
- focusingPointers.Remove(eventData.Pointer);
- }
- }
-
- public void OnFocusChanged(FocusEventData eventData) { }
-
- #endregion MixedRealityFocusChangedHandlers
-
- #region MixedRealityFocusHandlers
-
- public void OnFocusEnter(FocusEventData eventData)
- {
- if (CanInteract())
- {
- Debug.Assert(focusingPointers.Count > 0,
- "OnFocusEnter called but focusingPointers == 0. Most likely caused by the presence of a child object " +
- "that is handling IMixedRealityFocusChangedHandler");
- SetFocus(true);
- }
- }
-
- public void OnFocusExit(FocusEventData eventData)
- {
- if (!CanInteract() && !HasFocus)
- {
- return;
- }
-
- SetFocus(focusingPointers.Count > 0);
- }
-
- #endregion MixedRealityFocusHandlers
-
- ///
- /// Starts a timer to check if input is in progress
- /// - Make sure global pointer events are not double firing
- /// - Make sure Global Input events are not double firing
- /// - Make sure pointer events are not duplicating an input event
- ///
- ///
- protected void StartClickTimer(bool isFromInputDown = false)
- {
- if (IsGlobal || isFromInputDown)
- {
- if (clickValidTimer != null)
- {
- StopClickTimer();
- }
-
- clickValidTimer = StartCoroutine(InputDownTimer(clickTime));
- }
- }
-
- protected void StopClickTimer()
+ protected IEnumerator InputDownTimer(float time)
{
- Debug.Assert(clickValidTimer != null, "StopClickTimer called but no click timer is running");
- StopCoroutine(clickValidTimer);
+ yield return new WaitForSeconds(time);
clickValidTimer = null;
}
@@ -993,146 +1027,40 @@ protected void StopClickTimer()
/// Return true if the interactable can fire a click event.
/// Clicks can only occur within a short duration of an input down firing.
///
- ///
private bool CanFireClick()
{
return clickValidTimer != null;
}
- #region MixedRealityInputHandlers
-
- public void OnPositionInputChanged(InputEventData eventData)
- {
- // ignore
- }
-
- #endregion MixedRealityInputHandlers
-
- #region DimensionsUtilities
-
- ///
- /// A public way to access the current dimension
- ///
- ///
- public int GetDimensionIndex()
- {
- return dimensionIndex;
- }
-
- ///
- /// a public way to increase a dimension, for cycle button
- ///
- public void IncreaseDimension()
- {
- IncreaseDimensionIndex();
- }
-
- ///
- /// a public way to decrease the dimension
- ///
- public void DecreaseDimension()
- {
- int index = dimensionIndex;
- if (index > 0)
- {
- index--;
- }
- else
- {
- index = Dimensions - 1;
- }
-
- SetDimensionIndex(index);
- }
-
- ///
- /// a public way to set the dimension index
- ///
- ///
- public void SetDimensionIndex(int index)
- {
- int currentIndex = dimensionIndex;
- if (index < Dimensions)
- {
- dimensionIndex = index;
+ #endregion
- if (currentIndex != dimensionIndex)
- {
- FilterThemesByDimensions();
- forceUpdate = true;
- }
- }
- }
+ #region Interactable Utilities
- ///
- /// internal dimension cycling
- ///
- protected void IncreaseDimensionIndex()
+ private void RegisterHandler(bool enable) where T : IEventSystemHandler
{
- int currentIndex = dimensionIndex;
-
- if (dimensionIndex < Dimensions - 1)
+ if (enable)
{
- dimensionIndex++;
+ CoreServices.InputSystem?.RegisterHandler(this);
}
else
{
- dimensionIndex = 0;
+ CoreServices.InputSystem?.UnregisterHandler(this);
}
-
- if (currentIndex != dimensionIndex)
- {
- FilterThemesByDimensions();
- forceUpdate = true;
- }
- }
-
- public void ForceUpdateThemes()
- {
- SetupEvents();
- SetupThemes();
- SetupStates();
}
- #endregion DimensionsUtilities
-
- #region InteractableUtilities
-
///
/// Assigns the InputAction based on the InputActionId
///
- ///
- ///
public static MixedRealityInputAction ResolveInputAction(int index)
{
- MixedRealityInputAction[] actions = InputSystem.InputSystemProfile.InputActionsProfile.InputActions;
+ MixedRealityInputAction[] actions = CoreServices.InputSystem.InputSystemProfile.InputActionsProfile.InputActions;
index = Mathf.Clamp(index, 0, actions.Length - 1);
return actions[index];
}
- ///
- /// Get the themes based on the current dimesionIndex
- ///
- protected void FilterThemesByDimensions()
- {
- runningThemesList = new List();
-
- for (int i = 0; i < runningProfileSettings.Count; i++)
- {
- ProfileSettings settings = runningProfileSettings[i];
- ThemeSettings themeSettings = settings.ThemeSettings[dimensionIndex];
- for (int j = 0; j < themeSettings.Settings.Count; j++)
- {
- runningThemesList.Add(themeSettings.Settings[j].Theme);
- }
- }
- }
-
///
/// Based on inputAction and state, should interactable listen to this up/down event.
///
- ///
- ///
protected virtual bool ShouldListenToUpDownEvent(InputEventData data)
{
if (!(HasFocus || IsGlobal))
@@ -1172,8 +1100,6 @@ protected virtual bool ShouldListenToUpDownEvent(InputEventData data)
///
/// Returns true if the inputeventdata is being dispatched from a near pointer
///
- ///
- ///
private bool IsInputFromNearInteraction(InputEventData eventData)
{
bool isAnyNearpointerFocusing = false;
@@ -1191,20 +1117,14 @@ private bool IsInputFromNearInteraction(InputEventData eventData)
///
/// Based on button settings and state, should this button listen to input?
///
- ///
protected virtual bool CanInteract()
{
- if (!Enabled)
- {
- return false;
- }
-
- if (Dimensions > 1 && ((dimensionIndex != Dimensions - 1 && !CanSelect) || (dimensionIndex == Dimensions - 1 && !CanDeselect)))
- {
- return false;
- }
-
- return true;
+ // Interactable can interact if we are enabled and we are not a toggle button
+ // If we are a toggle button, then we can only toggle if CanSelect (to turn on) or CanDeslect (to turn off)
+ return IsEnabled &&
+ (ButtonMode != SelectionModes.Toggle
+ || (CurrentDimension == 0 && CanSelect)
+ || (CurrentDimension == 1 && CanDeselect));
}
///
@@ -1212,32 +1132,26 @@ protected virtual bool CanInteract()
///
public void TriggerOnClick()
{
- if(Dimensions == 2)
- {
- SetToggled(dimensionIndex % 2 == 0);
- }
- else
- {
- IncreaseDimensionIndex();
- }
-
+ IncreaseDimension();
+
SendOnClick(null);
- SetVisited(true);
+
+ IsVisited = true;
}
///
- /// call onClick methods on receivers or IInteractableHandlers
+ /// Call onClick methods on receivers or IInteractableHandlers
///
protected void SendOnClick(IMixedRealityPointer pointer)
{
OnClick.Invoke();
- clickCount++;
+ ClickCount++;
- for (int i = 0; i < Events.Count; i++)
+ for (int i = 0; i < InteractableEvents.Count; i++)
{
- if (Events[i].Receiver != null)
+ if (InteractableEvents[i].Receiver != null)
{
- Events[i].Receiver.OnClick(StateManager, this, pointer);
+ InteractableEvents[i].Receiver.OnClick(StateManager, this, pointer);
}
}
@@ -1251,20 +1165,19 @@ protected void SendOnClick(IMixedRealityPointer pointer)
}
///
- /// sets some visual states for automating button events like clicks from a keyword
+ /// For input "clicks" that do not have corresponding input up/down tracking such as voice commands
+ /// Simulate pressed and start timer to reset states after some click time
///
- ///
protected void StartGlobalVisual(bool voiceCommand = false)
{
if (voiceCommand)
{
- StateManager.SetStateValue(InteractableStates.InteractableStateEnum.VoiceCommand, 1);
+ HasVoiceCommand = true;
}
- SetVisited(true);
- StateManager.SetStateValue(InteractableStates.InteractableStateEnum.Focus, 1);
- StateManager.SetStateValue(InteractableStates.InteractableStateEnum.Pressed, 1);
- UpdateState();
+ IsVisited = true;
+ HasFocus = true;
+ HasPress = true;
if (globalTimer != null)
{
@@ -1277,128 +1190,278 @@ protected void StartGlobalVisual(bool voiceCommand = false)
///
/// Clears up any automated visual states
///
- ///
- ///
protected IEnumerator GlobalVisualReset(float time)
{
yield return new WaitForSeconds(time);
- StateManager.SetStateValue(InteractableStates.InteractableStateEnum.VoiceCommand, 0);
+ HasVoiceCommand = false;
if (!HasFocus)
{
- StateManager.SetStateValue(InteractableStates.InteractableStateEnum.Focus, 0);
+ HasFocus = false;
}
if (!HasPress)
{
- StateManager.SetStateValue(InteractableStates.InteractableStateEnum.Pressed, 0);
+ HasPress = false;
}
- UpdateState();
-
globalTimer = null;
}
///
- /// A timer for the MixedRealityInputHandlers, clicks should occur within a certain time.
+ /// Public method that can be used to set state of interactable
+ /// corresponding to an input going down (select button, menu button, touch)
///
- ///
- ///
- protected IEnumerator InputDownTimer(float time)
+ public void SetInputDown()
{
- yield return new WaitForSeconds(time);
- clickValidTimer = null;
- }
+ if (!CanInteract())
+ {
+ return;
+ }
- #endregion InteractableUtilities
+ dragStartPosition = null;
- #region VoiceCommands
+ HasPress = true;
- ///
- /// Voice commands from MixedRealitySpeechCommandProfile, keyword recognized
- /// requires isGlobal
- ///
- ///
- public void OnSpeechKeywordRecognized(SpeechEventData eventData)
- {
- if (eventData.Command.Keyword == VoiceCommand && (!RequiresFocus || HasFocus) && Enabled)
- {
- StartGlobalVisual(true);
- SetVoiceCommand(true);
- SendVoiceCommands(VoiceCommand, 0, 1);
- TriggerOnClick();
- eventData.Use();
- }
+ StartClickTimer(true);
}
///
- /// call OnVoinceCommand methods on receivers or IInteractableHandlers
+ /// Public method that can be used to set state of interactable
+ /// corresponding to an input going up.
///
- protected void SendVoiceCommands(string command, int index, int length)
+ public void SetInputUp()
{
- for (int i = 0; i < Events.Count; i++)
+ if (!CanInteract())
{
- if (Events[i].Receiver != null)
- {
- Events[i].Receiver.OnVoiceCommand(StateManager, this, command, index, length);
- }
+ return;
}
- for (int i = 0; i < handlers.Count; i++)
+ HasPress = false;
+ HasGesture = false;
+
+ if (CanFireClick())
{
- if (handlers[i] != null)
- {
- handlers[i].OnVoiceCommand(StateManager, this, command, index, length);
- }
+ StopClickTimer();
+
+ TriggerOnClick();
+ IsVisited = true;
}
}
- ///
- /// checks the voiceCommand array for a keyword and returns it's index
- ///
- ///
- ///
- protected int GetVoiceCommandIndex(string command)
+ private void OnInputChangedHelper(InputEventData eventData, Vector3 inputPosition, float gestureDeadzoneThreshold)
{
- if (voiceCommands.Length > 1)
+ if (!CanInteract())
{
- for (int i = 0; i < voiceCommands.Length; i++)
- {
- if (command == voiceCommands[i])
- {
- return i;
- }
- }
+ return;
}
- return 0;
+ if (ShouldListenToMoveEvent(eventData))
+ {
+ if (dragStartPosition == null)
+ {
+ dragStartPosition = inputPosition;
+ }
+ else if (!HasGesture)
+ {
+ if (Vector3.Distance(dragStartPosition.Value, inputPosition) > gestureStartThresholdVector2)
+ {
+ HasGesture = true;
+ }
+ }
+ }
+ }
+
+ private bool ShouldListenToMoveEvent(InputEventData eventData)
+ {
+ if (!(HasFocus || IsGlobal))
+ {
+ return false;
+ }
+
+ if (!HasPress)
+ {
+ return false;
+ }
+
+ // Ensure that this move event is from a pointer that is pressing the interactable
+ int matchingPointerCount = 0;
+ foreach (var pressingInputSource in pressingInputSources)
+ {
+ if (pressingInputSource == eventData.InputSource)
+ {
+ matchingPointerCount++;
+ }
+ }
+
+ return matchingPointerCount > 0;
+ }
+
+ ///
+ /// Creates the default States ScriptableObject configured for Interactable
+ ///
+ /// Default Interactable States asset
+ public static States GetDefaultInteractableStates()
+ {
+ States result = ScriptableObject.CreateInstance();
+ InteractableStates allInteractableStates = new InteractableStates();
+ result.StateModelType = typeof(InteractableStates);
+ result.StateList = allInteractableStates.GetDefaultStates();
+ result.DefaultIndex = 0;
+ return result;
+ }
+
+ ///
+ /// Helper function to create a new Theme asset using Default Interactable States and provided theme definitions
+ ///
+ /// List of Theme Definitions to associate with Theme asset
+ /// Theme ScriptableObject instance
+ public static Theme GetDefaultThemeAsset(List themeDefintions)
+ {
+ // Create the Theme configuration asset
+ Theme newTheme = ScriptableObject.CreateInstance();
+ newTheme.States = GetDefaultInteractableStates();
+ newTheme.Definitions = themeDefintions;
+ return newTheme;
+ }
+
+ #endregion
+
+ #region MixedRealityFocusChangedHandlers
+
+ ///
+ public void OnBeforeFocusChange(FocusEventData eventData)
+ {
+ if (!CanInteract())
+ {
+ return;
+ }
+
+ if (eventData.NewFocusedObject == null)
+ {
+ focusingPointers.Remove(eventData.Pointer);
+ }
+ else if (eventData.NewFocusedObject.transform.IsChildOf(gameObject.transform))
+ {
+ if (!focusingPointers.Contains(eventData.Pointer))
+ {
+ focusingPointers.Add(eventData.Pointer);
+ }
+ }
+ else if (eventData.OldFocusedObject != null
+ && eventData.OldFocusedObject.transform.IsChildOf(gameObject.transform))
+ {
+ focusingPointers.Remove(eventData.Pointer);
+ }
+ }
+
+ ///
+ public void OnFocusChanged(FocusEventData eventData) { }
+
+ #endregion MixedRealityFocusChangedHandlers
+
+ #region MixedRealityFocusHandlers
+
+ ///
+ public void OnFocusEnter(FocusEventData eventData)
+ {
+ if (CanInteract())
+ {
+ Debug.Assert(focusingPointers.Count > 0,
+ "OnFocusEnter called but focusingPointers == 0. Most likely caused by the presence of a child object " +
+ "that is handling IMixedRealityFocusChangedHandler");
+
+ HasFocus = true;
+ }
+ }
+
+ ///
+ public void OnFocusExit(FocusEventData eventData)
+ {
+ if (!CanInteract() && !HasFocus)
+ {
+ return;
+ }
+
+ HasFocus = focusingPointers.Count > 0;
+ }
+
+ #endregion MixedRealityFocusHandlers
+
+ #region MixedRealityInputHandlers
+
+ ///
+ public void OnPositionInputChanged(InputEventData eventData) { }
+
+ #endregion MixedRealityInputHandlers
+
+ #region MixedRealityVoiceCommands
+
+ ///
+ /// Voice commands from MixedRealitySpeechCommandProfile, keyword recognized
+ ///
+ public void OnSpeechKeywordRecognized(SpeechEventData eventData)
+ {
+ if (eventData.Command.Keyword == VoiceCommand && (!VoiceRequiresFocus || HasFocus) && IsEnabled)
+ {
+ StartGlobalVisual(true);
+ HasVoiceCommand = true;
+ SendVoiceCommands(VoiceCommand, 0, 1);
+ TriggerOnClick();
+ eventData.Use();
+ }
+ }
+
+ ///
+ /// call OnVoinceCommand methods on receivers or IInteractableHandlers
+ ///
+ protected void SendVoiceCommands(string command, int index, int length)
+ {
+ for (int i = 0; i < InteractableEvents.Count; i++)
+ {
+ if (InteractableEvents[i].Receiver != null)
+ {
+ InteractableEvents[i].Receiver.OnVoiceCommand(StateManager, this, command, index, length);
+ }
+ }
+
+ for (int i = 0; i < handlers.Count; i++)
+ {
+ if (handlers[i] != null)
+ {
+ handlers[i].OnVoiceCommand(StateManager, this, command, index, length);
+ }
+ }
}
#endregion VoiceCommands
- #region TouchHandlers
+ #region MixedRealityTouchHandlers
public void OnTouchStarted(HandTrackingInputEventData eventData)
{
- SetPress(true);
- SetPhysicalTouch(true);
+ HasPress = true;
+ HasPhysicalTouch = true;
eventData.Use();
}
public void OnTouchCompleted(HandTrackingInputEventData eventData)
{
- SetPress(false);
- SetPhysicalTouch(false);
+ HasPress = false;
+ HasPhysicalTouch = false;
eventData.Use();
}
public void OnTouchUpdated(HandTrackingInputEventData eventData) { }
+
#endregion TouchHandlers
- #region InputHandlers
+ #region MixedRealityInputHandlers
+
+ ///
public void OnInputUp(InputEventData eventData)
{
- if ((!CanInteract() && !HasPress))
+ if (!CanInteract() && !HasPress)
{
return;
}
@@ -1408,8 +1471,7 @@ public void OnInputUp(InputEventData eventData)
SetInputUp();
if (IsInputFromNearInteraction(eventData))
{
- // TODO:what if we have two hands grabbing?
- SetGrab(false);
+ HasGrab = false;
}
eventData.Use();
@@ -1417,6 +1479,7 @@ public void OnInputUp(InputEventData eventData)
pressingInputSources.Remove(eventData.InputSource);
}
+ ///
public void OnInputDown(InputEventData eventData)
{
if (!CanInteract())
@@ -1428,114 +1491,270 @@ public void OnInputDown(InputEventData eventData)
{
pressingInputSources.Add(eventData.InputSource);
SetInputDown();
- SetGrab(IsInputFromNearInteraction(eventData));
+ HasGrab = IsInputFromNearInteraction(eventData);
eventData.Use();
}
}
+ ///
+ public void OnInputChanged(InputEventData eventData)
+ {
+ OnInputChangedHelper(eventData, eventData.InputData, gestureStartThresholdVector2);
+ }
+
+ ///
+ public void OnInputChanged(InputEventData eventData)
+ {
+ OnInputChangedHelper(eventData, eventData.InputData, gestureStartThresholdVector3);
+ }
+
+ ///
+ public void OnInputChanged(InputEventData eventData)
+ {
+ OnInputChangedHelper(eventData, eventData.InputData.Position, gestureStartThresholdMixedRealityPose);
+ }
+
+ #endregion InputHandlers
+
+ #region Deprecated
+
///
- /// Public method that can be used to set state of interactable
- /// corresponding to an input going down (select button, menu button, touch)
+ /// Resets input tracking states such as focus or grab that are directly controlled by Interactable
///
- public void SetInputDown()
+ [System.Obsolete("Use ResetInputTrackingStates property instead")]
+ public void ResetBaseStates()
{
- if (!CanInteract())
- {
- return;
- }
- dragStartPosition = null;
+ ResetInputTrackingStates();
+ }
- SetPress(true);
- StartClickTimer(true);
+ ///
+ /// A public way to access the current dimension
+ ///
+ [System.Obsolete("Use CurrentDimension property instead")]
+ public int GetDimensionIndex()
+ {
+ return CurrentDimension;
}
///
- /// Public method that can be used to set state of interactable
- /// corresponding to an input going up.
+ /// a public way to set the dimension index
///
- public void SetInputUp()
+ [System.Obsolete("Use CurrentDimension property instead")]
+ public void SetDimensionIndex(int index)
{
- if (!CanInteract())
- {
- return;
- }
+ CurrentDimension = index;
+ }
+
+ ///
+ /// Force re-initialization of Interactable from events, themes and state references
+ ///
+ [System.Obsolete("Use RefreshSetup() instead")]
+ public void ForceUpdateThemes()
+ {
+ RefreshSetup();
+ }
- SetPress(false);
- SetGesture(false);
+ ///
+ /// Does this interactable require focus
+ ///
+ [System.Obsolete("Use IsGlobal instead")]
+ public bool FocusEnabled { get { return !IsGlobal; } set { IsGlobal = !value; } }
- if (CanFireClick())
- {
- StopClickTimer();
+ ///
+ /// True if Selection is "Toggle" (Dimensions == 2)
+ ///
+ [System.Obsolete("Use ButtonMode to test if equal to SelectionModes.Toggle instead")]
+ public bool IsToggleButton { get { return NumOfDimensions == 2; } }
- TriggerOnClick();
- SetVisited(true);
- }
+ ///
+ /// Is the interactable enabled?
+ ///
+ [System.Obsolete("Use IsEnabled instead")]
+ public bool Enabled
+ {
+ get => IsEnabled;
+ set => IsEnabled = value;
}
- private void OnInputChangedHelper(InputEventData eventData, Vector3 inputPosition, float gestureDeadzoneThreshold)
+ ///
+ /// Do oice commands require focus?
+ ///
+ [System.Obsolete("Use VoiceRequiresFocus instead")]
+ public bool RequiresFocus
{
- if (!CanInteract())
- {
- return;
- }
+ get => VoiceRequiresFocus;
+ set => VoiceRequiresFocus = value;
+ }
- if (ShouldListenToMoveEvent(eventData))
+ ///
+ /// Is disabled
+ ///
+ [System.Obsolete("Use IsEnabled instead")]
+ public bool IsDisabled
+ {
+ get => !IsEnabled;
+ set => IsEnabled = !value;
+ }
+
+ ///
+ /// Returns a list of states assigned to the Interactable
+ ///
+ [System.Obsolete("Use States.StateList instead")]
+ public State[] GetStates()
+ {
+ if (States != null)
{
- if (dragStartPosition == null)
- {
- dragStartPosition = inputPosition;
- }
- else if (!HasGesture)
- {
- if (Vector3.Distance(dragStartPosition.Value, inputPosition) > gestureStartThresholdVector2)
- {
- SetGesture(true);
- }
- }
+ return States.StateList.ToArray();
}
+
+ return new State[0];
}
- public void OnInputChanged(InputEventData eventData)
+ ///
+ /// Handle focus state changes
+ ///
+ [System.Obsolete("Use Focus property instead")]
+ public virtual void SetFocus(bool focus)
{
- OnInputChangedHelper(eventData, eventData.InputData, gestureStartThresholdVector2);
+ HasFocus = focus;
}
+ ///
+ /// Change the press state
+ ///
+ [System.Obsolete("Use Press property instead")]
+ public virtual void SetPress(bool press)
+ {
+ HasPress = press;
+ }
- public void OnInputChanged(InputEventData eventData)
+ ///
+ /// Change the disabled state, will override the Enabled property
+ ///
+ [System.Obsolete("Use IsEnabled property instead")]
+ public virtual void SetDisabled(bool disabled)
{
- OnInputChangedHelper(eventData, eventData.InputData, gestureStartThresholdVector3);
+ IsEnabled = !disabled;
}
- public void OnInputChanged(InputEventData eventData)
+ ///
+ /// Change the targeted state
+ ///
+ [System.Obsolete("Use IsTargeted property instead")]
+ public virtual void SetTargeted(bool targeted)
{
- OnInputChangedHelper(eventData, eventData.InputData.Position, gestureStartThresholdMixedRealityPose);
+ IsTargeted = targeted;
}
- private bool ShouldListenToMoveEvent(InputEventData eventData)
+ ///
+ /// Change the Interactive state
+ ///
+ [System.Obsolete("Use IsInteractive property instead")]
+ public virtual void SetInteractive(bool interactive)
{
- if (!(HasFocus || IsGlobal))
- {
- return false;
- }
+ IsInteractive = interactive;
+ }
- if (!HasPress)
- {
- return false;
- }
+ ///
+ /// Change the observation targeted state
+ ///
+ [System.Obsolete("Use HasObservationTargeted property instead")]
+ public virtual void SetObservationTargeted(bool targeted)
+ {
+ HasObservationTargeted = targeted;
+ }
- // Ensure that this move event is from a pointer that is pressing the interactable
- int matchingPointerCount = 0;
- foreach (var pressingInputSource in pressingInputSources)
- {
- if (pressingInputSource == eventData.InputSource)
- {
- matchingPointerCount++;
- }
- }
+ ///
+ /// Change the observation state
+ ///
+ [System.Obsolete("Use HasObservation property instead")]
+ public virtual void SetObservation(bool observation)
+ {
+ HasObservation = observation;
+ }
- return matchingPointerCount > 0;
+ ///
+ /// Change the visited state
+ ///
+ [System.Obsolete("Use IsVisited property instead")]
+ public virtual void SetVisited(bool visited)
+ {
+ IsVisited = visited;
}
- #endregion InputHandlers
+
+ ///
+ /// Change the toggled state
+ ///
+ [System.Obsolete("Use IsToggled property instead")]
+ public virtual void SetToggled(bool toggled)
+ {
+ IsToggled = toggled;
+ }
+
+ ///
+ /// Change the gesture state
+ ///
+ [System.Obsolete("Use HasGesture property instead")]
+ public virtual void SetGesture(bool gesture)
+ {
+ HasGesture = gesture;
+ }
+
+ ///
+ /// Change the gesture max state
+ ///
+ [System.Obsolete("Use HasGestureMax property instead")]
+ public virtual void SetGestureMax(bool gesture)
+ {
+ HasGestureMax = gesture;
+ }
+
+ ///
+ /// Change the collision state
+ ///
+ [System.Obsolete("Use HasCollision property instead")]
+ public virtual void SetCollision(bool collision)
+ {
+ HasCollision = collision;
+ }
+
+ ///
+ /// Change the custom state
+ ///
+ [System.Obsolete("Use HasCustom property instead")]
+ public virtual void SetCustom(bool custom)
+ {
+ HasCustom = custom;
+ }
+
+ ///
+ /// Change the voice command state
+ ///
+ [System.Obsolete("Use HasVoiceCommand property instead")]
+ public virtual void SetVoiceCommand(bool voice)
+ {
+ HasVoiceCommand = voice;
+ }
+
+ ///
+ /// Change the physical touch state
+ ///
+ [System.Obsolete("Use HasPhysicalTouch property instead")]
+ public virtual void SetPhysicalTouch(bool touch)
+ {
+ HasPhysicalTouch = touch;
+ }
+
+ ///
+ /// Change the grab state
+ ///
+ [System.Obsolete("Use HasGrab property instead")]
+ public virtual void SetGrab(bool grab)
+ {
+ HasGrab = grab;
+ }
+
+ #endregion
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/InteractableToggleCollection.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/InteractableToggleCollection.cs
index e21ea6d1b96..dfe25006bfc 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/InteractableToggleCollection.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/InteractableToggleCollection.cs
@@ -20,7 +20,7 @@ public class InteractableToggleCollection : MonoBehaviour
[Tooltip("exposed selection changed event")]
public UnityEvent OnSelectionEvents;
- private void OnEnable()
+ private void Start()
{
for (int i = 0; i < ToggleList.Length; ++i)
{
@@ -29,14 +29,18 @@ private void OnEnable()
ToggleList[i].OnClick.AddListener(() => OnSelection(itemIndex));
ToggleList[i].CanDeselect = false;
}
-
+
+ OnSelection(CurrentIndex, true);
+ }
+
+ private void OnEnable()
+ {
OnSelection(CurrentIndex, true);
}
///
/// Sets the selected index and selected Interactive
///
- ///
public void SetSelection(int index)
{
if (!isActiveAndEnabled ||
@@ -51,15 +55,13 @@ public void SetSelection(int index)
///
/// Set the toggle state of each button based on the selected item
///
- ///
- ///
protected virtual void OnSelection(int index, bool force = false)
{
for (int i = 0; i < ToggleList.Length; ++i)
{
if (i != index)
{
- ToggleList[i].SetDimensionIndex(0);
+ ToggleList[i].IsToggled = false;
}
}
@@ -67,7 +69,7 @@ protected virtual void OnSelection(int index, bool force = false)
if (force)
{
- ToggleList[index].SetDimensionIndex(1);
+ ToggleList[index].IsToggled = true;
}
else
{
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSize.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSize.cs
index 88cb5db862a..3ce3ef0e895 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSize.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSize.cs
@@ -49,7 +49,6 @@ public class ButtonBackgroundSize : MonoBehaviour
///
/// Set the size at Runtime or through code
///
- ///
public void SetSize(Vector3 size)
{
ItemSize = size;
@@ -58,7 +57,6 @@ public void SetSize(Vector3 size)
///
/// Get the current size
///
- ///
public Vector3 GetSize()
{
return ItemSize;
@@ -67,7 +65,6 @@ public Vector3 GetSize()
///
/// Get the base pixel scale
///
- ///
public float GetBasePixelScale()
{
return BasePixelScale;
@@ -76,7 +73,6 @@ public float GetBasePixelScale()
///
/// Set the base pixel scale
///
- ///
public void SetBasePixelScale(float scale)
{
BasePixelScale = scale;
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSizeOffset.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSizeOffset.cs
index 584864d4f31..4d8649ed636 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSizeOffset.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSizeOffset.cs
@@ -58,7 +58,6 @@ public class ButtonBackgroundSizeOffset : MonoBehaviour
///
/// Set the objects scale relative to the Anchor
///
- ///
public void SetScale(Vector3 scale)
{
Scale = scale;
@@ -73,7 +72,6 @@ public Vector3 GetScale()
///
/// Set a consistent offset value from the Anchor
///
- ///
public void SetOffset(Vector3 offset)
{
Offset = offset;
@@ -82,7 +80,6 @@ public void SetOffset(Vector3 offset)
///
/// Get the current offset value
///
- ///
public Vector3 GetSOffset()
{
return Offset;
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Profile/InteractableProfileItem.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Profile/InteractableProfileItem.cs
index 0986da84543..71701e5a7d9 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Profile/InteractableProfileItem.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Profile/InteractableProfileItem.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
-using System;
using System.Collections.Generic;
using UnityEngine;
@@ -9,49 +8,19 @@ namespace Microsoft.MixedReality.Toolkit.UI
{
///
/// The foundation of profiles that exist on an Interactable
- /// Profiles pair themes with the objects they manipulate, based on state changes
+ /// Profiles pair ThemeContainers with the objects they manipulate, based on state changes
///
-
[System.Serializable]
public class InteractableProfileItem
{
- public GameObject Target;
- public List Themes;
- public bool HadDefaultTheme;
-
///
- /// The list of base classes whose derived classes will be included in interactable theme
- /// selection dropdowns.
+ /// GameObject to target with associated Themes
///
- private static readonly List candidateThemeTypes = new List()
- {
- typeof(InteractableThemeBase),
- typeof(InteractableShaderTheme),
- typeof(InteractableColorTheme)
- };
-
- ///
- /// Get a list of themes
- ///
- ///
- public static InteractableTypesContainer GetThemeTypes()
- {
- return InteractableTypeFinder.Find(candidateThemeTypes, TypeRestriction.DerivedOnly);
- }
+ public GameObject Target;
///
- /// Get a new theme instance and load it with settings
+ /// List of Theme configuration data to intialize with an Interactable
///
- ///
- ///
- ///
- ///
- public static InteractableThemeBase GetTheme(InteractableThemePropertySettings settings, GameObject host)
- {
- Type themeType = Type.GetType(settings.AssemblyQualifiedName);
- InteractableThemeBase theme = (InteractableThemeBase)Activator.CreateInstance(themeType);
- theme.Init(host, settings);
- return theme;
- }
+ public List Themes = new List();
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Selection/SelectionModes.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Selection/SelectionModes.cs
index c903a48b5f3..c209e73f5db 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Selection/SelectionModes.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Selection/SelectionModes.cs
@@ -8,6 +8,10 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
public enum SelectionModes
{
+ ///
+ /// Not a valid mode
+ ///
+ Invalid = -1,
///
/// Just click, no selection
///
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Simulation/InteractablePointerSimulator.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Simulation/InteractablePointerSimulator.cs
index 19d1e9c0d33..c47f92bc787 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Simulation/InteractablePointerSimulator.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Simulation/InteractablePointerSimulator.cs
@@ -31,19 +31,19 @@ private void Update()
if (hasFocus != Focus)
{
- Button.SetFocus(Focus);
+ Button.HasFocus = Focus;
hasFocus = Focus;
}
if (hasDown != Down)
{
- Button.SetPress(Down);
+ Button.HasPress = Down;
hasDown = Down;
}
if (isDisabled != Disabled)
{
- Button.SetDisabled(Disabled);
+ Button.IsEnabled = !Disabled;
isDisabled = Disabled;
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStates.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStates.cs
index 6c939e3f0e0..a51da779142 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStates.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStates.cs
@@ -9,8 +9,11 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
/// list of Interactable states and basic comparison
///
- public class InteractableStates : InteractableStateModel
+ public class InteractableStates : BaseStateModel
{
+ ///
+ /// List of valid state types for Interactable
+ ///
public enum InteractableStateEnum
{
///
@@ -108,7 +111,7 @@ public enum InteractableStateEnum
public InteractableStates()
{
base.allStates = allStates;
- currentState = allStates[0];
+ SetCurrentState(allStates[0]);
}
public InteractableStates(State defaultState) : base(defaultState)
@@ -116,45 +119,50 @@ public InteractableStates(State defaultState) : base(defaultState)
base.allStates = allStates;
}
+ ///
public virtual void SetStateOn(InteractableStateEnum state)
{
SetStateOn((int)state);
}
+ ///
public virtual void SetStateOff(InteractableStateEnum state)
{
SetStateOff((int)state);
}
+ ///
public virtual void SetStateValue(InteractableStateEnum state, int value)
{
SetStateValue((int)state, value);
}
+ ///
public State GetState(InteractableStateEnum state)
{
return GetState((int)state);
}
- // compares all the state values and returns a state based on bitwise comparison
+ ///
public override State CompareStates()
{
int bit = GetBit();
- currentState = stateList[0];
+ SetCurrentState(stateList[0]);
for (int i = stateList.Count - 1; i > -1; i--)
{
if (bit >= stateList[i].Bit)
{
- currentState = stateList[i];
+ SetCurrentState(stateList[i]);
break;
}
}
- return currentState;
+ return CurrentState();
}
+ ///
public override State[] GetStates()
{
return stateList.ToArray();
@@ -166,7 +174,6 @@ public override State[] GetStates()
/// states is specified.
/// Default States should match "DefaultStates" scriptable object in Interactable
///
- ///
public virtual List GetDefaultStates()
{
List result = new List();
@@ -174,6 +181,13 @@ public virtual List GetDefaultStates()
result.Add(GetState(InteractableStateEnum.Focus));
result.Add(GetState(InteractableStateEnum.Pressed));
result.Add(GetState(InteractableStateEnum.Disabled));
+
+ for (int i = 0; i < result.Count; i++)
+ {
+ result[i].Bit = 1 << i;
+ result[i].ActiveIndex = i;
+ }
+
return result;
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/States.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/States.cs
deleted file mode 100644
index e4b0a040525..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/States.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- [CreateAssetMenu(fileName = "States", menuName = "Mixed Reality Toolkit/Interactable/State", order = 1)]
- public class States : ScriptableObject
- {
- public List StateList;
- public int DefaultIndex = 0;
- public Type StateType;
- public InteractableTypesContainer StateOptions;
- public string StateLogicName = "InteractableStates";
- public string AssemblyQualifiedName = typeof(InteractableStates).AssemblyQualifiedName;
-
- ///
- /// The list of base classes whose derived classes will be included in interactable state
- /// selection dropdowns.
- ///
- private static readonly List candidateStateTypes = new List() { typeof(InteractableStates) };
-
- public static States GetDefaultInteractableStates()
- {
- States result = CreateInstance();
-
- InteractableStates allInteractableStates = new InteractableStates();
-
- result.StateType = Type.GetType(typeof(InteractableStates).AssemblyQualifiedName);
- result.StateOptions = InteractableTypeFinder.Find(candidateStateTypes, TypeRestriction.AllowBase);
- result.StateList = allInteractableStates.GetDefaultStates();
- result.DefaultIndex = 0;
- return result;
- }
-
- //!!! finish making states work, they should initiate the type and run the logic during play mode.
- private void OnEnable()
- {
- SetupStateOptions();
- }
-
- public State[] GetStates()
- {
- return StateList.ToArray();
- }
-
- public InteractableStates SetupLogic()
- {
- StateType = Type.GetType(AssemblyQualifiedName);
- InteractableStates stateLogic = (InteractableStates)Activator.CreateInstance(StateType, StateList[DefaultIndex]);
- List stateListCopy = new List();
- for (int i = 0; i < StateList.Count; i++)
- {
- State state = new State();
- state.ActiveIndex = StateList[i].ActiveIndex;
- state.Bit = StateList[i].Bit;
- state.Index = StateList[i].Index;
- state.Name = StateList[i].Name;
- state.Value = StateList[i].Value;
- stateListCopy.Add(state);
- }
- stateLogic.ImportStates(stateListCopy);
-
- return stateLogic;
- }
-
- public void SetupStateOptions()
- {
- StateOptions = InteractableTypeFinder.Find(candidateStateTypes, TypeRestriction.AllowBase);
- }
-
- // redundant method, put in a utils with static methods!!!
- public static int ReverseLookup(string option, string[] options)
- {
- for (int i = 0; i < options.Length; i++)
- {
- if (options[i] == option)
- {
- return i;
- }
- }
-
- return 0;
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableActivateTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableActivateTheme.cs
deleted file mode 100644
index ec33929afcb..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableActivateTheme.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- public class InteractableActivateTheme : InteractableThemeBase
- {
-
- public InteractableActivateTheme()
- {
- Types = new Type[] { typeof(Transform) };
- Name = "Activate Theme";
- NoEasing = true;
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Activate",
- Type = InteractableThemePropertyValueTypes.Bool,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { Bool = true }
- });
- }
-
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- InteractableThemePropertyValue start = new InteractableThemePropertyValue();
- start.Bool = Host.activeSelf;
- return start;
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- Host.SetActive(property.Values[index].Bool);
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAnimatorTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAnimatorTheme.cs
deleted file mode 100644
index 89f92a31512..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAnimatorTheme.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- ///
- /// Uses Animator to control Interactable feedback based on state changes.
- ///
- public class InteractableAnimatorTheme : InteractableThemeBase
- {
- private int lastIndex = 0;
- private Animator controller;
-
- public InteractableAnimatorTheme()
- {
- Types = new Type[] { typeof(Transform) };
- Name = "AnimatorTheme";
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Animator Trigger",
- Type = InteractableThemePropertyValueTypes.AnimatorTrigger,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { String = "Default" }
- });
- }
-
- public override void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- base.Init(host, settings);
- controller = Host.GetComponent();
- }
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- InteractableThemePropertyValue start = new InteractableThemePropertyValue();
- start.String = property.Values[lastIndex].String;
- return start;
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- if(lastIndex != index)
- {
- if(controller != null)
- {
- controller.SetTrigger(property.Values[index].String);
- }
- lastIndex = index;
- }
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAudioTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAudioTheme.cs
deleted file mode 100644
index 604fefb14a9..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAudioTheme.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- public class InteractableAudioTheme : InteractableThemeBase
- {
- private AudioSource audioSource;
-
- public InteractableAudioTheme()
- {
- Types = new Type[] { typeof(Transform) };
- Name = "Audio Theme";
- NoEasing = true;
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Audio",
- Type = InteractableThemePropertyValueTypes.AudioClip,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { AudioClip = null }
- });
- }
-
- public override void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- base.Init(host, settings);
- audioSource = Host.GetComponentInChildren();
- }
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- InteractableThemePropertyValue start = new InteractableThemePropertyValue();
- AudioSource audioSource = Host.GetComponentInChildren();
- if (audioSource != null)
- {
- start.AudioClip = audioSource.clip;
- }
- return start;
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- if (audioSource == null)
- {
- audioSource = Host.AddComponent();
- }
-
- audioSource.clip = property.Values[index].AudioClip;
- audioSource.Play();
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableMaterialTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableMaterialTheme.cs
deleted file mode 100644
index cc4a387ca1c..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableMaterialTheme.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- public class InteractableMaterialTheme : InteractableThemeBase
- {
- private Material material = null;
- private Renderer renderer;
-
- public override void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- base.Init(host, settings);
-
- renderer = Host.GetComponent();
- }
-
- public InteractableMaterialTheme()
- {
- Types = new Type[] { typeof(Renderer) };
- Name = "Material Theme";
- NoEasing = true;
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Material",
- Type = InteractableThemePropertyValueTypes.Material,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { Material = null }
- });
- }
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- InteractableThemePropertyValue start = new InteractableThemePropertyValue();
-
- material = renderer.material;
- start.Material = material;
- return start;
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- Host.SetActive(property.Values[index].Bool);
-
- material = property.Values[index].Material;
- renderer.material = material;
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableOffsetTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableOffsetTheme.cs
deleted file mode 100644
index eaa2a9bb613..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableOffsetTheme.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- public class InteractableOffsetTheme : InteractableThemeBase
- {
- private Vector3 startPosition;
- private Transform hostTransform;
-
- public InteractableOffsetTheme()
- {
- Types = new Type[] { typeof(Transform) };
- Name = "Offset Theme";
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Offset",
- Type = InteractableThemePropertyValueTypes.Vector3,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { Vector3 = Vector3.zero }
- });
- }
-
- public override void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- base.Init(host, settings);
- hostTransform = Host.transform;
- startPosition = hostTransform.localPosition;
- }
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- InteractableThemePropertyValue start = new InteractableThemePropertyValue();
- start.Vector3 = hostTransform.localPosition;
- return start;
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- hostTransform.localPosition = Vector3.Lerp(property.StartValue.Vector3, startPosition + property.Values[index].Vector3, percentage);
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableRotationTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableRotationTheme.cs
deleted file mode 100644
index 62c8b522189..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableRotationTheme.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- public class InteractableRotationTheme : InteractableThemeBase
- {
- private Transform hostTransform;
-
- public InteractableRotationTheme()
- {
- Types = new Type[] { typeof(Transform) };
- Name = "Rotation Theme";
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Rotation",
- Type = InteractableThemePropertyValueTypes.Vector3,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { Vector3 = Vector3.zero }
- });
- }
-
- public override void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- base.Init(host, settings);
-
- hostTransform = Host.transform;
- }
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- InteractableThemePropertyValue start = new InteractableThemePropertyValue();
- start.Vector3 = hostTransform.eulerAngles;
- return start;
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- hostTransform.localRotation = Quaternion.Euler( Vector3.Lerp(property.StartValue.Vector3, property.Values[index].Vector3, percentage));
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableScaleTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableScaleTheme.cs
deleted file mode 100644
index 1fc69d491e9..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableScaleTheme.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- public class InteractableScaleTheme : InteractableThemeBase
- {
- private Transform hostTransform;
-
- public override void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- base.Init(host, settings);
-
- hostTransform = Host.transform;
- }
-
- public InteractableScaleTheme()
- {
- Types = new Type[] { typeof(Transform) };
- Name = "Scale Theme";
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Scale",
- Type = InteractableThemePropertyValueTypes.Vector3,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { Vector3 = Vector3.one}
- });
- }
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- InteractableThemePropertyValue start = new InteractableThemePropertyValue();
- start.Vector3 = hostTransform.localScale;
- return start;
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- hostTransform.localScale = Vector3.Lerp(property.StartValue.Vector3, property.Values[index].Vector3, percentage);
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableShaderTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableShaderTheme.cs
deleted file mode 100644
index dbe041df093..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableShaderTheme.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- public class InteractableShaderTheme : InteractableThemeBase
- {
- private static InteractableThemePropertyValue emptyValue = new InteractableThemePropertyValue();
-
- protected MaterialPropertyBlock propertyBlock;
- protected List shaderProperties;
- protected Renderer renderer;
-
- private InteractableThemePropertyValue startValue = new InteractableThemePropertyValue();
-
- public InteractableShaderTheme()
- {
- Types = new Type[] { typeof(Renderer) };
- Name = "Shader Float";
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Shader",
- Type = InteractableThemePropertyValueTypes.ShaderFloat,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { Float = 0}
- });
- }
-
- public override void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- base.Init(host, settings);
-
- shaderProperties = new List();
- for (int i = 0; i < ThemeProperties.Count; i++)
- {
- InteractableThemeProperty prop = ThemeProperties[i];
- if (prop.ShaderOptions.Count > 0)
- {
- shaderProperties.Add(prop.ShaderOptions[prop.PropId]);
- }
- }
-
- propertyBlock = InteractableThemeShaderUtils.GetMaterialPropertyBlock(host, shaderProperties.ToArray());
-
- renderer = Host.GetComponent();
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- if (Host == null)
- return;
-
- renderer.GetPropertyBlock(propertyBlock);
-
- int propId = property.GetShaderPropertyId();
- float newValue;
- switch (property.Type)
- {
- case InteractableThemePropertyValueTypes.Color:
- Color newColor = Color.Lerp(property.StartValue.Color, property.Values[index].Color, percentage);
- propertyBlock = SetColor(propertyBlock, newColor, propId);
- break;
- case InteractableThemePropertyValueTypes.ShaderFloat:
- newValue = LerpFloat(property.StartValue.Float, property.Values[index].Float, percentage);
- propertyBlock = SetFloat(propertyBlock, newValue, propId);
- break;
- case InteractableThemePropertyValueTypes.ShaderRange:
- newValue = LerpFloat(property.StartValue.Float, property.Values[index].Float, percentage);
- propertyBlock = SetFloat(propertyBlock, newValue, propId);
- break;
- default:
- break;
- }
-
- renderer.SetPropertyBlock(propertyBlock);
- }
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- if (Host == null)
- return emptyValue;
-
- renderer.GetPropertyBlock(propertyBlock);
-
- startValue.Reset();
-
- int propId = property.GetShaderPropertyId();
- switch (property.Type)
- {
- case InteractableThemePropertyValueTypes.Color:
- startValue.Color = propertyBlock.GetVector(propId);
- break;
- case InteractableThemePropertyValueTypes.ShaderFloat:
- startValue.Float = propertyBlock.GetFloat(propId);
- break;
- case InteractableThemePropertyValueTypes.ShaderRange:
- startValue.Float = propertyBlock.GetFloat(propId);
- break;
- default:
- break;
- }
-
- return startValue;
- }
-
- public static float GetFloat(GameObject host, int propId)
- {
- if (host == null)
- return 0;
-
- MaterialPropertyBlock block = InteractableThemeShaderUtils.GetPropertyBlock(host);
- return block.GetFloat(propId);
- }
-
- public static void SetPropertyBlock(GameObject host, MaterialPropertyBlock block)
- {
- Renderer renderer = host.GetComponent();
- renderer.SetPropertyBlock(block);
- }
-
- public static MaterialPropertyBlock SetFloat(MaterialPropertyBlock block, float value, int propId)
- {
- if (block == null)
- return null;
-
- block.SetFloat(propId, value);
- return block;
- }
-
- public static Color GetColor(GameObject host, int propId)
- {
- if (host == null)
- return Color.white;
-
- MaterialPropertyBlock block = InteractableThemeShaderUtils.GetPropertyBlock(host);
- return block.GetVector(propId);
- }
-
- public static MaterialPropertyBlock SetColor(MaterialPropertyBlock block, Color color, int propId)
- {
- if (block == null)
- return null;
-
- block.SetColor(propId, color);
- return block;
-
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableStringTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableStringTheme.cs
deleted file mode 100644
index 6df4627ce1b..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableStringTheme.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- ///
- /// Change string on a text object based on state
- ///
- public class InteractableStringTheme : InteractableThemeBase
- {
- private TextMesh mesh;
- private Text text;
-
- public InteractableStringTheme()
- {
- Types = new Type[] { typeof(TextMesh), typeof(Text) };
- Name = "String Theme";
- NoEasing = true;
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "String",
- Type = InteractableThemePropertyValueTypes.String,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { String = "" }
-
- });
- }
-
- public override void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- base.Init(host, settings);
-
- mesh = Host.GetComponent();
- text = Host.GetComponent();
- }
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- InteractableThemePropertyValue start = new InteractableThemePropertyValue();
- start.String = "";
-
- if (mesh != null)
- {
- start.String = mesh.text;
- return start;
- }
-
- if (mesh != null)
- {
- start.String = text.text;
- }
- return start;
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- if(mesh != null)
- {
- mesh.text = property.Values[index].String;
- return;
- }
- if (mesh != null)
- {
- text.text = property.Values[index].String;
- }
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableTextureTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableTextureTheme.cs
deleted file mode 100644
index 7b1e4aa2ff4..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableTextureTheme.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- public class InteractableTextureTheme : InteractableThemeBase
- {
- private MaterialPropertyBlock propertyBlock;
- private Renderer renderer;
-
- public InteractableTextureTheme()
- {
- Types = new Type[] { typeof(Renderer) };
- Name = "Texture Theme";
- NoEasing = true;
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Texture",
- Type = InteractableThemePropertyValueTypes.Texture,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { Texture = null }
- });
- }
-
- public override void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- base.Init(host, settings);
- propertyBlock = InteractableThemeShaderUtils.GetMaterialPropertyBlock(host, new ShaderProperties[0]);
- renderer = Host.GetComponent();
- }
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- InteractableThemePropertyValue start = new InteractableThemePropertyValue();
- start.Texture = propertyBlock.GetTexture("_MainTex");
- return start;
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- propertyBlock.SetTexture("_MainTex", property.Values[index].Texture);
- renderer.SetPropertyBlock(propertyBlock);
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemeBase.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemeBase.cs
deleted file mode 100644
index 76db0312349..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemeBase.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using Microsoft.MixedReality.Toolkit.Utilities;
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- ///
- /// Base class for themes
- ///
-
- public abstract class InteractableThemeBase
- {
- public Type[] Types;
- public string Name = "Base Theme";
- public List ThemeProperties = new List();
- public List CustomSettings = new List();
- public GameObject Host;
- public Easing Ease;
- public bool NoEasing;
- public bool Loaded;
- public string AssemblyQualifiedName;
-
- private bool hasFirstState = false;
-
- private int lastState = -1;
-
- //! find a way to set the default values of the properties, like scale should be Vector3.one
- // these should be custom, per theme
-
- public abstract void SetValue(InteractableThemeProperty property, int index, float percentage);
-
- public abstract InteractableThemePropertyValue GetProperty(InteractableThemeProperty property);
-
- public virtual void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- Host = host;
-
- for (int i = 0; i < settings.Properties.Count; i++)
- {
- InteractableThemeProperty prop = ThemeProperties[i];
- prop.ShaderOptionNames = settings.Properties[i].ShaderOptionNames;
- prop.ShaderOptions = settings.Properties[i].ShaderOptions;
- prop.PropId = settings.Properties[i].PropId;
- prop.Values = settings.Properties[i].Values;
-
- ThemeProperties[i] = prop;
- }
-
- for (int i = 0; i < settings.CustomSettings.Count; i++)
- {
- InteractableCustomSetting setting = CustomSettings[i];
- setting.Name = settings.CustomSettings[i].Name;
- setting.Type = settings.CustomSettings[i].Type;
- setting.Value = settings.CustomSettings[i].Value;
- CustomSettings[i] = setting;
- }
-
- Ease = CopyEase(settings.Easing);
- Ease.Stop();
-
- Loaded = true;
- }
-
- protected float LerpFloat(float s, float e, float t)
- {
- return (e - s) * t + s;
- }
-
- protected int LerpInt(int s, int e, float t)
- {
- return Mathf.RoundToInt((e - s) * t) + s;
- }
-
- protected Easing CopyEase(Easing ease)
- {
- Easing newEase = new Easing();
- newEase.Curve = ease.Curve;
- newEase.Enabled = ease.Enabled;
- newEase.LerpTime = ease.LerpTime;
-
- return newEase;
- }
-
- public virtual void OnUpdate(int state, Interactable source, bool force = false)
- {
-
- if (state != lastState || force)
- {
- int themePropCount = ThemeProperties.Count;
- for (int i = 0; i < themePropCount; i++)
- {
- InteractableThemeProperty current = ThemeProperties[i];
- current.StartValue = GetProperty(current);
- if (hasFirstState || force)
- {
- Ease.Start();
- SetValue(current, state, Ease.GetCurved());
- hasFirstState = true;
- }
- else
- {
- SetValue(current, state, 1);
- if (i >= themePropCount - 1)
- {
- hasFirstState = true;
- }
- }
- ThemeProperties[i] = current;
- }
-
- lastState = state;
- }
- else if (Ease.Enabled && Ease.IsPlaying())
- {
- Ease.OnUpdate();
- int themePropCount = ThemeProperties.Count;
- for (int i = 0; i < themePropCount; i++)
- {
- InteractableThemeProperty current = ThemeProperties[i];
- SetValue(current, state, Ease.GetCurved());
- }
- }
-
- lastState = state;
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemeProperty.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemeProperty.cs
deleted file mode 100644
index e228069fd6e..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemeProperty.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- ///
- /// Base class for themes
- ///
-
- [System.Serializable]
- public class InteractableThemeProperty
- {
- public string Name;
- public InteractableThemePropertyValueTypes Type;
- public List Values;
- public InteractableThemePropertyValue StartValue;
- public int PropId; // i.e OptionIndex
- public List ShaderOptions;
- public List ShaderOptionNames;
- public InteractableThemePropertyValue Default;
- public string ShaderName;
-
- private List ShaderPropertyIDs = null;
- private const string DefaultProperty = "_Color";
-
- ///
- /// This method gets the integer key assigned by Unity at runtime for the current shader property.
- /// It will also lazy load the array of possible key values on first access using Unity's Shader.PropertyToID()
- /// It is generally preferred to use the integer key over the string key with Unity to avoid perf cost for the dictionary lookup on every get/set.
- /// ex: On SetFloat(string key), Unity will perform Shader.PropertyToID() itself every call
- ///
- /// integer key for current shader property to get/set shader values. Returns default backup property in case of failure
- public int GetShaderPropertyId()
- {
- // Lazy load Shader Properties
- if (ShaderPropertyIDs == null)
- {
- ShaderPropertyIDs = new List(ShaderOptionNames.Count);
- for (int i = 0; i < this.ShaderOptionNames.Count; i++)
- {
- ShaderPropertyIDs.Add(Shader.PropertyToID(this.ShaderOptionNames[i]));
- }
- }
-
- if (ShaderPropertyIDs.Count > PropId)
- {
- return ShaderPropertyIDs[PropId];
- }
-
- return Shader.PropertyToID(DefaultProperty);
- }
-
- ///
- /// Get the current shader property name. Again it is preferred to utilize the integer key over the string key in Unity
- ///
- /// string name of current property. Returns default backup property in case of failure
- public string GetShaderPropertyName()
- {
- if (ShaderOptionNames.Count > PropId)
- {
- return ShaderOptionNames[PropId];
- }
-
- return DefaultProperty;
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertySettings.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertySettings.cs
deleted file mode 100644
index 3b333c497b5..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertySettings.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using Microsoft.MixedReality.Toolkit.Utilities;
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- ///
- /// list of theme settings to virtualize theme values
- ///
- public struct ProfileSettings
- {
- public List ThemeSettings;
- }
-
- ///
- /// List of settings that are copied from themes
- ///
- public struct ThemeSettings
- {
- public List Settings;
- }
-
- ///
- /// A way to cache some serializes values to pass between buttons and handlers
- ///
- [System.Serializable]
- public class ThemeTarget
- {
- public List Properties;
- public GameObject Target;
- public State[] States;
- }
-
- ///
- /// The main settings found in Themes
- ///
- [System.Serializable]
- public struct InteractableThemePropertySettings
- {
- public string Name;
- public string AssemblyQualifiedName;
- public Type Type;
- public InteractableThemeBase Theme;
- public List Properties;
- public List History;
- public List CustomSettings;
- public List CustomHistory;
- public Easing Easing;
- public bool NoEasing;
- public bool IsValid;
- public ThemeTarget ThemeTarget;
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/ScaleOffsetColorTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/ScaleOffsetColorTheme.cs
deleted file mode 100644
index b64f9994e02..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/ScaleOffsetColorTheme.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using TMPro;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- public class ScaleOffsetColorTheme : InteractableColorTheme
- {
- protected Vector3 startPosition;
- protected Vector3 startScale;
- protected Transform hostTransform;
-
- public override void Init(GameObject host, InteractableThemePropertySettings settings)
- {
- base.Init(host, settings);
- hostTransform = Host.transform;
- startPosition = hostTransform.localPosition;
- startScale = hostTransform.localScale;
- }
-
- public ScaleOffsetColorTheme()
- {
- Types = new Type[] { typeof(Transform), typeof(TextMesh), typeof(TextMesh), typeof(TextMeshPro), typeof(TextMeshProUGUI), typeof(Renderer) };
- Name = "Default: Scale, Offset, Color";
- ThemeProperties = new List();
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Scale",
- Type = InteractableThemePropertyValueTypes.Vector3,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { Vector3 = Vector3.one }
- });
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Offset",
- Type = InteractableThemePropertyValueTypes.Vector3,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { Vector3 = Vector3.zero }
- });
- ThemeProperties.Add(
- new InteractableThemeProperty()
- {
- Name = "Color",
- Type = InteractableThemePropertyValueTypes.Color,
- Values = new List(),
- Default = new InteractableThemePropertyValue() { Color = Color.white }
- });
- }
-
- public override InteractableThemePropertyValue GetProperty(InteractableThemeProperty property)
- {
- InteractableThemePropertyValue start = new InteractableThemePropertyValue();
-
- switch (property.Name)
- {
- case "Scale":
- start.Vector3 = hostTransform.localScale;
- break;
- case "Offset":
- start.Vector3 = hostTransform.localPosition;
- break;
- case "Color":
- start = base.GetProperty(property);
- break;
- default:
- break;
- }
- return start;
- }
-
- public override void SetValue(InteractableThemeProperty property, int index, float percentage)
- {
- switch (property.Name)
- {
- case "Scale":
- hostTransform.localScale = Vector3.Lerp(property.StartValue.Vector3, Vector3.Scale(startScale, property.Values[index].Vector3), percentage);
- break;
- case "Offset":
- hostTransform.localPosition = Vector3.Lerp(property.StartValue.Vector3, startPosition + property.Values[index].Vector3, percentage);
- break;
- case "Color":
- base.SetValue(property, index, percentage);
- break;
- default:
- break;
- }
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/Theme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/Theme.cs
deleted file mode 100644
index f42243d973c..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/Theme.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- ///
- /// Theme scriptableObject for loading theme settings
- ///
-
- [CreateAssetMenu(fileName = "Theme", menuName = "Mixed Reality Toolkit/Interactable/Theme", order = 1)]
- public class Theme : ScriptableObject
- {
- public string Name;
- public List Settings;
- public List CustomSettings;
- public States States;
-
- public State[] GetStates()
- {
- if (States != null)
- {
- return States.GetStates();
- }
-
- return new State[0];
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableType.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableType.cs
deleted file mode 100644
index d6f71605544..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableType.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using Microsoft.MixedReality.Toolkit.Utilities;
-using System;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- ///
- /// A wrapper for a Type which gives a "friendly name" for the type (i.e.
- /// the class name) along with the assembly qualified name (which can be used
- /// to new instances of this type).
- ///
- ///
- /// The intent of this wrapper is for use with the various Interactable state, event
- /// and theme classes, which are enumerated using reflection in the editor but must
- /// then be instantiated at runtime (without the usage of reflection due to .NET
- /// backend constraints).
- ///
- public class InteractableType
- {
- ///
- /// The class name of this interactable type (for example, "InteractableActivateTheme").
- ///
- public string ClassName { get; private set; }
-
- ///
- /// The assembly qualified name of the class (for example,
- /// "Microsoft.MixedReality.Toolkit.UI.InteractableActivateTheme,
- /// Microsoft.MixedReality.Toolkit.UI")
- ///
- public string AssemblyQualifiedName { get; private set; }
-
- ///
- /// The type of the class (for example, typeof(InteractableActivateTheme)).
- ///
- public Type Type { get; private set; }
-
- public InteractableType(Type type)
- {
- ClassName = type.Name;
- AssemblyQualifiedName = SystemType.GetReference(type);
- Type = type;
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableTypeFinder.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableTypeFinder.cs
deleted file mode 100644
index 1c1d5997c72..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableTypeFinder.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- ///
- /// A helper that uses reflection to find objects that implement base types of the
- /// Interactable types that populate the various state, theme, and event inspectors.
- ///
- public class InteractableTypeFinder
- {
- ///
- /// A convenience wrapper provided for editor code to turn a list of types into a form that
- /// matches their existing structure.
- ///
- ///
- /// This is primarily a crutch because of how the inspector code stores parallel arrays of
- /// objects, rather than just storing an array of objects (i.e. it stores three arrays
- /// of objects which happen to have matching indices, rather than storing a single array
- /// of objects which have state relevant within the object).
- ///
- public static InteractableTypesContainer Find(List types, TypeRestriction typeRestriction)
- {
-#if UNITY_EDITOR
- return new InteractableTypesContainer(FindTypes(types, typeRestriction));
-#else
- // Due to other code structure, it's possible that this can still be invoked at runtime, but should
- // not return anything (because type information should be read from serialized assembly data, rather
- // than using reflection at runtime).
- return new InteractableTypesContainer(new List());
-#endif
- }
-
-#if UNITY_EDITOR
- ///
- /// Used to cache lookups for Types (for example, InteractableThemeBase) to their classes that implement
- /// that type.
- ///
- private static Dictionary> cache = new Dictionary>();
-
- ///
- /// Gets the list of InteractableType objects for classes that support the specified types.
- ///
- private static List FindTypes(List types, TypeRestriction typeRestriction)
- {
- EnsureCacheForTypes(types, typeRestriction);
- return GetTypesFromCache(types);
- }
-
- ///
- /// Gets the list of InteractableType objects for classes that support the specified types by
- /// looking directly in the cache.
- ///
- ///
- /// Assumes it is called after EnsureCacheForTypes. Otherwise, this is dangerous to call.
- ///
- private static List GetTypesFromCache(List types)
- {
- List interactableTypes = new List();
- foreach (Type type in types)
- {
- interactableTypes.AddRange(cache[type]);
- }
- return interactableTypes;
- }
-
- ///
- /// Ensures a cache entry is setup for all types in the InteractableType enum.
- ///
- ///
- /// Note that this is not invoked at runtime and is assumed to be invoked from a single
- /// threaded UI context, and is thus not locked.
- ///
- private static void EnsureCacheForTypes(List types, TypeRestriction typeRestriction)
- {
- HashSet cacheMisses = new HashSet();
- foreach (Type type in types)
- {
- if (!cache.ContainsKey(type))
- {
- cacheMisses.Add(type);
- }
- }
-
- var assemblies = AppDomain.CurrentDomain.GetAssemblies();
- foreach (Type type in cacheMisses)
- {
- cache[type] = GetTypesFromAssemblies(type, typeRestriction, assemblies);
- }
- }
-
- ///
- /// Loads the classes that derive from the given type by looking through all of the assemblies.
- ///
- private static List GetTypesFromAssemblies(Type type, TypeRestriction typeRestriction, Assembly[] assemblies)
- {
- List interactableTypes = new List();
-
- if (typeRestriction == TypeRestriction.AllowBase)
- {
- InteractableType interactableType = new InteractableType(type);
- interactableTypes.Add(interactableType);
- }
-
- foreach (Assembly assembly in assemblies)
- {
- foreach (Type assemblyType in assembly.GetTypes())
- {
- TypeInfo info = assemblyType.GetTypeInfo();
- if (info.IsSubclassOf(type))
- {
- InteractableType interactableType = new InteractableType(assemblyType);
- interactableTypes.Add(interactableType);
- }
- }
- }
- return interactableTypes;
- }
-#endif
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableTypesContainer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableTypesContainer.cs
deleted file mode 100644
index 346621c9926..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableTypesContainer.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- ///
- /// A convenience class that holds arrays of class names, fully qualified assembly names
- /// and their corresponding actual types.
- ///
- ///
- /// This abstraction exists primarily to reduce code duplication among the different
- /// inspectors which use these lists to populate their dropdowns.
- ///
- /// Note that all of these arrays are the same size and come in the same order
- /// (so for example, ClassName[0] = "InteractableActivateTheme" means that
- /// Types[0] == typeof(InteractableActivateTheme) and AssemblyQualifiedNames
- /// is the assembly qualified name for InteractableActivateTheme.
- ///
- public class InteractableTypesContainer
- {
- ///
- /// An array of class names (for example, "InteractableActivateTheme").
- ///
- public string[] ClassNames { get; private set; }
-
- ///
- /// A array of assembly qualified names (for example,
- /// "Microsoft.MixedReality.Toolkit.UI.InteractableActivateTheme,
- /// Microsoft.MixedReality.Toolkit.UI")
- ///
- public string[] AssemblyQualifiedNames { get; private set; }
-
- ///
- /// An array of types. See class remarks for more information on relation to
- /// other fields.
- ///
- public Type[] Types { get; private set; }
-
- ///
- /// A convenience helper that will unwrap a list of InteractableType objects into
- /// a form that is more easy consumed by inspector components.
- ///
- public InteractableTypesContainer(List interactableTypes)
- {
- var classNames = new List();
- var assemblyQualifiedNames = new List();
- var types = new List();
-
- for (int i = 0; i < interactableTypes.Count; i++)
- {
- classNames.Add(interactableTypes[i].ClassName);
- assemblyQualifiedNames.Add(interactableTypes[i].AssemblyQualifiedName);
- types.Add(interactableTypes[i].Type);
- }
-
- ClassNames = classNames.ToArray();
- AssemblyQualifiedNames = assemblyQualifiedNames.ToArray();
- Types = types.ToArray();
- }
- }
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/TypeRestriction.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/TypeRestriction.cs
deleted file mode 100644
index 1db655d8c34..00000000000
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/TypeRestriction.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-namespace Microsoft.MixedReality.Toolkit.UI
-{
- ///
- /// Controls the behavior of the InteractableTypeFinder.FindTypes function. See individual
- /// enum values for more details.
- ///
- public enum TypeRestriction
- {
- ///
- /// When this is specified, only classes derived from the specified type will be
- /// returned by the lookup. This means that if you pass InteractableStates, the
- /// lookup will only return classes whose base class is InteractableStates but
- /// will not return InteractableStates itself.
- ///
- DerivedOnly,
-
- ///
- /// When this is specified, classes derived from the specified type AND the class
- /// itself will be returned by the lookup. This means that if you pass
- /// InteractableStates, the lookup will both classes whose base class is
- /// InteractableStates and InteractableStates itself.
- ///
- AllowBase,
- };
-}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Textures/ButtonHome.png b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Textures/ButtonHome.png
new file mode 100644
index 00000000000..27db90567f6
Binary files /dev/null and b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Textures/ButtonHome.png differ
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Textures/ButtonHome.png.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Textures/ButtonHome.png.meta
new file mode 100644
index 00000000000..54927660fce
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Textures/ButtonHome.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 3608489204b037744b259e8c9a81482f
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes.meta
index 7e7b4521a8b..9f21e961e76 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes.meta
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes.meta
@@ -1,8 +1,6 @@
fileFormatVersion: 2
guid: 86c2310036f39a74996874f7ee7ebb75
folderAsset: yes
-timeCreated: 1517596159
-licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AnimatorTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AnimatorTheme.asset
index 6c2f233c0fd..b9f00d4f822 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AnimatorTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AnimatorTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: AnimatorTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableAnimatorTheme
+ definitions:
+ - ClassName: InteractableAnimatorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableAnimatorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Animator Trigger
- Type: 16
- Values:
+ stateProperties:
+ - name: Animator Trigger
+ type: 16
+ values:
- Name: Default
String: Default
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,586 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.9019608, g: 0.9019608, b: 0.9019608, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.7019608, g: 0.7019608, b: 0.7019608, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.3529412, g: 0.3529412, b: 0.3529412, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.005}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.004}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Animation
- Type: 12
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Animation
- Type: 14
- Values:
- - Name:
- String: Default
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Focus
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Press
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Disabled
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Animator
- Type: 14
- Values:
- - Name:
- String: Default
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Focus
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Pressed
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Disabled
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -684,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -692,29 +118,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -741,11 +152,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonBackgroundTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonBackgroundTheme.asset
index e41bf5cab49..5c06dca1b9b 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonBackgroundTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonBackgroundTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: AppBarButtonBackgroundTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableActivateTheme
+ definitions:
+ - ClassName: InteractableActivateTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableActivateTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Activate
- Type: 15
- Values:
+ stateProperties:
+ - name: Activate
+ type: 15
+ values:
- Name: Default
String:
Bool: 1
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,76 +84,6 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- Name:
String:
Bool: 0
@@ -158,56 +91,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -216,10 +100,6 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- Name:
String:
Bool: 0
@@ -227,6 +107,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -242,71 +123,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -315,10 +132,6 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- Name:
String:
Bool: 0
@@ -326,6 +139,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -334,52 +148,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -387,6 +156,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -395,189 +165,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Animator Trigger
- Type: 16
- Values:
- - Name:
- String: Default
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Focus
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Pressed
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Disabled
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -585,6 +173,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -593,128 +182,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Audio
- Type: 11
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -741,11 +216,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.25
- NoEasing: 1
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonIconTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonIconTheme.asset
index 05b7e4e6099..0ba2d1342a3 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonIconTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonIconTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: AppBarButtonIconTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorTheme
+ definitions:
+ - ClassName: InteractableColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,194 +84,6 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName: GUI/Text Shader
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- Name:
String:
Bool: 0
@@ -276,6 +91,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -284,45 +100,6 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- Name:
String:
Bool: 0
@@ -330,6 +107,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -345,21 +123,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -375,6 +139,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -383,7 +148,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -391,6 +156,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,90 +165,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -490,6 +173,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -498,29 +182,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 10101, guid: 0000000000000000e000000000000000, type: 0}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: GUI/Text Shader
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -547,11 +217,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.25
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonTextTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonTextTheme.asset
index 394c9bdfbb3..9299646f193 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonTextTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/AppBarButtonTextTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: AppBarButtonTextTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorTheme
+ definitions:
+ - ClassName: InteractableColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,202 +84,6 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _FaceColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _OutlineColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _UnderlayColor
- Type: 0
- Range: {x: 0, y: 0}
- ShaderOptionNames:
- - _FaceColor
- - _OutlineColor
- - _UnderlayColor
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName: Mixed Reality Toolkit/TextMeshPro
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- Name:
String:
Bool: 0
@@ -284,6 +91,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -292,45 +100,6 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- Name:
String:
Bool: 0
@@ -338,6 +107,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -353,21 +123,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -383,6 +139,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -391,7 +148,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -399,6 +156,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -407,90 +165,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -498,6 +173,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -506,29 +182,17 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 1c504b73bf66872479cd1215fb5ce0fe, type: 3}
+ shaderPropertyName: _FaceColor
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _FaceColor
+ - _OutlineColor
+ - _UnderlayColor
+ ShaderName: Mixed Reality Toolkit/TextMeshPro
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -555,11 +219,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.25
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBackground.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBackground.asset
index 70e6452a58c..a0a0b8af923 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBackground.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBackground.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ButtonBackground
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.005}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.004}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,227 +332,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -646,11 +367,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBackgroundSelected.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBackgroundSelected.asset
index 4dd43e61c8e..4d8e18fee3b 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBackgroundSelected.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBackgroundSelected.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ButtonBackgroundSelected
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.005}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.004}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,227 +332,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -646,11 +367,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBorders.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBorders.asset
index 48814ea6e67..6d2623f6b1a 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBorders.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBorders.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ButtonBorders
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorChildrenTheme
+ definitions:
+ - ClassName: InteractableColorChildrenTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorChildrenTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,190 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.9019608, g: 0.9019608, b: 0.9019608, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.7019608, g: 0.7019608, b: 0.7019608, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.3529412, g: 0.3529412, b: 0.3529412, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -288,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -296,128 +118,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -444,11 +152,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 0
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBordersSelected.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBordersSelected.asset
index 2588798a2b6..fa3e80ab5af 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBordersSelected.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonBordersSelected.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ButtonBordersSelected
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorChildrenTheme
+ definitions:
+ - ClassName: InteractableColorChildrenTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorChildrenTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,289 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.9019608, g: 0.9019608, b: 0.9019608, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.7019608, g: 0.7019608, b: 0.7019608, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.3529412, g: 0.3529412, b: 0.3529412, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -387,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -395,29 +118,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -444,11 +152,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 0
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabel.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabel.asset
index fbd960cf9d8..45912542736 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabel.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabel.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ButtonLabel
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.005}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.004}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,227 +332,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -646,11 +367,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabelColor.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabelColor.asset
index b6efba94bf3..dd397a75254 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabelColor.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabelColor.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ButtonLabelColor
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorTheme
+ definitions:
+ - ClassName: InteractableColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,190 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.18382353, g: 0.18382353, b: 0.18382353, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.005}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.004}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -288,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -296,128 +118,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -444,11 +152,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 0
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabelSelected.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabelSelected.asset
index 00d5c5a6329..3ce3c34b579 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabelSelected.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ButtonLabelSelected.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ButtonLabelSelected
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.005}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.004}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,227 +332,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -646,11 +367,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CheeseTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CheeseTheme.asset
index d8a419c507c..c5adbd21376 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CheeseTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CheeseTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: CheeseTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1.1, y: 1.1, z: 1.1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.9, y: 0.9, z: 0.9}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,7 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -287,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -295,50 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingPlaneBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _HoverColorOpaqueOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingPlaneBorderColor
- - _HoverColorOverride
- - _HoverColorOpaqueOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -346,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -354,11 +332,24 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingPlaneBorderColor
+ - _HoverColorOverride
+ - _HoverColorOpaqueOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
ShaderName: Mixed Reality Toolkit/Standard
- History: []
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -385,11 +376,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CoffeeTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CoffeeTheme.asset
index 3b3ecf02c65..e9780cb0059 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CoffeeTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CoffeeTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: CoffeeTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: -0.4, z: 0}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,7 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -287,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -295,50 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingPlaneBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _HoverColorOpaqueOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingPlaneBorderColor
- - _HoverColorOverride
- - _HoverColorOpaqueOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -346,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -354,11 +332,24 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingPlaneBorderColor
+ - _HoverColorOverride
+ - _HoverColorOpaqueOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
ShaderName: Mixed Reality Toolkit/Standard
- History: []
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -385,11 +376,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.2
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CylinderTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CylinderTheme.asset
index 0a0c9993c59..58acf7cd20f 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CylinderTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/CylinderTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: CylinderTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: -0.32, z: 0}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,7 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -287,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -295,50 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingPlaneBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _HoverColorOpaqueOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingPlaneBorderColor
- - _HoverColorOverride
- - _HoverColorOpaqueOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -346,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -354,11 +332,24 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingPlaneBorderColor
+ - _HoverColorOverride
+ - _HoverColorOpaqueOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
ShaderName: Mixed Reality Toolkit/Standard
- History: []
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -385,11 +376,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/DefaultTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/DefaultTheme.asset
index c0614c964f2..a3802c029d8 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/DefaultTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/DefaultTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: DefaultTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1.06, y: 1.06, z: 1.06}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.01}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,123 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _SpecColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _RimColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissionColor
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- - _SpecColor
- - _RimColor
- - _EmissionColor
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.88235295, g: 0.05190311, b: 0.05190311, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.048875432, g: 0.5072933, b: 0.8308824, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.17355102, g: 0.78676474, b: 0.4568981, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.84108996, g: 0.85294116, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -403,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -411,90 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -502,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -510,227 +332,18 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 2, y: 3, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Shader
- Type: 3
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 10
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
+ ShaderOptionNames:
+ - _Color
+ - _SpecColor
+ - _RimColor
+ - _EmissionColor
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -757,11 +370,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/FocusExampleTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/FocusExampleTheme.asset
index 2f61a72eab2..c443af56e83 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/FocusExampleTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/FocusExampleTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: FocusExampleTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorTheme
+ definitions:
+ - ClassName: InteractableColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,131 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _HoverColorOpaqueOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingBorderColor
- - _HoverColorOverride
- - _HoverColorOpaqueOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.16078432, g: 0.16078432, b: 0.16078432, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.16078432, g: 0.16078432, b: 0.16078432, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -229,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -237,227 +118,24 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.005}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.004}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingBorderColor
+ - _HoverColorOverride
+ - _HoverColorOpaqueOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
+ ShaderName: Mixed Reality Toolkit/Standard
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -484,11 +162,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: eea7cc35b9115d34595e51c5e4211c84, type: 2}
+ states: {fileID: 11400000, guid: eea7cc35b9115d34595e51c5e4211c84, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/FocusPressTouchGrabTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/FocusPressTouchGrabTheme.asset
index 215030da794..535242ec247 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/FocusPressTouchGrabTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/FocusPressTouchGrabTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: FocusPressTouchGrabTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1.2, y: 1.2, z: 1.2}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.8, y: 0.8, z: 0.8}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -88,6 +91,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.7, y: 0.7, z: 0.7}
@@ -103,6 +107,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.5, y: 0.5, z: 0.5}
@@ -118,6 +123,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -126,7 +132,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -134,6 +140,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,10 +149,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -153,6 +157,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -161,10 +166,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -187,6 +198,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -202,6 +214,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -217,6 +230,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -232,6 +246,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -247,6 +262,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -262,6 +278,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -270,7 +287,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -278,6 +295,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -286,10 +304,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -297,6 +312,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -305,10 +321,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -316,6 +337,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -331,6 +353,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -346,6 +369,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -361,6 +385,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -376,6 +401,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -391,6 +417,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -406,6 +433,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -414,143 +442,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingBorderColor
- - _HoverColorOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0.7529412, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 0.62734854, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06915272, g: 0.6981132, b: 0.45621789, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -558,6 +450,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -566,90 +459,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -657,6 +467,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -665,272 +476,23 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1.1, y: 1.1, z: 1.1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0.9, y: 0.9, z: 0.9}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingBorderColor
+ - _HoverColorOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
+ ShaderName: Mixed Reality Toolkit/Standard
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -957,11 +519,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.2
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
+ states: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/GrabColorChildren.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/GrabColorChildren.asset
index a5fa902d18c..0499ef5c320 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/GrabColorChildren.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/GrabColorChildren.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: GrabColorChildren
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorChildrenTheme
+ definitions:
+ - ClassName: InteractableColorChildrenTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorChildrenTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,388 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0.59923285, b: 0.8113208, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.08627451, g: 0.8470589, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.9339623, g: 0.7471792, b: 0.47138664, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -486,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -494,29 +118,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -543,11 +152,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.35
- NoEasing: 0
- IsValid: 0
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/GrabScaleTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/GrabScaleTheme.asset
index 87132dfab92..3f88c4457cb 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/GrabScaleTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/GrabScaleTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: GrabScaleTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableGrabScaleTheme
+ definitions:
+ - ClassName: InteractableGrabScaleTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableGrabScaleTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.98, y: 1.02, z: 0.98}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,91 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -189,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -197,225 +118,13 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings:
+ customProperties:
- Name: ScaleMagnifier
Type: 6
Value:
@@ -426,6 +135,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.9, y: 1.1, z: 0.9}
@@ -444,6 +154,7 @@ MonoBehaviour:
Float: 0.2
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -452,8 +163,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- CustomHistory: []
- Easing:
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -480,11 +190,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.25
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonBackPlate.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonBackPlate.asset
index 68066d9190c..f72ea53559c 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonBackPlate.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonBackPlate.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: HolographicButtonBackPlate
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorTheme
+ definitions:
+ - ClassName: InteractableColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,131 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _HoverColorOpaqueOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingBorderColor
- - _HoverColorOverride
- - _HoverColorOpaqueOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.16078432, g: 0.16078432, b: 0.16078432, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.16078432, g: 0.16078432, b: 0.16078432, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -229,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -237,227 +118,24 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.005}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.004}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingBorderColor
+ - _HoverColorOverride
+ - _HoverColorOpaqueOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
+ ShaderName: Mixed Reality Toolkit/Standard
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -484,11 +162,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonBackPlateToggleSelected.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonBackPlateToggleSelected.asset
index d4b2f99e05e..bd740d63e82 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonBackPlateToggleSelected.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonBackPlateToggleSelected.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: HolographicButtonBackPlateToggleSelected
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorTheme
+ definitions:
+ - ClassName: InteractableColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,329 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingPlaneBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _HoverColorOpaqueOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingPlaneBorderColor
- - _HoverColorOverride
- - _HoverColorOpaqueOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.005}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.004}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -427,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -435,29 +118,24 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingPlaneBorderColor
+ - _HoverColorOverride
+ - _HoverColorOpaqueOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
+ ShaderName: Mixed Reality Toolkit/Standard
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -484,11 +162,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonFrontPlate.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonFrontPlate.asset
index 8ddf296f7a6..44712a15945 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonFrontPlate.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonFrontPlate.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: HolographicButtonFrontPlate
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableShaderTheme
+ definitions:
+ - ClassName: InteractableShaderTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableShaderTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Shader
- Type: 3
- Values:
+ stateProperties:
+ - name: Shader
+ type: 3
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0.45
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0.45
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,185 +101,27 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ defaultValue:
+ Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _BorderLight
PropId: 37
- ShaderOptions:
- - Name: _AlbedoAlphaMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _AlbedoAssignedAtRuntime
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Cutoff
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Metallic
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Smoothness
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _EnableChannelMap
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableNormalMap
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _NormalMapScale
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableEmission
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableTriplanarMapping
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableLocalSpaceTriplanarMapping
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _TriplanarMappingBlendSharpness
- Type: 2
- Range: {x: 1, y: 16}
- - Name: _DirectionalLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _SpecularHighlights
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Reflections
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Refraction
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RefractiveIndex
- Type: 2
- Range: {x: 0, y: 3}
- - Name: _RimLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RimPower
- Type: 2
- Range: {x: 0, y: 8}
- - Name: _ClippingPlane
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingSphere
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingBox
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingBorder
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingBorderWidth
- Type: 2
- Range: {x: 0.005, y: 1}
- - Name: _NearPlaneFade
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _FadeBeginDistance
- Type: 2
- Range: {x: 0.01, y: 10}
- - Name: _FadeCompleteDistance
- Type: 2
- Range: {x: 0.01, y: 10}
- - Name: _HoverLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableHoverColorOverride
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _HoverLightOpaque
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableHoverColorOpaqueOverride
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RoundCorners
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RoundCornerRadius
- Type: 2
- Range: {x: 0.01, y: 0.5}
- - Name: _RoundCornerMargin
- Type: 2
- Range: {x: 0, y: 0.5}
- - Name: _BorderLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderLightUsesHoverColor
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderLightOpaque
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderWidth
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _BorderMinValue
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _EdgeSmoothingValue
- Type: 2
- Range: {x: 0.0001, y: 0.2}
- - Name: _InnerGlow
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColoring
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorThreshold
- Type: 2
- Range: {x: 0, y: 3}
- - Name: _EnvironmentColorIntensity
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Mode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _CustomMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _SrcBlend
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _DstBlend
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BlendOp
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ZTest
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ZWrite
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ColorWriteMask
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _CullMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RenderQueueOverride
- Type: 2
- Range: {x: -1, y: 5000}
- - Name: _InstancedColor
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Stencil
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _StencilReference
- Type: 2
- Range: {x: 0, y: 255}
- - Name: _StencilComparison
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _StencilOperation
- Type: 1
- Range: {x: 0, y: 0}
+ ShaderOptions: []
ShaderOptionNames:
- _AlbedoAlphaMode
- _AlbedoAssignedAtRuntime
@@ -336,206 +182,107 @@ MonoBehaviour:
- _StencilReference
- _StencilComparison
- _StencilOperation
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
+ customProperties: []
+ easing:
+ Enabled: 0
+ Curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ LerpTime: 0.1
+ - ClassName: InteractableColorTheme
+ AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
+ Microsoft.MixedReality.Toolkit.SDK
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
+ - Name: Default
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
+ Color: {r: 0, g: 0, b: 0, a: 1}
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
+ - Name: Focus
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
+ Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- - Name:
+ - Name: Pressed
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
+ Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
+ - Name: Disabled
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
+ Color: {r: 0, g: 0, b: 0, a: 1}
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -543,6 +290,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -551,71 +299,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -623,6 +307,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -631,275 +316,10 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Shader
- Type: 3
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0.45
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0.45
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 30
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
- Enabled: 0
- Curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- LerpTime: 0.1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- - Name: InteractableColorTheme
- AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
- Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
- - Name: Default
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Focus
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Pressed
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Disabled
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _HoverColorOpaqueOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
ShaderOptionNames:
- _Color
- _EmissiveColor
@@ -911,324 +331,9 @@ MonoBehaviour:
- _EnvironmentColorX
- _EnvironmentColorY
- _EnvironmentColorZ
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -1255,11 +360,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonFrontPlateThick.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonFrontPlateThick.asset
index 9fdc168ad14..46b721a5871 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonFrontPlateThick.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonFrontPlateThick.asset
@@ -12,14 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: HolographicButtonFrontPlateThick
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableShaderTheme
- AssemblyQualifiedName:
- Properties:
- - Name: Shader
- Type: 3
- Values:
+ definitions:
+ - ClassName: InteractableShaderTheme
+ AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableShaderTheme,
+ Microsoft.MixedReality.Toolkit.SDK
+ stateProperties:
+ - name: Shader
+ type: 3
+ values:
- Name: Default
String:
Bool: 0
@@ -27,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -42,6 +43,7 @@ MonoBehaviour:
Float: 0.45
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -57,6 +59,7 @@ MonoBehaviour:
Float: 0.45
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -72,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -80,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -88,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -96,6 +101,25 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ defaultValue:
+ Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _BorderWidth
PropId: 37
ShaderOptions:
- Name: _AlbedoAlphaMode
@@ -335,206 +359,107 @@ MonoBehaviour:
- _StencilReference
- _StencilComparison
- _StencilOperation
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
+ customProperties: []
+ easing:
+ Enabled: 0
+ Curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ LerpTime: 0.1
+ - ClassName: InteractableColorTheme
+ AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
+ Microsoft.MixedReality.Toolkit.SDK
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
+ - Name: Default
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
+ Color: {r: 0, g: 0, b: 0, a: 1}
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
+ - Name: Focus
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
+ Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- - Name:
+ - Name: Pressed
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
+ Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
+ - Name: Disabled
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
+ Color: {r: 0, g: 0, b: 0, a: 1}
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -542,6 +467,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -550,71 +476,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -622,6 +484,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -630,274 +493,10 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Shader
- Type: 3
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0.45
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0.45
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 30
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
- Enabled: 0
- Curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- LerpTime: 0.1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- - Name: InteractableColorTheme
- AssemblyQualifiedName:
- Properties:
- - Name: Color
- Type: 2
- Values:
- - Name: Default
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Focus
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Pressed
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Disabled
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _HoverColorOpaqueOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
ShaderOptionNames:
- _Color
- _EmissiveColor
@@ -909,324 +508,9 @@ MonoBehaviour:
- _EnvironmentColorX
- _EnvironmentColorY
- _EnvironmentColorZ
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -1253,11 +537,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel-Simple.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel-Simple.asset
new file mode 100644
index 00000000000..7668577e268
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel-Simple.asset
@@ -0,0 +1,212 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+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: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
+ m_Name: HolographicButtonSeeItSayItLabel-Simple
+ m_EditorClassIdentifier:
+ definitions:
+ - ClassName: InteractableScaleTheme
+ AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableScaleTheme,
+ Microsoft.MixedReality.Toolkit.SDK
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
+ - Name: Default
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ - Name: Focus
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 1, y: 1, z: 1}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ - Name: Pressed
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ - Name: PhysicalTouch
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ - Name: Grab
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ - Name: Gesture
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ - Name: Disabled
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ startValue:
+ Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ defaultValue:
+ Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
+ ShaderName:
+ customProperties: []
+ easing:
+ Enabled: 1
+ Curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.9974621
+ value: -0.002669083
+ inSlope: -0.0024149457
+ outSlope: -0.0024149457
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.25344455
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ LerpTime: 1
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel-Simple.asset.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel-Simple.asset.meta
new file mode 100644
index 00000000000..d9abf380e65
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel-Simple.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a4ada4b285469047946e8662531da54
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel.asset
index fab3d740c63..7bc89080d9a 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: HolographicButtonSeeItSayItLabel
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableScaleTheme
+ definitions:
+ - ClassName: InteractableScaleTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableScaleTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -88,6 +91,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -103,6 +107,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -118,6 +123,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -126,7 +132,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -134,6 +140,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,136 +149,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06666667, g: 0.06666667, b: 0.06666667, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -279,6 +157,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -287,326 +166,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -642,11 +209,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/Model_BuckyTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/Model_BuckyTheme.asset
index 57e0e0155d5..90357ea622d 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/Model_BuckyTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/Model_BuckyTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: Model_BuckyTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableRotationTheme
+ definitions:
+ - ClassName: InteractableRotationTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableRotationTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Rotation
- Type: 6
- Values:
+ stateProperties:
+ - name: Rotation
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 90, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 270, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,784 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0.7529412, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 0.62734854, b: 0, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.06915272, g: 0.6981132, b: 0.45621789, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1.1, y: 1.1, z: 1.1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0.9, y: 0.9, z: 0.9}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Rotation
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Animator Trigger
- Type: 16
- Values:
- - Name:
- String: Default
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Focus
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Pressed
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Disabled
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: String
- Type: 14
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Audio
- Type: 11
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -882,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -890,29 +118,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -939,31 +152,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.2
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States:
- - Name: Default
- Index: 0
- Bit: 1
- Value: 0
- ActiveIndex: 0
- - Name: Focus
- Index: 1
- Bit: 2
- Value: 0
- ActiveIndex: 1
- - Name: Pressed
- Index: 2
- Bit: 4
- Value: 0
- ActiveIndex: 2
- - Name: Disabled
- Index: 7
- Bit: 8
- Value: 0
- ActiveIndex: 3
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/Model_IcosaTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/Model_IcosaTheme.asset
index dd157d98963..3f9c80c4440 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/Model_IcosaTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/Model_IcosaTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: Model_IcosaTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableShaderTheme
+ definitions:
+ - ClassName: InteractableShaderTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableShaderTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Shader
- Type: 3
- Values:
+ stateProperties:
+ - name: Shader
+ type: 3
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 1
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 1
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,164 +101,27 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ defaultValue:
+ Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _BorderLight
PropId: 27
- ShaderOptions:
- - Name: _AlbedoAlphaMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Cutoff
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Metallic
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Smoothness
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _EnableChannelMap
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableNormalMap
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableEmission
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _DirectionalLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _SpecularHighlights
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Reflections
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Refraction
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RefractiveIndex
- Type: 2
- Range: {x: 0, y: 3}
- - Name: _RimLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RimPower
- Type: 2
- Range: {x: 0, y: 8}
- - Name: _ClippingPlane
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingPlaneBorder
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingPlaneBorderWidth
- Type: 2
- Range: {x: 0.005, y: 1}
- - Name: _NearPlaneFade
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _FadeBeginDistance
- Type: 2
- Range: {x: 0.01, y: 10}
- - Name: _FadeCompleteDistance
- Type: 2
- Range: {x: 0.01, y: 10}
- - Name: _HoverLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableHoverColorOverride
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _HoverLightOpaque
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableHoverColorOpaqueOverride
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RoundCorners
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RoundCornerRadius
- Type: 2
- Range: {x: 0.01, y: 0.5}
- - Name: _RoundCornerMargin
- Type: 2
- Range: {x: 0, y: 0.5}
- - Name: _BorderLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderLightUsesHoverColor
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderLightOpaque
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderWidth
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _BorderMinValue
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _EdgeSmoothingValue
- Type: 2
- Range: {x: 0.0001, y: 0.2}
- - Name: _InnerGlow
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColoring
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorThreshold
- Type: 2
- Range: {x: 0, y: 3}
- - Name: _EnvironmentColorIntensity
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Mode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _CustomMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _SrcBlend
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _DstBlend
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BlendOp
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ZTest
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ZWrite
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ColorWriteMask
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _CullMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RenderQueueOverride
- Type: 2
- Range: {x: -1, y: 5000}
- - Name: _InstancedColor
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Stencil
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _StencilReference
- Type: 2
- Range: {x: 0, y: 255}
- - Name: _StencilComparison
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _StencilOperation
- Type: 1
- Range: {x: 0, y: 0}
+ ShaderOptions: []
ShaderOptionNames:
- _AlbedoAlphaMode
- _Cutoff
@@ -308,148 +175,50 @@ MonoBehaviour:
- _StencilReference
- _StencilComparison
- _StencilOperation
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
+ customProperties: []
+ easing:
+ Enabled: 1
+ Curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ LerpTime: 0.2
+ - ClassName: InteractableShaderTheme
+ AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableShaderTheme,
+ Microsoft.MixedReality.Toolkit.SDK
+ stateProperties:
+ - name: Shader
+ type: 3
+ values:
+ - Name: Default
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -458,13 +227,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- - Name:
+ - Name: Focus
String:
Bool: 0
Int: 0
- Float: 0
+ Float: 0.1
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -473,13 +243,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- - Name:
+ - Name: Pressed
String:
Bool: 0
Int: 0
- Float: 0
+ Float: 0.2
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -488,14 +259,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
+ - Name: Disabled
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -504,10 +275,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -515,6 +283,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -523,71 +292,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -595,6 +300,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -603,520 +309,10 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _BorderWidth
+ PropId: 30
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Animator Trigger
- Type: 16
- Values:
- - Name:
- String: Default
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Focus
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Pressed
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Disabled
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Shader
- Type: 3
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
- Enabled: 1
- Curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- LerpTime: 0.2
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States:
- - Name: Default
- Index: 0
- Bit: 1
- Value: 0
- ActiveIndex: 0
- - Name: Focus
- Index: 1
- Bit: 2
- Value: 0
- ActiveIndex: 1
- - Name: Pressed
- Index: 2
- Bit: 4
- Value: 0
- ActiveIndex: 2
- - Name: Disabled
- Index: 7
- Bit: 8
- Value: 0
- ActiveIndex: 3
- - Name: InteractableShaderTheme
- AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableShaderTheme,
- Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Shader
- Type: 3
- Values:
- - Name: Default
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Focus
- String:
- Bool: 0
- Int: 0
- Float: 0.1
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Pressed
- String:
- Bool: 0
- Int: 0
- Float: 0.2
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Disabled
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 30
- ShaderOptions:
- - Name: _AlbedoAlphaMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Cutoff
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Metallic
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Smoothness
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _EnableChannelMap
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableNormalMap
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableEmission
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _DirectionalLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _SpecularHighlights
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Reflections
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Refraction
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RefractiveIndex
- Type: 2
- Range: {x: 0, y: 3}
- - Name: _RimLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RimPower
- Type: 2
- Range: {x: 0, y: 8}
- - Name: _ClippingPlane
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingPlaneBorder
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingPlaneBorderWidth
- Type: 2
- Range: {x: 0.005, y: 1}
- - Name: _NearPlaneFade
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _FadeBeginDistance
- Type: 2
- Range: {x: 0.01, y: 10}
- - Name: _FadeCompleteDistance
- Type: 2
- Range: {x: 0.01, y: 10}
- - Name: _HoverLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableHoverColorOverride
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _HoverLightOpaque
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableHoverColorOpaqueOverride
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RoundCorners
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RoundCornerRadius
- Type: 2
- Range: {x: 0.01, y: 0.5}
- - Name: _RoundCornerMargin
- Type: 2
- Range: {x: 0, y: 0.5}
- - Name: _BorderLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderLightUsesHoverColor
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderLightOpaque
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderWidth
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _BorderMinValue
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _EdgeSmoothingValue
- Type: 2
- Range: {x: 0.0001, y: 0.2}
- - Name: _InnerGlow
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColoring
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorThreshold
- Type: 2
- Range: {x: 0, y: 3}
- - Name: _EnvironmentColorIntensity
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Mode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _CustomMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _SrcBlend
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _DstBlend
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BlendOp
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ZTest
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ZWrite
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ColorWriteMask
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _CullMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RenderQueueOverride
- Type: 2
- Range: {x: -1, y: 5000}
- - Name: _InstancedColor
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Stencil
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _StencilReference
- Type: 2
- Range: {x: 0, y: 255}
- - Name: _StencilComparison
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _StencilOperation
- Type: 1
- Range: {x: 0, y: 0}
ShaderOptionNames:
- _AlbedoAlphaMode
- _Cutoff
@@ -1170,522 +366,9 @@ MonoBehaviour:
- _StencilReference
- _StencilComparison
- _StencilOperation
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Animator Trigger
- Type: 16
- Values:
- - Name:
- String: Default
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Focus
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Pressed
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String: Disabled
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Shader
- Type: 3
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -1712,31 +395,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.2
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States:
- - Name: Default
- Index: 0
- Bit: 1
- Value: 0
- ActiveIndex: 0
- - Name: Focus
- Index: 1
- Bit: 2
- Value: 0
- ActiveIndex: 1
- - Name: Pressed
- Index: 2
- Bit: 4
- Value: 0
- ActiveIndex: 2
- - Name: Disabled
- Index: 7
- Bit: 8
- Value: 0
- ActiveIndex: 3
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PianoKeyThemeBlack.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PianoKeyThemeBlack.asset
index ace5b92256a..5dadc536239 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PianoKeyThemeBlack.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PianoKeyThemeBlack.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: PianoKeyThemeBlack
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.02}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,7 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -287,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -295,46 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingBorderColor
- - _HoverColorOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -342,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -350,11 +332,23 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingBorderColor
+ - _HoverColorOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
ShaderName: Mixed Reality Toolkit/Standard
- History: []
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -381,11 +375,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.2
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PianoKeyThemeWhite.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PianoKeyThemeWhite.asset
index be491a8acd5..ad74c5dbb88 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PianoKeyThemeWhite.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PianoKeyThemeWhite.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: PianoKeyThemeWhite
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.02}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,7 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -287,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -295,46 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingBorderColor
- - _HoverColorOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -342,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -350,11 +332,23 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingBorderColor
+ - _HoverColorOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
ShaderName: Mixed Reality Toolkit/Standard
- History: []
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -381,11 +375,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.2
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonCubeTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonCubeTheme.asset
index 88ee59e0e7e..1a10828968a 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonCubeTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonCubeTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: PressableButtonCubeTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,7 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -287,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -295,46 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingBorderColor
- - _HoverColorOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -342,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -350,11 +332,23 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingBorderColor
+ - _HoverColorOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
ShaderName: Mixed Reality Toolkit/Standard
- History: []
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -381,11 +375,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonFrontPlate.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonFrontPlate.asset
index d68f05f112c..6b1536f2d91 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonFrontPlate.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonFrontPlate.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: PressableButtonFrontPlate
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableOffsetTheme
+ definitions:
+ - ClassName: InteractableOffsetTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableOffsetTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Offset
- Type: 6
- Values:
+ stateProperties:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.008}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -88,6 +91,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -103,6 +107,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -118,6 +123,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -126,7 +132,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -134,6 +140,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,631 +149,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.016}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Shader
- Type: 3
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 32
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 32
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 6
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 32
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 45
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Material
- Type: 10
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -774,6 +157,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -782,29 +166,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -831,11 +200,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.03
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonFrontPlatePressed.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonFrontPlatePressed.asset
index bfd87b78878..6469d866ed8 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonFrontPlatePressed.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonFrontPlatePressed.asset
@@ -12,14 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: PressableButtonFrontPlatePressed
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableShaderTheme
- AssemblyQualifiedName:
- Properties:
- - Name: Shader
- Type: 3
- Values:
+ definitions:
+ - ClassName: InteractableShaderTheme
+ AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableShaderTheme,
+ Microsoft.MixedReality.Toolkit.SDK
+ stateProperties:
+ - name: Shader
+ type: 3
+ values:
- Name: Default
String:
Bool: 0
@@ -27,6 +27,7 @@ MonoBehaviour:
Float: 32
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -42,6 +43,7 @@ MonoBehaviour:
Float: 32
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -57,6 +59,7 @@ MonoBehaviour:
Float: 2
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -72,6 +75,7 @@ MonoBehaviour:
Float: 32
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -80,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -88,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -96,212 +101,27 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ defaultValue:
+ Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _InnerGlowPower
PropId: 45
- ShaderOptions:
- - Name: _AlbedoAlphaMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _AlbedoAssignedAtRuntime
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Cutoff
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Metallic
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Smoothness
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _EnableChannelMap
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableNormalMap
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _NormalMapScale
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableEmission
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableTriplanarMapping
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableLocalSpaceTriplanarMapping
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _TriplanarMappingBlendSharpness
- Type: 2
- Range: {x: 1, y: 16}
- - Name: _DirectionalLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _SpecularHighlights
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _SphericalHarmonics
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Reflections
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Refraction
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RefractiveIndex
- Type: 2
- Range: {x: 0, y: 3}
- - Name: _RimLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RimPower
- Type: 2
- Range: {x: 0, y: 8}
- - Name: _VertexColors
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingPlane
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingSphere
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingBox
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingBorder
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ClippingBorderWidth
- Type: 2
- Range: {x: 0.005, y: 1}
- - Name: _NearPlaneFade
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _NearLightFade
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _FadeBeginDistance
- Type: 2
- Range: {x: 0.01, y: 10}
- - Name: _FadeCompleteDistance
- Type: 2
- Range: {x: 0.01, y: 10}
- - Name: _HoverLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnableHoverColorOverride
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ProximityLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RoundCorners
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RoundCornerRadius
- Type: 2
- Range: {x: 0, y: 0.5}
- - Name: _RoundCornerMargin
- Type: 2
- Range: {x: 0, y: 0.5}
- - Name: _BorderLight
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderLightUsesHoverColor
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderLightReplacesAlbedo
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderLightOpaque
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BorderWidth
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _BorderMinValue
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _EdgeSmoothingValue
- Type: 2
- Range: {x: 0.0001, y: 0.2}
- - Name: _BorderLightOpaqueAlpha
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _InnerGlow
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _InnerGlowPower
- Type: 2
- Range: {x: 2, y: 32}
- - Name: _Iridescence
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _IridescenceIntensity
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _IridescenceThreshold
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _IridescenceAngle
- Type: 2
- Range: {x: -0.78, y: 0.78}
- - Name: _EnvironmentColoring
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorThreshold
- Type: 2
- Range: {x: 0, y: 3}
- - Name: _EnvironmentColorIntensity
- Type: 2
- Range: {x: 0, y: 1}
- - Name: _Mode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _CustomMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _SrcBlend
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _DstBlend
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _BlendOp
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ZTest
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ZWrite
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _ColorWriteMask
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _CullMode
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _RenderQueueOverride
- Type: 2
- Range: {x: -1, y: 5000}
- - Name: _InstancedColor
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _Stencil
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _StencilReference
- Type: 2
- Range: {x: 0, y: 255}
- - Name: _StencilComparison
- Type: 1
- Range: {x: 0, y: 0}
- - Name: _StencilOperation
- Type: 1
- Range: {x: 0, y: 0}
+ ShaderOptions: []
ShaderOptionNames:
- _AlbedoAlphaMode
- _AlbedoAssignedAtRuntime
@@ -371,324 +191,9 @@ MonoBehaviour:
- _StencilReference
- _StencilComparison
- _StencilOperation
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -715,11 +220,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.5
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 0}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonToggleStateOff.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonToggleStateOff.asset
index 166d4065510..1852ecc8a59 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonToggleStateOff.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonToggleStateOff.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: PressableButtonToggleStateOff
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableActivateTheme
+ definitions:
+ - ClassName: InteractableActivateTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableActivateTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Activate
- Type: 15
- Values:
+ stateProperties:
+ - name: Activate
+ type: 15
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -88,6 +91,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -103,6 +107,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -118,6 +123,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -126,7 +132,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -134,6 +140,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,676 +149,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.008}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Shader
- Type: 3
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 32
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 32
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 6
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 32
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 45
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Material
- Type: 10
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -819,6 +157,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -827,29 +166,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -876,11 +200,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.03
- NoEasing: 1
- IsValid: 0
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
+ states: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonToggleStateOn.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonToggleStateOn.asset
index d9d4835e32c..b007ea59d5e 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonToggleStateOn.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableButtonToggleStateOn.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: PressableButtonToggleStateOn
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableActivateTheme
+ definitions:
+ - ClassName: InteractableActivateTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableActivateTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Activate
- Type: 15
- Values:
+ stateProperties:
+ - name: Activate
+ type: 15
+ values:
- Name: Default
String:
Bool: 1
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -88,6 +91,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -103,6 +107,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -118,6 +123,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -126,7 +132,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -134,6 +140,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,676 +149,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.008}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Shader
- Type: 3
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 32
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 32
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 6
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 32
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 45
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Material
- Type: 10
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -819,6 +157,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -827,29 +166,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -876,11 +200,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.03
- NoEasing: 1
- IsValid: 0
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
+ states: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableRoundButton.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableRoundButton.asset
index 0460b735a02..3d1de15d402 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableRoundButton.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableRoundButton.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: PressableRoundButton
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableOffsetTheme
+ definitions:
+ - ClassName: InteractableOffsetTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableOffsetTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Offset
- Type: 6
- Values:
+ stateProperties:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.01}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,388 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.01}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -486,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -494,29 +118,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -543,11 +152,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.2
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 0}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableRoundButtonColor.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableRoundButtonColor.asset
index 232b28ff848..691e6552217 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableRoundButtonColor.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/PressableRoundButtonColor.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: PressableRoundButtonColor
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -88,6 +91,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -103,6 +107,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -118,6 +123,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -126,7 +132,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -134,6 +140,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,10 +149,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -153,6 +157,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -161,10 +166,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -187,6 +198,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -202,6 +214,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.24}
@@ -217,6 +230,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -232,6 +246,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -247,6 +262,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -262,6 +278,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -270,7 +287,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -278,6 +295,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -286,10 +304,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -297,6 +312,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -305,10 +321,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -316,6 +337,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -331,6 +353,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -346,6 +369,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.24}
@@ -361,6 +385,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -376,6 +401,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -391,6 +417,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -406,6 +433,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -414,174 +442,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _ProximityLightCenterColorOverride
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _ProximityLightMiddleColorOverride
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _ProximityLightOuterColorOverride
- Type: 0
- Range: {x: 0, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingBorderColor
- - _HoverColorOverride
- - _ProximityLightCenterColorOverride
- - _ProximityLightMiddleColorOverride
- - _ProximityLightOuterColorOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0.59923285, b: 0.8113208, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.08627451, g: 0.8470589, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.9339623, g: 0.7471792, b: 0.47138664, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -589,6 +450,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -597,71 +459,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.24}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -669,6 +467,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -677,371 +476,26 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Texture
- Type: 9
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingBorderColor
+ - _HoverColorOverride
+ - _ProximityLightCenterColorOverride
+ - _ProximityLightMiddleColorOverride
+ - _ProximityLightOuterColorOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
+ ShaderName: Mixed Reality Toolkit/Standard
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -1068,11 +522,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.1
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/TextureTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/TextureTheme.asset
new file mode 100644
index 00000000000..a623674d08e
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/TextureTheme.asset
@@ -0,0 +1,171 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+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: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
+ m_Name: TextureTheme
+ m_EditorClassIdentifier:
+ definitions:
+ - ClassName: InteractableTextureTheme
+ AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableTextureTheme,
+ Microsoft.MixedReality.Toolkit.SDK, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ stateProperties:
+ - name: Texture
+ type: 9
+ values:
+ - Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 2800000, guid: e2cd08a4d181dcc4ea7beb0992656c7e, type: 3}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ - Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 2800000, guid: c4ef4f1a21329834b834a089722652f1, type: 3}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ - Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 2800000, guid: c4ef4f1a21329834b834a089722652f1, type: 3}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ - Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 2800000, guid: e2cd08a4d181dcc4ea7beb0992656c7e, type: 3}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ - Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ startValue:
+ Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ defaultValue:
+ Name:
+ String:
+ Bool: 0
+ Int: 0
+ Float: 0
+ Texture: {fileID: 0}
+ Material: {fileID: 0}
+ Shader: {fileID: 0}
+ GameObject: {fileID: 0}
+ Vector2: {x: 0, y: 0}
+ Vector3: {x: 0, y: 0, z: 0}
+ Vector4: {x: 0, y: 0, z: 0, w: 0}
+ Color: {r: 0, g: 0, b: 0, a: 0}
+ Quaternion: {x: 0, y: 0, z: 0, w: 0}
+ AudioClip: {fileID: 0}
+ Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _MainTex
+ PropId: -1
+ ShaderOptions: []
+ ShaderOptionNames: []
+ ShaderName:
+ customProperties: []
+ easing:
+ Enabled: 0
+ Curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ LerpTime: 0.5
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/TextureTheme.asset.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/TextureTheme.asset.meta
new file mode 100644
index 00000000000..86a8a9366d9
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/TextureTheme.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 10c315df64dc56e44bd2e3c8949e08fa
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleBackground.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleBackground.asset
index 97d82976851..b264ae663ab 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleBackground.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleBackground.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ToggleBackground
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorTheme
+ definitions:
+ - ClassName: InteractableColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,131 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EmissiveColor
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _RimColor
- Type: 0
- Range: {x: 0.5, y: 0.5}
- - Name: _ClippingPlaneBorderColor
- Type: 0
- Range: {x: 0.2, y: 0}
- - Name: _HoverColorOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _HoverColorOpaqueOverride
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _InnerGlowColor
- Type: 0
- Range: {x: 1, y: 1}
- - Name: _EnvironmentColorX
- Type: 0
- Range: {x: 0, y: 0}
- - Name: _EnvironmentColorY
- Type: 0
- Range: {x: 1, y: 0}
- - Name: _EnvironmentColorZ
- Type: 0
- Range: {x: 0, y: 1}
- ShaderOptionNames:
- - _Color
- - _EmissiveColor
- - _RimColor
- - _ClippingPlaneBorderColor
- - _HoverColorOverride
- - _HoverColorOpaqueOverride
- - _InnerGlowColor
- - _EnvironmentColorX
- - _EnvironmentColorY
- - _EnvironmentColorZ
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName: Mixed Reality Toolkit/Standard
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.28627452, g: 0.28627452, b: 0.28627452, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.28627452, g: 0.28627452, b: 0.28627452, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.3529412, g: 0.3529412, b: 0.3529412, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -229,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -237,227 +118,24 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ - _EmissiveColor
+ - _RimColor
+ - _ClippingPlaneBorderColor
+ - _HoverColorOverride
+ - _HoverColorOpaqueOverride
+ - _InnerGlowColor
+ - _EnvironmentColorX
+ - _EnvironmentColorY
+ - _EnvironmentColorZ
+ ShaderName: Mixed Reality Toolkit/Standard
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -484,11 +162,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleBackgroundSelected.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleBackgroundSelected.asset
index 1535d13d38e..3bde2211774 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleBackgroundSelected.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleBackgroundSelected.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ToggleBackgroundSelected
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: InteractableColorTheme
+ definitions:
+ - ClassName: InteractableColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Color
- Type: 2
- Values:
+ stateProperties:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,289 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.1764706, g: 0.49019608, b: 0.6039216, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.754361, g: 0.93816495, b: 0.9811321, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.6, g: 0.9019608, b: 0.972549, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0.39215687, g: 0.39215687, b: 0.39215687, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: -0.007}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -387,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -395,29 +118,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -444,11 +152,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 0
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleButton.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleButton.asset
index b18e9a20421..b2362e4d230 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleButton.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleButton.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ToggleButton
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.004}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.002}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,227 +332,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -646,11 +367,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleButtonSelected.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleButtonSelected.asset
index 537d2c9a5ea..d87ef176bcc 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleButtonSelected.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleButtonSelected.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ToggleButtonSelected
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.004}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.002}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,227 +332,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -646,11 +367,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleDot.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleDot.asset
index 4ebb01d7739..a0ed241327d 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleDot.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleDot.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ToggleDot
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.004}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.002}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,227 +332,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -646,11 +367,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleDotSelected.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleDotSelected.asset
index dadab195940..3543f487d4f 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleDotSelected.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleDotSelected.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ToggleDotSelected
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.02, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.02, y: 0, z: -0.005}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.02, y: 0, z: 0.004}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.02, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,227 +332,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -646,11 +367,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleIcon.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleIcon.asset
index 82c2b501997..03f821355d1 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleIcon.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleIcon.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ToggleIcon
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.004}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.002}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,51 +332,56 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
+ Enabled: 1
+ Curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 2
+ outSlope: 2
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 0
+ LerpTime: 0.3
+ - ClassName: InteractableActivateTheme
+ AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableActivateTheme,
+ Microsoft.MixedReality.Toolkit.SDK
+ stateProperties:
+ - name: Activate
+ type: 15
+ values:
+ - Name: Default
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -452,13 +390,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- - Name:
+ - Name: Focus
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -467,13 +406,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- - Name:
+ - Name: Pressed
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -482,14 +422,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
+ - Name: Disabled
String:
Bool: 0
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -498,10 +438,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -509,6 +446,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -517,71 +455,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -589,6 +463,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -597,663 +472,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
- Enabled: 1
- Curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 2
- outSlope: 2
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 0
- LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- - Name: InteractableActivateTheme
- AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableActivateTheme,
- Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Activate
- Type: 15
- Values:
- - Name: Default
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Focus
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Pressed
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Disabled
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Audio
- Type: 11
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -1280,11 +506,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.5
- NoEasing: 1
- IsValid: 0
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleIconSelected.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleIconSelected.asset
index aa663f43682..9a95cc16370 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleIconSelected.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleIconSelected.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ToggleIconSelected
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.004}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.002}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,51 +332,56 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
+ Enabled: 1
+ Curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 2
+ outSlope: 2
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 0
+ LerpTime: 0.3
+ - ClassName: InteractableActivateTheme
+ AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableActivateTheme,
+ Microsoft.MixedReality.Toolkit.SDK
+ stateProperties:
+ - name: Activate
+ type: 15
+ values:
+ - Name: Default
String:
- Bool: 0
+ Bool: 1
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -452,13 +390,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- - Name:
+ - Name: Focus
String:
- Bool: 0
+ Bool: 1
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -467,13 +406,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- - Name:
+ - Name: Pressed
String:
- Bool: 0
+ Bool: 1
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -482,14 +422,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
+ - Name: Disabled
String:
- Bool: 0
+ Bool: 1
Int: 0
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -498,10 +438,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -509,6 +446,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -517,71 +455,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -589,6 +463,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -597,663 +472,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
PropId: 0
ShaderOptions: []
ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
- Enabled: 1
- Curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 2
- outSlope: 2
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 0
- LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- - Name: InteractableActivateTheme
- AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableActivateTheme,
- Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Activate
- Type: 15
- Values:
- - Name: Default
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Focus
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Pressed
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name: Disabled
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Activate
- Type: 15
- Values:
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 1
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Audio
- Type: 11
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 0
Curve:
serializedVersion: 2
@@ -1280,11 +506,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.5
- NoEasing: 1
- IsValid: 0
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleLabel.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleLabel.asset
index fa32fbd9f35..7c1c905d789 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleLabel.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleLabel.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ToggleLabel
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.003}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.003}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,227 +332,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -646,11 +367,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleLabelSelected.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleLabelSelected.asset
index 7d5af98ddbe..03344edcf35 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleLabelSelected.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/ToggleLabelSelected.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: ToggleLabelSelected
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: -0.003}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0.003}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,30 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions:
- - Name: _Color
- Type: 0
- Range: {x: 1, y: 1}
- ShaderOptionNames:
- - _Color
- Default:
+ startValue:
Name:
String:
Bool: 0
@@ -310,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -318,72 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
- History:
- - Name: Color
- Type: 2
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 1, g: 1, b: 1, a: 1}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
+ defaultValue:
Name:
String:
Bool: 0
@@ -391,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -399,227 +332,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
PropId: 0
ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Offset
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- - Name: Scale
- Type: 6
- Values:
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- - Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 1, y: 1, z: 1}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- StartValue:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
- Name:
- String:
- Bool: 0
- Int: 0
- Float: 0
- Texture: {fileID: 0}
- Material: {fileID: 0}
- GameObject: {fileID: 0}
- Vector2: {x: 0, y: 0}
- Vector3: {x: 0, y: 0, z: 0}
- Vector4: {x: 0, y: 0, z: 0, w: 0}
- Color: {r: 0, g: 0, b: 0, a: 0}
- Quaternion: {x: 0, y: 0, z: 0, w: 0}
- AudioClip: {fileID: 0}
- Animation: {fileID: 0}
- ShaderName:
- CustomSettings: []
- CustomHistory: []
- Easing:
+ ShaderOptionNames:
+ - _Color
+ ShaderName: MixedRealityToolkit/Examples/UnlitTriplanar
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -646,11 +367,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 0
LerpTime: 0.3
- NoEasing: 0
- IsValid: 1
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/balloonTheme.asset b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/balloonTheme.asset
index aa221e13bd8..932a305a35e 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/balloonTheme.asset
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/balloonTheme.asset
@@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
m_Name: balloonTheme
m_EditorClassIdentifier:
- Name:
- Settings:
- - Name: ScaleOffsetColorTheme
+ definitions:
+ - ClassName: ScaleOffsetColorTheme
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
Microsoft.MixedReality.Toolkit.SDK
- Properties:
- - Name: Scale
- Type: 6
- Values:
+ stateProperties:
+ - name: Scale
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -28,6 +27,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1.1, y: 1.1, z: 1.1}
@@ -58,6 +59,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0.9, y: 0.9, z: 0.9}
@@ -73,6 +75,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 1, y: 1, z: 1}
@@ -81,7 +84,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -89,6 +92,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -97,10 +101,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -116,10 +118,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Offset
- Type: 6
- Values:
+ - name: Offset
+ type: 6
+ values:
- Name: Default
String:
Bool: 0
@@ -127,6 +134,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -157,6 +166,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -172,6 +182,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -180,7 +191,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -188,6 +199,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -196,10 +208,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -207,6 +216,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -215,10 +225,15 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 0}
+ shaderPropertyName:
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- - Name: Color
- Type: 2
- Values:
+ - name: Color
+ type: 2
+ values:
- Name: Default
String:
Bool: 0
@@ -226,6 +241,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -279,7 +298,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- StartValue:
+ startValue:
Name:
String:
Bool: 0
@@ -287,6 +306,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -295,10 +315,7 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
- PropId: 0
- ShaderOptions: []
- ShaderOptionNames: []
- Default:
+ defaultValue:
Name:
String:
Bool: 0
@@ -306,6 +323,7 @@ MonoBehaviour:
Float: 0
Texture: {fileID: 0}
Material: {fileID: 0}
+ Shader: {fileID: 0}
GameObject: {fileID: 0}
Vector2: {x: 0, y: 0}
Vector3: {x: 0, y: 0, z: 0}
@@ -314,11 +332,14 @@ MonoBehaviour:
Quaternion: {x: 0, y: 0, z: 0, w: 0}
AudioClip: {fileID: 0}
Animation: {fileID: 0}
+ targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+ shaderPropertyName: _Color
+ PropId: 0
+ ShaderOptions: []
+ ShaderOptionNames: []
ShaderName:
- History: []
- CustomSettings: []
- CustomHistory: []
- Easing:
+ customProperties: []
+ easing:
Enabled: 1
Curve:
serializedVersion: 2
@@ -345,11 +366,4 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
LerpTime: 0.1
- NoEasing: 0
- IsValid: 0
- ThemeTarget:
- Properties: []
- Target: {fileID: 0}
- States: []
- CustomSettings: []
- States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+ states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBox.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBox.mat
index dde50f399bf..7ecc669bc11 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBox.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBox.mat
@@ -41,6 +41,7 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 1
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -66,6 +67,7 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
@@ -73,8 +75,10 @@ Material:
- _FadeBeginDistance: 0.01
- _FadeCompleteDistance: 0.18
- _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _HoverLight: 1
- _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 14.8
- _InstancedColor: 0
@@ -89,6 +93,7 @@ Material:
- _NearPlaneFadeReverse: 1
- _NormalMapScale: 1
- _ProximityLight: 1
+ - _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
@@ -110,6 +115,7 @@ Material:
- _TriplanarMappingBlendSharpness: 4
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
@@ -125,4 +131,7 @@ Material:
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 0.3962264, g: 0.3962264, b: 0.3962264, a: 1}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBoxHandleBlueGrabbed.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBoxHandleBlueGrabbed.mat
index 89af4ab9d33..614194ef606 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBoxHandleBlueGrabbed.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBoxHandleBlueGrabbed.mat
@@ -78,6 +78,7 @@ Material:
- _AlbedoAlphaSmoothness: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -108,17 +109,21 @@ Material:
- _EnableLightMap: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.46
- _EnvironmentColorThreshold: 1.46
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 1
- _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 1
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -128,11 +133,14 @@ Material:
- _IridescenceThreshold: 0.05
- _Metallic: 0
- _Mode: 0
+ - _NearLightFade: 0
- _NearPlaneFade: 0
- _NormalMapScale: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
- _RefractiveIndex: 1.1
@@ -154,6 +162,11 @@ Material:
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
@@ -169,4 +182,7 @@ Material:
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 0.28627455, g: 0.5784523, b: 1, a: 0.2784314}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBoxHandleWhite.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBoxHandleWhite.mat
index 9035f182ef3..fca75f1ee10 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBoxHandleWhite.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/BoundingBoxHandleWhite.mat
@@ -78,6 +78,7 @@ Material:
- _AlbedoAlphaSmoothness: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -108,17 +109,21 @@ Material:
- _EnableLightMap: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.46
- _EnvironmentColorThreshold: 1.46
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
+ - _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 1
- _HoverLightOpaque: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 1
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -128,11 +133,14 @@ Material:
- _IridescenceThreshold: 0.05
- _Metallic: 0
- _Mode: 0
+ - _NearLightFade: 0
- _NearPlaneFade: 0
- _NormalMapScale: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 1
+ - _ProximityLightSubtractive: 0
+ - _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
- _RefractiveIndex: 1.1
@@ -154,6 +162,11 @@ Material:
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
+ - _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
+ - _VertexExtrusionValue: 0
+ - _ZOffsetFactor: 0
+ - _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
@@ -169,4 +182,7 @@ Material:
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.78431374}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/UnityUIBackground.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/UnityUIBackground.mat
index 51be868d9a8..98ee927f086 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/UnityUIBackground.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Materials/UnityUIBackground.mat
@@ -154,6 +154,7 @@ Material:
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Meshes/Cursors/Materials/Light.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Meshes/Cursors/Materials/Light.mat
index 519a61707dd..771c0f4c007 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Meshes/Cursors/Materials/Light.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Meshes/Cursors/Materials/Light.mat
@@ -72,6 +72,7 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -98,6 +99,7 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
@@ -105,10 +107,12 @@ Material:
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
- _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _HoverLight: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -124,6 +128,7 @@ Material:
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
@@ -147,6 +152,7 @@ Material:
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
@@ -162,4 +168,7 @@ Material:
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Meshes/Cursors/Materials/Shadow.mat b/Assets/MixedRealityToolkit.SDK/Features/UX/Meshes/Cursors/Materials/Shadow.mat
index 34c36eab708..07b258725c2 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Meshes/Cursors/Materials/Shadow.mat
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Meshes/Cursors/Materials/Shadow.mat
@@ -72,6 +72,7 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
+ - _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
@@ -98,6 +99,7 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
+ - _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
@@ -105,10 +107,12 @@ Material:
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
- _FadeMinValue: 0
+ - _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _HoverLight: 0
+ - _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
@@ -124,6 +128,7 @@ Material:
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 0
+ - _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
@@ -147,6 +152,7 @@ Material:
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
+ - _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
@@ -162,4 +168,7 @@ Material:
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+ - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+ - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+ - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Panels/ToggleFeaturesPanel.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Panels/ToggleFeaturesPanel.prefab
index 9df53690f0e..8ac8bf8f77e 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Panels/ToggleFeaturesPanel.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Panels/ToggleFeaturesPanel.prefab
@@ -1,5 +1,292 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1203732838615583294
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1320635252184296656}
+ - component: {fileID: 8676387434092084015}
+ - component: {fileID: 5967704869708727891}
+ m_Layer: 0
+ m_Name: GrabVisualCueVerticalRight
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1320635252184296656
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1203732838615583294}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.1075, y: 0.012699999, z: -0.001}
+ m_LocalScale: {x: 0.0034266084, y: 0.023154724, z: 0.0039000595}
+ m_Children: []
+ m_Father: {fileID: 13635054967816160}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8676387434092084015
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1203732838615583294}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &5967704869708727891
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1203732838615583294}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: e28b3473906c8764a948650d42b975c1, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1 &2250321181792910202
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7175932055632064994}
+ - component: {fileID: 6489359697116138686}
+ m_Layer: 0
+ m_Name: ButtonCollection
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &7175932055632064994
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2250321181792910202}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.0356, y: 0.0126, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 2788573366228284988}
+ - {fileID: 3559032651836885711}
+ - {fileID: 6325538425937753157}
+ - {fileID: 4305907100017388415}
+ m_Father: {fileID: 8503270331930508642}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6489359697116138686
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2250321181792910202}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cf12ee76e7e00a44a9a84256760020e6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ignoreInactiveTransforms: 1
+ sortType: 0
+ surfaceType: 1
+ orientType: 0
+ layout: 0
+ radius: 2
+ radialRange: 180
+ distance: 0
+ rows: 1
+ cellWidth: 0.032
+ cellHeight: 0.032
+--- !u!65 &5374263260114166598
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2924503655918868814}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 0.99999994, z: 1}
+ m_Center: {x: 0.00000004856583, y: 0, z: 3.0616168e-17}
+--- !u!114 &93299919385884468
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2924503655918868814}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5afd5316c63705643b3daba5a6e923bd, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ShowTetherWhenManipulating: 1
+--- !u!114 &542117415920781033
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2924503655918868814}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5afd5316c63705643b3daba5a6e923bd, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ShowTetherWhenManipulating: 1
+--- !u!114 &6943337177222387468
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2924503655918868814}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 03daa81ea5f685f4ebf6e32038d058ca, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ hostTransform: {fileID: 8503270331930508642}
+ manipulationType: 2
+ twoHandedManipulationType: 5
+ allowFarManipulation: 1
+ oneHandRotationModeNear: 6
+ oneHandRotationModeFar: 6
+ releaseBehavior: 3
+ constraintOnRotation: 2
+ constraintOnMovement: 0
+ smoothingActive: 1
+ smoothingAmountOneHandManip: 0.001
+ OnManipulationStarted:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1262640991058816982}
+ m_MethodName: set_material
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 2100000, guid: 16526572b35ecaa4ba781a0bff18ab12,
+ type: 2}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 3183098002564305489}
+ m_MethodName: set_enabled
+ m_Mode: 6
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 6111504088444772018}
+ m_MethodName: SetToggled
+ m_Mode: 6
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 1
+ m_CallState: 2
+ - m_Target: {fileID: 4529492485766667979}
+ m_MethodName: PlayOneShot
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 8300000, guid: 72d90092d0f1a734eb1cfcf71b8fa2e4,
+ type: 3}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 1
+ m_CallState: 2
+ m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ OnManipulationEnded:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1262640991058816982}
+ m_MethodName: set_material
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 2100000, guid: ec72a3a105768f746b556a8dfdae61a8,
+ type: 2}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 4529492485766667979}
+ m_MethodName: PlayOneShot
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 8300000, guid: ec33d8a6027c1574390812966f8aef94,
+ type: 3}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ OnHoverEntered:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ OnHoverExited:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &4943773361295851263
GameObject:
m_ObjectHideFlags: 0
@@ -13,8 +300,8 @@ GameObject:
- component: {fileID: 3673227729376072232}
- component: {fileID: 958447895517940439}
- component: {fileID: 3183098002564305489}
- - component: {fileID: 3232451984617828042}
- component: {fileID: 1900320861033997991}
+ - component: {fileID: 4529492485766667979}
m_Layer: 0
m_Name: ToggleFeaturesPanel
m_TagString: Untagged
@@ -30,16 +317,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4943773361295851263}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.0216, y: -0.3484, z: -0.6497}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4467977233900039076}
- - {fileID: 2788573366228284988}
- - {fileID: 3559032651836885711}
- - {fileID: 6325538425937753157}
- - {fileID: 4305907100017388415}
- - {fileID: 391794986452234272}
- - {fileID: 1430872464373691942}
+ - {fileID: 7175932055632064994}
+ - {fileID: 5650399960645272298}
+ - {fileID: 13635054967816160}
+ - {fileID: 3716424187809740528}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -135,15 +420,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
updateLinkedTransform: 0
- moveLerpTime: 0.3
- rotateLerpTime: 0.3
+ moveLerpTime: 0.5
+ rotateLerpTime: 0.5
scaleLerpTime: 0
maintainScale: 1
smoothing: 1
lifetime: 0
referenceDirection: 1
- minDistance: 0.4
- maxDistance: 0.8
+ minDistance: 0.3
+ maxDistance: 0.6
minViewDegrees: 0
maxViewDegrees: 15
aspectV: 1
@@ -152,7 +437,7 @@ MonoBehaviour:
useFixedVerticalPosition: 1
fixedVerticalPosition: -0.4
orientToReferenceDirection: 0
---- !u!114 &3232451984617828042
+--- !u!114 &1900320861033997991
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -161,22 +446,105 @@ MonoBehaviour:
m_GameObject: {fileID: 4943773361295851263}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 2d1fea68463e4e84b86c395b654f950d, type: 3}
+ m_Script: {fileID: 11500000, guid: 05bf489b30ac3e7419b1924c4a055b29, type: 3}
m_Name:
m_EditorClassIdentifier:
- visualizationObject: {fileID: 0}
---- !u!114 &1900320861033997991
-MonoBehaviour:
+--- !u!82 &4529492485766667979
+AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4943773361295851263}
m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 05bf489b30ac3e7419b1924c4a055b29, type: 3}
- m_Name:
- m_EditorClassIdentifier:
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 0}
+ m_PlayOnAwake: 1
+ m_Volume: 1
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
--- !u!1 &5160907477204597137
GameObject:
m_ObjectHideFlags: 0
@@ -205,7 +573,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5160907477204597137}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -0.0069}
+ m_LocalPosition: {x: 0, y: 0, z: 0.008}
m_LocalScale: {x: 0.0064073736, y: 0.0064073736, z: 0.0064073736}
m_Children: []
m_Father: {fileID: 8503270331930508642}
@@ -213,7 +581,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.0032999925, y: 0.0273}
+ m_AnchoredPosition: {x: 0.02, y: 0.0506}
m_SizeDelta: {x: 20, y: 5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &996862266752652201
@@ -233,7 +601,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
+ - {fileID: 21202819797275496, guid: 6a84f857bec7e7345843ae29404c57ce, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -291,8 +659,8 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Toggle Features
m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
- m_sharedMaterial: {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217,
+ m_fontAsset: {fileID: 11400000, guid: 6a84f857bec7e7345843ae29404c57ce, type: 2}
+ m_sharedMaterial: {fileID: 21202819797275496, guid: 6a84f857bec7e7345843ae29404c57ce,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -318,15 +686,14 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
- m_fontSize: 18
- m_fontSizeBase: 18
+ m_fontSize: 12
+ m_fontSizeBase: 12
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 257
- m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
@@ -353,10 +720,11 @@ MonoBehaviour:
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: -24.667788, w: 0.1563147}
+ m_margin: {x: 0, y: 1.1615484, z: 0.9536365, w: 1.6841211}
m_textInfo:
textComponent: {fileID: 5057653355905261972}
characterCount: 15
@@ -367,12 +735,9 @@ MonoBehaviour:
lineCount: 1
pageCount: 1
materialCount: 1
- m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
- m_isInputParsingRequired: 0
- m_inputSource: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 996862266752652201}
m_subTextObjects:
@@ -385,127 +750,297 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
m_maskType: 0
---- !u!1001 &958447893780406897
-PrefabInstance:
+--- !u!1 &5362877158012995877
+GameObject:
m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 8503270331930508642}
- m_Modifications:
- - target: {fileID: 538639403742340272, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_Name
- value: Backplate
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.010599993
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.0085
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_RootOrder
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 1.2465076
- objectReference: {fileID: 0}
- - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 2.5137935
- objectReference: {fileID: 0}
- - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.17
- objectReference: {fileID: 0}
- - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.0188
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 9215a7c858170d74fb2257375d5feaf1, type: 3}
---- !u!4 &391794986452234272 stripped
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 743095499168569790}
+ - component: {fileID: 8268670497717609886}
+ - component: {fileID: 3451132850374947041}
+ m_Layer: 0
+ m_Name: GrabVisualCueVerticalLeft
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &743095499168569790
Transform:
- m_CorrespondingSourceObject: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
- type: 3}
- m_PrefabInstance: {fileID: 958447893780406897}
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5362877158012995877}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0.03571999, y: 0.012699999, z: -0.001}
+ m_LocalScale: {x: 0.0034266084, y: 0.023154724, z: 0.0039000595}
+ m_Children: []
+ m_Father: {fileID: 13635054967816160}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8268670497717609886
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5362877158012995877}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3451132850374947041
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5362877158012995877}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: e28b3473906c8764a948650d42b975c1, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1 &5678401236566999267
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 857856027920548274}
+ - component: {fileID: 509432306915370466}
+ - component: {fileID: 6674770707037514464}
+ m_Layer: 0
+ m_Name: GrabVisualCueHorizontalTop
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &857856027920548274
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5678401236566999267}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.0355, y: 0.0362, z: -0.001}
+ m_LocalScale: {x: 0.074928366, y: 0.0036311317, z: 0.009433999}
+ m_Children: []
+ m_Father: {fileID: 13635054967816160}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &509432306915370466
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5678401236566999267}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6674770707037514464
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &958447894271004644
+ m_GameObject: {fileID: 5678401236566999267}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 13a6bafb89ca6414895d965b2fdb2041, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1 &6079912339959148644
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 13635054967816160}
+ m_Layer: 0
+ m_Name: GravVisualCue
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &13635054967816160
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6079912339959148644}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 743095499168569790}
+ - {fileID: 1320635252184296656}
+ - {fileID: 857856027920548274}
+ - {fileID: 2787721312075970460}
+ m_Father: {fileID: 8503270331930508642}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &9210019406430209719
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2787721312075970460}
+ - component: {fileID: 1208947650950215786}
+ - component: {fileID: 8022791743646997236}
+ m_Layer: 0
+ m_Name: GrabVisualCueHorizontalBottom
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2787721312075970460
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9210019406430209719}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.0355, y: -0.0111, z: -0.001}
+ m_LocalScale: {x: 0.074928366, y: 0.0036311317, z: 0.009433999}
+ m_Children: []
+ m_Father: {fileID: 13635054967816160}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1208947650950215786
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9210019406430209719}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8022791743646997236
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9210019406430209719}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 13a6bafb89ca6414895d965b2fdb2041, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!1001 &2690841495530984125
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 8503270331930508642}
+ m_TransformParent: {fileID: 7175932055632064994}
m_Modifications:
- target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_Name
- value: ToggleFollow
+ value: ToggleInputRecording
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalPosition.x
- value: 0.1621
+ value: 0.048
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalPosition.y
- value: 0.03275
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalPosition.z
- value: -0.0081
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -530,7 +1065,7 @@ PrefabInstance:
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -547,57 +1082,107 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_IsActive
- value: 0
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 3232451984617828042}
+ objectReference: {fileID: 3673227729376072232}
- target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: ToggleFollowMeBehavior
+ value: ToggleRecording
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_havePropertiesChanged
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
+ value:
+ objectReference: {fileID: 3673227729376072232}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
+ value: SaveRecordedInput
+ objectReference: {fileID: 0}
+ - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_isInputParsingRequired
+ propertyPath: m_text
+ value: Record Input
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_textAlignment
- value: 514
+ propertyPath: m_textInfo.wordCount
+ value: 2
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_havePropertiesChanged
- value: 1
+ value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_isInputParsingRequired
- value: 1
+ value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_textAlignment
value: 514
objectReference: {fileID: 0}
- - target: {fileID: 2204069623052342158, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.0002
+ propertyPath: m_isAlignmentEnumConverted
+ value: 1
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992593, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_IsActive
value: 0
@@ -606,31 +1191,82 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
- objectReference: {fileID: 2100000, guid: 983d124b2920b4e4499bfc42d1bee8d2, type: 2}
+ objectReference: {fileID: 2100000, guid: e6ab953dc933471489f5ebff6791a886, type: 2}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_text
+ value: Say "Toggle Profiler"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 21
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textAlignment
+ value: 514
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
---- !u!4 &1430872464373691942 stripped
+--- !u!23 &4305907099866046977 stripped
+MeshRenderer:
+ m_CorrespondingSourceObject: {fileID: 2204069622869160124, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ m_PrefabInstance: {fileID: 2690841495530984125}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &4305907100017388415 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- m_PrefabInstance: {fileID: 958447894271004644}
+ m_PrefabInstance: {fileID: 2690841495530984125}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &2690841495530984125
+--- !u!1001 &3454917270568841997
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 8503270331930508642}
+ m_TransformParent: {fileID: 7175932055632064994}
m_Modifications:
- target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_Name
- value: ToggleInputRecording
+ value: ToggleHandMesh
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalPosition.x
- value: 0.106599994
+ value: -0.016
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -640,7 +1276,7 @@ PrefabInstance:
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalPosition.z
- value: -0.011100113
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -665,7 +1301,7 @@ PrefabInstance:
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -685,67 +1321,32 @@ PrefabInstance:
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalScale.x
- value: 1.5
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalScale.y
- value: 1.5
- objectReference: {fileID: 0}
- - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size
- value: 2
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 3673227729376072232}
+ objectReference: {fileID: 4546402662010242382}
- target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: ToggleRecording
- objectReference: {fileID: 0}
- - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
- value:
- objectReference: {fileID: 3673227729376072232}
- - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
- value: SaveRecordedInput
- objectReference: {fileID: 0}
- - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
+ value: OnToggleHandMesh
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_text
- value: Record Input
+ value: Hand Mesh
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_textInfo.characterCount
- value: 12
+ value: 9
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -759,29 +1360,44 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_havePropertiesChanged
- value: 0
+ propertyPath: m_textAlignment
+ value: 514
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_isInputParsingRequired
- value: 0
+ propertyPath: m_isAlignmentEnumConverted
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_textAlignment
- value: 514
+ propertyPath: m_havePropertiesChanged
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_isAlignmentEnumConverted
- value: 1
+ propertyPath: m_isInputParsingRequired
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 7344413e86980e943b39f9d8080ed99f, type: 2}
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_text
@@ -827,46 +1443,30 @@ PrefabInstance:
propertyPath: m_textAlignment
value: 514
objectReference: {fileID: 0}
- - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: e6ab953dc933471489f5ebff6791a886, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
---- !u!4 &4305907100017388415 stripped
+--- !u!4 &3559032651836885711 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- m_PrefabInstance: {fileID: 2690841495530984125}
- m_PrefabAsset: {fileID: 0}
---- !u!23 &4305907099866046977 stripped
-MeshRenderer:
- m_CorrespondingSourceObject: {fileID: 2204069622869160124, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- m_PrefabInstance: {fileID: 2690841495530984125}
+ m_PrefabInstance: {fileID: 3454917270568841997}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &3454917270568841997
+--- !u!1001 &4045759786895659006
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 8503270331930508642}
+ m_TransformParent: {fileID: 7175932055632064994}
m_Modifications:
- target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_Name
- value: ToggleHandMesh
+ value: ToggleProfilerButton
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalPosition.x
- value: 0.011099994
+ value: -0.048
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -876,7 +1476,7 @@ PrefabInstance:
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalPosition.z
- value: -0.01110014
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -901,7 +1501,7 @@ PrefabInstance:
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -921,47 +1521,32 @@ PrefabInstance:
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalScale.x
- value: 1.5000002
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalScale.y
- value: 1.5
- objectReference: {fileID: 0}
- - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 4546402662010242382}
+ objectReference: {fileID: 1900320861033997991}
- target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnToggleHandMesh
+ value: ToggleProfiler
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_text
- value: Hand Mesh
+ value: Profiler
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_textInfo.characterCount
- value: 9
- objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: m_textInfo.spaceCount
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: m_textInfo.wordCount
- value: 2
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -988,6 +1573,21 @@ PrefabInstance:
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 85b164de2cfcb854cbbcb9c82670749d, type: 2}
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_text
@@ -1033,40 +1633,152 @@ PrefabInstance:
propertyPath: m_textAlignment
value: 514
objectReference: {fileID: 0}
- - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
+--- !u!4 &2788573366228284988 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4045759786895659006}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5064501110533230779
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 8503270331930508642}
+ m_Modifications:
+ - target: {fileID: 538639403742340272, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_Name
+ value: Backplate
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.008
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0126
+ objectReference: {fileID: 0}
+ - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.064
+ objectReference: {fileID: 0}
+ - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.16
+ objectReference: {fileID: 0}
+ - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
type: 3}
- propertyPath: m_IsActive
- value: 0
+ propertyPath: m_LocalPosition.x
+ value: 0.0358
objectReference: {fileID: 0}
- - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1,
type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: 7344413e86980e943b39f9d8080ed99f, type: 2}
+ propertyPath: m_LocalScale.z
+ value: 0.010599999
+ objectReference: {fileID: 0}
m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
---- !u!4 &3559032651836885711 stripped
+ m_SourcePrefab: {fileID: 100100000, guid: 9215a7c858170d74fb2257375d5feaf1, type: 3}
+--- !u!23 &1262640991058816982 stripped
+MeshRenderer:
+ m_CorrespondingSourceObject: {fileID: 6326842415924641645, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ m_PrefabInstance: {fileID: 5064501110533230779}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &2924503655918868814 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7988634196090784245, guid: 9215a7c858170d74fb2257375d5feaf1,
+ type: 3}
+ m_PrefabInstance: {fileID: 5064501110533230779}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &5650399960645272298 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ m_CorrespondingSourceObject: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1,
type: 3}
- m_PrefabInstance: {fileID: 3454917270568841997}
+ m_PrefabInstance: {fileID: 5064501110533230779}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &4045759786895659006
+--- !u!1001 &5286871970645101959
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 8503270331930508642}
+ m_TransformParent: {fileID: 7175932055632064994}
m_Modifications:
- target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_Name
- value: ToggleProfilerButton
+ value: ToggleHandJoint
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalPosition.x
- value: -0.03660001
+ value: 0.016
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -1076,22 +1788,22 @@ PrefabInstance:
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalPosition.z
- value: -0.0111
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -1101,7 +1813,7 @@ PrefabInstance:
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -1121,47 +1833,42 @@ PrefabInstance:
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalScale.x
- value: 1.5
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_LocalScale.y
- value: 1.5
- objectReference: {fileID: 0}
- - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 1900320861033997991}
+ objectReference: {fileID: 4546402662010242382}
- target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: ToggleProfiler
+ value: OnToggleHandJoint
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_text
- value: Profiler
+ value: Hand Joint
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_textInfo.characterCount
- value: 8
+ value: 10
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_textAlignment
- value: 514
+ propertyPath: m_textInfo.spaceCount
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- propertyPath: m_isAlignmentEnumConverted
- value: 1
+ propertyPath: m_textInfo.wordCount
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
@@ -1173,11 +1880,36 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_textAlignment
+ value: 514
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_isAlignmentEnumConverted
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
+ - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: e6ab953dc933471489f5ebff6791a886, type: 2}
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
propertyPath: m_text
@@ -1223,221 +1955,305 @@ PrefabInstance:
propertyPath: m_textAlignment
value: 514
objectReference: {fileID: 0}
- - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: 85b164de2cfcb854cbbcb9c82670749d, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
---- !u!4 &2788573366228284988 stripped
+--- !u!4 &6325538425937753157 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
type: 3}
- m_PrefabInstance: {fileID: 4045759786895659006}
+ m_PrefabInstance: {fileID: 5286871970645101959}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &5286871970645101959
+--- !u!1001 &7927425398529021326
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8503270331930508642}
m_Modifications:
- - target: {fileID: 2204069621426241315, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
- type: 3}
- propertyPath: m_Name
- value: ToggleHandJoint
- objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalPosition.x
- value: 0.058999993
+ value: 0.135
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: 0.029921
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalPosition.z
- value: -0.011100113
+ value: 0.0001424
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_RootOrder
- value: 3
+ value: 4
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalScale.x
- value: 1.5000002
+ value: 0.9139199
objectReference: {fileID: 0}
- - target: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_LocalScale.y
- value: 1.5
+ value: 0.9139199
objectReference: {fileID: 0}
- - target: {fileID: 1874729665501627384, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_IsActive
- value: 0
+ propertyPath: m_LocalScale.z
+ value: 1.1424
objectReference: {fileID: 0}
- - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094791252829599, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 4546402662010242382}
- - target: {fileID: 8779034279059886464, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ propertyPath: m_Name
+ value: ButtonPin
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnToggleHandJoint
+ propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_text
- value: Hand Joint
+ propertyPath: Events.Array.size
+ value: 2
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_textInfo.characterCount
- value: 10
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.size
+ value: 1
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_textInfo.spaceCount
+ propertyPath: Events.Array.data[1].Settings.Array.size
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_textInfo.wordCount
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Name
+ value: OnSelect
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 3183098002564305489}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: set_enabled
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_havePropertiesChanged
- value: 0
+ propertyPath: Events.Array.data[1].Event.m_TypeName
+ value: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_isInputParsingRequired
- value: 0
+ propertyPath: Events.Array.data[1].ClassName
+ value: InteractableOnToggleReceiver
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_textAlignment
- value: 514
+ propertyPath: Events.Array.data[1].AssemblyQualifiedName
+ value: Microsoft.MixedReality.Toolkit.UI.InteractableOnToggleReceiver, Microsoft.MixedReality.Toolkit.SDK
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992595, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_isAlignmentEnumConverted
- value: 1
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].Type
+ value: 18
objectReference: {fileID: 0}
- - target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_Mesh
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].Label
+ value: On Deselect
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].Name
+ value: OnDeselect
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].Tooltip
+ value: The toggle is deselected
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
+ objectReference: {fileID: 3183098002564305489}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: set_enabled
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_text
- value: Say "Toggle Profiler"
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 6
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_firstOverflowCharacterIndex
- value: 12
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_textInfo.characterCount
- value: 21
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
+ value: 1
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_textInfo.spaceCount
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_textInfo.wordCount
- value: 3
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_TypeName
+ value: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+ Culture=neutral, PublicKeyToken=null
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_textInfo.lineCount
- value: 2
+ propertyPath: StartDimensionIndex
+ value: 1
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_havePropertiesChanged
+ propertyPath: Events.Array.data[1].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: Events.Array.data[1].Settings.Array.data[0].EventValue.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: startDimensionIndex
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 8495876841678131188, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_isInputParsingRequired
+ propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6413889394266691908, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- propertyPath: m_textAlignment
- value: 514
+ propertyPath: m_IsActive
+ value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3954648794444109128, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094791873819757, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2204069623052342153, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ - target: {fileID: 6742094791873819759, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094791873819759, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742094790700452149, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
- objectReference: {fileID: 2100000, guid: e6ab953dc933471489f5ebff6791a886, type: 2}
+ objectReference: {fileID: 2100000, guid: 983d124b2920b4e4499bfc42d1bee8d2, type: 2}
+ - target: {fileID: 2689703347428627497, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 416caa6b57bb22c40ab9f1a4c12b304e, type: 2}
+ - target: {fileID: 2521141002669455045, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_havePropertiesChanged
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2521141002669455045, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ propertyPath: m_isInputParsingRequired
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
---- !u!4 &6325538425937753157 stripped
+ m_SourcePrefab: {fileID: 100100000, guid: 64790b91b91094d49942373c4e83c237, type: 3}
+--- !u!4 &3716424187809740528 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 2204069623020599746, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
+ m_CorrespondingSourceObject: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237,
type: 3}
- m_PrefabInstance: {fileID: 5286871970645101959}
+ m_PrefabInstance: {fileID: 7927425398529021326}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &6111504088444772018 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
+ type: 3}
+ m_PrefabInstance: {fileID: 7927425398529021326}
m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Pointers/GrabPointer.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Pointers/GrabPointer.prefab
index 8abb0d6db90..22d5c345182 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Pointers/GrabPointer.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Pointers/GrabPointer.prefab
@@ -72,7 +72,11 @@ MonoBehaviour:
defaultPointerExtent: 10
sphereCastRadius: 0.05
nearObjectMargin: 0.2
- debugMode: 0
+ grabLayerMasks:
+ - serializedVersion: 2
+ m_Bits: 563
+ triggerInteraction: 0
+ sceneQueryBufferSize: 64
--- !u!114 &7376459786343609486
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Pointers/TouchPointer.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Pointers/TouchPointer.prefab
index 9df9482c220..ad85ffb7336 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Pointers/TouchPointer.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Pointers/TouchPointer.prefab
@@ -9,10 +9,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4215223911988956}
- - component: {fileID: 114689919749246242}
- - component: {fileID: 120690711267243118}
- - component: {fileID: 114903794112201558}
- - component: {fileID: 114052612917089170}
- component: {fileID: 114405004987074356}
m_Layer: 0
m_Name: TouchPointer
@@ -35,329 +31,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114689919749246242
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1247086986094436}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 81c169a39f8e430d869bbc5d938b0e5a, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- lineStartClamp: 0
- lineEndClamp: 1
- customLineTransform: {fileID: 0}
- loops: 0
- transformMode: 0
- rotationMode: 1
- flipUpVector: 0
- originOffset: {x: 0, y: 0, z: 0}
- manualUpVectorBlend: 0
- manualUpVectors:
- - {x: 0, y: 1, z: 0}
- - {x: 0, y: 1, z: 0}
- - {x: 0, y: 1, z: 0}
- velocitySearchRange: 0.02
- distorters:
- - {fileID: 114052612917089170}
- distortionEnabled: 1
- distortionMode: 0
- distortionStrength:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- uniformDistortionStrength: 1
- startPoint:
- position: {x: 0, y: 0, z: 0}
- rotation: {x: 0, y: 0, z: 0, w: 1}
- endPoint:
- position: {x: 0, y: 0, z: 1}
- rotation: {x: 0, y: 0, z: 0, w: 1}
---- !u!120 &120690711267243118
-LineRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1247086986094436}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_MotionVectors: 0
- m_LightProbeUsage: 0
- m_ReflectionProbeUsage: 0
- m_RenderingLayerMask: 4294967295
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 11727442de02c1d4b8d37a063c748aec, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 0
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_Positions:
- - {x: 0, y: 0, z: 1.1920929e-11}
- - {x: 0, y: 0, z: 0.0032517451}
- - {x: 0, y: 0, z: 0.023423482}
- - {x: 0, y: 0, z: 0.0704557}
- - {x: 0, y: 0, z: 0.14670977}
- - {x: 0, y: 0, z: 0.2469679}
- - {x: 0, y: 0, z: 0.35843328}
- - {x: 0, y: 0, z: 0.46072987}
- - {x: 0, y: 0, z: 0.5333267}
- - {x: 0, y: 0, z: 0.59998}
- - {x: 0, y: 0, z: 0.66663337}
- - {x: 0, y: 0, z: 0.7332867}
- - {x: 0, y: 0, z: 0.79994}
- - {x: 0, y: 0, z: 0.8665933}
- - {x: 0, y: 0, z: 0.9332467}
- - {x: 0, y: 0, z: 0.9999}
- m_Parameters:
- serializedVersion: 3
- widthMultiplier: 0.01
- widthCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- colorGradient:
- serializedVersion: 2
- key0: {r: 0, g: 0.12270379, b: 1, a: 1}
- key1: {r: 1, g: 1, b: 1, a: 1}
- key2: {r: 0, g: 0, b: 0, a: 0}
- key3: {r: 0, g: 0, b: 0, a: 0}
- key4: {r: 0, g: 0, b: 0, a: 0}
- key5: {r: 0, g: 0, b: 0, a: 0}
- key6: {r: 0, g: 0, b: 0, a: 0}
- key7: {r: 0, g: 0, b: 0, a: 0}
- ctime0: 0
- ctime1: 65535
- ctime2: 0
- ctime3: 0
- ctime4: 0
- ctime5: 0
- ctime6: 0
- ctime7: 0
- atime0: 0
- atime1: 65535
- atime2: 0
- atime3: 0
- atime4: 0
- atime5: 0
- atime6: 0
- atime7: 0
- m_Mode: 0
- m_NumColorKeys: 2
- m_NumAlphaKeys: 2
- numCornerVertices: 8
- numCapVertices: 8
- alignment: 0
- textureMode: 0
- shadowBias: 0
- generateLightingData: 0
- m_UseWorldSpace: 1
- m_Loop: 0
---- !u!114 &114903794112201558
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1247086986094436}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 1287d4d138a242f794bcfc01354d3ae2, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- lineDataSource: {fileID: 114689919749246242}
- lineColor:
- serializedVersion: 2
- key0: {r: 0, g: 0.12270379, b: 1, a: 1}
- key1: {r: 1, g: 1, b: 1, a: 1}
- key2: {r: 0, g: 0, b: 0, a: 0}
- key3: {r: 0, g: 0, b: 0, a: 0}
- key4: {r: 0, g: 0, b: 0, a: 0}
- key5: {r: 0, g: 0, b: 0, a: 0}
- key6: {r: 0, g: 0, b: 0, a: 0}
- key7: {r: 0, g: 0, b: 0, a: 0}
- ctime0: 0
- ctime1: 65535
- ctime2: 0
- ctime3: 0
- ctime4: 0
- ctime5: 0
- ctime6: 0
- ctime7: 0
- atime0: 0
- atime1: 65535
- atime2: 0
- atime3: 0
- atime4: 0
- atime5: 0
- atime6: 0
- atime7: 0
- m_Mode: 0
- m_NumColorKeys: 2
- m_NumAlphaKeys: 2
- lineWidth:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- widthMultiplier: 0.01
- colorOffset: 0
- widthOffset: 0
- stepMode: 0
- lineStepCount: 16
- pointDistributionMode: 1
- customPointDistributionLength: 0.1
- customPointDistributionCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 1
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 1
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- lineMaterial: {fileID: 2100000, guid: 11727442de02c1d4b8d37a063c748aec, type: 2}
- roundedEdges: 1
- roundedCaps: 1
- lineRenderer: {fileID: 120690711267243118}
- tileMaterialByWorldLength: 0
- tileMaterialScale: 1
---- !u!114 &114052612917089170
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1247086986094436}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 61e2b9c3b68642d6a51894a46aaece55, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- distortOrder: 0
- distortStrength: 1
- localCenterOfGravity: {x: 0, y: 0, z: 0}
- axisStrength: {x: 1, y: 1, z: 1}
- radius: 0.5
- gravityStrength:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
--- !u!114 &114405004987074356
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -371,7 +44,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
handedness: 0
- destroyOnSourceLost: 0
+ destroyOnSourceLost: 1
useSourcePoseData: 1
poseAction:
id: 0
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Slate/Slate.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Slate/Slate.prefab
index 71b112011ef..659c255dc3b 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Slate/Slate.prefab
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Slate/Slate.prefab
@@ -184,7 +184,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
eventsToReceive: 0
- pokeThreshold: 0.25
debounceThreshold: 0.01
touchableCollider: {fileID: 1807168023245165402}
localForward: {x: 0, y: 0, z: -1}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/LabelOnlyTooltip.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/LabelOnlyTooltip.prefab
new file mode 100644
index 00000000000..e0330dc5af7
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/LabelOnlyTooltip.prefab
@@ -0,0 +1,108 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &8217972947001070273
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1083549605185280, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_Name
+ value: LabelOnlyTooltip
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4510122080978026, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 114071207091359978, guid: afaef0108a478c44a9eac26658bc29bf,
+ type: 3}
+ propertyPath: showConnector
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 114071207091359978, guid: afaef0108a478c44a9eac26658bc29bf,
+ type: 3}
+ propertyPath: toolTipText
+ value: Speech Confirmation
+ objectReference: {fileID: 0}
+ - target: {fileID: 114254035704318198, guid: afaef0108a478c44a9eac26658bc29bf,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 114570207066485496, guid: afaef0108a478c44a9eac26658bc29bf,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 120256979407580908, guid: afaef0108a478c44a9eac26658bc29bf,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4892726138630008, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.21288851
+ objectReference: {fileID: 0}
+ - target: {fileID: 114957968741241876, guid: afaef0108a478c44a9eac26658bc29bf,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7446970764068212843, guid: afaef0108a478c44a9eac26658bc29bf,
+ type: 3}
+ propertyPath: m_text
+ value: Speech Confirmation
+ objectReference: {fileID: 0}
+ - target: {fileID: 7446970764068212843, guid: afaef0108a478c44a9eac26658bc29bf,
+ type: 3}
+ propertyPath: m_isAlignmentEnumConverted
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7446970764068212843, guid: afaef0108a478c44a9eac26658bc29bf,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 19
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: afaef0108a478c44a9eac26658bc29bf, type: 3}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/LabelOnlyTooltip.prefab.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/LabelOnlyTooltip.prefab.meta
new file mode 100644
index 00000000000..5f14a2e2aea
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/LabelOnlyTooltip.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 247dc8aebe30ca2408e8293a883c75df
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/SpeechConfirmationTooltip.prefab b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/SpeechConfirmationTooltip.prefab
new file mode 100644
index 00000000000..c1cbda4e124
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/SpeechConfirmationTooltip.prefab
@@ -0,0 +1,388 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!95 &7788073934848418371
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 779914303111114550}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 393b0cc1083725f44837b3a1efc4e229, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &1915752821
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 779914303111114550}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4684083f6dff4a1d8a790bccc354fcf4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ updateLinkedTransform: 0
+ moveLerpTime: 0
+ rotateLerpTime: 0
+ scaleLerpTime: 0
+ maintainScale: 1
+ smoothing: 1
+ lifetime: 0
+ referenceDirection: 1
+ minDistance: 1
+ maxDistance: 1
+ minViewDegrees: 0
+ maxViewDegrees: 1
+ aspectV: 1
+ ignoreAngleClamp: 0
+ ignoreDistanceClamp: 0
+ useFixedVerticalPosition: 0
+ fixedVerticalPosition: -0.4
+ orientToReferenceDirection: 0
+--- !u!114 &1915752822
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 779914303111114550}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ trackedTargetType: 0
+ trackedHandness: 3
+ trackedHandJoint: 2
+ transformOverride: {fileID: 0}
+ additionalOffset: {x: 0, y: -0.4, z: 0}
+ additionalRotation: {x: 0, y: 0, z: 0}
+ updateSolvers: 1
+--- !u!114 &959849227508966978
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 779914303111114550}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0ba356208ebee842b61c465bde80a05, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ delay: 2
+--- !u!114 &8046114618238072051
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 779914303111114550}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 36767500e4f76334a8999a2f5fa5dcc6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ showBackground: 1
+ showHighlight: 0
+ showConnector: 1
+ tipState: 1
+ groupTipState: 0
+ masterTipState: 0
+ anchor: {fileID: 780362276772741392}
+ pivot: {fileID: 781119022804126630}
+ label: {fileID: 780285727566011556}
+ contentParent: {fileID: 780353081939047444}
+ toolTipText: Recognized Text
+ backgroundPadding: {x: 0.05, y: 0.015}
+ backgroundOffset: {x: 0, y: 0, z: 0}
+ contentScale: 0.6
+ fontSize: 30
+ attachPointType: 9
+ attachPointOffset: {x: 0, y: 0, z: 0}
+ toolTipLine: {fileID: 812055196429508800}
+--- !u!1001 &8709130777020578551
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 8219002942482847169, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_Name
+ value: SpeechConfirmationTooltip
+ objectReference: {fileID: 0}
+ - target: {fileID: 8217189920156946147, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8329956899072727607, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: endPoint.position.y
+ value: 0.23951453
+ objectReference: {fileID: 0}
+ - target: {fileID: 8329956899072727607, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222481329602893483, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8330271889260716089, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8328408549162534613, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: toolTip
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 8333673406232624173, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8333673406232624173, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_Positions.Array.data[1].y
+ value: 0.233327
+ objectReference: {fileID: 0}
+ - target: {fileID: 8239404905434933495, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 33bd7ed5b0c7fbf458af3e21dc58c192, type: 2}
+ - target: {fileID: 8222863950748663225, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.161272
+ objectReference: {fileID: 0}
+ - target: {fileID: 8222863950748663225, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.034951583
+ objectReference: {fileID: 0}
+ - target: {fileID: 8102129296322141565, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 21202819797275496, guid: 6a84f857bec7e7345843ae29404c57ce,
+ type: 2}
+ - target: {fileID: 8215610606298197891, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.6
+ objectReference: {fileID: 0}
+ - target: {fileID: 8215610606298197891, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.6
+ objectReference: {fileID: 0}
+ - target: {fileID: 8215610606298197891, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.6
+ objectReference: {fileID: 0}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_fontAsset
+ value:
+ objectReference: {fileID: 11400000, guid: 6a84f857bec7e7345843ae29404c57ce,
+ type: 2}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_sharedMaterial
+ value:
+ objectReference: {fileID: 21202819797275496, guid: 6a84f857bec7e7345843ae29404c57ce,
+ type: 2}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_fontColor32.rgba
+ value: 16777215
+ objectReference: {fileID: 0}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_fontColor.a
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_text
+ value: Recognized Text
+ objectReference: {fileID: 0}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_textInfo.lineCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_textInfo.pageCount
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_fontSize
+ value: 30
+ objectReference: {fileID: 0}
+ - target: {fileID: 1537115806125884074, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_fontSizeBase
+ value: 30
+ objectReference: {fileID: 0}
+ - target: {fileID: 1012395828249241974, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 8279342259856327629, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8329787883158438443, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: backgroundPadding.x
+ value: 0.05
+ objectReference: {fileID: 0}
+ - target: {fileID: 8329787883158438443, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: contentScale
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8329787883158438443, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: toolTipText
+ value: Recognized Text
+ objectReference: {fileID: 0}
+ - target: {fileID: 8329787883158438443, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents:
+ - {fileID: 8329787883158438443, guid: 247dc8aebe30ca2408e8293a883c75df, type: 3}
+ m_SourcePrefab: {fileID: 100100000, guid: 247dc8aebe30ca2408e8293a883c75df, type: 3}
+--- !u!1 &779914303111114550 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8219002942482847169, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ m_PrefabInstance: {fileID: 8709130777020578551}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &812055196429508800 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 8329956899072727607, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ m_PrefabInstance: {fileID: 8709130777020578551}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 779914303111114550}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 81c169a39f8e430d869bbc5d938b0e5a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &780362276772741392 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8217216743078902759, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ m_PrefabInstance: {fileID: 8709130777020578551}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &781119022804126630 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8217411052995998033, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ m_PrefabInstance: {fileID: 8709130777020578551}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &780353081939047444 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8217189920156946147, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ m_PrefabInstance: {fileID: 8709130777020578551}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &780285727566011556 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8217149505344808531, guid: 247dc8aebe30ca2408e8293a883c75df,
+ type: 3}
+ m_PrefabInstance: {fileID: 8709130777020578551}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/SpeechConfirmationTooltip.prefab.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/SpeechConfirmationTooltip.prefab.meta
new file mode 100644
index 00000000000..c2586e0696e
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/SpeechConfirmationTooltip.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 271778f6c957b524981067a81d238394
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/AppBar/AppBarButton.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/AppBar/AppBarButton.cs
index 9495fb1d6a7..0a2e9faae51 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/AppBar/AppBarButton.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/AppBar/AppBarButton.cs
@@ -97,8 +97,7 @@ public void SetVisible(bool visible)
gameObject.SetActive(visible);
// Use the interactable theme to make button invisible
button.enabled = visible;
- interactable.Enabled = visible;
-
+ interactable.IsEnabled = visible;
}
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs
index 05f0e9f705a..a2867828d50 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs
@@ -2,6 +2,7 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.
using Microsoft.MixedReality.Toolkit.Input;
+using Microsoft.MixedReality.Toolkit.Utilities;
using System;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
@@ -12,6 +13,12 @@
namespace Microsoft.MixedReality.Toolkit.UI
{
+ ///
+ /// BoundingBox allows to transform objects (rotate and scale) and draws a cube around the object to visualize
+ /// the possibility of user triggered transform manipulation.
+ /// BoundingBox provides scale and rotation handles that can be used for far and near interaction manipulation
+ /// of the object. It further provides a proximity effect for scale and rotation handles that alters scaling and material.
+ ///
[HelpURL("https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/README_BoundingBox.html")]
public class BoundingBox : MonoBehaviour,
IMixedRealitySourceStateHandler,
@@ -21,7 +28,7 @@ public class BoundingBox : MonoBehaviour,
#region Enums
///
- /// Enum which describes how an object's boundingbox is to be flattened.
+ /// Enum which describes how an object's BoundingBox is to be flattened.
///
public enum FlattenModeType
{
@@ -45,7 +52,7 @@ public enum FlattenModeType
}
///
- /// Enum which describes whether a boundingbox handle which has been grabbed, is
+ /// Enum which describes whether a BoundingBox handle which has been grabbed, is
/// a Rotation Handle (sphere) or a Scale Handle( cube)
///
public enum HandleType
@@ -56,7 +63,7 @@ public enum HandleType
}
///
- /// This enum describes which primitive type the wireframe portion of the boundingbox
+ /// This enum describes which primitive type the wireframe portion of the BoundingBox
/// consists of.
///
///
@@ -135,7 +142,7 @@ public enum RotationHandlePrefabCollider
}
///
- /// Container for handle references and states (including scale and rotation type handles)
+ /// Container for handle references and states (including scale and rotation type handles) which is used in the handle proximity effect
///
private class Handle
{
@@ -151,6 +158,21 @@ private class Handle
[SerializeField]
[Tooltip("The object that the bounding box rig will be modifying.")]
private GameObject targetObject;
+ ///
+ /// The object that the bounding box rig will be modifying.
+ ///
+ public GameObject Target
+ {
+ get
+ {
+ if (targetObject == null)
+ {
+ targetObject = gameObject;
+ }
+
+ return targetObject;
+ }
+ }
[Tooltip("For complex objects, automatic bounds calculation may not behave as expected. Use an existing Box Collider (even on a child object) to manually determine bounds of Bounding Box.")]
[SerializeField]
@@ -231,6 +253,7 @@ public BoundingBoxActivationType BoundingBoxActivation
///
+ /// Deprecated: Use TransformScaleHandler component instead.
/// Public property for the scale minimum, in the target's local scale.
/// Set this value with SetScaleLimits.
///
@@ -248,6 +271,7 @@ public float ScaleMinimum
}
///
+ /// Deprecated: Use TransformScaleHandler component instead.
/// Public property for the scale maximum, in the target's local scale.
/// Set this value with SetScaleLimits.
///
@@ -787,11 +811,17 @@ public bool ProximityEffectActive
[SerializeField]
[Tooltip("How far away should the hand be from a handle before it starts scaling the handle?")]
[Range(0.005f, 0.2f)]
+ ///
+ /// Distance between handle and hand before proximity scaling will be triggered.
+ ///
private float handleMediumProximity = 0.1f;
[SerializeField]
[Tooltip("How far away should the hand be from a handle before it activates the close-proximity scaling effect?")]
[Range(0.001f, 0.1f)]
+ ///
+ /// Distance between handle and hand that will trigger the close proximity effect.
+ ///
private float handleCloseProximity = 0.03f;
[SerializeField]
@@ -854,16 +884,25 @@ public float CloseScale
[SerializeField]
[Tooltip("At what rate should a Proximity-scaled Handle scale when the Hand moves from Medium proximity to Far proximity?")]
[Range(0.0f, 1.0f)]
+ ///
+ /// Scaling animation velocity from medium to far proximity state.
+ ///
private float farGrowRate = 0.3f;
[SerializeField]
[Tooltip("At what rate should a Proximity-scaled Handle scale when the Hand moves to a distance that activates Medium Scale ?")]
[Range(0.0f, 1.0f)]
+ ///
+ /// Scaling animation velocity from far to medium proximity.
+ ///
private float mediumGrowRate = 0.2f;
[SerializeField]
[Tooltip("At what rate should a Proximity-scaled Handle scale when the Hand moves to a distance that activates Close Scale ?")]
[Range(0.0f, 1.0f)]
+ ///
+ /// Scaling animation velocity from medium to close proximity.
+ ///
private float closeGrowRate = 0.3f;
[SerializeField]
@@ -887,6 +926,9 @@ public Collider HandlesIgnoreCollider
[Header("Debug")]
[Tooltip("Debug only. Component used to display debug messages")]
+ ///
+ /// Debug only. Component used to display debug messages
+ ///
public TextMesh debugText;
[SerializeField]
@@ -940,9 +982,21 @@ private void UpdateRigVisibilityInInspector()
}
[Header("Events")]
+ ///
+ /// Event that gets fired when interaction with a rotation handle starts.
+ ///
public UnityEvent RotateStarted = new UnityEvent();
+ ///
+ /// Event that gets fired when interaction with a rotation handle stops.
+ ///
public UnityEvent RotateStopped = new UnityEvent();
+ ///
+ /// Event that gets fired when interaction with a scale handle starts.
+ ///
public UnityEvent ScaleStarted = new UnityEvent();
+ ///
+ /// Event that gets fired when interaction with a scale handle stops.
+ ///
public UnityEvent ScaleStopped = new UnityEvent();
#endregion Serialized Fields
@@ -1025,6 +1079,9 @@ private void UpdateRigVisibilityInInspector()
#region public Properties
// TODO Review this, it feels like we should be using Behaviour.enabled instead.
private bool active = false;
+ ///
+ /// Flag that indicates if the bounding box is currently active / visible.
+ ///
public bool Active
{
get
@@ -1047,18 +1104,7 @@ public bool Active
}
}
- public GameObject Target
- {
- get
- {
- if (targetObject == null)
- {
- targetObject = gameObject;
- }
-
- return targetObject;
- }
- }
+
///
/// The collider reference tracking the bounds utilized by this component during runtime
@@ -1175,6 +1221,11 @@ private void OnEnable()
private void OnDisable()
{
DestroyRig();
+
+ if (currentPointer != null)
+ {
+ DropController();
+ }
}
private void Update()
@@ -1187,7 +1238,8 @@ private void Update()
UpdateBounds();
UpdateRigHandles();
}
- else if (!isChildOfTarget && Target.transform.hasChanged)
+ else if ((!isChildOfTarget && Target.transform.hasChanged)
+ || (boundsOverride != null && HasBoundsOverrideChanged()))
{
UpdateBounds();
UpdateRigHandles();
@@ -1432,8 +1484,6 @@ private void AddCorners()
///
/// Add all common components to a corner or rotate affordance
///
- ///
- ///
private void AddComponentsToAffordance(GameObject afford, Bounds bounds, RotationHandlePrefabCollider colliderType, CursorContextInfo.CursorAction cursorType, Vector3 colliderPadding)
{
if (colliderType == RotationHandlePrefabCollider.Box)
@@ -1712,7 +1762,7 @@ private Bounds GetTargetBounds()
// Collect all Transforms except for the rigRoot(s) transform structure(s)
// Its possible we have two rigRoots here, the one about to be deleted and the new one
- // Since those have the gizmo structure childed, be need to ommit them completely in the calculation of the bounds
+ // Since those have the gizmo structure childed, be need to omit them completely in the calculation of the bounds
// This can only happen by name unless there is a better idea of tracking the rigRoot that needs destruction
List childTransforms = new List();
@@ -1815,9 +1865,7 @@ private void SetMaterials()
{
float[] color = { 1.0f, 1.0f, 1.0f, 0.75f };
- Shader shader = Shader.Find("Mixed Reality Toolkit/Standard");
-
- wireframeMaterial = new Material(shader);
+ wireframeMaterial = new Material(StandardShaderUtility.MrtkStandardShader);
wireframeMaterial.EnableKeyword("_InnerGlow");
wireframeMaterial.SetColor("_Color", new Color(0.0f, 0.63f, 1.0f));
wireframeMaterial.SetFloat("_InnerGlow", 1.0f);
@@ -1827,9 +1875,7 @@ private void SetMaterials()
{
float[] color = { 1.0f, 1.0f, 1.0f, 0.75f };
- Shader shader = Shader.Find("Mixed Reality Toolkit/Standard");
-
- handleMaterial = new Material(shader);
+ handleMaterial = new Material(StandardShaderUtility.MrtkStandardShader);
handleMaterial.EnableKeyword("_InnerGlow");
handleMaterial.SetColor("_Color", new Color(0.0f, 0.63f, 1.0f));
handleMaterial.SetFloat("_InnerGlow", 1.0f);
@@ -1839,9 +1885,7 @@ private void SetMaterials()
{
float[] color = { 1.0f, 1.0f, 1.0f, 0.75f };
- Shader shader = Shader.Find("Mixed Reality Toolkit/Standard");
-
- handleGrabbedMaterial = new Material(shader);
+ handleGrabbedMaterial = new Material(StandardShaderUtility.MrtkStandardShader);
handleGrabbedMaterial.EnableKeyword("_InnerGlow");
handleGrabbedMaterial.SetColor("_Color", new Color(0.0f, 0.63f, 1.0f));
handleGrabbedMaterial.SetFloat("_InnerGlow", 1.0f);
@@ -2069,7 +2113,7 @@ private void UpdateBounds()
private void UpdateRigHandles()
{
- if (rigRoot != null && Target != null)
+ if (rigRoot != null && Target != null && TargetBounds != null)
{
// We move the rigRoot to the scene root to ensure that non-uniform scaling performed
// anywhere above the rigRoot does not impact the position of rig corners / edges
@@ -2119,7 +2163,7 @@ private void UpdateRigHandles()
boxDisplay.transform.localScale = Vector3.Scale(GetBoxDisplayScale(), invRootScale);
}
- //move rig into position and rotation
+ // move rig into position and rotation
rigRoot.position = TargetBounds.bounds.center;
rigRoot.rotation = Target.transform.rotation;
rigRoot.parent = transform;
@@ -2151,7 +2195,7 @@ private void HandleProximityScaling()
maxRadius *= maxRadius;
maxRadius += handleCloseProximity + handleMediumProximity;
- // Grab points within sphere of inluence from valid pointers
+ // Grab points within sphere of influence from valid pointers
foreach (var pointer in proximityPointers)
{
if (IsPointWithinBounds(pointer.Position, maxRadius))
@@ -2159,7 +2203,9 @@ private void HandleProximityScaling()
proximityPoints.Add(pointer.Position);
}
- if (IsPointWithinBounds(pointer.Result.Details.Point, maxRadius))
+ Vector3? point = pointer.Result?.Details.Point;
+
+ if (point.HasValue && IsPointWithinBounds(point.Value, maxRadius))
{
proximityPoints.Add(pointer.Result.Details.Point);
}
@@ -2172,7 +2218,7 @@ private void HandleProximityScaling()
{
for (int i = 0; i < handles.Count; ++i)
{
- // If handle can't be visisble, skip calculations
+ // If handle can't be visible, skip calculations
if (!IsHandleTypeVisible(handles[i].Type))
continue;
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBoxHelper.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBoxHelper.cs
index 1b4a1d62990..011b52ae57b 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBoxHelper.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBoxHelper.cs
@@ -35,9 +35,6 @@ public class BoundingBoxHelper
/// Objects that align to an target's bounding box can call this function in the object's UpdateLoop
/// to get current bound points;
///
- ///
- ///
- ///
public void UpdateNonAABoundingBoxCornerPositions(BoundingBox boundingBox, List boundsPoints)
{
if (boundingBox.TargetBounds != targetBounds || rawBoundingCornersObtained == false)
@@ -61,8 +58,6 @@ public void UpdateNonAABoundingBoxCornerPositions(BoundingBox boundingBox, List<
///
/// This function gets the untransformed bounding box corner points of a GameObject.
///
- ///
- ///
public void GetRawBBCorners(BoundingBox boundingBox)
{
targetBounds = boundingBox.TargetBounds;
@@ -143,7 +138,6 @@ public Vector3 GetFaceNormal(int index)
/// by the index parameter;
///
/// an index into the list of faces of a boundingcube. 0-5
- ///
public Vector3 GetFaceCentroid(int index)
{
int[] faceIndices = GetFaceIndices(index);
@@ -226,7 +220,6 @@ public int GetIndexOfForwardFace(Vector3 lookAtPoint)
///
/// The gameObject whose bounding box is desired
/// the array of 8 points that will be filled
- /// a LayerMask variable
public static void GetUntransformedCornersFromObject(BoxCollider targetBounds, List boundsPoints)
{
Bounds cloneBounds = new Bounds(targetBounds.center, targetBounds.size);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/BaseObjectCollection.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/BaseObjectCollection.cs
index 63df3c28ed0..2165ba1b4a4 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/BaseObjectCollection.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/BaseObjectCollection.cs
@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
-using UnityEditor;
using UnityEngine;
namespace Microsoft.MixedReality.Toolkit.Utilities
@@ -76,8 +75,8 @@ public virtual void UpdateCollection()
{
Transform child = transform.GetChild(i);
#if UNITY_EDITOR
- Undo.RecordObject(child, "ObjectCollection modify transform");
-#endif
+ UnityEditor.Undo.RecordObject(child, "ObjectCollection modify transform");
+#endif // UNITY_EDITOR
if (!ContainsNode(child) && (child.gameObject.activeSelf || !IgnoreInactiveTransforms))
{
NodeList.Add(new ObjectCollectionNode { Name = child.name, Transform = child });
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs
index 31e4dc72f64..bcf3bd8e829 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs
@@ -286,7 +286,6 @@ protected void ResolveGridLayout(Vector3[] grid, LayoutOrder order)
///
/// Update the facing of a node given the nodes new position for facing origin with node and orientation type
///
- ///
protected void UpdateNodeFacing(ObjectCollectionNode node)
{
Vector3 centerAxis;
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/TileGridObjectCollection.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/TileGridObjectCollection.cs
index a1270ce6c5b..210c621f97b 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/TileGridObjectCollection.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/TileGridObjectCollection.cs
@@ -108,8 +108,6 @@ protected virtual void Start()
///
/// Set the item position by index
///
- ///
- ///
public virtual Vector3 GetListPosition(int index)
{
int column = index % Columns;
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/MixedRealityControllerInfo.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/MixedRealityControllerInfo.cs
index 90888079b4e..42c922e5bca 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/MixedRealityControllerInfo.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/MixedRealityControllerInfo.cs
@@ -145,7 +145,6 @@ public bool TryGetElement(ControllerElementEnum element, out Transform elementTr
/// thumbstick, and touchpad animation.
///
/// The transforms of the glTF model.
- ///
public void LoadInfo(Transform[] childTransforms, MixedRealityControllerVisualizer motionControllerVisualizer)
{
foreach (Transform child in childTransforms)
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/MixedRealityControllerVisualizer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/MixedRealityControllerVisualizer.cs
index ab04b228528..1b68692ba75 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/MixedRealityControllerVisualizer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/MixedRealityControllerVisualizer.cs
@@ -24,7 +24,6 @@ public class MixedRealityControllerVisualizer : ControllerPoseSynchronizer, IMix
///
/// Reserved for future implementation
///
- ///
public override void OnInputDown(InputEventData eventData)
{
base.OnInputDown(eventData);
@@ -37,7 +36,6 @@ public override void OnInputDown(InputEventData eventData)
///
/// Reserved for future implementation
///
- ///
public override void OnInputUp(InputEventData eventData)
{
base.OnInputUp(eventData);
@@ -50,7 +48,6 @@ public override void OnInputUp(InputEventData eventData)
///
/// Reserved for future implementation
///
- ///
public override void OnInputChanged(InputEventData eventData)
{
base.OnInputChanged(eventData);
@@ -63,7 +60,6 @@ public override void OnInputChanged(InputEventData eventData)
///
/// Reserved for future implementation
///
- ///
public override void OnInputChanged(InputEventData eventData)
{
base.OnInputChanged(eventData);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/WindowsMixedRealityControllerVisualizer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/WindowsMixedRealityControllerVisualizer.cs
index dad1646fe98..b6e208565ce 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/WindowsMixedRealityControllerVisualizer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/WindowsMixedRealityControllerVisualizer.cs
@@ -10,6 +10,7 @@ public class WindowsMixedRealityControllerVisualizer : MixedRealityControllerVis
{
private readonly Quaternion inverseRotation = Quaternion.Euler(0f, 180f, 0f);
+ ///
public override void OnSourcePoseChanged(SourcePoseEventData eventData)
{
if (UseSourcePoseData &&
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/AnimatedCursor.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/AnimatedCursor.cs
index 4953fa9d6c3..8be360b8b38 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/AnimatedCursor.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/AnimatedCursor.cs
@@ -80,7 +80,6 @@ public override void OnFocusChanged(FocusEventData eventData)
///
/// Override OnCursorState change to set the correct animation state for the cursor.
///
- ///
public override void OnCursorStateChange(CursorStateEnum state)
{
base.OnCursorStateChange(state);
@@ -99,7 +98,6 @@ public override void OnCursorStateChange(CursorStateEnum state)
///
/// Override OnCursorContext change to set the correct animation state for the cursor.
///
- ///
public override void OnCursorContextChange(CursorContextEnum context)
{
base.OnCursorContextChange(context);
@@ -118,7 +116,6 @@ public override void OnCursorContextChange(CursorContextEnum context)
///
/// Based on the type of animator state info pass it through to the animator
///
- ///
private void SetAnimatorParameter(AnimatorParameter animationParameter)
{
// Return if we do not have an animator
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/BaseCursor.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/BaseCursor.cs
index 39ecb23fa1b..52844ebb156 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/BaseCursor.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/BaseCursor.cs
@@ -687,7 +687,6 @@ public virtual CursorContextEnum CheckCursorContext()
///
/// Change the cursor state to the new state. Override in cursor implementations.
///
- ///
public virtual void OnCursorStateChange(CursorStateEnum state)
{
CursorState = state;
@@ -696,7 +695,6 @@ public virtual void OnCursorStateChange(CursorStateEnum state)
///
/// Change the cursor context state to the new context. Override in cursor implementations.
///
- ///
public virtual void OnCursorContextChange(CursorContextEnum context)
{
CursorContext = context;
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/FingerCursor.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/FingerCursor.cs
index 1253c1b3e9e..6ce3d64d337 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/FingerCursor.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/FingerCursor.cs
@@ -67,8 +67,17 @@ protected override void UpdateCursorTransform()
{
indexKnucklePosition = transform.position;
}
-
- if (nearPointer.IsNearObject)
+
+ if (!nearPointer.IsInteractionEnabled)
+ {
+ // If the pointer is disabled, make sure to turn the ring cursor off
+ // but still want show the proximity effect on bounding content
+ if (indexFingerRingRenderer != null)
+ {
+ UpdateVisuals(indexFingerRingRenderer, 1, false);
+ }
+ }
+ else if (nearPointer.IsNearObject)
{
// If the pointer is near an object translate the primary ring to the index finger tip and rotate to surface normal if close.
// The secondary ring should be hidden.
@@ -168,7 +177,6 @@ protected virtual bool IsNearGrabbableObject(out float dist)
/// Vector3.zero
/// Out parameter filled with joint rotation, otherwise
/// Quaternion.identity
- ///
protected bool TryGetJoint(TrackedHandJoint joint, out Vector3 position, out Quaternion rotation)
{
if (Pointer != null)
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/InteractiveMeshCursor.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/InteractiveMeshCursor.cs
index 59453a7d49d..c8fdf06f1e7 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/InteractiveMeshCursor.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/InteractiveMeshCursor.cs
@@ -60,7 +60,6 @@ private void Awake()
///
/// Decide which element (ring or dot) should be visible and at what scale
///
- ///
public override void OnCursorStateChange(CursorStateEnum state)
{
base.OnCursorStateChange(state);
@@ -149,7 +148,6 @@ protected override void UpdateCursorTransform()
///
/// override the base class for custom visibility
///
- ///
public override void SetVisibility(bool visible)
{
base.SetVisibility(visible);
@@ -166,7 +164,6 @@ public override void SetVisibility(bool visible)
///
/// controls the visibility of cursor elements in one place
///
- ///
private void ElementVisibility(bool visible)
{
if (ring != null)
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/MeshCursor.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/MeshCursor.cs
index 3122411f30a..a2cb81a3767 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/MeshCursor.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/MeshCursor.cs
@@ -51,7 +51,6 @@ protected override void OnEnable()
/// Override OnCursorState change to set the correct animation
/// state for the cursor
///
- ///
public override void OnCursorStateChange(CursorStateEnum state)
{
base.OnCursorStateChange(state);
@@ -71,7 +70,6 @@ public override void OnCursorStateChange(CursorStateEnum state)
///
/// Based on the type of state info pass it through to the mesh renderer
///
- ///
private void SetCursorState(MeshCursorDatum stateDatum)
{
// Return if we do not have an animator
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/ObjectCursor.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/ObjectCursor.cs
index b355e81d41e..fff1b033c21 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/ObjectCursor.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/ObjectCursor.cs
@@ -44,7 +44,6 @@ protected override void OnEnable()
/// Override OnCursorState change to set the correct animation
/// state for the cursor
///
- ///
public override void OnCursorStateChange(CursorStateEnum state)
{
base.OnCursorStateChange(state);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/SpriteCursor.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/SpriteCursor.cs
index 8fda7632beb..42cea5ee8bd 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/SpriteCursor.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/SpriteCursor.cs
@@ -50,7 +50,6 @@ protected override void OnEnable()
/// Override OnCursorState change to set the correct sprite
/// state for the cursor
///
- ///
public override void OnCursorStateChange(CursorStateEnum state)
{
base.OnCursorStateChange(state);
@@ -70,7 +69,6 @@ public override void OnCursorStateChange(CursorStateEnum state)
///
/// Based on the type of state info pass it through to the sprite renderer
///
- ///
private void SetCursorState(SpriteCursorDatum stateDatum)
{
// Return if we do not have an animator
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs
index 8b8682bf898..b0539a33607 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs
@@ -11,6 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.Input
/// Base Pointer class for pointers that exist in the scene as GameObjects.
///
[DisallowMultipleComponent]
+ [HelpURL("https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Input/Pointers.html")]
public abstract class BaseControllerPointer : ControllerPoseSynchronizer, IMixedRealityPointer
{
[SerializeField]
@@ -119,14 +120,8 @@ private void DestroyCursorInstance()
{
if (cursorInstance != null)
{
- if (Application.isPlaying)
- {
- Destroy(cursorInstance);
- }
- else
- {
- DestroyImmediate(cursorInstance);
- }
+ // Destroy correctly depending on if in play mode or edit mode
+ GameObjectExtensions.DestroyGameObject(cursorInstance);
}
}
@@ -164,7 +159,7 @@ protected override async void Start()
// The pointer's input source was lost during the await.
if (Controller == null)
{
- Destroy(gameObject);
+ GameObjectExtensions.DestroyGameObject(gameObject);
return;
}
}
@@ -295,8 +290,11 @@ public virtual bool IsInteractionEnabled
///
public bool IsFocusLocked { get; set; }
- ///
- public bool IsTargetPositionLockedOnFocusLock { get; set; }
+ ///
+ /// Specifies whether the pointer's target position (cursor) is locked to the target object when focus is locked.
+ /// Most pointers want the cursor to "stick" to the object when manipulating, so set this to true by default.
+ ///
+ public virtual bool IsTargetPositionLockedOnFocusLock { get; set; } = true;
[SerializeField]
private bool overrideGlobalPointerExtent = false;
@@ -363,7 +361,7 @@ public float DefaultPointerExtent
public virtual SceneQueryType SceneQueryType { get; set; } = SceneQueryType.SimpleRaycast;
[SerializeField]
- [Tooltip("The radius to use when SceneQueryType is set to Sphere or SphereColliders.")]
+ [Tooltip("How far controller needs to be from object before object can be grabbed / focused.")]
private float sphereCastRadius = 0.1f;
///
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/BaseMousePointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/BaseMousePointer.cs
index 876346c4bae..7ae2da4995c 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/BaseMousePointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/BaseMousePointer.cs
@@ -59,7 +59,6 @@ public abstract class BaseMousePointer : BaseControllerPointer, IMixedRealityMou
protected abstract string ControllerName { get; }
-
private IMixedRealityController controller;
///
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/DefaultPointerMediator.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/DefaultPointerMediator.cs
index a6bc76e45f9..8c0c18d55a2 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/DefaultPointerMediator.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/DefaultPointerMediator.cs
@@ -1,10 +1,16 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using System;
using System.Collections.Generic;
namespace Microsoft.MixedReality.Toolkit.Input
{
+ ///
+ /// The default implementation for pointer mediation in MRTK which is responsible for
+ /// determining which pointers are active based on the state of all pointers.
+ /// For example, one of the key things this class does is disable far pointers when a near pointer is close to an object.
+ ///
public class DefaultPointerMediator : IMixedRealityPointerMediator
{
protected readonly HashSet allPointers = new HashSet();
@@ -14,6 +20,18 @@ public class DefaultPointerMediator : IMixedRealityPointerMediator
protected readonly HashSet unassignedPointers = new HashSet();
protected readonly Dictionary> pointerByInputSourceParent = new Dictionary>();
+ private IPointerPreferences pointerPreferences;
+
+ public DefaultPointerMediator()
+ : this(null)
+ {
+ }
+
+ public DefaultPointerMediator(IPointerPreferences pointerPrefs)
+ {
+ pointerPreferences = pointerPrefs;
+ }
+
public virtual void RegisterPointers(IMixedRealityPointer[] pointers)
{
for (int i = 0; i < pointers.Length; i++)
@@ -98,6 +116,8 @@ public virtual void UpdatePointers()
unassignedPointers.Add(unassignedPointer);
}
+ ApplyCustomPointerBehaviors();
+
// If any pointers are locked, they have priority.
// Deactivate all other pointers that are on that input source
foreach (IMixedRealityPointer pointer in allPointers)
@@ -168,5 +188,33 @@ public virtual void UpdatePointers()
unassignedPointer.IsActive = true;
}
}
+
+ private void ApplyCustomPointerBehaviors()
+ {
+ if (pointerPreferences != null)
+ {
+ Action setPointerState =
+ (ptr, behavior) =>
+ {
+ if (behavior == PointerBehavior.Default)
+ {
+ return;
+ }
+
+ bool isPointerOn = behavior == PointerBehavior.AlwaysOn;
+ ptr.IsActive = isPointerOn;
+ if (ptr is GenericPointer genericPtr)
+ {
+ genericPtr.IsInteractionEnabled = isPointerOn;
+ }
+ unassignedPointers.Remove(ptr);
+ };
+
+ foreach (IMixedRealityPointer pointer in allPointers)
+ {
+ setPointerState(pointer, pointerPreferences.GetPointerBehavior(pointer));
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/GGVPointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/GGVPointer.cs
index 4cac5c1d303..07ca958407d 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/GGVPointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/GGVPointer.cs
@@ -158,6 +158,7 @@ int IEqualityComparer.GetHashCode(object obj)
return obj.GetHashCode();
}
+ ///
public override int GetHashCode()
{
unchecked
@@ -198,12 +199,7 @@ public virtual Quaternion Rotation
// This caused issues when the head rotated, but the hand stayed where it was.
// Now we're returning a rotation based on the vector from the camera position
// to the hand. This rotation is not affected by rotating your head.
- //
- // The y value is set to 0 here as we want the rotation to be about the y axis.
- // Without this, one-hand manipulating an object would give it unwanted x/z
- // rotations as you move your hand up and down.
Vector3 look = Position - CameraCache.Main.transform.position;
- look.y = 0;
return Quaternion.LookRotation(look);
}
}
@@ -293,6 +289,7 @@ protected override void OnDisable()
#region InputSystemGlobalHandlerListener Implementation
+ ///
protected override void RegisterHandlers()
{
InputSystem?.RegisterHandler(this);
@@ -300,6 +297,7 @@ protected override void RegisterHandlers()
InputSystem?.RegisterHandler(this);
}
+ ///
protected override void UnregisterHandlers()
{
InputSystem?.UnregisterHandler(this);
@@ -336,14 +334,7 @@ public void OnSourceLost(SourceStateEventData eventData)
}
// Destroy the pointer since nobody else is destroying us
- if (!Application.isPlaying)
- {
- DestroyImmediate(gameObject);
- }
- else
- {
- Destroy(gameObject);
- }
+ GameObjectExtensions.DestroyGameObject(gameObject);
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/LinePointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/LinePointer.cs
index b8978c4e39e..7b8b3e2ccb5 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/LinePointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/LinePointer.cs
@@ -201,6 +201,7 @@ protected virtual void SetLinePoints(Vector3 startPoint, Vector3 endPoint, float
lineBase.LastPoint = endPoint;
}
+ ///
public override bool IsInteractionEnabled =>
// If IsTracked is not true, then we don't have position data yet (or have stale data),
// so remain disabled until we know where to appear (not just at the origin).
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/MousePointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/MousePointer.cs
index d8587ee97b3..57568714d5b 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/MousePointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/MousePointer.cs
@@ -14,24 +14,10 @@ namespace Microsoft.MixedReality.Toolkit.Input
///
public class MousePointer : BaseMousePointer
{
- private MixedRealityMouseInputProfile mouseInputProfile = null;
-
- private MixedRealityMouseInputProfile MouseInputProfile
- {
- get
- {
- if (mouseInputProfile == null)
- {
- // Get the profile from the input system's registered mouse device manager.
- IMixedRealityMouseDeviceManager mouseManager = (InputSystem as IMixedRealityDataProviderAccess)?.GetDataProvider();
- mouseInputProfile = mouseManager?.MouseInputProfile;
- }
- return mouseInputProfile;
- }
- }
-
+ ///
protected override string ControllerName => "Spatial Mouse Pointer";
+ ///
public override void OnPreSceneQuery()
{
// screenspace to ray conversion
@@ -55,18 +41,12 @@ public override void OnInputChanged(InputEventData eventData)
{
if (PoseAction == eventData.MixedRealityInputAction && !UseSourcePoseData)
{
- Vector3 mouseDeltaRotation = Vector3.zero;
- mouseDeltaRotation.x += eventData.InputData.x;
- mouseDeltaRotation.y += eventData.InputData.y;
- if (MouseInputProfile != null)
- {
- mouseDeltaRotation *= MouseInputProfile.MouseSpeed;
- }
- UpdateMouseRotation(mouseDeltaRotation);
+ UpdateMouseRotation(eventData.InputData);
}
}
}
+ ///
public override void OnInputChanged(InputEventData eventData)
{
if (eventData.SourceId == Controller?.InputSource.SourceId)
@@ -96,7 +76,7 @@ private void UpdateMouseRotation(Vector3 mouseDeltaRotation)
timeoutTimer = 0.0f;
}
- transform.Rotate(mouseDeltaRotation, Space.World);
+ transform.Rotate(mouseDeltaRotation, Space.Self);
}
protected override void Start()
@@ -114,6 +94,7 @@ protected override void Start()
Cursor.lockState = CursorLockMode.Locked;
}
+ ///
protected override void SetVisibility(bool visible)
{
base.SetVisibility(visible);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ParabolicTeleportPointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ParabolicTeleportPointer.cs
index b62c82a6c57..535753dcb47 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ParabolicTeleportPointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ParabolicTeleportPointer.cs
@@ -7,7 +7,6 @@
namespace Microsoft.MixedReality.Toolkit.Teleport
{
[RequireComponent(typeof(ParabolaPhysicalLineDataProvider))]
- [ExecuteAlways]
public class ParabolicTeleportPointer : TeleportPointer
{
[SerializeField]
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/PokePointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/PokePointer.cs
index 45a84f137fd..78747d1f30c 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/PokePointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/PokePointer.cs
@@ -14,13 +14,19 @@ namespace Microsoft.MixedReality.Toolkit.Input
///
/// If a poke pointer has no [CurrentTouchableObjectDown](xref:Microsoft.MixedReality.Toolkit.Input.PokePointer.CurrentTouchableObjectDown), then it will try to select one from the Reachable Objects based on:
/// 1. Layer mask priority: Lower-priority layer masks will only be considered if higher-priority layers don't contain any Reachable Objects.
- /// 1. Distance: the closest object in the highest priority layers is selected based on [DistanceToTouchable](xref:Microsoft.MixedReality.Toolkit.Input.BaseNearInteractionTouchable.DistanceToTouchable*).
- /// 1. Poke Threshold: The object becomes the [CurrentTouchableObjectDown](xref:Microsoft.MixedReality.Toolkit.Input.PokePointer.CurrentTouchableObjectDown) once it crosses the [PokeThreshold](xref:Microsoft.MixedReality.Toolkit.Input.BaseNearInteractionTouchable.PokeThreshold) distance (behind the surface). At this point the [OnTouchStarted](xref:Microsoft.MixedReality.Toolkit.Input.IMixedRealityTouchHandler.OnTouchStarted*) or [OnPointerDown](xref:Microsoft.MixedReality.Toolkit.Input.IMixedRealityPointerHandler.OnPointerDown*) event is raised.
+ /// 1. Touchable Distance: the closest object in the highest priority layers is selected based on [DistanceToTouchable](xref:Microsoft.MixedReality.Toolkit.Input.BaseNearInteractionTouchable.DistanceToTouchable*).
+ /// 1. Ray Distance: The object becomes the [CurrentTouchableObjectDown](xref:Microsoft.MixedReality.Toolkit.Input.PokePointer.CurrentTouchableObjectDown) once the ray cast distance becomes negative (behind the surface). At this point the [OnTouchStarted](xref:Microsoft.MixedReality.Toolkit.Input.IMixedRealityTouchHandler.OnTouchStarted*) or [OnPointerDown](xref:Microsoft.MixedReality.Toolkit.Input.IMixedRealityPointerHandler.OnPointerDown*) event is raised.
///
/// If a poke pointer _does_ have a [CurrentTouchableObjectDown](xref:Microsoft.MixedReality.Toolkit.Input.PokePointer.CurrentTouchableObjectDown) it will not consider any other object, until the [DistanceToTouchable](xref:Microsoft.MixedReality.Toolkit.Input.BaseNearInteractionTouchable.DistanceToTouchable*) exceeds the [DebounceThreshold](xref:Microsoft.MixedReality.Toolkit.Input.BaseNearInteractionTouchable.DebounceThreshold) (in front of the surface). At this point the active object is cleared and the [OnTouchCompleted](xref:Microsoft.MixedReality.Toolkit.Input.IMixedRealityTouchHandler.OnTouchCompleted*) or [OnPointerUp](xref:Microsoft.MixedReality.Toolkit.Input.IMixedRealityPointerHandler.OnPointerUp*) event is raised.
///
public class PokePointer : BaseControllerPointer, IMixedRealityNearPointer
{
+ ///
+ /// If touchable volumes are larger than this size (meters), pointer will raise
+ /// touch up even when pointer is inside the volume
+ ///
+ private const int maximumTouchableVolumeSize = 1000;
+
[SerializeField]
protected LineRenderer line;
@@ -90,10 +96,8 @@ public class PokePointer : BaseControllerPointer, IMixedRealityNearPointer
/// the same current closest touchable component's changes (e.g. Unity UI control elements).
public GameObject CurrentTouchableObjectDown => currentTouchableObjectDown;
- protected override void Start()
+ private void Awake()
{
- base.Start();
-
queryBuffer = new Collider[sceneQueryBufferSize];
}
@@ -105,11 +109,15 @@ protected void OnValidate()
sceneQueryBufferSize = Mathf.Max(sceneQueryBufferSize, 1);
}
+ ///
public bool IsNearObject
{
get { return (closestProximityTouchable != null); }
}
+ ///
+ public override bool IsInteractionEnabled => base.IsInteractionEnabled && IsNearObject;
+
public override void OnPreSceneQuery()
{
if (Rays == null)
@@ -134,8 +142,12 @@ public override void OnPreSceneQuery()
if (newClosestTouchable != null)
{
// Build ray (poke from in front to the back of the pointer position)
- Vector3 start = Position - newClosestTouchable.PokeThreshold * -closestNormal;
- Vector3 end = Position + touchableDistance * -closestNormal;
+ // We make a very long ray if we are touching a touchable volume to ensure that we actually
+ // hit the volume when we are inside of the volume, which could be very large.
+ var lengthOfPointerRay = newClosestTouchable is NearInteractionTouchableVolume ?
+ maximumTouchableVolumeSize : touchableDistance;
+ Vector3 start = Position + lengthOfPointerRay * closestNormal;
+ Vector3 end = Position - lengthOfPointerRay * closestNormal;
Rays[0].UpdateRayStep(ref start, ref end);
line.SetPosition(0, Position);
@@ -147,7 +159,7 @@ public override void OnPreSceneQuery()
{
if (!IsObjectPartOfTouchable(currentTouchableObjectDown, newClosestTouchable))
{
- TryRaisePokeUp(Result.CurrentPointerTarget, Position);
+ TryRaisePokeUp();
}
}
@@ -167,12 +179,12 @@ private bool FindClosestTouchableForLayerMask(LayerMask layerMask, out BaseNearI
int numColliders = UnityEngine.Physics.OverlapSphereNonAlloc(Position, touchableDistance, queryBuffer, layerMask, triggerInteraction);
if (numColliders == queryBuffer.Length)
{
- Debug.LogWarning($"Maximum number of {numColliders} colliders found in PokePointer overlap query. Consider increasing the query buffer size in the pointer profile.");
+ Debug.LogWarning($"Maximum number of {numColliders} colliders found in PokePointer overlap query. Consider increasing the query buffer size in the input system settings.");
}
for (int i = 0; i < numColliders; ++i)
{
- var touchable = queryBuffer[i].GetComponent();
+ var touchable = queryBuffer[i].GetComponent();
if (touchable)
{
float distance = touchable.DistanceToTouchable(Position, out Vector3 normal);
@@ -202,6 +214,7 @@ private bool FindClosestTouchableForLayerMask(LayerMask layerMask, out BaseNearI
return closest != null;
}
+ ///
public override void OnPostSceneQuery()
{
base.OnPostSceneQuery();
@@ -213,23 +226,35 @@ public override void OnPostSceneQuery()
if (Result?.CurrentPointerTarget != null && closestProximityTouchable != null)
{
- float distToFront = Vector3.Distance(Result.StartPoint, Result.Details.Point) - closestProximityTouchable.PokeThreshold;
- bool newIsDown = (distToFront < 0);
- bool newIsUp = (distToFront > closestProximityTouchable.DebounceThreshold);
+ float distToTouchable;
+ if (closestProximityTouchable is NearInteractionTouchableVolume)
+ {
+ // Volumes can be arbitrary size, so don't rely on the length of the raycast ray
+ // instead just have the volume itself give us the distance.
+ distToTouchable = closestProximityTouchable.DistanceToTouchable(Position, out _);
+ }
+ else
+ {
+ // Start position of the ray is offset by TouchableDistance, subtract to get distance between surface and pointer position.
+ distToTouchable = Vector3.Distance(Result.StartPoint, Result.Details.Point) - touchableDistance;
+ }
+
+ bool newIsDown = (distToTouchable < 0.0f);
+ bool newIsUp = (distToTouchable > closestProximityTouchable.DebounceThreshold);
if (newIsDown)
{
- TryRaisePokeDown(Result.CurrentPointerTarget, Position);
+ TryRaisePokeDown();
}
else if (currentTouchableObjectDown != null)
{
if (newIsUp)
{
- TryRaisePokeUp(Result.CurrentPointerTarget, Position);
+ TryRaisePokeUp();
}
else
{
- TryRaisePokeDown(Result.CurrentPointerTarget, Position);
+ TryRaisePokeDown();
}
}
}
@@ -250,6 +275,7 @@ public override void OnPostSceneQuery()
PreviousPosition = Position;
}
+ ///
public override void OnPreCurrentPointerTargetChange()
{
// We need to raise the event now, since the pointer's focused object or touchable will change
@@ -258,8 +284,10 @@ public override void OnPreCurrentPointerTargetChange()
TryRaisePokeUp();
}
- private void TryRaisePokeDown(GameObject targetObject, Vector3 touchPosition)
+ private void TryRaisePokeDown()
{
+ GameObject targetObject = Result.CurrentPointerTarget;
+
if (currentTouchableObjectDown == null)
{
// In order to get reliable up/down event behavior, only allow the closest touchable to be touched.
@@ -273,17 +301,17 @@ private void TryRaisePokeDown(GameObject targetObject, Vector3 touchPosition)
}
else if (closestProximityTouchable.EventsToReceive == TouchableEventType.Touch)
{
- InputSystem?.RaiseOnTouchStarted(InputSourceParent, Controller, Handedness, touchPosition);
+ InputSystem?.RaiseOnTouchStarted(InputSourceParent, Controller, Handedness, Position);
}
}
}
else
{
- RaiseTouchUpdated(targetObject, touchPosition);
+ RaiseTouchUpdated(targetObject, Position);
}
}
- private void TryRaisePokeUp(GameObject targetObject, Vector3 touchPosition)
+ private void TryRaisePokeUp()
{
if (currentTouchableObjectDown != null)
{
@@ -296,21 +324,13 @@ private void TryRaisePokeUp(GameObject targetObject, Vector3 touchPosition)
}
else if (closestProximityTouchable.EventsToReceive == TouchableEventType.Touch)
{
- InputSystem?.RaiseOnTouchCompleted(InputSourceParent, Controller, Handedness, touchPosition);
+ InputSystem?.RaiseOnTouchCompleted(InputSourceParent, Controller, Handedness, Position);
}
currentTouchableObjectDown = null;
}
}
- private void TryRaisePokeUp()
- {
- if (currentTouchableObjectDown != null)
- {
- TryRaisePokeUp(Result.CurrentPointerTarget, Position);
- }
- }
-
private void RaiseTouchUpdated(GameObject targetObject, Vector3 touchPosition)
{
if (currentTouchableObjectDown != null)
@@ -363,18 +383,21 @@ public override void OnSourceLost(SourceStateEventData eventData)
base.OnSourceLost(eventData);
}
+ ///
public override void OnSourceDetected(SourceStateEventData eventData)
{
base.OnSourceDetected(eventData);
PreviousPosition = Position;
}
+ ///
public override void OnInputDown(InputEventData eventData)
{
// Poke pointer should not respond when a button is pressed or hand is pinched
// It should only dispatch events based on collision with touchables.
}
+ ///
public override void OnInputUp(InputEventData eventData)
{
// Poke pointer should not respond when a button is released or hand is un-pinched
@@ -385,6 +408,8 @@ protected override void OnEnable()
{
base.OnEnable();
+ IsTargetPositionLockedOnFocusLock = false;
+
Debug.Assert(line != null, "No line renderer found in PokePointer.");
Debug.Assert(visuals != null, "No visuals object found in PokePointer.");
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ScreenSpaceMousePointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ScreenSpaceMousePointer.cs
index e008fedee5c..22bc8ddb532 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ScreenSpaceMousePointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ScreenSpaceMousePointer.cs
@@ -15,6 +15,7 @@ public class ScreenSpaceMousePointer : BaseMousePointer
{
private Vector2 lastMousePosition;
+ ///
protected override string ControllerName => "ScreenSpace Mouse Pointer";
///
@@ -45,6 +46,7 @@ public override void OnPreSceneQuery()
transform.rotation = Quaternion.LookRotation(ray.direction);
}
+ ///
protected override void SetVisibility(bool visible)
{
base.SetVisibility(visible);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ShellHandRayPointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ShellHandRayPointer.cs
index aea371b79ba..2effb576f91 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ShellHandRayPointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/ShellHandRayPointer.cs
@@ -62,6 +62,7 @@ public override void OnPostSceneQuery()
}
}
+ ///
protected override void SetLinePoints(Vector3 startPoint, Vector3 endPoint, float distance)
{
LineBase.FirstPoint = startPoint;
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/SpherePointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/SpherePointer.cs
index 3641f9581bc..7f4222dccd9 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/SpherePointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/SpherePointer.cs
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using System;
using Microsoft.MixedReality.Toolkit.Physics;
using Microsoft.MixedReality.Toolkit.Utilities;
using UnityEngine;
@@ -11,14 +12,15 @@ public class SpherePointer : BaseControllerPointer, IMixedRealityNearPointer
{
private SceneQueryType raycastMode = SceneQueryType.SphereOverlap;
+ ///
public override SceneQueryType SceneQueryType { get { return raycastMode; } set { raycastMode = value; } }
[SerializeField]
[Min(0.0f)]
- [Tooltip("Additional distance between SphereCastRadius and NearObjectRadius")]
+ [Tooltip("Additional distance on top of sphere cast radius when pointer is considered 'near' an object and far interaction will turn off")]
private float nearObjectMargin = 0.2f;
///
- /// Additional distance between and .
+ /// Additional distance on top of when pointer is considered 'near' an object and far interaction will turn off.
///
///
/// This creates a dead zone in which far interaction is disabled before objects become grabbable.
@@ -34,30 +36,57 @@ public class SpherePointer : BaseControllerPointer, IMixedRealityNearPointer
public float NearObjectRadius => SphereCastRadius + NearObjectMargin;
[SerializeField]
- private bool debugMode = false;
+ [Tooltip("The LayerMasks, in prioritized order, that are used to determine the grabble objects. Remember to also add NearInteractionGrabbable! Only collidables with NearInteractionGrabbable will raise events.")]
+ private LayerMask[] grabLayerMasks = { UnityEngine.Physics.DefaultRaycastLayers };
+ ///
+ /// The LayerMasks, in prioritized order, that are used to determine the touchable objects.
+ ///
+ ///
+ /// Only [NearInteractionGrabbables](xref:Microsoft.MixedReality.Toolkit.Input.NearInteractionGrabbable) in one of the LayerMasks will raise events.
+ ///
+ public LayerMask[] GrabLayerMasks => grabLayerMasks;
+
+ [SerializeField]
+ [Tooltip("Specify whether queries for grabbable objects hit triggers.")]
+ protected QueryTriggerInteraction triggerInteraction = QueryTriggerInteraction.UseGlobal;
+ ///
+ /// Specify whether queries for grabbable objects hit triggers.
+ ///
+ public QueryTriggerInteraction TriggerInteraction => triggerInteraction;
+
+
+ [SerializeField]
+ [Tooltip("Maximum number of colliders that can be detected in a scene query.")]
+ [Min(1)]
+ private int sceneQueryBufferSize = 64;
+ ///
+ /// Maximum number of colliders that can be detected in a scene query.
+ ///
+ public int SceneQueryBufferSize => sceneQueryBufferSize;
+
- private Transform debugSphere;
+ private SpherePointerQueryInfo queryBufferNearObjectRadius;
+ private SpherePointerQueryInfo queryBufferInteractionRadius;
///
- /// Currently performs a sphere check.
- /// Currently anything that has a collider is considered "Grabbable".
- /// Eventually we need to filter based on things that can respond
- /// to grab events.
+ /// Test if the pointer is near any collider that's both on a grabbable layer mask, and has a NearInteractionGrabbable.
+ /// Uses SphereCastRadius + NearObjectMargin to determine if near an object.
///
- /// True if the hand is near anything that's grabbable.
+ /// True if the pointer is near any collider that's both on a grabbable layer mask, and has a NearInteractionGrabbable.
public bool IsNearObject
{
get
{
- if (TryGetNearGraspPoint(out Vector3 position))
- {
- return UnityEngine.Physics.CheckSphere(position, NearObjectRadius, ~UnityEngine.Physics.IgnoreRaycastLayer);
- }
-
- return false;
+ return queryBufferNearObjectRadius.ContainsGrabbable();
}
}
+ ///
+ /// Test if the pointer is within the grabbable radius of collider that's both on a grabbable layer mask, and has a NearInteractionGrabbable.
+ /// Uses SphereCastRadius to determine if near an object.
+ /// Note: if focus on pointer is locked, will always return true.
+ ///
+ /// True if the pointer is within the grabbable radius of collider that's both on a grabbable layer mask, and has a NearInteractionGrabbable.
public override bool IsInteractionEnabled
{
get
@@ -66,15 +95,16 @@ public override bool IsInteractionEnabled
{
return true;
}
- else if (base.IsInteractionEnabled && TryGetNearGraspPoint(out Vector3 position))
- {
- return UnityEngine.Physics.CheckSphere(position, SphereCastRadius, ~UnityEngine.Physics.IgnoreRaycastLayer);
- }
-
- return false;
+ return base.IsInteractionEnabled && queryBufferInteractionRadius.ContainsGrabbable();
}
}
+ private void Awake()
+ {
+ queryBufferNearObjectRadius = new SpherePointerQueryInfo(sceneQueryBufferSize, NearObjectRadius);
+ queryBufferInteractionRadius = new SpherePointerQueryInfo(sceneQueryBufferSize, SphereCastRadius);
+ }
+
///
public override void OnPreSceneQuery()
{
@@ -86,20 +116,26 @@ public override void OnPreSceneQuery()
Vector3 pointerPosition;
if (TryGetNearGraspPoint(out pointerPosition))
{
- if (debugMode)
+ Vector3 endPoint = Vector3.forward * SphereCastRadius;
+ Rays[0].UpdateRayStep(ref pointerPosition, ref endPoint);
+
+ var layerMasks = PrioritizedLayerMasksOverride ?? GrabLayerMasks;
+
+ for (int i = 0; i < layerMasks.Length; i++)
{
- if (debugSphere == null)
+ if (queryBufferNearObjectRadius.TryUpdateQueryBufferForLayerMask(layerMasks[i], pointerPosition, triggerInteraction))
{
- debugSphere = GameObject.CreatePrimitive(PrimitiveType.Sphere).transform;
- debugSphere.localScale = Vector3.one * SphereCastRadius * 2;
- Destroy(debugSphere.gameObject.GetComponent());
+ break;
}
-
- debugSphere.position = pointerPosition;
}
- Vector3 endPoint = Vector3.forward * SphereCastRadius;
- Rays[0].UpdateRayStep(ref pointerPosition, ref endPoint);
+ for (int i = 0; i < layerMasks.Length; i++)
+ {
+ if (queryBufferInteractionRadius.TryUpdateQueryBufferForLayerMask(layerMasks[i], pointerPosition, triggerInteraction))
+ {
+ break;
+ }
+ }
}
}
@@ -171,12 +207,69 @@ public bool TryGetNormalToNearestSurface(out Vector3 normal)
return false;
}
- private void OnDestroy()
+ ///
+ /// Helper class for storing and managing near grabbables close to a point
+ ///
+ private class SpherePointerQueryInfo
{
- if (debugSphere)
+ ///
+ /// How many colliders are near the point from the latest call to TryUpdateQueryBufferForLayerMask
+ ///
+ private int numColliders;
+
+ ///
+ /// Fixed-length array used to story physics queries
+ ///
+ private Collider[] queryBuffer;
+
+ ///
+ /// Distance for performing queries.
+ ///
+ private float queryRadius;
+
+ ///
+ /// The grabbable near the QueryRadius.
+ ///
+ private NearInteractionGrabbable grabbable;
+
+ public SpherePointerQueryInfo(int bufferSize, float radius)
+ {
+ numColliders = 0;
+ queryBuffer = new Collider[bufferSize];
+ queryRadius = radius;
+ }
+
+ public bool TryUpdateQueryBufferForLayerMask(LayerMask layerMask, Vector3 pointerPosition, QueryTriggerInteraction triggerInteraction)
+ {
+ grabbable = null;
+ numColliders = UnityEngine.Physics.OverlapSphereNonAlloc(
+ pointerPosition,
+ queryRadius,
+ queryBuffer,
+ layerMask,
+ triggerInteraction);
+
+ if (numColliders == queryBuffer.Length)
+ {
+ Debug.LogWarning($"Maximum number of {numColliders} colliders found in SpherePointer overlap query. Consider increasing the query buffer size in the pointer profile.");
+ }
+
+ for (int i = 0; i < numColliders; i++)
+ {
+ if (grabbable = queryBuffer[i].GetComponent())
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ ///
+ /// Returns true if any of the objects inside QueryBuffer contain a grabbable
+ ///
+ public bool ContainsGrabbable()
{
- Destroy(debugSphere.gameObject);
+ return grabbable != null;
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/SpherePointerVisual.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/SpherePointerVisual.cs
index 1770ebb9116..c0f89de9291 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/SpherePointerVisual.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/SpherePointerVisual.cs
@@ -6,12 +6,11 @@
namespace Microsoft.MixedReality.Toolkit.Input
{
- [ExecuteAlways]
public class SpherePointerVisual : MonoBehaviour
{
public Transform TetherEndPoint => tetherEndPoint;
- public bool TetherVisualsEnabled => tetherVisualsEnabled;
+ public bool TetherVisualsEnabled { get; private set; }
[Tooltip("The pointer these visuals decorate")]
private SpherePointer pointer;
@@ -30,8 +29,6 @@ public class SpherePointerVisual : MonoBehaviour
[SerializeField]
private BaseMixedRealityLineDataProvider tetherLine = null;
- private bool tetherVisualsEnabled;
-
public void OnEnable()
{
CheckInitialization();
@@ -58,6 +55,7 @@ private void CheckInitialization()
{
pointer = GetComponent();
}
+
if (pointer == null)
{
Debug.LogError($"No SpherePointer found on {gameObject.name}.");
@@ -78,12 +76,7 @@ private void CheckAsset(object asset, string fieldname)
public void Update()
{
- if (!Application.isPlaying)
- {
- return;
- }
-
- tetherVisualsEnabled = false;
+ TetherVisualsEnabled = false;
if (pointer.IsFocusLocked && pointer.IsTargetPositionLockedOnFocusLock && pointer.Result != null)
{
NearInteractionGrabbable grabbedObject = GetGrabbedObject();
@@ -94,14 +87,14 @@ public void Update()
tetherLine.FirstPoint = graspPosition;
Vector3 endPoint = pointer.Result.Details.Object.transform.TransformPoint(pointer.Result.Details.PointLocalSpace);
tetherLine.LastPoint = endPoint;
- tetherVisualsEnabled = Vector3.Distance(tetherLine.FirstPoint, tetherLine.LastPoint) > minTetherLength;
- tetherLine.enabled = tetherVisualsEnabled;
- tetherEndPoint.gameObject.SetActive(tetherVisualsEnabled);
+ TetherVisualsEnabled = Vector3.Distance(tetherLine.FirstPoint, tetherLine.LastPoint) > minTetherLength;
+ tetherLine.enabled = TetherVisualsEnabled;
+ tetherEndPoint.gameObject.SetActive(TetherVisualsEnabled);
tetherEndPoint.position = endPoint;
}
}
- visualsRoot.gameObject.SetActive(tetherVisualsEnabled);
+ visualsRoot.gameObject.SetActive(TetherVisualsEnabled);
}
private NearInteractionGrabbable GetGrabbedObject()
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs
index 4b2b1327805..82d33bc032e 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs
@@ -209,6 +209,7 @@ public float PointerOrientation
}
}
+ ///
public override void OnPreSceneQuery()
{
if (LineBase == null)
@@ -240,6 +241,7 @@ public override void OnPreSceneQuery()
GravityDistorter.enabled = (TeleportSurfaceResult == TeleportSurfaceResult.HotSpot);
}
+ ///
public override void OnPostSceneQuery()
{
if (IsSelectPressed)
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PhysicalPressEventRouter.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PhysicalPressEventRouter.cs
index 84edf91b7de..4eba31ed312 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PhysicalPressEventRouter.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PhysicalPressEventRouter.cs
@@ -4,10 +4,10 @@
using Microsoft.MixedReality.Toolkit.UI;
using UnityEngine;
-namespace Microsoft.MixedReality.Toolkit.Examples.Demos
+namespace Microsoft.MixedReality.Toolkit
{
///
- /// This class exists to route events through to Interactable.
+ /// This class exists to route events through to .
/// The result is being able to have physical touch call Interactable.OnPointerClicked.
///
public class PhysicalPressEventRouter : MonoBehaviour
@@ -32,38 +32,58 @@ private void Awake()
}
}
+ private bool CanRouteInput()
+ {
+ return routingTarget != null && routingTarget.IsEnabled;
+ }
+
+ ///
+ /// Gets called when the TouchBegin event is invoked within the default PressableButton and
+ /// PressableButtonHoloLens2 components. When the physical touch with a
+ /// hand has begun, set physical touch state within Interactable.
+ ///
public void OnHandPressTouched()
{
- if (routingTarget != null)
+ if (CanRouteInput())
{
- routingTarget.SetPhysicalTouch(true);
+ routingTarget.HasPhysicalTouch = true;
if (InteractableOnClick == PhysicalPressEventBehavior.EventOnTouch)
{
- routingTarget.SetPress(true);
+ routingTarget.HasPress = true;
routingTarget.TriggerOnClick();
- routingTarget.SetPress(false);
+ routingTarget.HasPress = false;
}
}
}
+ ///
+ /// Gets called when the TouchEnd event is invoked within the default PressableButton and
+ /// PressableButtonHoloLens2 components. Once the physical touch with a hand is removed, set
+ /// the physical touch and possibly press state within Interactable.
+ ///
public void OnHandPressUntouched()
{
- if (routingTarget != null)
+ if (CanRouteInput())
{
- routingTarget.SetPhysicalTouch(false);
+ routingTarget.HasPhysicalTouch = false;
if (InteractableOnClick == PhysicalPressEventBehavior.EventOnTouch)
{
- routingTarget.SetPress(true);
+ routingTarget.HasPress = true;
}
}
}
+ ///
+ /// Gets called when the ButtonPressed event is invoked within the default PressableButton and
+ /// PressableButtonHoloLens2 components. When the physical press with a hand is triggered, set
+ /// the physical touch and press state within Interactable.
+ ///
public void OnHandPressTriggered()
{
- if (routingTarget != null)
+ if (CanRouteInput())
{
- routingTarget.SetPhysicalTouch(true);
- routingTarget.SetPress(true);
+ routingTarget.HasPhysicalTouch = true;
+ routingTarget.HasPress = true;
if (InteractableOnClick == PhysicalPressEventBehavior.EventOnPress)
{
routingTarget.TriggerOnClick();
@@ -71,18 +91,23 @@ public void OnHandPressTriggered()
}
}
+ ///
+ /// Gets called when the ButtonReleased event is invoked within the default PressableButton and
+ /// PressableButtonHoloLens2 components. Once the physical press with a hand is completed, set
+ /// the press and physical touch states within Interactable
+ ///
public void OnHandPressCompleted()
{
- if (routingTarget != null)
+ if (CanRouteInput())
{
- routingTarget.SetPhysicalTouch(true);
- routingTarget.SetPress(true);
+ routingTarget.HasPhysicalTouch = true;
+ routingTarget.HasPress = true;
if (InteractableOnClick == PhysicalPressEventBehavior.EventOnClickCompletion)
{
routingTarget.TriggerOnClick();
}
- routingTarget.SetPress(false);
- routingTarget.SetPhysicalTouch(false);
+ routingTarget.HasPress = false;
+ routingTarget.HasPhysicalTouch = false;
}
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PressableButton.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PressableButton.cs
index 0d9d30e33d3..2614be9c7be 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PressableButton.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PressableButton.cs
@@ -12,13 +12,14 @@ namespace Microsoft.MixedReality.Toolkit.UI
{
///
/// A button that can be pushed via direct touch.
- /// You can use to route these events to .
+ /// You can use to route these events to .
///
- [RequireComponent(typeof(BoxCollider))]
public class PressableButton : MonoBehaviour, IMixedRealityTouchHandler
{
const string InitialMarkerTransformName = "Initial Marker";
+ bool hasStarted = false;
+
///
/// The object that is being pushed.
///
@@ -61,7 +62,7 @@ public SpaceMode DistanceSpaceMode
}
[SerializeField]
- [Tooltip("The offset at which pushing starts. Offset is relative to the pivot of either the moving visuals if there's any or the button itself.")]
+ [Tooltip("The offset at which pushing starts. Offset is relative to the pivot of either the moving visuals if there's any or the button itself. For UnityUI based PressableButtons, this cannot be a negative value.")]
protected float startPushDistance = 0.0f;
///
@@ -146,7 +147,6 @@ public SpaceMode DistanceSpaceMode
///
public float CurrentPushDistance { get => currentPushDistance; protected set => currentPushDistance = value; }
-
private bool isTouching = false;
///
@@ -188,16 +188,16 @@ private set
public bool IsPressing { get; private set; }
///
- /// The press direction of the button as defined by a NearInteractionTouchable.
+ /// The press direction of the button as defined by a NearInteractionTouchableSurface.
///
private Vector3 WorldSpacePressDirection
{
get
{
- var nearInteractionTouchable = GetComponent();
+ var nearInteractionTouchable = GetComponent();
if (nearInteractionTouchable != null)
{
- return -1.0f * nearInteractionTouchable.Forward;
+ return nearInteractionTouchable.transform.TransformDirection(nearInteractionTouchable.LocalPressDirection);
}
return transform.forward;
@@ -236,10 +236,10 @@ private float LocalToWorldScale
///
/// Initial offset from moving visuals to button
///
- private Vector3 initialOffsetMovingVisuals = Vector3.zero;
+ private Vector3 movingVisualsInitialLocalPosition = Vector3.zero;
///
- /// The position from where the button starts to move.
+ /// The position from where the button starts to move. Projected into world space based on the button's current world space position.
///
private Vector3 InitialPosition
{
@@ -247,13 +247,12 @@ private Vector3 InitialPosition
{
if (Application.isPlaying && movingButtonVisuals) // we're using a cached position in play mode as the moving visuals will be moved during button interaction
{
- return PushSpaceSourceParentPosition + initialOffsetMovingVisuals;
+ return PushSpaceSourceParentPosition + movingButtonVisuals.transform.TransformVector(movingVisualsInitialLocalPosition);
}
else
{
return PushSpaceSourceTransform.position;
}
-
}
}
@@ -268,12 +267,17 @@ private void OnEnable()
protected virtual void Start()
{
+ hasStarted = true;
+
if (gameObject.layer == 2)
{
Debug.LogWarning("PressableButton will not work if game object layer is set to 'Ignore Raycast'.");
}
- initialOffsetMovingVisuals = PushSpaceSourceTransform.position - PushSpaceSourceParentPosition;
+ movingVisualsInitialLocalPosition = movingButtonVisuals.transform.localPosition;
+
+ // Ensure everything is set to initial positions correctly.
+ UpdateMovingVisualsPosition();
}
void OnDisable()
@@ -282,9 +286,12 @@ void OnDisable()
touchPoints.Clear();
currentInputSources.Clear();
- // make sure button doesn't stay in a pressed state in case we disable the button while pressing it
- currentPushDistance = startPushDistance;
- UpdateMovingVisualsPosition();
+ if (hasStarted)
+ {
+ // make sure button doesn't stay in a pressed state in case we disable the button while pressing it
+ currentPushDistance = startPushDistance;
+ UpdateMovingVisualsPosition();
+ }
}
private void Update()
@@ -416,8 +423,6 @@ void IMixedRealityTouchHandler.OnTouchCompleted(HandTrackingInputEventData event
///
/// Returns world space position along the push direction for the given local distance
///
- ///
- ///
///
public Vector3 GetWorldPositionAlongPushDirection(float localDistance)
{
@@ -429,8 +434,6 @@ public Vector3 GetWorldPositionAlongPushDirection(float localDistance)
///
/// Returns the local distance along the push direction for the passed in world position
///
- ///
- ///
public float GetDistanceAlongPushDirection(Vector3 positionWorldSpace)
{
Vector3 localPosition = positionWorldSpace - InitialPosition;
@@ -466,7 +469,6 @@ private float GetFarthestDistanceAlongPressDirection()
return Mathf.Clamp(farthestDistance, startPushDistance, maxPushDistance);
}
-
private void UpdatePressedState(float pushDistance)
{
// If we aren't in a press and can't start a simple one.
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PressableButtonHoloLens2.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PressableButtonHoloLens2.cs
index 684e6d47c3f..d2786e30ef3 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PressableButtonHoloLens2.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/PressableButtonHoloLens2.cs
@@ -106,6 +106,7 @@ public GameObject MovingButtonIconText
}
}
+ ///
protected override void UpdateMovingVisualsPosition()
{
base.UpdateMovingVisualsPosition();
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/SubmitEventRouter.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/SubmitEventRouter.cs
new file mode 100644
index 00000000000..59f2515ac42
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/SubmitEventRouter.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+namespace Microsoft.MixedReality.Toolkit
+{
+ ///
+ /// This is a helper class to allow you to call OnSubmit() on a UnityEngine.UI.Button or other control derived from UnityEngine.EventSystems.ISubmitHandler on this gameObject.
+ /// It exposes a public function that can be bound in the Editor to a Unity Event.
+ ///
+ public class SubmitEventRouter : MonoBehaviour
+ {
+ public void Submit()
+ {
+ ExecuteEvents.Execute(this.gameObject, new BaseEventData(EventSystem.current), ExecuteEvents.submitHandler);
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/SubmitEventRouter.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/SubmitEventRouter.cs.meta
new file mode 100644
index 00000000000..73aa342e626
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/PressableButtons/SubmitEventRouter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 724341da07c2e1742a82bcc156a2461d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/ProgressIndicators/IProgressIndicator.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/ProgressIndicators/IProgressIndicator.cs
index bf37cfccc9b..9260f826141 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/ProgressIndicators/IProgressIndicator.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/ProgressIndicators/IProgressIndicator.cs
@@ -32,13 +32,11 @@ public interface IProgressIndicator
///
/// Opens the progress indicator before loading begins. Method is async to allow for animation to begin before loading.
///
- ///
Task OpenAsync();
///
/// Closes the progress indicator after loading is finished. Method is async to allow for animation to complete.
///
- ///
Task CloseAsync();
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/FollowMeToggle.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/FollowMeToggle.cs
index e0e7cfb5959..d948f523183 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/FollowMeToggle.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/FollowMeToggle.cs
@@ -1,40 +1,200 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using Microsoft.MixedReality.Toolkit.Utilities;
using Microsoft.MixedReality.Toolkit.Utilities.Solvers;
+using System.Collections;
using UnityEngine;
namespace Microsoft.MixedReality.Toolkit.UI
{
+ ///
+ /// A utility script for toggling the 'Follow Me' behavior by activating/deactivating the Radial View Solver.
+ /// This script also provides optional toggle at specified distance.
+ ///
[RequireComponent(typeof(RadialView))]
public class FollowMeToggle : MonoBehaviour
{
+ ///
+ /// An optional object for visualizing the 'Follow Me' mode state.
+ ///
+ public GameObject VisualizationObject
+ {
+ get { return visualizationObject; }
+ set { visualizationObject = value; }
+ }
+
[SerializeField]
- [Tooltip("An opional object for visualizing the 'Follow Me' mode state")]
+ [Tooltip("An optional object for visualizing the 'Follow Me' mode state.")]
private GameObject visualizationObject = null;
+ ///
+ /// An optional Interactable to select/deselect when toggling the follow behavior.
+ ///
+ public Interactable InteractableObject
+ {
+ get { return interactableObject; }
+ set { interactableObject = value; }
+ }
+
+ [SerializeField]
+ [Tooltip("An optional Interactable to select/deselect when toggling the follow behavior.")]
+ private Interactable interactableObject = null;
+
+ ///
+ /// Should following be automatically enabled when the user is further than a certain distance away?
+ ///
+ public bool AutoFollowAtDistance
+ {
+ get { return autoFollowAtDistance; }
+ set
+ {
+ autoFollowAtDistance = value;
+
+ if (autoFollowAtDistance)
+ {
+ if (autoFollowDistanceCheck == null)
+ {
+ autoFollowDistanceCheck = StartCoroutine(AutoFollowDistanceCheck());
+ }
+ }
+ else
+ {
+ if (autoFollowDistanceCheck != null)
+ {
+ StopCoroutine(autoFollowDistanceCheck);
+ autoFollowDistanceCheck = null;
+ }
+ }
+ }
+ }
+
+ [SerializeField]
+ [Tooltip("Should following be automatically enabled when the user is further than a certain distance away?")]
+ private bool autoFollowAtDistance = false;
+
+ ///
+ /// If autoFollowAtDistance is enabled, what distance to trigger auto following at.
+ ///
+ public float AutoFollowDistance
+ {
+ get { return autoFollowDistance; }
+ set { autoFollowDistance = value; }
+ }
+
+ [SerializeField]
+ [Tooltip("If autoFollowAtDistance is enabled, what distance to trigger auto following at.")]
+ private float autoFollowDistance = 2.0f;
+
+ ///
+ /// Optional transform to use when using autoFollowAtDistance. If not specified the local transform is used.
+ ///
+ public Transform AutoFollowTransformTarget
+ {
+ get { return autoFollowTransformTarget; }
+ set
+ {
+ autoFollowTransformTarget = value;
+
+ if (autoFollowTransformTarget == null)
+ {
+ autoFollowTransformTarget = transform;
+ }
+ }
+ }
+
+ [SerializeField]
+ [Tooltip("Optional transform to use when using autoFollowAtDistance. If not specified the local transform is used.")]
+ private Transform autoFollowTransformTarget = null;
+
private RadialView radialView = null;
+ private Coroutine autoFollowDistanceCheck = null;
- private void Start()
+ #region MonoBehaviour Implementation
+
+ private void Awake()
{
- // Get Radial Solver component
radialView = GetComponent();
+
+ if (autoFollowTransformTarget == null)
+ {
+ autoFollowTransformTarget = transform;
+ }
+
+ // Begin the follow coroutine if requested at the beginning.
+ AutoFollowAtDistance = autoFollowAtDistance;
+ }
+
+ private void OnValidate()
+ {
+ // When playing make sure the coroutine starts and stops based on inspector updates.
+ if (Application.isPlaying)
+ {
+ AutoFollowAtDistance = autoFollowAtDistance;
+ }
}
+ #endregion MonoBehaviour Implementation
+
+ ///
+ /// Toggles the current follow behavior of the solver.
+ ///
public void ToggleFollowMeBehavior()
{
if (radialView != null)
+ {
+ SetFollowMeBehavior(!radialView.enabled);
+ }
+ }
+
+ ///
+ /// Enables or disables the solver based on the follow parameter.
+ ///
+ /// True if the solver should be active.
+ public void SetFollowMeBehavior(bool follow)
+ {
+ if (radialView != null && radialView.enabled != follow)
{
// Toggle Radial Solver component
// You can tweak the detailed positioning behavior such as offset, lerping time, orientation type in the Inspector panel
- radialView.enabled = !radialView.enabled;
+ radialView.enabled = follow;
- if(visualizationObject != null)
+ if (visualizationObject != null)
{
- visualizationObject.SetActive(radialView.enabled);
+ visualizationObject.SetActive(follow);
+ }
+
+ if (interactableObject != null)
+ {
+ interactableObject.IsToggled = follow;
}
}
+ }
+ ///
+ /// Coroutine which checks how far away this transform is from the user and enables the follow behavior at a specified distance.
+ ///
+ /// Coroutine enumerator.
+ private IEnumerator AutoFollowDistanceCheck()
+ {
+ while (true)
+ {
+ var mainCamera = CameraCache.Main;
+
+ if (mainCamera != null)
+ {
+ float autoFollowDistanceSq = autoFollowDistance * autoFollowDistance;
+
+ if (autoFollowTransformTarget != null)
+ {
+ if ((mainCamera.transform.position - autoFollowTransformTarget.position).sqrMagnitude >= autoFollowDistanceSq)
+ {
+ SetFollowMeBehavior(true);
+ }
+ }
+ }
+ yield return null;
+ }
}
}
}
\ No newline at end of file
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/HandInteractionPanZoom.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/HandInteractionPanZoom.cs
index 1e62e4c9c54..a1fc02b9180 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/HandInteractionPanZoom.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/HandInteractionPanZoom.cs
@@ -150,6 +150,7 @@ private bool scaleActive
private Dictionary handDataMap = new Dictionary();
List uvs = new List();
List uvsOrig = new List();
+ private bool oldIsTargetPositionLockedOnFocusLock;
#endregion Private Properties
///
@@ -292,9 +293,11 @@ private void Initialize()
}
else
{
- if (this.GetComponent()?.material?.mainTexture != null)
+ Renderer renderer = this.GetComponent();
+ Material material = (renderer != null) ? renderer.material : null;
+ if ((material != null) && (material.mainTexture != null))
{
- this.GetComponent().material.mainTexture.wrapMode = TextureWrapMode.Repeat;
+ material.mainTexture.wrapMode = TextureWrapMode.Repeat;
}
}
@@ -466,8 +469,12 @@ private void SetAffordancesActive(bool active)
rightPoint.SetActive(affordancesVisible);
}
- currentMaterial?.SetColor(proximityLightCenterColorID, active ? proximityLightCenterColor : defaultProximityLightCenterColor);
+ if (currentMaterial != null)
+ {
+ currentMaterial.SetColor(proximityLightCenterColorID, active ? proximityLightCenterColor : defaultProximityLightCenterColor);
+ }
}
+
private Vector3 GetContactForHand(Handedness hand)
{
Vector3 handPoint = Vector3.zero;
@@ -750,7 +757,11 @@ private void RaisePanning(uint sourceId)
#region BaseFocusHandler Methods
+
+ ///
public override void OnFocusEnter(FocusEventData eventData) { }
+
+ ///
public override void OnFocusExit(FocusEventData eventData)
{
EndAllTouches();
@@ -784,6 +795,11 @@ public void OnTouchUpdated(HandTrackingInputEventData eventData) { }
///
public void OnPointerDown(MixedRealityPointerEventData eventData)
{
+ oldIsTargetPositionLockedOnFocusLock = eventData.Pointer.IsTargetPositionLockedOnFocusLock;
+ if (! (eventData.Pointer is IMixedRealityNearPointer) && eventData.Pointer.Controller.IsRotationAvailable)
+ {
+ eventData.Pointer.IsTargetPositionLockedOnFocusLock = false;
+ }
SetAffordancesActive(false);
EndTouch(eventData.SourceId);
SetHandDataFromController(eventData.Pointer.Controller, eventData.Pointer, false);
@@ -791,6 +807,7 @@ public void OnPointerDown(MixedRealityPointerEventData eventData)
}
public void OnPointerUp(MixedRealityPointerEventData eventData)
{
+ eventData.Pointer.IsTargetPositionLockedOnFocusLock = oldIsTargetPositionLockedOnFocusLock;
EndTouch(eventData.SourceId);
eventData.Use();
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/DestroyOnAnimationComplete.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/DestroyOnAnimationComplete.cs
new file mode 100644
index 00000000000..6533ce89a73
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/DestroyOnAnimationComplete.cs
@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.UI
+{
+ ///
+ /// Destroys the Game Object after the length of the Animator component.
+ /// Attach this script to any game object with Animator component to destroy on animation complete.
+ ///
+ [RequireComponent(typeof(Animator))]
+ public class DestroyOnAnimationComplete : MonoBehaviour
+ {
+ [SerializeField]
+ [Tooltip("Additional delay after the animation complete")]
+ private float delay = 1.0f;
+ public float Delay
+ {
+ get { return delay; }
+ set { delay = value; }
+ }
+
+ void Start()
+ {
+ Destroy(gameObject, this.GetComponent().GetCurrentAnimatorStateInfo(0).length + delay);
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/DestroyOnAnimationComplete.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/DestroyOnAnimationComplete.cs.meta
new file mode 100644
index 00000000000..8c030f04d2b
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/DestroyOnAnimationComplete.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d0ba356208ebee842b61c465bde80a05
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/SpeechConfirmationTooltip.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/SpeechConfirmationTooltip.cs
new file mode 100644
index 00000000000..6cf24f0bf79
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/SpeechConfirmationTooltip.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.UI
+{
+ ///
+ /// Tooltip used for speech confirmation label. This inherits ToolTip class and provides generic text string interface for the label.
+ /// To create your own speecn cofirmation label, override SpeechConfirmationTooltip and provide SetText(string s) and
+ /// TriggerConfirmationAnimation() functions. Assign the prefab to the SpeechInputHandler.cs
+ ///
+ public class SpeechConfirmationTooltip : ToolTip
+ {
+ public virtual void SetText(string labelText)
+ {
+ ToolTipText = labelText;
+ }
+
+ public virtual void TriggerConfirmedAnimation()
+ {
+ gameObject.GetComponent().SetTrigger("Confirmed");
+ }
+
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/SpeechConfirmationTooltip.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/SpeechConfirmationTooltip.cs.meta
new file mode 100644
index 00000000000..31caf51a5c4
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/SpeechConfirmationTooltip.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 36767500e4f76334a8999a2f5fa5dcc6
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/Easing.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/Easing.cs
index 5dd50c2e979..d91092e0fa6 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/Easing.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/Easing.cs
@@ -29,7 +29,7 @@ public enum BasicEaseCurves { Linear, EaseIn, EaseOut, EaseInOut }
///
- /// The amount of time the ease should run
+ /// The amount of time the ease should run in seconds
///
public float LerpTime = 0.5f;
@@ -41,6 +41,20 @@ public Easing()
Stop();
}
+ ///
+ /// Create Easing object with copied internal properties
+ ///
+ /// Copy of current Easing instance
+ public Easing Copy()
+ {
+ return new Easing()
+ {
+ Curve = this.Curve,
+ Enabled = this.Enabled,
+ LerpTime = this.LerpTime,
+ };
+ }
+
///
/// Update the ease each frame or on Update
///
@@ -67,7 +81,6 @@ public void Start()
///
/// Is the ease currently running?
///
- ///
public bool IsPlaying()
{
return timer < LerpTime;
@@ -84,7 +97,6 @@ public void Stop()
///
/// get the linear ease value
///
- ///
public float GetLinear()
{
return timer / LerpTime;
@@ -93,7 +105,6 @@ public float GetLinear()
///
/// get the ease value based on the animation curve
///
- ///
public float GetCurved()
{
return IsLinear() ? GetLinear() : Curve.Evaluate(GetLinear());
@@ -125,7 +136,6 @@ protected bool IsLinear()
///
/// set the animation curve using a preset
///
- ///
public void SetCurve(BasicEaseCurves curve)
{
AnimationCurve animation = AnimationCurve.Linear(0, 1, 1, 1);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/GazeHandHelper.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/GazeHandHelper.cs
index 27e979dacfa..83a644a65a1 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/GazeHandHelper.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/GazeHandHelper.cs
@@ -67,7 +67,6 @@ public void RemoveSource(InputEventData eventData)
///
/// This function must be called from the OnSourceLost handler in a script implementing the IMixedRealitySourceStateHandler interface.
///
- ///
public void RemoveSource(SourceStateEventData eventData)
{
uint sourceId = eventData.SourceId;
@@ -81,7 +80,6 @@ public void RemoveSource(SourceStateEventData eventData)
///
/// This function must be called from the OnInputChanged handler in a script implementing the .
///
- ///
public void UpdateSource(InputEventData eventData)
{
uint id = eventData.SourceId;
@@ -109,7 +107,6 @@ public void UpdateSource(InputEventData eventData)
///
/// This function returns the number of active hands.
///
- ///
public int GetActiveHandCount()
{
int count = 0;
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/InteractableOnFocus.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/InteractableOnFocus.cs
index 35357d1de38..9e851e35475 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/InteractableOnFocus.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/InteractableOnFocus.cs
@@ -45,7 +45,7 @@ public void Update()
{
foreach (var theme in themes)
{
- theme.OnUpdate((int)State, null, false);
+ theme.OnUpdate((int)State, false);
}
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/RectTransformCubeScaler.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/RectTransformCubeScaler.cs
new file mode 100644
index 00000000000..c07d2da7f31
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/RectTransformCubeScaler.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.Utilities
+{
+ ///
+ /// RectTransforms do not scale 3d objects (such as unit cubes) to fit within their bounds.
+ /// This helper class will apply a scale to fit a unit cube into the bounds specified by the RectTransform.
+ /// The Z component is scaled to the min of the X and Y components.
+ ///
+ [ExecuteInEditMode]
+ [RequireComponent(typeof(RectTransform))]
+ public class RectTransformCubeScaler : MonoBehaviour
+ {
+ private RectTransform rectTransform;
+ private Vector2 prevRectSize = Vector2.zero;
+
+ private void Start()
+ {
+ rectTransform = GetComponent();
+ }
+
+ private void Update()
+ {
+ var size = rectTransform.rect.size;
+
+ if (prevRectSize != size)
+ {
+ prevRectSize = size;
+
+ this.transform.localScale = new Vector3(size.x, size.y, Mathf.Min(size.x, size.y));
+ }
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/RectTransformCubeScaler.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/RectTransformCubeScaler.cs.meta
new file mode 100644
index 00000000000..54bada62885
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/RectTransformCubeScaler.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4ea7dc4a5a95cb84584659cbc5279700
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/ToggleHandVisualisation.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/ToggleHandVisualisation.cs
index 97ba502d9f1..ee1a244f294 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/ToggleHandVisualisation.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/ToggleHandVisualisation.cs
@@ -24,32 +24,34 @@ protected IMixedRealityInputSystem InputSystem
}
}
- void updateHandVisibility()
+ ///
+ /// Initial setting of hand mesh visualization - default is disabled
+ ///
+ private void Start()
{
- MixedRealityHandTrackingProfile handTrackingProfile = InputSystem?.InputSystemProfile?.HandTrackingProfile;
- if (handTrackingProfile != null)
- {
- handTrackingProfile.EnableHandMeshVisualization = isHandMeshVisible;
- handTrackingProfile.EnableHandJointVisualization = isHandJointVisible;
- }
+ UpdateHandVisibility();
}
///
- /// Initial setting of hand mesh visualization - default is disabled
+ /// Updates the hand tracking profile with the current local visualization settings
///
- void Start()
+ private void UpdateHandVisibility()
{
- updateHandVisibility();
+ MixedRealityHandTrackingProfile handTrackingProfile = InputSystem?.InputSystemProfile?.HandTrackingProfile;
+ if (handTrackingProfile != null)
+ {
+ handTrackingProfile.EnableHandMeshVisualization = isHandMeshVisible;
+ handTrackingProfile.EnableHandJointVisualization = isHandJointVisible;
+ }
}
-
///
/// Toggles hand mesh visualization
///
public void OnToggleHandMesh()
{
isHandMeshVisible = !isHandMeshVisible;
- updateHandVisibility();
+ UpdateHandVisibility();
}
///
@@ -58,8 +60,7 @@ public void OnToggleHandMesh()
public void OnToggleHandJoint()
{
isHandJointVisible = !isHandJointVisible;
- updateHandVisibility();
+ UpdateHandVisibility();
}
-
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes.meta
new file mode 100644
index 00000000000..37804b99f05
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1c9c77d861c667145a59087347eea7ee
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core.meta
new file mode 100644
index 00000000000..0445c15edbd
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b84cb143ffdc7bc48862a0d6570a0759
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/Theme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/Theme.cs
new file mode 100644
index 00000000000..ae53b4647c2
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/Theme.cs
@@ -0,0 +1,110 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace Microsoft.MixedReality.Toolkit.UI
+{
+ ///
+ /// Theme scriptableObject for loading theme settings
+ ///
+ [CreateAssetMenu(fileName = "Theme", menuName = "Mixed Reality Toolkit/Theme", order = 1)]
+ public class Theme : ScriptableObject
+ {
+ [FormerlySerializedAs("Settings")]
+ [SerializeField]
+ private List definitions;
+
+ ///
+ /// List of Theme Definition configurations. Each definition defines what type of Theme Engine to create and how to configure it
+ ///
+ public List Definitions
+ {
+ get { return definitions; }
+ set
+ {
+ definitions = value;
+ ValidateDefinitions();
+ }
+ }
+
+ [FormerlySerializedAs("States")]
+ [SerializeField]
+ private States states;
+ ///
+ /// Associated States object to use with this theme. Defines the states available for each Theme to utilize
+ ///
+ public States States
+ {
+ get { return states; }
+ set
+ {
+ states = value;
+ ValidateDefinitions();
+ }
+ }
+
+ ///
+ /// Stores historical values of different ThemeDefinition selections. Useful for editor design
+ /// Each item in list corresponds to item in Definitions list property
+ /// Each Dictionary keeps track of last used ThemeDefinition configuration for a given Theme type (type must extend from InteractableThemeBase)
+ ///
+ public List> History = new List>();
+
+ ///
+ /// Helper function to convert States scriptableobject into an array of available State values
+ ///
+ /// Array of available State values for currently assigned States property in this Theme
+ [System.Obsolete("Use States.StateList instead")]
+ public State[] GetStates()
+ {
+ if (States != null)
+ {
+ return States.StateList.ToArray();
+ }
+
+ return new State[0];
+ }
+
+ ///
+ /// Validate list of ThemeDefinitions with current States object
+ ///
+ public void ValidateDefinitions()
+ {
+ if (Definitions != null && States != null)
+ {
+ int numOfStates = States.StateList.Count;
+ foreach (var definition in Definitions)
+ {
+ // For each theme property with values per possible state
+ // ensure the number of values matches the number of states
+ foreach (ThemeStateProperty p in definition.StateProperties)
+ {
+ if (p.Values.Count != numOfStates)
+ {
+ // Need to fill property with default values to match number of states
+ if (p.Values.Count < numOfStates)
+ {
+ for (int i = p.Values.Count - 1; i < numOfStates; i++)
+ {
+ p.Values.Add(p.Default.Copy());
+ }
+ }
+ else
+ {
+ // Too many property values, remove to match number of states
+ for (int i = p.Values.Count - 1; i >= numOfStates; i--)
+ {
+ p.Values.RemoveAt(i);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/Theme.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/Theme.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/Theme.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/Theme.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeDefinition.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeDefinition.cs
new file mode 100644
index 00000000000..d28d017a6cc
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeDefinition.cs
@@ -0,0 +1,140 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.MixedReality.Toolkit.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace Microsoft.MixedReality.Toolkit.UI
+{
+ ///
+ /// Defines configuration properties and settings to use when initializing a class extending InteractableThemeBase
+ ///
+ [System.Serializable]
+ public struct ThemeDefinition
+ {
+ ///
+ /// Defines the type of Theme to associate with this definition. Type must be a class that extends InteractableThemeBase
+ ///
+ public Type ThemeType
+ {
+ get
+ {
+ if (Type == null)
+ {
+ if (string.IsNullOrEmpty(AssemblyQualifiedName))
+ {
+ var className = ClassName;
+ // Temporary workaround
+ // This is to fix a bug in RC2.1 where the AssemblyQualifiedName was never actually saved.
+ var correctType = TypeCacheUtility.GetSubClasses().Where(s => s?.Name == className);
+ if (!correctType.Any())
+ {
+ return null;
+ }
+
+ AssemblyQualifiedName = correctType.First().AssemblyQualifiedName;
+ }
+
+ Type = Type.GetType(AssemblyQualifiedName);
+ }
+
+ return Type;
+ }
+ set
+ {
+ if (!value.IsSubclassOf(typeof(InteractableThemeBase)))
+ {
+ Debug.LogWarning($"Cannot assign type {value} that does not extend {typeof(InteractableThemeBase)} to ThemeDefinition");
+ return;
+ }
+
+ if (Type != value)
+ {
+ Type = value;
+ ClassName = Type.Name;
+ AssemblyQualifiedName = Type.AssemblyQualifiedName;
+ }
+ }
+ }
+
+ // Unity cannot serialize System.Type, thus must save AssemblyQualifiedName
+ // Field here for Runtime use
+ [NonSerialized]
+ private Type Type;
+
+ [FormerlySerializedAs("Name")]
+ [SerializeField]
+ private string ClassName;
+
+ [SerializeField]
+ private string AssemblyQualifiedName;
+
+ [FormerlySerializedAs("Properties")]
+ [FormerlySerializedAs("StateProperties")]
+ [SerializeField]
+ private List stateProperties;
+ ///
+ /// List of properties with values defined per state index (Example list of colors for different states)
+ ///
+ public List StateProperties
+ {
+ get { return stateProperties; }
+ set { stateProperties = value; }
+ }
+
+ [FormerlySerializedAs("CustomSettings")]
+ [FormerlySerializedAs("CustomProperties")]
+ [SerializeField]
+ private List customProperties;
+ ///
+ /// List of single-value properties defined for the entire Theme engine regardless of the current state
+ ///
+ public List CustomProperties
+ {
+ get { return customProperties; }
+ set { customProperties = value; }
+ }
+
+ [FormerlySerializedAs("Easing")]
+ [SerializeField]
+ private Easing easing;
+ ///
+ /// Object to configure easing between values. Type of Theme Engine, as defined by the ThemeType property, must have IsEasingSupported set to true
+ ///
+ public Easing Easing
+ {
+ get { return easing; }
+ set { easing = value; }
+ }
+
+ ///
+ /// Utility function to generate the default ThemeDefinition configuration for the provided type of Theme engine
+ ///
+ /// type of Theme Engine to build default configuration for
+ /// Default ThemeDefinition configuration for the provided them type
+ public static ThemeDefinition? GetDefaultThemeDefinition() where T : InteractableThemeBase
+ {
+ return GetDefaultThemeDefinition(typeof(T));
+ }
+
+ ///
+ /// Utility function to generate the default ThemeDefinition configuration for the provided type of Theme engine
+ ///
+ /// type of Theme Engine to build default configuration for
+ /// Default ThemeDefinition configuration for the provided them type
+ public static ThemeDefinition? GetDefaultThemeDefinition(Type themeType)
+ {
+ var theme = InteractableThemeBase.CreateTheme(themeType);
+ if (theme != null)
+ {
+ return theme.GetDefaultThemeDefinition();
+ }
+
+ return null;
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertySettings.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeDefinition.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertySettings.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeDefinition.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/ThemeEaseSettings.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeEaseSettings.cs
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/ThemeEaseSettings.cs
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeEaseSettings.cs
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/ThemeEaseSettings.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeEaseSettings.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/ThemeEaseSettings.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeEaseSettings.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableCustomSetting.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeProperty.cs
similarity index 67%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableCustomSetting.cs
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeProperty.cs
index 018484e7aa6..71a95bfb1dc 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableCustomSetting.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeProperty.cs
@@ -1,22 +1,18 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
namespace Microsoft.MixedReality.Toolkit.UI
{
///
/// A simple property with name value and type, used for serialization
/// The custom settings are used in themes to expose properties needed to enhance theme functionality
///
-
+
[System.Serializable]
- public class InteractableCustomSetting
+ public class ThemeProperty
{
public string Name;
- public InteractableThemePropertyValueTypes Type;
- public InteractableThemePropertyValue Value;
+ public ThemePropertyTypes Type;
+ public ThemePropertyValue Value;
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableCustomSetting.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeProperty.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableCustomSetting.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeProperty.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertyValue.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemePropertyValue.cs
similarity index 53%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertyValue.cs
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemePropertyValue.cs
index 199c54e63a9..03999af3171 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertyValue.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemePropertyValue.cs
@@ -8,9 +8,8 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
/// Base values of a theme property, used for serialization
///
-
[System.Serializable]
- public class InteractableThemePropertyValue
+ public class ThemePropertyValue
{
public string Name;
public string String;
@@ -19,6 +18,7 @@ public class InteractableThemePropertyValue
public float Float;
public Texture Texture;
public Material Material;
+ public Shader Shader;
public GameObject GameObject;
public Vector2 Vector2;
public Vector3 Vector3;
@@ -28,6 +28,36 @@ public class InteractableThemePropertyValue
public AudioClip AudioClip;
public Animation Animation;
+ ///
+ /// Create new ThemePropertyValue and copy over internal data
+ ///
+ /// New ThemePropertyValue with identical primitive and reference values as this ThemePropertyValue
+ public ThemePropertyValue Copy()
+ {
+ return new ThemePropertyValue()
+ {
+ Name = this.Name,
+ String = this.String,
+ Bool = this.Bool,
+ Int = this.Int,
+ Float = this.Float,
+ Texture = this.Texture,
+ Material = this.Material,
+ Shader = this.Shader,
+ GameObject = this.GameObject,
+ Vector2 = this.Vector2,
+ Vector3 = this.Vector3,
+ Vector4 = this.Vector4,
+ Color = this.Color,
+ Quaternion = this.Quaternion,
+ AudioClip = this.AudioClip,
+ Animation = this.Animation,
+ };
+ }
+
+ ///
+ /// Reset all fields to default type values
+ ///
public void Reset()
{
Name = string.Empty;
@@ -37,6 +67,7 @@ public void Reset()
Float = 0;
Texture = null;
Material = null;
+ Shader = null;
GameObject = null;
Vector2 = default(Vector2);
Vector3 = default(Vector3);
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertyValue.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemePropertyValue.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertyValue.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemePropertyValue.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertyValueTypes.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemePropertyValueTypes.cs
similarity index 88%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertyValueTypes.cs
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemePropertyValueTypes.cs
index 16d28082faf..d15943179c3 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertyValueTypes.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemePropertyValueTypes.cs
@@ -7,7 +7,8 @@ namespace Microsoft.MixedReality.Toolkit.UI
///
/// Theme property value types used for converting theme values back and forth from serialized objects
///
- public enum InteractableThemePropertyValueTypes {
+ public enum ThemePropertyTypes
+ {
Float,
Int,
Color,
@@ -24,6 +25,7 @@ public enum InteractableThemePropertyValueTypes {
GameObject,
String,
Bool,
- AnimatorTrigger
+ AnimatorTrigger,
+ Shader,
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertyValueTypes.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemePropertyValueTypes.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemePropertyValueTypes.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemePropertyValueTypes.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeStateProperty.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeStateProperty.cs
new file mode 100644
index 00000000000..a3c092ff6c0
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeStateProperty.cs
@@ -0,0 +1,185 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.MixedReality.Toolkit.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace Microsoft.MixedReality.Toolkit.UI
+{
+ ///
+ /// Class to store information about a Theme property that contains values per available state
+ ///
+ [Serializable]
+ public class ThemeStateProperty
+ {
+ [FormerlySerializedAs("Name")]
+ [SerializeField]
+ private string name;
+ ///
+ /// Name of property, useful for comparisons and editor displaying
+ ///
+ public string Name
+ {
+ get { return name; }
+ set { name = value; }
+ }
+
+ [FormerlySerializedAs("Type")]
+ [SerializeField]
+ private ThemePropertyTypes type;
+ ///
+ /// Type of value stored in this property
+ ///
+ public ThemePropertyTypes Type
+ {
+ get { return type; }
+ set { type = value; }
+ }
+
+ [FormerlySerializedAs("Values")]
+ [SerializeField]
+ private List values;
+ ///
+ /// List of values corresponding to every available state
+ ///
+ public List Values
+ {
+ get { return values; }
+ set { values = value; }
+ }
+
+ [FormerlySerializedAs("StartValue")]
+ [SerializeField]
+ private ThemePropertyValue startValue;
+ ///
+ /// The starting value of this property
+ ///
+ public ThemePropertyValue StartValue
+ {
+ get { return startValue; }
+ set { startValue = value; }
+ }
+
+ [FormerlySerializedAs("Default")]
+ [SerializeField]
+ private ThemePropertyValue defaultValue;
+ ///
+ /// Default value to use for this property
+ ///
+ public ThemePropertyValue Default
+ {
+ get { return defaultValue; }
+ set { defaultValue = value; }
+ }
+
+ [FormerlySerializedAs("TargetShader")]
+ [SerializeField]
+ private Shader targetShader;
+ ///
+ /// Shader to target for getting/setting values with this property, if applicable
+ /// Supported by Themes which have AreShadersSupported set to true
+ ///
+ public Shader TargetShader
+ {
+ get { return targetShader; }
+ set { targetShader = value; }
+ }
+
+ [FormerlySerializedAs("ShaderPropertyName")]
+ [SerializeField]
+ private string shaderPropertyName;
+ ///
+ /// Name of the shader property, defined in the TargetShader, to utilize for getting/setting values with this property, if applicable
+ /// Supported by Themes which have AreShadersSupported set to true
+ ///
+ public string ShaderPropertyName
+ {
+ get { return shaderPropertyName; }
+ set { shaderPropertyName = value; }
+ }
+
+ [System.NonSerialized]
+ protected int ShaderPropertyID = -1;
+
+ private static readonly ThemePropertyTypes[] ShaderTypes =
+ { ThemePropertyTypes.Color, ThemePropertyTypes .ShaderFloat, ThemePropertyTypes.ShaderRange, ThemePropertyTypes.Texture};
+
+ ///
+ /// Utility function that determines if the passed property type is supported for shader targeting
+ ///
+ /// type of property value
+ /// true if property type supports shader targeting, false otherwise
+ public static bool IsShaderPropertyType(ThemePropertyTypes type)
+ {
+ return ShaderTypes.Contains(type);
+ }
+
+ ///
+ /// Lazy loads shader property ID from Unity for the ShaderPropertyName
+ ///
+ /// integer key for current shader property to get/set shader values
+ public int GetShaderPropertyId()
+ {
+ if (ShaderPropertyID == -1)
+ {
+ ShaderPropertyID = Shader.PropertyToID(ShaderPropertyName);
+ }
+
+ return ShaderPropertyID;
+ }
+
+ // Properties below are outdated. They remain only for backward compatibility and migration purposes
+ [SerializeField]
+ [Obsolete("Utilize TargetShader and ShaderPropertyName instead")]
+ private int PropId = -1; // i.e OptionIndex
+
+ [SerializeField]
+ [Obsolete("Utilize TargetShader and ShaderPropertyName instead")]
+ private List ShaderOptions = new List();
+
+ [SerializeField]
+ [Obsolete("Utilize TargetShader and ShaderPropertyName instead")]
+ private List ShaderOptionNames = new List();
+
+ [SerializeField]
+ [Obsolete("Utilize TargetShader and ShaderPropertyName instead")]
+ private string ShaderName = "";
+
+ ///
+ /// This temporary function will migrate over the previously set shader data (via the now deprecated properties)
+ /// to the new TargetShader and ShaderPropertyName properties
+ ///
+ public void MigrateShaderData()
+ {
+ // Old shader properties have been deprecated but need to ignore compiler errors for migration code
+#pragma warning disable 612, 618
+ if (ShaderOptions != null && ShaderOptions.Count > 0)
+ {
+ TargetShader = Shader.Find(ShaderName);
+ ShaderPropertyName = ShaderOptionNames[PropId];
+ }
+#pragma warning restore 612, 618
+
+ if (IsShaderPropertyType(Type) && TargetShader == null)
+ {
+ TargetShader = StandardShaderUtility.MrtkStandardShader;
+
+ if (string.IsNullOrEmpty(ShaderPropertyName))
+ {
+ if (Type == ThemePropertyTypes.Color)
+ {
+ ShaderPropertyName = "_Color";
+ }
+ else if (Type == ThemePropertyTypes.Texture)
+ {
+ ShaderPropertyName = "_MainTex";
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemeProperty.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeStateProperty.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableThemeProperty.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/ThemeStateProperty.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/VisualProfile.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/VisualProfile.cs
similarity index 60%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/VisualProfile.cs
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/VisualProfile.cs
index ecf936e0851..e52cfeef6ab 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/VisualProfile.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/VisualProfile.cs
@@ -13,22 +13,29 @@ namespace Microsoft.MixedReality.Toolkit.UI
[Serializable]
public class VisualProfile
{
+ ///
+ /// GameObject to Target
+ ///
public GameObject Target;
+
+ ///
+ /// Theme definition to build
+ ///
public Theme Theme;
+ ///
+ /// Create and initialize Theme Engines with the associated Target and Theme property
+ ///
+ /// List of Theme Engine instances
public List CreateThemeEngines()
{
List results = new List();
if (Theme != null)
{
- foreach (var setting in Theme.Settings)
+ foreach (var definition in Theme.Definitions)
{
- Type themeType = Type.GetType(setting.AssemblyQualifiedName);
- InteractableThemeBase theme = (InteractableThemeBase)Activator.CreateInstance(themeType);
- theme.Init(Target, setting);
-
- results.Add(theme);
+ results.Add(InteractableThemeBase.CreateAndInitTheme(definition, Target));
}
}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/VisualProfile.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/VisualProfile.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/VisualProfile.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/Core/VisualProfile.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States.meta
new file mode 100644
index 00000000000..c1474bca85e
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c48171eb8a0b389429c140b8e6951695
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStateModel.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/BaseStateModel.cs
similarity index 57%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStateModel.cs
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/BaseStateModel.cs
index 4c09af693b9..f14cc9b5ffe 100644
--- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStateModel.cs
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/BaseStateModel.cs
@@ -6,39 +6,19 @@
namespace Microsoft.MixedReality.Toolkit.UI
{
///
- /// State data model, state management and comparison instructions
+ /// Base class for defining state model logic to use in conjunction with the State class
+ /// Allows for retrieving current state mode and comparing states
///
- [System.Serializable]
- public class State
- {
- public string Name;
- public int Index;
- public int Bit;
- public int Value;
- public int ActiveIndex;
-
- public override string ToString()
- {
- return Name;
- }
-
- public int ToInt()
- {
- return Index;
- }
-
- public int ToBit()
- {
- return Bit;
- }
- }
-
- public abstract class InteractableStateModel
+ public abstract class BaseStateModel
{
protected State currentState;
protected List stateList;
protected State[] allStates;
+ ///
+ /// Import the list of states into this state model
+ ///
+ /// list of state objects to import
public void ImportStates(List states)
{
stateList = states;
@@ -49,6 +29,10 @@ public void ImportStates(List states)
}
}
+ ///
+ /// Set the value of the state with given index to on (1)
+ ///
+ /// index of state to access
public virtual void SetStateOn(int index)
{
if (allStates.Length > index && index > 0)
@@ -59,6 +43,10 @@ public virtual void SetStateOn(int index)
}
}
+ ///
+ /// Set the value of the state with given index to off (0)
+ ///
+ /// index of state to access
public virtual void SetStateOff(int index)
{
if (allStates.Length > index && index > 0)
@@ -69,6 +57,11 @@ public virtual void SetStateOff(int index)
}
}
+ ///
+ /// Set value of state with given index to the provided value
+ ///
+ /// index of state to access
+ /// value to set for state
public virtual void SetStateValue(int index, int value)
{
if (allStates.Length > index && index > 0)
@@ -88,6 +81,11 @@ protected virtual void SetStateListValue(int index, int value)
}
}
+ ///
+ /// Get the value of the state with the given index
+ ///
+ /// index of state to access
+ /// value of the state
public int GetStateValue(int index)
{
if (allStates.Length > index && index > 0)
@@ -98,9 +96,14 @@ public int GetStateValue(int index)
return 0;
}
+ ///
+ /// Get the State object with the given index
+ ///
+ /// index of state to access
+ /// State Object at given index
public State GetState(int index)
{
- if (allStates.Length > index && index > 0)
+ if (allStates.Length > index && index >= 0)
{
State state = allStates[index];
return state;
@@ -108,27 +111,43 @@ public State GetState(int index)
return new State();
}
- public InteractableStateModel()
+ public BaseStateModel()
{
}
- public InteractableStateModel(State defaultState)
+ public BaseStateModel(State defaultState)
{
currentState = defaultState;
}
-
- public virtual void SetSate(State state)
+
+ ///
+ /// Set the current state to the provided State object
+ ///
+ /// State object to set
+ public virtual void SetCurrentState(State state)
{
currentState = state;
}
-
+
+ ///
+ /// Return the current State object
+ ///
+ /// Return the current State object
public virtual State CurrentState()
{
return currentState;
}
+ ///
+ /// Compare all state values, set appropriate current State and return that current State
+ ///
+ /// Current State after comparing State values
public abstract State CompareStates();
+ ///
+ /// Get list of available States for this State Model
+ ///
+ /// Array of available State objects
public abstract State[] GetStates();
protected int GetBit()
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStateModel.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/BaseStateModel.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStateModel.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/BaseStateModel.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/State.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/State.cs
new file mode 100644
index 00000000000..6d18cef2211
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/State.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+namespace Microsoft.MixedReality.Toolkit.UI
+{
+ ///
+ /// State data model, state management and comparison instructions
+ ///
+ [System.Serializable]
+ public class State
+ {
+ ///
+ /// Name of state
+ ///
+ public string Name;
+
+ ///
+ /// Index of State in all available state list
+ ///
+ public int Index;
+
+ ///
+ /// Bitwise value of state for comparison
+ ///
+ public int Bit;
+
+ ///
+ /// Current value of state (e.g on/off etc)
+ ///
+ public int Value;
+
+ ///
+ /// Index of state in current list
+ ///
+ public int ActiveIndex;
+
+ ///
+ public override string ToString()
+ {
+ return Name;
+ }
+
+ [System.Obsolete("Use Index property")]
+ public int ToInt()
+ {
+ return Index;
+ }
+
+ [System.Obsolete("Use Bit property")]
+ public int ToBit()
+ {
+ return Bit;
+ }
+
+ ///
+ /// Create copy of current State with identical values
+ ///
+ /// copied instance of this State
+ public State Copy()
+ {
+ return new State()
+ {
+ ActiveIndex = this.ActiveIndex,
+ Bit = this.Bit,
+ Index = this.Index,
+ Name = this.Name,
+ Value = this.Value,
+ };
+ }
+
+ ///
+ /// Returns true if two state objects have identical internal values, false otherwise
+ ///
+ /// other State object to compare against
+ /// true if identical internal values, false otherwise
+ public bool CompareState(State s)
+ {
+ if (s == null)
+ {
+ return false;
+ }
+
+ return this.Name == s.Name
+ && this.Index == s.Index
+ && this.Bit == s.Bit
+ && this.Value == s.Value
+ && this.ActiveIndex == s.ActiveIndex;
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/State.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/State.cs.meta
new file mode 100644
index 00000000000..0cc9edafb5f
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/State.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1bdc9c4b67102714e82dd060728b26f8
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/States.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/States.cs
new file mode 100644
index 00000000000..0ac18f8c8e9
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/States.cs
@@ -0,0 +1,146 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace Microsoft.MixedReality.Toolkit.UI
+{
+ ///
+ /// States scriptableObject for storing available states and related state model
+ ///
+ [CreateAssetMenu(fileName = "States", menuName = "Mixed Reality Toolkit/State", order = 1)]
+ public class States : ScriptableObject
+ {
+ [FormerlySerializedAs("StateList")]
+ [SerializeField]
+ private List stateList = new List();
+
+ ///
+ /// List of available states defined by asset
+ ///
+ public List StateList
+ {
+ get {return stateList;}
+ set { stateList = value; }
+ }
+
+ [FormerlySerializedAs("DefaultIndex")]
+ [SerializeField]
+ private int defaultIndex = 0;
+
+ ///
+ /// Default index into state list
+ ///
+ public int DefaultIndex
+ {
+ get { return defaultIndex; }
+ set { defaultIndex = value; }
+ }
+
+ ///
+ /// Defines the type of State Model to associate with this States asset. Type must be a class that extends InteractableStateModel
+ ///
+ public Type StateModelType
+ {
+ get
+ {
+ if (stateModelType == null)
+ {
+ if (string.IsNullOrEmpty(AssemblyQualifiedName))
+ {
+ return null;
+ }
+
+ stateModelType = Type.GetType(AssemblyQualifiedName);
+ }
+
+ return stateModelType;
+ }
+ set
+ {
+ if (!value.IsSubclassOf(typeof(BaseStateModel)))
+ {
+ Debug.LogWarning($"Cannot assign type {value} that does not extend {typeof(BaseStateModel)} to ThemeDefinition");
+ return;
+ }
+
+ if (stateModelType != value)
+ {
+ stateModelType = value;
+ StateModelClassName = stateModelType.Name;
+ AssemblyQualifiedName = stateModelType.AssemblyQualifiedName;
+ }
+ }
+ }
+
+ // Unity cannot serialize System.Type, thus must save AssemblyQualifiedName
+ // Field here for Runtime use
+ private Type stateModelType;
+
+ [FormerlySerializedAs("StateLogicName")]
+ [SerializeField]
+ private string StateModelClassName;
+
+ [SerializeField]
+ private string AssemblyQualifiedName;
+
+ public States()
+ {
+ // Set default type
+ StateModelType = typeof(InteractableStates);
+ }
+
+ [System.Obsolete("Use the StateList property instead")]
+ public State[] GetStates()
+ {
+ return StateList.ToArray();
+ }
+
+ ///
+ /// Test whether the current States object and the argument States object have the same internal values and configurations
+ ///
+ /// other States object to compare against self
+ /// true if internal list of state values and class configuration matches other, false otherwise
+ public bool Equals(States other)
+ {
+ if (this.StateList.Count != other.StateList.Count
+ || this.StateModelType != other.StateModelType
+ || this.DefaultIndex != other.DefaultIndex)
+ {
+ return false;
+ }
+
+ for (int i = 0; i < this.StateList.Count; i++)
+ {
+ if (!this.StateList[i].CompareState(other.StateList[i]))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ ///
+ /// Create a State Model class and initialize it with the configuration data from this States ScriptableObject
+ ///
+ /// BaseStateModel or inherited class implemention object initialized with the StateList in this ScriptableObject
+ public BaseStateModel CreateStateModel()
+ {
+ BaseStateModel stateLogic = (BaseStateModel)Activator.CreateInstance(StateModelType, StateList[DefaultIndex]);
+
+ List stateListCopy = new List();
+ foreach (State s in StateList)
+ {
+ stateListCopy.Add(s.Copy());
+ }
+
+ stateLogic.ImportStates(stateListCopy);
+
+ return stateLogic;
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/States.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/States.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/States.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/States/States.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines.meta
new file mode 100644
index 00000000000..1aed6a96692
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9afc0722b24d16b41b05bf52bab3c2f5
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableActivateTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableActivateTheme.cs
new file mode 100644
index 00000000000..cead0afb9c9
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableActivateTheme.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.UI
+{
+ ///
+ /// Theme engine that allows control to enable/disable a GameObject based on the current state
+ ///
+ public class InteractableActivateTheme : InteractableThemeBase
+ {
+ ///
+ public override bool IsEasingSupported => false;
+
+ public InteractableActivateTheme()
+ {
+ Types = new Type[] { typeof(Transform) };
+ Name = "Activate Theme";
+ }
+
+ ///
+ public override ThemeDefinition GetDefaultThemeDefinition()
+ {
+ return new ThemeDefinition()
+ {
+ ThemeType = GetType(),
+ StateProperties = new List()
+ {
+ new ThemeStateProperty()
+ {
+ Name = "Activate",
+ Type = ThemePropertyTypes.Bool,
+ Values = new List(),
+ Default = new ThemePropertyValue() { Bool = true }
+ },
+ },
+ CustomProperties = new List(),
+ };
+ }
+
+ ///
+ public override ThemePropertyValue GetProperty(ThemeStateProperty property)
+ {
+ ThemePropertyValue start = new ThemePropertyValue();
+ start.Bool = Host.activeSelf;
+ return start;
+ }
+
+ ///
+ public override void SetValue(ThemeStateProperty property, int index, float percentage)
+ {
+ Host.SetActive(property.Values[index].Bool);
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableActivateTheme.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableActivateTheme.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableActivateTheme.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableActivateTheme.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableAnimatorTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableAnimatorTheme.cs
new file mode 100644
index 00000000000..bd5a27d119f
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableAnimatorTheme.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.UI
+{
+ ///
+ /// ThemeEngine that controls Animator state based on state changes
+ /// Targets first Animator component returned on initialized GameObject
+ ///
+ public class InteractableAnimatorTheme : InteractableThemeBase
+ {
+ private int lastIndex = 0;
+ private Animator controller;
+
+ public InteractableAnimatorTheme()
+ {
+ Types = new Type[] { typeof(Transform) };
+ Name = "AnimatorTheme";
+ }
+
+ ///
+ public override ThemeDefinition GetDefaultThemeDefinition()
+ {
+ return new ThemeDefinition()
+ {
+ ThemeType = GetType(),
+ StateProperties = new List()
+ {
+ new ThemeStateProperty()
+ {
+ Name = "Animator Trigger",
+ Type = ThemePropertyTypes.AnimatorTrigger,
+ Values = new List(),
+ Default = new ThemePropertyValue() { String = "Default" }
+ },
+ },
+ CustomProperties = new List(),
+ };
+ }
+
+ ///
+ public override void Init(GameObject host, ThemeDefinition settings)
+ {
+ base.Init(host, settings);
+ controller = Host.GetComponent();
+ }
+
+ ///
+ public override ThemePropertyValue GetProperty(ThemeStateProperty property)
+ {
+ ThemePropertyValue start = new ThemePropertyValue();
+ start.String = property.Values[lastIndex].String;
+ return start;
+ }
+
+ ///
+ public override void SetValue(ThemeStateProperty property, int index, float percentage)
+ {
+ if(lastIndex != index)
+ {
+ if(controller != null)
+ {
+ controller.SetTrigger(property.Values[index].String);
+ }
+ lastIndex = index;
+ }
+ }
+ }
+}
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAnimatorTheme.cs.meta b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableAnimatorTheme.cs.meta
similarity index 100%
rename from Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAnimatorTheme.cs.meta
rename to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableAnimatorTheme.cs.meta
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableAudioTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableAudioTheme.cs
new file mode 100644
index 00000000000..71c3dc22610
--- /dev/null
+++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/VisualThemes/ThemeEngines/InteractableAudioTheme.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.UI
+{
+ ///
+ /// Theme Engine to play particular audio files based on state changes.
+ /// Add AudioSource component if none is found on initialized GameObject or in children
+ ///
+ public class InteractableAudioTheme : InteractableThemeBase
+ {
+ ///
+ public override bool IsEasingSupported => false;
+
+ private AudioSource audioSource;
+
+ public InteractableAudioTheme()
+ {
+ Types = new Type[] { typeof(Transform) };
+ Name = "Audio Theme";
+ }
+
+ ///
+ public override ThemeDefinition GetDefaultThemeDefinition()
+ {
+ return new ThemeDefinition()
+ {
+ ThemeType = GetType(),
+ StateProperties = new List()
+ {
+ new ThemeStateProperty()
+ {
+ Name = "Audio",
+ Type = ThemePropertyTypes.AudioClip,
+ Values = new List