Skip to content

Commit 78e7038

Browse files
committed
Adds legend
1 parent b7f06d8 commit 78e7038

14 files changed

+1457
-10
lines changed

Assets/_Project/Input/TallyInputSystem.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,14 @@ public @TallyInputSystem()
194194
""processors"": """",
195195
""interactions"": """"
196196
},
197+
{
198+
""name"": ""LegendToggle"",
199+
""type"": ""Button"",
200+
""id"": ""e86e3c98-d0cf-4fc0-a4f5-8b429f676d00"",
201+
""expectedControlType"": ""Button"",
202+
""processors"": """",
203+
""interactions"": """"
204+
},
197205
{
198206
""name"": ""FeedToggle"",
199207
""type"": ""Button"",
@@ -266,6 +274,17 @@ public @TallyInputSystem()
266274
""action"": ""TimelineToggle"",
267275
""isComposite"": false,
268276
""isPartOfComposite"": false
277+
},
278+
{
279+
""name"": """",
280+
""id"": ""8c7ae6a2-a730-4579-99b8-8c05c4e88196"",
281+
""path"": ""<Keyboard>/l"",
282+
""interactions"": """",
283+
""processors"": """",
284+
""groups"": """",
285+
""action"": ""LegendToggle"",
286+
""isComposite"": false,
287+
""isPartOfComposite"": false
269288
}
270289
]
271290
},
@@ -581,6 +600,7 @@ public @TallyInputSystem()
581600
m_UI = asset.FindActionMap("UI", throwIfNotFound: true);
582601
m_UI_Quit = m_UI.FindAction("Quit", throwIfNotFound: true);
583602
m_UI_ControlToggle = m_UI.FindAction("ControlToggle", throwIfNotFound: true);
603+
m_UI_LegendToggle = m_UI.FindAction("LegendToggle", throwIfNotFound: true);
584604
m_UI_FeedToggle = m_UI.FindAction("FeedToggle", throwIfNotFound: true);
585605
m_UI_TimelineToggle = m_UI.FindAction("TimelineToggle", throwIfNotFound: true);
586606
// Player
@@ -732,6 +752,7 @@ public void SetCallbacks(IDebugActions instance)
732752
private IUIActions m_UIActionsCallbackInterface;
733753
private readonly InputAction m_UI_Quit;
734754
private readonly InputAction m_UI_ControlToggle;
755+
private readonly InputAction m_UI_LegendToggle;
735756
private readonly InputAction m_UI_FeedToggle;
736757
private readonly InputAction m_UI_TimelineToggle;
737758
public struct UIActions
@@ -740,6 +761,7 @@ public struct UIActions
740761
public UIActions(@TallyInputSystem wrapper) { m_Wrapper = wrapper; }
741762
public InputAction @Quit => m_Wrapper.m_UI_Quit;
742763
public InputAction @ControlToggle => m_Wrapper.m_UI_ControlToggle;
764+
public InputAction @LegendToggle => m_Wrapper.m_UI_LegendToggle;
743765
public InputAction @FeedToggle => m_Wrapper.m_UI_FeedToggle;
744766
public InputAction @TimelineToggle => m_Wrapper.m_UI_TimelineToggle;
745767
public InputActionMap Get() { return m_Wrapper.m_UI; }
@@ -757,6 +779,9 @@ public void SetCallbacks(IUIActions instance)
757779
@ControlToggle.started -= m_Wrapper.m_UIActionsCallbackInterface.OnControlToggle;
758780
@ControlToggle.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnControlToggle;
759781
@ControlToggle.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnControlToggle;
782+
@LegendToggle.started -= m_Wrapper.m_UIActionsCallbackInterface.OnLegendToggle;
783+
@LegendToggle.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnLegendToggle;
784+
@LegendToggle.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnLegendToggle;
760785
@FeedToggle.started -= m_Wrapper.m_UIActionsCallbackInterface.OnFeedToggle;
761786
@FeedToggle.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnFeedToggle;
762787
@FeedToggle.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnFeedToggle;
@@ -773,6 +798,9 @@ public void SetCallbacks(IUIActions instance)
773798
@ControlToggle.started += instance.OnControlToggle;
774799
@ControlToggle.performed += instance.OnControlToggle;
775800
@ControlToggle.canceled += instance.OnControlToggle;
801+
@LegendToggle.started += instance.OnLegendToggle;
802+
@LegendToggle.performed += instance.OnLegendToggle;
803+
@LegendToggle.canceled += instance.OnLegendToggle;
776804
@FeedToggle.started += instance.OnFeedToggle;
777805
@FeedToggle.performed += instance.OnFeedToggle;
778806
@FeedToggle.canceled += instance.OnFeedToggle;
@@ -879,6 +907,7 @@ public interface IUIActions
879907
{
880908
void OnQuit(InputAction.CallbackContext context);
881909
void OnControlToggle(InputAction.CallbackContext context);
910+
void OnLegendToggle(InputAction.CallbackContext context);
882911
void OnFeedToggle(InputAction.CallbackContext context);
883912
void OnTimelineToggle(InputAction.CallbackContext context);
884913
}

Assets/_Project/Input/TallyInputSystem.inputactions

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,14 @@
181181
"processors": "",
182182
"interactions": ""
183183
},
184+
{
185+
"name": "LegendToggle",
186+
"type": "Button",
187+
"id": "e86e3c98-d0cf-4fc0-a4f5-8b429f676d00",
188+
"expectedControlType": "Button",
189+
"processors": "",
190+
"interactions": ""
191+
},
184192
{
185193
"name": "FeedToggle",
186194
"type": "Button",
@@ -253,6 +261,17 @@
253261
"action": "TimelineToggle",
254262
"isComposite": false,
255263
"isPartOfComposite": false
264+
},
265+
{
266+
"name": "",
267+
"id": "8c7ae6a2-a730-4579-99b8-8c05c4e88196",
268+
"path": "<Keyboard>/l",
269+
"interactions": "",
270+
"processors": "",
271+
"groups": "",
272+
"action": "LegendToggle",
273+
"isComposite": false,
274+
"isPartOfComposite": false
256275
}
257276
]
258277
},

Assets/_Project/Prefabs/UI/ColorText.prefab

Lines changed: 264 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Prefabs/UI/ColorText.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)