3D Keyboard #765
3D Keyboard #765
Conversation
[~] Updated SymbolDisableHighlight to also take an image
Merging changes from upstream HTK into fork for keyboard
… will remove before rebasing.
Merging changes from HoloToolkit master
… carat. [~] Still need to resolve double input issue and overlap with input modules
[^] Updated scene and moved to under the tests directory
| @@ -39,9 +39,21 @@ GraphicsSettings: | |||
| m_PreloadedShaders: [] | |||
| m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, | |||
| type: 0} | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
What's the best way to revert? I thought I had but obviously not. D'oh!
thanks,
-pat
| iOSRenderExtraFrameOnPause: 1 | ||
| >>>>>>> ea6c94daea2cfe3366daef3abbd09d429b0f439e |
ProjectSettings/ProjectVersion.txt
Outdated
| m_EditorVersion: 5.6.2f1 | ||
| >>>>>>> e884de114b8d267c45b534bab5894651c8ff4d90 |
|
Settings should all now be reverted. |
| [HideInInspector] | ||
| public Vector3 TargetPoint; | ||
|
|
||
| float GetAxis(Vector3 v) |
There was a problem hiding this comment.
nit: explicit access modifiers. (Is this public or private?)
| /// <summary> | ||
| /// Use late update to track the input slider | ||
| /// </summary> | ||
| public void LateUpdate() |
There was a problem hiding this comment.
nit: All the Unity API methods should be private, not public.
| /// </summary> | ||
| private Keyboard m_Keyboard; | ||
|
|
||
|
|
There was a problem hiding this comment.
nit: extra line space
| private void Start() | ||
| { | ||
| m_Keyboard = this.GetComponentInParent<Keyboard>(); | ||
| this.UpdateState(); |
There was a problem hiding this comment.
nit: this. is implied, we can safely remove it.
|
|
||
| #if UNITY_EDITOR | ||
| [CustomEditor(typeof(KeyboardInputField))] | ||
| public class KeyboardInputFieldEditor : Editor |
There was a problem hiding this comment.
This should be broken out into it's own file, in an Editor folder.
| /// The color to switch to when the button is disabled. | ||
| /// </summary> | ||
| [SerializeField] | ||
| private Color m_DisabledColor = Color.grey; |
There was a problem hiding this comment.
nit: tab formatting
|
|
||
| this.UpdateState(); | ||
|
|
||
|
|
| /// </summary> | ||
| public List<RectTransform> Items { get; private set; } | ||
|
|
||
| void Awake() |
There was a problem hiding this comment.
nit: explicit private access modifier for Unity APIs
| float columnHeight = 0.0f; | ||
| float maxPanelWidth = 0.0f; | ||
|
|
||
| foreach (RectTransform item in Items) |
There was a problem hiding this comment.
We could switch to a for seeing as this is in an update loop.
| // Ensure the anchors and pivot are set properly for positioning in the UICollection | ||
| item.anchorMin = new Vector2(0.0f, 1.0f); | ||
| item.anchorMax = new Vector2(0.0f, 1.0f); | ||
| item.pivot = new Vector2(0.0f, 1.0f); |
There was a problem hiding this comment.
We could cache this vector allocation as well bc of the loop.
| /// <summary> | ||
| /// Initialize key text, subscribe to the onClick event, and subscribe to keyboard shift event. | ||
| /// </summary> | ||
| void Start() |
| UpdateLayout(); | ||
| } | ||
|
|
||
| private void _AddItem(RectTransform item) |
There was a problem hiding this comment.
Why does this method have an underscore prefix?
|
|
||
| protected virtual void UpdateLayout() | ||
| { | ||
| RectTransform rectTransform = GetComponent<RectTransform>(); |
There was a problem hiding this comment.
Nit: we should cache this component as a private field in awake or start.
| UpdateLayout(); | ||
| } | ||
|
|
||
| void Update() |
|
Hi @StephenHodgson, I should have addressed all our comments with what's currently committed. Please let me know if you see anything else. Also let me know if you have any input on the keyboard itself if you've had the chance to test it. thanks, |
|
Hey Pat, sorry I won't be able to have the chance to test until later today. |
|
No problem, I just wanted to make sure I didn't miss anything :). Thanks Stephen! |
| { | ||
| public enum LayoutType | ||
| { | ||
| Alpha, |
There was a problem hiding this comment.
Oh I see it in the variable names below.
| Items.Add(item); | ||
|
|
||
| item.SetParent(transform); | ||
| item.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); |
|
Awesome! Once it is merged, I'll do visual fit & finish pass and look into the possibility of adding Japanese Keyboard too. (#735) |
|
@StephenHodgson will wait on you to approve and then merge. |
3D Keyboard
This is the added 3D keyboard for text entry. The keyboard and KeyboardInputField support different styles of keyboard to be targeted. Currently there is a bug with getting HoloLens Input Module to not create double input (https://forums.hololens.com/discussion/6999/ui-button-on-click-event-firing-twice).