Merge pull request #3724 from Railboy/mrtk_tmp_tooltips_update

Tooltips Fixes / Text Mesh Pro Assets

Author: keveleigh

Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Tooltips/Bezier ToolTip.prefab

@@ -88,7 +88,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_Children:
-  - {fileID: 4820497369803348}
+  - {fileID: 3790207408260708166}
   - {fileID: 4104249324394746}
   m_Father: {fileID: 4517565306006688}
   m_RootOrder: 0
@@ -221,10 +221,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c6003f55e36d48db805fa570767ea1e5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  lineStartClamp: 0
-  lineEndClamp: 1
+  lineStartClamp: 0.0001
+  lineEndClamp: 0.9999
   customLineTransform: {fileID: 0}
   loops: 0
+  transformMode: 1
   rotationMode: 1
   flipUpVector: 0
   originOffset: {x: 0, y: 0, z: 0}
@@ -265,7 +266,7 @@ MonoBehaviour:
     position: {x: 0, y: 0, z: 0}
     rotation: {x: 0, y: 0, z: 0, w: 1}
   endPoint:
-    position: {x: 0.5, y: 0.2830029, z: 0}
+    position: {x: 0.5, y: 0.28495353, z: 0}
     rotation: {x: 0, y: 0, z: 0, w: 1}
   upDirection: {x: 0, y: 0.07, z: 0}
   height: 0.21
@@ -340,6 +341,32 @@ MonoBehaviour:
   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: 10306, guid: 0000000000000000f000000000000000, type: 0}
   roundedEdges: 1
   roundedCaps: 1
@@ -382,22 +409,22 @@ LineRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_Positions:
-  - {x: 0.00005, y: 0.000112280795, z: 0}
-  - {x: 0.033376668, y: 0.071221136, z: 0}
-  - {x: 0.066703334, y: 0.13486631, z: 0}
-  - {x: 0.10003, y: 0.1910478, z: 0}
-  - {x: 0.13335668, y: 0.23976561, z: 0}
-  - {x: 0.16668333, y: 0.28101975, z: 0}
-  - {x: 0.20001, y: 0.3148102, z: 0}
-  - {x: 0.23333666, y: 0.34113693, z: 0}
-  - {x: 0.26666334, y: 0.36000004, z: 0}
-  - {x: 0.29999, y: 0.37139943, z: 0}
-  - {x: 0.33331668, y: 0.37533516, z: 0}
-  - {x: 0.36664334, y: 0.37180722, z: 0}
-  - {x: 0.39997, y: 0.36081558, z: 0}
-  - {x: 0.43329665, y: 0.34236026, z: 0}
-  - {x: 0.46662334, y: 0.31644127, z: 0}
-  - {x: 0.49995, y: 0.2830586, z: 0}
+  - {x: 0.00005, y: 0.00011247586, z: 0}
+  - {x: 0.033376668, y: 0.07135135, z: 0}
+  - {x: 0.066703334, y: 0.13512653, z: 0}
+  - {x: 0.10003, y: 0.19143805, z: 0}
+  - {x: 0.13335668, y: 0.24028587, z: 0}
+  - {x: 0.16668333, y: 0.28167, z: 0}
+  - {x: 0.20001, y: 0.31559047, z: 0}
+  - {x: 0.23333666, y: 0.34204724, z: 0}
+  - {x: 0.26666334, y: 0.36104035, z: 0}
+  - {x: 0.29999, y: 0.37256977, z: 0}
+  - {x: 0.33331668, y: 0.37663552, z: 0}
+  - {x: 0.36664334, y: 0.37323758, z: 0}
+  - {x: 0.39997, y: 0.36237597, z: 0}
+  - {x: 0.43329665, y: 0.34405068, z: 0}
+  - {x: 0.46662334, y: 0.31826168, z: 0}
+  - {x: 0.49995, y: 0.28500906, z: 0}
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 0.01
@@ -492,8 +519,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1938448898337100}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.162, y: 0.033002928, z: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.001}
+  m_LocalScale: {x: 0.075, y: 0.015, z: 1}
   m_Children: []
   m_Father: {fileID: 4139348576178690}
   m_RootOrder: 1
@@ -559,6 +586,7 @@ MonoBehaviour:
   lineEndClamp: 1
   customLineTransform: {fileID: 0}
   loops: 0
+  transformMode: 1
   rotationMode: 1
   flipUpVector: 0
   originOffset: {x: 0, y: 0, z: 0}
@@ -800,7 +828,33 @@ MonoBehaviour:
   colorOffset: 0
   widthOffset: 0
   stepMode: 1
-  lineStepCount: 16
+  lineStepCount: 2
+  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: 10306, guid: 0000000000000000f000000000000000, type: 0}
   roundedEdges: 1
   roundedCaps: 1
@@ -813,18 +867,20 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4820497369803348}
-  - component: {fileID: 23913304314907500}
-  - component: {fileID: 102429094617329568}
+  - component: {fileID: 3790207408260708166}
+  - component: {fileID: 7554743645055247269}
+  - component: {fileID: 8999655829618831190}
+  - component: {fileID: 3390949380709017969}
+  - component: {fileID: 4420248255326135869}
   m_Layer: 0
   m_Name: Label
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4820497369803348
-Transform:
+--- !u!224 &3790207408260708166
+RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -837,24 +893,29 @@ Transform:
   m_Father: {fileID: 4139348576178690}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &23913304314907500
+  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: 20, y: 5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!23 &7554743645055247269
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1942671045987180}
   m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
   m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
-  m_RenderingLayerMask: 4294967295
+  m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: a99e8b1ed1154eb58270cc6a18605657, type: 3}
+  - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -874,25 +935,135 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!102 &102429094617329568
-TextMesh:
-  serializedVersion: 3
+--- !u!33 &8999655829618831190
+MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1942671045987180}
-  m_Text: Tooltip Text
-  m_OffsetZ: 0
-  m_CharacterSize: 1
-  m_LineSpacing: 1
-  m_Anchor: 4
-  m_Alignment: 0
-  m_TabSize: 4
-  m_FontSize: 30
-  m_FontStyle: 0
-  m_RichText: 1
-  m_Font: {fileID: 12800000, guid: a99e8b1ed1154eb58270cc6a18605657, type: 3}
-  m_Color:
+  m_Mesh: {fileID: 0}
+--- !u!222 &3390949380709017969
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1942671045987180}
+  m_CullTransparentMesh: 0
+--- !u!114 &4420248255326135869
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1942671045987180}
+  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: Tooltip Text
+  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: 30
+  m_fontSizeBase: 30
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_textAlignment: 544
+  m_isAlignmentEnumConverted: 1
+  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_firstVisibleCharacter: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_textInfo:
+    textComponent: {fileID: 4420248255326135869}
+    characterCount: 12
+    spriteCount: 0
+    spaceCount: 1
+    wordCount: 2
+    linkCount: 0
+    lineCount: 1
+    pageCount: 1
+    materialCount: 1
+  m_havePropertiesChanged: 1
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_spriteAnimator: {fileID: 0}
+  m_isInputParsingRequired: 0
+  m_inputSource: 3
+  m_hasFontAssetChanged: 0
+  m_renderer: {fileID: 0}
+  m_subTextObjects:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  m_maskType: 0