Skip to content

Commit 44c868b

Browse files
omundyomundy
committed
Merge branch 'player-ui'
2 parents 715ff46 + 95ea4f2 commit 44c868b

File tree

6 files changed

+17409
-47
lines changed

6 files changed

+17409
-47
lines changed

‎Assets/_Project/Input/TallyInputSystem.cs‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,14 @@ public @TallyInputSystem()
320320
""expectedControlType"": ""Button"",
321321
""processors"": """",
322322
""interactions"": """"
323+
},
324+
{
325+
""name"": ""Tap"",
326+
""type"": ""Value"",
327+
""id"": ""b7d0dfea-7e61-4761-a836-497cf05c647c"",
328+
""expectedControlType"": ""Vector2"",
329+
""processors"": """",
330+
""interactions"": """"
323331
}
324332
],
325333
""bindings"": [
@@ -334,6 +342,39 @@ public @TallyInputSystem()
334342
""isComposite"": false,
335343
""isPartOfComposite"": false
336344
},
345+
{
346+
""name"": ""1D Axis"",
347+
""id"": ""e5355b1f-39ef-4c6d-a27d-5bcf356d2b66"",
348+
""path"": ""1DAxis"",
349+
""interactions"": """",
350+
""processors"": """",
351+
""groups"": """",
352+
""action"": ""HorizontalMovement"",
353+
""isComposite"": true,
354+
""isPartOfComposite"": false
355+
},
356+
{
357+
""name"": ""negative"",
358+
""id"": ""ef1b0302-cb75-477d-95a2-1f8be034fdf1"",
359+
""path"": ""<Keyboard>/a"",
360+
""interactions"": """",
361+
""processors"": """",
362+
""groups"": """",
363+
""action"": ""HorizontalMovement"",
364+
""isComposite"": false,
365+
""isPartOfComposite"": true
366+
},
367+
{
368+
""name"": ""positive"",
369+
""id"": ""f9f30591-4b95-4b95-a99d-7e7b5a0b39c1"",
370+
""path"": ""<Keyboard>/d"",
371+
""interactions"": """",
372+
""processors"": """",
373+
""groups"": """",
374+
""action"": ""HorizontalMovement"",
375+
""isComposite"": false,
376+
""isPartOfComposite"": true
377+
},
337378
{
338379
""name"": """",
339380
""id"": ""0eedeee7-12a6-43cc-8b26-b98282ae10c7"",
@@ -345,6 +386,39 @@ public @TallyInputSystem()
345386
""isComposite"": false,
346387
""isPartOfComposite"": false
347388
},
389+
{
390+
""name"": ""1D Axis"",
391+
""id"": ""85ef5a22-d686-44be-acef-bc63c9c90cbd"",
392+
""path"": ""1DAxis"",
393+
""interactions"": """",
394+
""processors"": """",
395+
""groups"": """",
396+
""action"": ""VerticalMovement"",
397+
""isComposite"": true,
398+
""isPartOfComposite"": false
399+
},
400+
{
401+
""name"": ""negative"",
402+
""id"": ""86337789-af6e-4e07-856d-a0b66bc1c7ca"",
403+
""path"": ""<Keyboard>/s"",
404+
""interactions"": """",
405+
""processors"": """",
406+
""groups"": """",
407+
""action"": ""VerticalMovement"",
408+
""isComposite"": false,
409+
""isPartOfComposite"": true
410+
},
411+
{
412+
""name"": ""positive"",
413+
""id"": ""0200a15f-5241-4a7a-9572-fd6a5d91f759"",
414+
""path"": ""<Keyboard>/w"",
415+
""interactions"": """",
416+
""processors"": """",
417+
""groups"": """",
418+
""action"": ""VerticalMovement"",
419+
""isComposite"": false,
420+
""isPartOfComposite"": true
421+
},
348422
{
349423
""name"": """",
350424
""id"": ""91bc4016-3b05-4f64-991d-f468db222b53"",
@@ -432,6 +506,61 @@ public @TallyInputSystem()
432506
""action"": ""ZoomOut"",
433507
""isComposite"": false,
434508
""isPartOfComposite"": false
509+
},
510+
{
511+
""name"": ""SwipeUp"",
512+
""id"": ""0dd22a9f-9c48-457b-af52-093b60a2d763"",
513+
""path"": ""1DAxis"",
514+
""interactions"": """",
515+
""processors"": """",
516+
""groups"": """",
517+
""action"": ""ZoomIn"",
518+
""isComposite"": true,
519+
""isPartOfComposite"": false
520+
},
521+
{
522+
""name"": ""positive"",
523+
""id"": ""b5a9229d-d71d-408d-8a2f-c03dba49497f"",
524+
""path"": ""<Touchscreen>/delta/y"",
525+
""interactions"": """",
526+
""processors"": ""AxisDeadzone(min=20,max=50)"",
527+
""groups"": """",
528+
""action"": ""ZoomIn"",
529+
""isComposite"": false,
530+
""isPartOfComposite"": true
531+
},
532+
{
533+
""name"": ""SwipeDown"",
534+
""id"": ""d7b94bd9-6906-4154-a7b3-1bcb7fb4facc"",
535+
""path"": ""1DAxis"",
536+
""interactions"": """",
537+
""processors"": """",
538+
""groups"": """",
539+
""action"": ""ZoomOut"",
540+
""isComposite"": true,
541+
""isPartOfComposite"": false
542+
},
543+
{
544+
""name"": ""positive"",
545+
""id"": ""f27b491d-2e23-470d-8108-b53702dcc2aa"",
546+
""path"": ""<Touchscreen>/delta/y"",
547+
""interactions"": """",
548+
""processors"": ""Invert,AxisDeadzone(min=20,max=50)"",
549+
""groups"": """",
550+
""action"": ""ZoomOut"",
551+
""isComposite"": false,
552+
""isPartOfComposite"": true
553+
},
554+
{
555+
""name"": """",
556+
""id"": ""2cad8674-651e-4f79-943a-a423904d9aa7"",
557+
""path"": ""<Touchscreen>/primaryTouch/startPosition"",
558+
""interactions"": """",
559+
""processors"": """",
560+
""groups"": """",
561+
""action"": ""Tap"",
562+
""isComposite"": false,
563+
""isPartOfComposite"": false
435564
}
436565
]
437566
}
@@ -462,6 +591,7 @@ public @TallyInputSystem()
462591
m_Player_SelectRight = m_Player.FindAction("SelectRight", throwIfNotFound: true);
463592
m_Player_ZoomIn = m_Player.FindAction("ZoomIn", throwIfNotFound: true);
464593
m_Player_ZoomOut = m_Player.FindAction("ZoomOut", throwIfNotFound: true);
594+
m_Player_Tap = m_Player.FindAction("Tap", throwIfNotFound: true);
465595
}
466596

