Skip to content

Commit 5898640

Browse files
Darren-Kelly-UnityDarren-Kelly-Unity
committed
Fix failing test for DefaultInputActions.
1 parent 64d3aed commit 5898640

2 files changed

Lines changed: 54 additions & 28 deletions

File tree

‎Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.cs‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ public @DefaultInputActions()
5656
""expectedControlType"": ""Vector2"",
5757
""processors"": """",
5858
""interactions"": """",
59-
""initialStateCheck"": true
59+
""initialStateCheck"": true,
60+
""priority"": 0
6061
},
6162
{
6263
""name"": ""Look"",
@@ -65,16 +66,18 @@ public @DefaultInputActions()
6566
""expectedControlType"": ""Vector2"",
6667
""processors"": """",
6768
""interactions"": """",
68-
""initialStateCheck"": true
69+
""initialStateCheck"": true,
70+
""priority"": 0
6971
},
7072
{
7173
""name"": ""Fire"",
7274
""type"": ""Button"",
7375
""id"": ""6c2ab1b8-8984-453a-af3d-a3c78ae1679a"",
74-
""expectedControlType"": ""Button"",
76+
""expectedControlType"": """",
7577
""processors"": """",
7678
""interactions"": """",
77-
""initialStateCheck"": false
79+
""initialStateCheck"": false,
80+
""priority"": 0
7881
}
7982
],
8083
""bindings"": [
@@ -311,7 +314,8 @@ public @DefaultInputActions()
311314
""expectedControlType"": ""Vector2"",
312315
""processors"": """",
313316
""interactions"": """",
314-
""initialStateCheck"": false
317+
""initialStateCheck"": false,
318+
""priority"": 0
315319
},
316320
{
317321
""name"": ""Submit"",
@@ -320,7 +324,8 @@ public @DefaultInputActions()
320324
""expectedControlType"": ""Button"",
321325
""processors"": """",
322326
""interactions"": """",
323-
""initialStateCheck"": false
327+
""initialStateCheck"": false,
328+
""priority"": 0
324329
},
325330
{
326331
""name"": ""Cancel"",
@@ -329,7 +334,8 @@ public @DefaultInputActions()
329334
""expectedControlType"": ""Button"",
330335
""processors"": """",
331336
""interactions"": """",
332-
""initialStateCheck"": false
337+
""initialStateCheck"": false,
338+
""priority"": 0
333339
},
334340
{
335341
""name"": ""Point"",
@@ -338,7 +344,8 @@ public @DefaultInputActions()
338344
""expectedControlType"": ""Vector2"",
339345
""processors"": """",
340346
""interactions"": """",
341-
""initialStateCheck"": true
347+
""initialStateCheck"": true,
348+
""priority"": 0
342349
},
343350
{
344351
""name"": ""Click"",
@@ -347,7 +354,8 @@ public @DefaultInputActions()
347354
""expectedControlType"": ""Button"",
348355
""processors"": """",
349356
""interactions"": """",
350-
""initialStateCheck"": true
357+
""initialStateCheck"": true,
358+
""priority"": 0
351359
},
352360
{
353361
""name"": ""ScrollWheel"",
@@ -356,7 +364,8 @@ public @DefaultInputActions()
356364
""expectedControlType"": ""Vector2"",
357365
""processors"": """",
358366
""interactions"": """",
359-
""initialStateCheck"": false
367+
""initialStateCheck"": false,
368+
""priority"": 0
360369
},
361370
{
362371
""name"": ""MiddleClick"",
@@ -365,7 +374,8 @@ public @DefaultInputActions()
365374
""expectedControlType"": ""Button"",
366375
""processors"": """",
367376
""interactions"": """",
368-
""initialStateCheck"": false
377+
""initialStateCheck"": false,
378+
""priority"": 0
369379
},
370380
{
371381
""name"": ""RightClick"",
@@ -374,7 +384,8 @@ public @DefaultInputActions()
374384
""expectedControlType"": ""Button"",
375385
""processors"": """",
376386
""interactions"": """",
377-
""initialStateCheck"": false
387+
""initialStateCheck"": false,
388+
""priority"": 0
378389
},
379390
{
380391
""name"": ""TrackedDevicePosition"",
@@ -383,7 +394,8 @@ public @DefaultInputActions()
383394
""expectedControlType"": ""Vector3"",
384395
""processors"": """",
385396
""interactions"": """",
386-
""initialStateCheck"": false
397+
""initialStateCheck"": false,
398+
""priority"": 0
387399
},
388400
{
389401
""name"": ""TrackedDeviceOrientation"",
@@ -392,7 +404,8 @@ public @DefaultInputActions()
392404
""expectedControlType"": ""Quaternion"",
393405
""processors"": """",
394406
""interactions"": """",
395-
""initialStateCheck"": false
407+
""initialStateCheck"": false,
408+
""priority"": 0
396409
}
397410
],
398411
""bindings"": [

‎Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.inputactions‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"expectedControlType": "Vector2",
1414
"processors": "",
1515
"interactions": "",
16-
"initialStateCheck": true
16+
"initialStateCheck": true,
17+
"priority": 0
1718
},
1819
{
1920
"name": "Look",
@@ -22,16 +23,18 @@
2223
"expectedControlType": "Vector2",
2324
"processors": "",
2425
"interactions": "",
25-
"initialStateCheck": true
26+
"initialStateCheck": true,
27+
"priority": 0
2628
},
2729
{
2830
"name": "Fire",
2931
"type": "Button",
3032
"id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a",
31-
"expectedControlType": "Button",
33+
"expectedControlType": "",
3234
"processors": "",
3335
"interactions": "",
34-
"initialStateCheck": false
36+
"initialStateCheck": false,
37+
"priority": 0
3538
}
3639
],
3740
"bindings": [
@@ -268,7 +271,8 @@
268271
"expectedControlType": "Vector2",
269272
"processors": "",
270273
"interactions": "",
271-
"initialStateCheck": false
274+
"initialStateCheck": false,
275+
"priority": 0
272276
},
273277
{
274278
"name": "Submit",
@@ -277,7 +281,8 @@
277281
"expectedControlType": "Button",
278282
"processors": "",
279283
"interactions": "",
280-
"initialStateCheck": false
284+
"initialStateCheck": false,
285+
"priority": 0
281286
},
282287
{
283288
"name": "Cancel",
@@ -286,7 +291,8 @@
286291
"expectedControlType": "Button",
287292
"processors": "",
288293
"interactions": "",
289-
"initialStateCheck": false
294+
"initialStateCheck": false,
295+
"priority": 0
290296
},
291297
{
292298
"name": "Point",
@@ -295,7 +301,8 @@
295301
"expectedControlType": "Vector2",
296302
"processors": "",
297303
"interactions": "",
298-
"initialStateCheck": true
304+
"initialStateCheck": true,
305+
"priority": 0
299306
},
300307
{
301308
"name": "Click",
@@ -304,7 +311,8 @@
304311
"expectedControlType": "Button",
305312
"processors": "",
306313
"interactions": "",
307-
"initialStateCheck": true
314+
"initialStateCheck": true,
315+
"priority": 0
308316
},
309317
{
310318
"name": "ScrollWheel",
@@ -313,7 +321,8 @@
313321
"expectedControlType": "Vector2",
314322
"processors": "",
315323
"interactions": "",
316-
"initialStateCheck": false
324+
"initialStateCheck": false,
325+
"priority": 0
317326
},
318327
{
319328
"name": "MiddleClick",
@@ -322,7 +331,8 @@
322331
"expectedControlType": "Button",
323332
"processors": "",
324333
"interactions": "",
325-
"initialStateCheck": false
334+
"initialStateCheck": false,
335+
"priority": 0
326336
},
327337
{
328338
"name": "RightClick",
@@ -331,7 +341,8 @@
331341
"expectedControlType": "Button",
332342
"processors": "",
333343
"interactions": "",
334-
"initialStateCheck": false
344+
"initialStateCheck": false,
345+
"priority": 0
335346
},
336347
{
337348
"name": "TrackedDevicePosition",
@@ -340,7 +351,8 @@
340351
"expectedControlType": "Vector3",
341352
"processors": "",
342353
"interactions": "",
343-
"initialStateCheck": false
354+
"initialStateCheck": false,
355+
"priority": 0
344356
},
345357
{
346358
"name": "TrackedDeviceOrientation",
@@ -349,7 +361,8 @@
349361
"expectedControlType": "Quaternion",
350362
"processors": "",
351363
"interactions": "",
352-
"initialStateCheck": false
364+
"initialStateCheck": false,
365+
"priority": 0
353366
}
354367
],
355368
"bindings": [

0 commit comments

Comments
 (0)