-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from bookdude13/ui-enhancements
UI enhancements
- Loading branch information
Showing
7 changed files
with
237 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| using SRVoting.Util; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using UnityEngine; | ||
| using UnityEngine.Events; | ||
| using UnityEngine.UI; | ||
| using VRTK.UnityEventHelper; | ||
|
|
||
| namespace SRVoting.UI | ||
| { | ||
| class VoteDirectionComponent | ||
| { | ||
| private Util.ILogger logger; | ||
| private UnityAction<object, VRTK.InteractableObjectEventArgs> onArrowUse; | ||
| private GameObject arrow; | ||
| private VRTK_InteractableObject_UnityEvents arrowEvents; | ||
| private TMPro.TMP_Text countText; | ||
|
|
||
| public string ArrowName { get; private set; } | ||
| public bool IsUiCreated { get; private set; } = false; | ||
|
|
||
|
|
||
| public VoteDirectionComponent(Util.ILogger logger, string arrowName, UnityAction<object, VRTK.InteractableObjectEventArgs> onArrowUse) | ||
| { | ||
| this.logger = logger; | ||
| ArrowName = arrowName; | ||
| this.onArrowUse = onArrowUse; | ||
| } | ||
|
|
||
| public void DisableEvents() | ||
| { | ||
| arrowEvents?.OnUse?.RemoveAllListeners(); | ||
| } | ||
|
|
||
| public void UpdateUI(bool isActive, bool isMyVote, string text) | ||
| { | ||
| countText.SetText(text); | ||
|
|
||
| if (isMyVote) | ||
| { | ||
| countText.fontStyle = TMPro.FontStyles.Underline; | ||
| countText.color = Color.white; | ||
| } | ||
| else | ||
| { | ||
| countText.fontStyle = TMPro.FontStyles.Normal; | ||
| countText.color = new Color(0.4f, 0.4f, 0.4f, 1.0f); | ||
| } | ||
|
|
||
| if (isActive) | ||
| { | ||
| arrowEvents.OnUse.RemoveAllListeners(); | ||
| arrowEvents.OnUse.AddListener(onArrowUse); | ||
|
|
||
| arrow.GetComponent<Synth.Utils.VRTKButtonHelper>().SetActive(); | ||
| } | ||
| else | ||
| { | ||
| arrowEvents.OnUse.RemoveAllListeners(); | ||
|
|
||
| arrow.GetComponent<Synth.Utils.VRTKButtonHelper>().SetInactive(); | ||
| } | ||
| } | ||
|
|
||
| public void CreateUI( | ||
| Transform parent, | ||
| Transform leftSideReference, | ||
| Transform rightOffsetReference, | ||
| Transform arrowToClone, | ||
| GameObject textReference | ||
| ) | ||
| { | ||
| if (IsUiCreated) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| IsUiCreated = true; | ||
|
|
||
| var container = CreateVoteDirectionContainer(parent, leftSideReference, rightOffsetReference); | ||
| arrow = CreateVoteArrow(container.transform, arrowToClone); | ||
| arrowEvents = arrow.GetComponent<VRTK_InteractableObject_UnityEvents>(); | ||
| countText = CreateVoteCountText(container.transform, arrow, textReference); | ||
| } | ||
|
|
||
| private GameObject CreateVoteDirectionContainer( | ||
| Transform parent, | ||
| Transform leftSideReference, | ||
| Transform rightOffsetReference | ||
| ) | ||
| { | ||
| var voteContainer = new GameObject("srvoting_container"); | ||
| voteContainer.transform.SetParent(parent, false); | ||
| voteContainer.transform.localPosition = leftSideReference.localPosition + rightOffsetReference.localPosition + new Vector3(2.0f, 0.0f, 0.0f); | ||
| voteContainer.transform.localRotation = leftSideReference.localRotation; | ||
|
|
||
| return voteContainer; | ||
| } | ||
|
|
||
| private GameObject CreateVoteArrow(Transform voteContainer, Transform arrowToClone) | ||
| { | ||
| // Clone arrow used to actually vote | ||
| var voteArrow = GameObject.Instantiate(arrowToClone, voteContainer.transform); | ||
| voteArrow.name = ArrowName; | ||
| voteArrow.localPosition = Vector3.zero; | ||
| voteArrow.localEulerAngles = arrowToClone.localEulerAngles + new Vector3(0f, 0f, 90f); | ||
|
|
||
| // Replace button event | ||
| var buttonEvents = voteArrow.GetComponent<VRTK_InteractableObject_UnityEvents>(); | ||
| buttonEvents.OnUse.RemoveAllListeners(); | ||
|
|
||
| // 2 persistent listeners not removed by RemoveAllListeners() exist | ||
| // See https://forum.unity.com/threads/documentation-unityevent-removealllisteners-only-removes-non-persistent-listeners.341796/ | ||
| // After trial and error, the one at index 0 controls volume still and needs to be disabled. | ||
| // The one at index 1 still needs to stick around to handle new events | ||
| buttonEvents.OnUse.SetPersistentListenerState(0, UnityEventCallState.Off); | ||
|
|
||
| voteArrow.gameObject.SetActive(true); | ||
| buttonEvents.OnUse.AddListener(onArrowUse); | ||
|
|
||
| logger.Debug($"Arrow added"); | ||
| return voteArrow.gameObject; | ||
| } | ||
|
|
||
| private TMPro.TMP_Text CreateVoteCountText(Transform voteContainer, GameObject voteArrow, GameObject textReference) | ||
| { | ||
| var voteCountText = GameObject.Instantiate(textReference, voteContainer); | ||
| voteCountText.name = voteArrow.name + "_text"; | ||
| voteCountText.transform.localPosition = voteArrow.transform.localPosition + new Vector3(1.2f, 0.0f, 0.0f); | ||
| voteCountText.transform.eulerAngles = textReference.transform.eulerAngles; | ||
|
|
||
| var text = voteCountText.GetComponent<TMPro.TMP_Text>(); | ||
| text.SetText("#####"); | ||
| text.alignment = TMPro.TextAlignmentOptions.Left; | ||
|
|
||
| logger.Debug("Text added"); | ||
| return text; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.