467597
public void Dispose()
@@ -663,6 +793,7 @@ public void SetCallbacks(IUIActions instance)
663793
private readonly InputAction m_Player_SelectRight;
664794
private readonly InputAction m_Player_ZoomIn;
665795
private readonly InputAction m_Player_ZoomOut;
796+
private readonly InputAction m_Player_Tap;
666797
public struct PlayerActions
667798
{
668799
private @TallyInputSystem m_Wrapper;
@@ -673,6 +804,7 @@ public struct PlayerActions
673804
public InputAction @SelectRight => m_Wrapper.m_Player_SelectRight;
674805
public InputAction @ZoomIn => m_Wrapper.m_Player_ZoomIn;
675806
public InputAction @ZoomOut => m_Wrapper.m_Player_ZoomOut;
807+
public InputAction @Tap => m_Wrapper.m_Player_Tap;
676808
public InputActionMap Get() { return m_Wrapper.m_Player; }
677809
public void Enable() { Get().Enable(); }
678810
public void Disable() { Get().Disable(); }
@@ -700,6 +832,9 @@ public void SetCallbacks(IPlayerActions instance)
700832
@ZoomOut.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnZoomOut;
701833
@ZoomOut.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnZoomOut;
702834
@ZoomOut.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnZoomOut;
835+
@Tap.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTap;
836+
@Tap.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTap;
837+
@Tap.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTap;
703838
}
704839
m_Wrapper.m_PlayerActionsCallbackInterface = instance;
705840
if (instance != null)
@@ -722,6 +857,9 @@ public void SetCallbacks(IPlayerActions instance)
722857
@ZoomOut.started += instance.OnZoomOut;
723858
@ZoomOut.performed += instance.OnZoomOut;
724859
@ZoomOut.canceled += instance.OnZoomOut;
860+
@Tap.started += instance.OnTap;
861+
@Tap.performed += instance.OnTap;
862+
@Tap.canceled += instance.OnTap;
725863
}
726864
}
727865
}
@@ -752,5 +890,6 @@ public interface IPlayerActions
752890
void OnSelectRight(InputAction.CallbackContext context);
753891
void OnZoomIn(InputAction.CallbackContext context);
754892
void OnZoomOut(InputAction.CallbackContext context);
893+
void OnTap(InputAction.CallbackContext context);
755894
}
756895
}

