Merge pull request #2314 from brean/june18_dev

Better example for custom Icons for AppBar

Assets/HoloToolkit/UX/Materials/ButtonIconMaterial.mat

@@ -9,7 +9,7 @@ Material:
   m_Name: ButtonIconMaterial
   m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3}
   m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT
-    _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
+    _EMISSION _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -81,7 +81,8 @@ Material:
     - _DirectionalLight: 1
     - _DstBlend: 0
     - _EdgeSmoothingValue: 0.002
-    - _EnableEmission: 0
+    - _EnableEmission: 1
+    - _EnableHoverColorOpaqueOverride: 0
     - _EnableHoverColorOverride: 0
     - _EnableNormalMap: 0
     - _EnvironmentColorIntensity: 0.5
@@ -93,6 +94,7 @@ Material:
     - _Glossiness: 0.5
     - _GlossyReflections: 1
     - _HoverLight: 0
+    - _HoverLightOpaque: 0
     - _InnerGlow: 0
     - _Metallic: 0
     - _Mode: 1
@@ -122,10 +124,11 @@ Material:
     - _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}
-    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissiveColor: {r: 1, g: 1, b: 1, 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: 1, g: 1, b: 1, a: 0.75}
     - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

Assets/HoloToolkit/UX/Prefabs/Buttons/HolographicButton.prefab

@@ -183,6 +183,7 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
   m_Materials:
   - {fileID: 0}
   m_StaticBatchInfo:
@@ -217,6 +218,7 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
   m_Materials:
   - {fileID: 2100000, guid: 1017ef825d041c749bab30bf03aca0d3, type: 2}
   m_StaticBatchInfo:
@@ -251,6 +253,7 @@ MeshRenderer:
   m_MotionVectors: 2
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
+  m_RenderingLayerMask: 4294967295
   m_Materials:
   - {fileID: 2100000, guid: 1c018e76b2657e041976bfa8486880aa, type: 2}
   m_StaticBatchInfo:
@@ -285,6 +288,7 @@ MeshRenderer:
   m_MotionVectors: 2
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
+  m_RenderingLayerMask: 4294967295
   m_Materials:
   - {fileID: 2100000, guid: df4abdb025f6c11489a7f77f9fba8659, type: 2}
   m_StaticBatchInfo:
@@ -398,6 +402,7 @@ MonoBehaviour:
   DisableIcon: 0
   OverrideIcon: 0
   iconName: ObjectCollectionScatter
+  PrefabFromProfile: 0
   iconOverride: {fileID: 0}
   alpha: 1
 --- !u!114 &114549673379926378

Assets/HoloToolkit/UX/Profiles/DefaultButtonIconProfileTexture.asset

@@ -11,7 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 235c7917337f78f4b853694125a79865, type: 3}
   m_Name: DefaultButtonIconProfileTexture
   m_EditorClassIdentifier: Assembly-CSharp:HUX.Buttons:ButtonIconProfileTexture
-  _IconNotFound_: {fileID: 2800000, guid: 2adc8135dd936004db37d5cead85f951, type: 3}
+  _IconNotFound: {fileID: 0}
   AlphaTransitionSpeed: 0.25
   IconMaterial: {fileID: 2100000, guid: 4f37668d794e3694c9ee36b62447d99b, type: 2}
   IconMesh: {fileID: 4300010, guid: c68a88ae5c5b91f41b94c83aa4c4196e, type: 3}
@@ -56,3 +56,8 @@ MonoBehaviour:
   - {fileID: 2800000, guid: fa5e3c121495d23458245aacbc4cc29b, type: 3}
   - {fileID: 2800000, guid: e2d1418e284d6a84791331a768e88c69, type: 3}
   - {fileID: 2800000, guid: 517a5268112b8854e8d807547081e670, type: 3}
+  - {fileID: 2800000, guid: fdac2bce952169d46986bf702e00f2e6, type: 3}
+  - {fileID: 2800000, guid: 5cf198fae044fae47bde3da22d5de95a, type: 3}
+  - {fileID: 2800000, guid: 8867ef317bf86c142897904dbb7a1ac6, type: 3}
+  - {fileID: 2800000, guid: 1756676fd64b61e4a914ffa70233b9a6, type: 3}
+  - {fileID: 2800000, guid: 7029cbbbce5f0ac4dbc4e93267bfddf4, type: 3}

Assets/HoloToolkit/UX/Scripts/AppBar/AppBar.cs

@@ -487,7 +487,7 @@ private static ButtonTemplate GetDefaultButtonTemplateFromType(ButtonTypeEnum ty
                     return new ButtonTemplate(
                         ButtonTypeEnum.Adjust,
                         "Adjust",
-                        "ObjectCollectionScatter", // Replace with your custom icon texture name in HolographicButton prefab
+                        "AppBarAdjust",
                         "Adjust",
                         adjustPosition, // Always next-to-last to appear
                         0);
@@ -496,7 +496,7 @@ private static ButtonTemplate GetDefaultButtonTemplateFromType(ButtonTypeEnum ty
                     return new ButtonTemplate(
                         ButtonTypeEnum.Done,
                         "Done",
-                        "ObjectCollectionScatter", // Replace with your custom icon texture name in HolographicButton prefab
+                        "AppBarDone",
                         "Done",
                         0,
                         0);
@@ -505,7 +505,7 @@ private static ButtonTemplate GetDefaultButtonTemplateFromType(ButtonTypeEnum ty
                     return new ButtonTemplate(
                         ButtonTypeEnum.Hide,
                         "Hide",
-                        "ObjectCollectionScatter", // Replace with your custom icon texture name in HolographicButton prefab
+                        "AppBarHide",
                         "Hide Menu",
                         0, // Always the first to appear
                         0);
@@ -525,7 +525,7 @@ private static ButtonTemplate GetDefaultButtonTemplateFromType(ButtonTypeEnum ty
                     return new ButtonTemplate(
                         ButtonTypeEnum.Remove,
                         "Remove",
-                        "ObjectCollectionScatter", // Replace with your custom icon texture name in HolographicButton prefab
+                        "KeyboardKeyGlyphs_Close",
                         "Remove",
                         removePosition, // Always the last to appear
                         1);
@@ -534,7 +534,7 @@ private static ButtonTemplate GetDefaultButtonTemplateFromType(ButtonTypeEnum ty
                     return new ButtonTemplate(
                         ButtonTypeEnum.Show,
                         "Show",
-                        "ObjectCollectionScatter", // Replace with your custom icon texture name in HolographicButton prefab
+                        "AppBarShow",
                         "Show Menu",
                         0,
                         0);