From bc0b18ace5dedaf58253946a561dfbc14fe43c5d Mon Sep 17 00:00:00 2001 From: Eric Heine <erheine@nps.edu> Date: Thu, 31 Oct 2019 15:11:37 -0700 Subject: [PATCH] Made the Scriptable Variable UI use TextMeshPro input fields and text labels. --- .../Scriptable Variables/ScriptableVariableLabel.cs | 6 +++--- Sane Eric's UI/Scriptable Variables/StringVariableInput.cs | 6 +++--- Sane Eric's UI/Shared.SEUI.asmdef | 5 +++-- package.json | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Sane Eric's UI/Scriptable Variables/ScriptableVariableLabel.cs b/Sane Eric's UI/Scriptable Variables/ScriptableVariableLabel.cs index 0369a46..0c172cc 100644 --- a/Sane Eric's UI/Scriptable Variables/ScriptableVariableLabel.cs +++ b/Sane Eric's UI/Scriptable Variables/ScriptableVariableLabel.cs @@ -1,15 +1,15 @@ using System; using UnityEngine; -using UnityEngine.UI; +using TMPro; namespace Shared.SEUI { // Base class for read only UI for a ScriptableVariable public abstract class ScriptableVariableLabel<T> : MonoBehaviour { [Tooltip("The optional Text where we are putting the variable's name")] - public Text nameLabel; + public TMP_Text nameLabel; [Tooltip("The optional Text where we are putting the variable's value")] - public Text valueLabel; + public TMP_Text valueLabel; [Tooltip("The C# String.Format() string for displaying the value")] public string format; diff --git a/Sane Eric's UI/Scriptable Variables/StringVariableInput.cs b/Sane Eric's UI/Scriptable Variables/StringVariableInput.cs index e6116e2..ae4af34 100644 --- a/Sane Eric's UI/Scriptable Variables/StringVariableInput.cs +++ b/Sane Eric's UI/Scriptable Variables/StringVariableInput.cs @@ -1,6 +1,6 @@ using UnityEngine; using UnityEngine.Events; -using UnityEngine.UI; +using TMPro; using Shared.ScriptableVariables; namespace Shared.SEUI { @@ -11,12 +11,12 @@ namespace Shared.SEUI { public StringVariable variable; [Tooltip("The input UI to edit the variable's value with")] - public InputField input; + public TMP_InputField input; //--------------------------------------------------------------------------- void Start() { // Make sure the input handles the right content type - input.contentType = InputField.ContentType.Standard; + input.contentType = TMP_InputField.ContentType.Standard; } //--------------------------------------------------------------------------- diff --git a/Sane Eric's UI/Shared.SEUI.asmdef b/Sane Eric's UI/Shared.SEUI.asmdef index f13a3f1..1f7f1bd 100644 --- a/Sane Eric's UI/Shared.SEUI.asmdef +++ b/Sane Eric's UI/Shared.SEUI.asmdef @@ -1,9 +1,10 @@ { "name": "Shared.SEUI", "references": [ - "GUID:6735fe1fe1dbd994a96eb9d888b81400" + "GUID:6735fe1fe1dbd994a96eb9d888b81400", + "Unity.TextMeshPro" ], - "optionalUnityReferences": [], + "optionalUnityReferences": [ "TestAssemblies" ], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, diff --git a/package.json b/package.json index 26dce5a..31a7842 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "com.futuretech.shared", "displayName": "FutureTech Shared", "description": "Contains shared items such as the Scriptable Variables.", - "version": "0.1.18", - "unity": "2018.3", + "version": "0.1.19", + "unity": "2019.1", "license": "MIT", "repository": { "type": "git", -- GitLab