‎Assets/_Project/Input/TallyInputSystem.inputactions‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,14 @@
307307
"expectedControlType": "Button",
308308
"processors": "",
309309
"interactions": ""
310+
},
311+
{
312+
"name": "Tap",
313+
"type": "Value",
314+
"id": "b7d0dfea-7e61-4761-a836-497cf05c647c",
315+
"expectedControlType": "Vector2",
316+
"processors": "",
317+
"interactions": ""
310318
}
311319
],
312320
"bindings": [
@@ -321,6 +329,39 @@
321329
"isComposite": false,
322330
"isPartOfComposite": false
323331
},
332+
{
333+
"name": "1D Axis",
334+
"id": "e5355b1f-39ef-4c6d-a27d-5bcf356d2b66",
335+
"path": "1DAxis",
336+
"interactions": "",
337+
"processors": "",
338+
"groups": "",
339+
"action": "HorizontalMovement",
340+
"isComposite": true,
341+
"isPartOfComposite": false
342+
},
343+
{
344+
"name": "negative",
345+
"id": "ef1b0302-cb75-477d-95a2-1f8be034fdf1",
346+
"path": "<Keyboard>/a",
347+
"interactions": "",
348+
"processors": "",
349+
"groups": "",
350+
"action": "HorizontalMovement",
351+
"isComposite": false,
352+
"isPartOfComposite": true
353+
},
354+
{
355+
"name": "positive",
356+
"id": "f9f30591-4b95-4b95-a99d-7e7b5a0b39c1",
357+
"path": "<Keyboard>/d",
358+
"interactions": "",
359+
"processors": "",
360+
"groups": "",
361+
"action": "HorizontalMovement",
362+
"isComposite": false,
363+
"isPartOfComposite": true
364+
},
324365
{
325366
"name": "",
326367
"id": "0eedeee7-12a6-43cc-8b26-b98282ae10c7",
@@ -332,6 +373,39 @@
332373
"isComposite": false,
333374
"isPartOfComposite": false
334375
},
376+
{
377+
"name": "1D Axis",
378+
"id": "85ef5a22-d686-44be-acef-bc63c9c90cbd",
379+
"path": "1DAxis",
380+
"interactions": "",
381+
"processors": "",
382+
"groups": "",
383+
"action": "VerticalMovement",
384+
"isComposite": true,
385+
"isPartOfComposite": false
386+
},
387+
{
388+
"name": "negative",
389+
"id": "86337789-af6e-4e07-856d-a0b66bc1c7ca",
390+
"path": "<Keyboard>/s",
391+
"interactions": "",
392+
"processors": "",
393+
"groups": "",
394+
"action": "VerticalMovement",
395+
"isComposite": false,
396+
"isPartOfComposite": true
397+
},
398+
{
399+
"name": "positive",
400+
"id": "0200a15f-5241-4a7a-9572-fd6a5d91f759",
401+
"path": "<Keyboard>/w",
402+
"interactions": "",
403+
"processors": "",
404+
"groups": "",
405+
"action": "VerticalMovement",
406+
"isComposite": false,
407+
"isPartOfComposite": true
408+
},
335409
{
336410
"name": "",
337411
"id": "91bc4016-3b05-4f64-991d-f468db222b53",
@@ -419,6 +493,61 @@
419493
"action": "ZoomOut",
420494
"isComposite": false,
421495
"isPartOfComposite": false
496+
},
497+
{
498+
"name": "SwipeUp",
499+
"id": "0dd22a9f-9c48-457b-af52-093b60a2d763",
500+
"path": "1DAxis",
501+
"interactions": "",
502+
"processors": "",
503+
"groups": "",
504+
"action": "ZoomIn",
505+
"isComposite": true,
506+
"isPartOfComposite": false
507+
},
508+
{
509+
"name": "positive",
510+
"id": "b5a9229d-d71d-408d-8a2f-c03dba49497f",
511+
"path": "<Touchscreen>/delta/y",
512+
"interactions": "",
513+
"processors": "AxisDeadzone(min=20,max=50)",
514+
"groups": "",
515+
"action": "ZoomIn",
516+
"isComposite": false,
517+
"isPartOfComposite": true
518+
},
519+
{
520+
"name": "SwipeDown",
521+
"id": "d7b94bd9-6906-4154-a7b3-1bcb7fb4facc",
522+
"path": "1DAxis",
523+
"interactions": "",
524+
"processors": "",
525+
"groups": "",
526+
"action": "ZoomOut",
527+
"isComposite": true,
528+
"isPartOfComposite": false
529+
},
530+
{
531+
"name": "positive",
532+
"id": "f27b491d-2e23-470d-8108-b53702dcc2aa",
533+
"path": "<Touchscreen>/delta/y",
534+
"interactions": "",
535+
"processors": "Invert,AxisDeadzone(min=20,max=50)",
536+
"groups": "",
537+
"action": "ZoomOut",
538+
"isComposite": false,
539+
"isPartOfComposite": true
540+
},
541+
{
542+
"name": "",
543+
"id": "2cad8674-651e-4f79-943a-a423904d9aa7",
544+
"path": "<Touchscreen>/primaryTouch/startPosition",
545+
"interactions": "",
546+
"processors": "",
547+
"groups": "",
548+
"action": "Tap",
549+
"isComposite": false,
550+
"isPartOfComposite": false
422551
}
423552
]
424553
}

0 commit comments

Comments
 (0)