diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 6ddc226dbd..b0dc44e136 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -13,15 +13,14 @@ however, it has to be formatted properly to pass verification tests. ### Fixed - Fixed touch pointers being released twice causing an index out of bounds error. [ISXB-687](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-687) - Fixed `NullReferenceException` from disconnecting and reconnecting a GXDKGamepad. +- Fixed wrong mapping of Xbox Series S|X and Xbox One wireless controllers "View" button on macOS.[ISXB-385](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-385) - Fixed "AnalyticsResult" errors on consoles [ISXB-1107] +- Fixed wrong `Display Index` value for touchscreen events.[ISXB-1101](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1101) ### Added - Added the display of the device flag `CanRunInBackground` in device debug view. - Added analytics for programmatic `InputAction` setup via `InputActionSetupExtensions` when exiting play-mode. -### Fixed -- Fixed wrong mapping of Xbox Series S|X and Xbox One wireless controllers "View" button on macOS.[ISXB-385](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-385) - ## [1.11.1] - 2024-09-26 ### Fixed diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs index 3b75a754e5..40a3fd31e0 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs @@ -60,6 +60,9 @@ public FastTouchscreen() // /Touchscreen/press var ctrlTouchscreenpress = Initialize_ctrlTouchscreenpress(kTouchPressLayout, this); + // /Touchscreen/displayIndex + var ctrlTouchscreendisplayIndex = Initialize_ctrlTouchscreendisplayIndex(kIntegerLayout, this); + // /Touchscreen/touch0 var ctrlTouchscreentouch0 = Initialize_ctrlTouchscreentouch0(kTouchLayout, this); @@ -90,9 +93,6 @@ public FastTouchscreen() // /Touchscreen/touch9 var ctrlTouchscreentouch9 = Initialize_ctrlTouchscreentouch9(kTouchLayout, this); - // /Touchscreen/displayIndex - var ctrlTouchscreendisplayIndex = Initialize_ctrlTouchscreendisplayIndex(kIntegerLayout, this); - // /Touchscreen/primaryTouch/touchId var ctrlTouchscreenprimaryTouchtouchId = Initialize_ctrlTouchscreenprimaryTouchtouchId(kIntegerLayout, ctrlTouchscreenprimaryTouch); @@ -973,7 +973,7 @@ public FastTouchscreen() this.radius = ctrlTouchscreenradius; this.pressure = ctrlTouchscreenpressure; this.press = ctrlTouchscreenpress; - this.displayIndex = ctrlTouchscreenprimaryTouchdisplayIndex; + this.displayIndex = ctrlTouchscreendisplayIndex; ctrlTouchscreenprimaryTouch.press = ctrlTouchscreenprimaryTouchpress; ctrlTouchscreenprimaryTouch.displayIndex = ctrlTouchscreenprimaryTouchdisplayIndex; ctrlTouchscreenprimaryTouch.touchId = ctrlTouchscreenprimaryTouchtouchId; @@ -1265,7 +1265,7 @@ public FastTouchscreen() { 32785u, 16810014u, 16810026u, 33587231u, 33587243u, 50364450u, 50364451u, 50364452u, 50364462u, 50364463u , 50364464u, 67141664u, 67141665u, 67141669u, 67141676u, 67141677u, 67141681u, 83918851u, 83918868u, 100696102u - , 100696114u, 117473319u, 117473331u, 134225925u, 134225942u, 134225943u, 138420248u, 142614553u, 142622736u, 146801690u + , 100696114u, 117473319u, 117473331u, 134225925u, 134225942u, 134225943u, 138420248u, 142614534u, 142614553u, 146801690u , 148898843u, 167837724u, 201359400u, 218136617u, 234913844u, 251691073u, 268468290u, 285245509u, 285245510u, 285245511u , 302022723u, 302022724u, 302022728u, 318799927u, 335577161u, 352354378u, 369107001u, 369107002u, 373301307u, 377495612u , 381682749u, 383779902u, 402718783u, 436240459u, 453017676u, 469794893u, 486572122u, 503349339u, 520126558u, 520126559u @@ -1293,162 +1293,161 @@ public FastTouchscreen() builder.WithControlTree(new byte[] { // Control tree nodes as bytes - 63, 19, 1, 0, 0, 0, 0, 192, 8, 3, 0, 0, 0, 0, 63, 19, 5, 1, 0, 0, 0, 128, 3, 5, 0, 0, 0, 0, 192, 8 - , 107, 0, 0, 0, 0, 192, 1, 7, 0, 0, 0, 1, 128, 3, 57, 0, 68, 0, 1, 192, 0, 9, 0, 0, 0, 0, 192, 1, 21, 0 + 63, 19, 1, 0, 0, 0, 0, 192, 8, 3, 0, 0, 0, 0, 63, 19, 1, 1, 0, 0, 0, 128, 3, 5, 0, 0, 0, 0, 192, 8 + , 103, 0, 0, 0, 0, 192, 1, 7, 0, 0, 0, 1, 128, 3, 53, 0, 68, 0, 1, 192, 0, 9, 0, 0, 0, 0, 192, 1, 21, 0 , 0, 0, 0, 96, 0, 11, 0, 0, 0, 0, 192, 0, 15, 0, 0, 0, 0, 32, 0, 255, 255, 1, 0, 1, 96, 0, 13, 0, 2, 0 , 2, 64, 0, 255, 255, 4, 0, 2, 96, 0, 255, 255, 6, 0, 2, 144, 0, 17, 0, 8, 0, 8, 192, 0, 19, 0, 16, 0, 8, 120 - , 0, 255, 255, 24, 0, 6, 144, 0, 255, 255, 30, 0, 6, 168, 0, 255, 255, 36, 0, 2, 192, 0, 255, 255, 38, 0, 2, 32, 1, 23 - , 0, 0, 0, 0, 192, 1, 51, 0, 0, 0, 0, 8, 1, 25, 0, 0, 0, 0, 32, 1, 35, 0, 0, 0, 0, 228, 0, 27, 0, 40 + , 0, 255, 255, 24, 0, 6, 144, 0, 255, 255, 30, 0, 6, 168, 0, 255, 255, 36, 0, 2, 192, 0, 255, 255, 38, 0, 2, 29, 1, 23 + , 0, 0, 0, 0, 192, 1, 47, 0, 0, 0, 0, 8, 1, 25, 0, 0, 0, 0, 29, 1, 35, 0, 0, 0, 0, 228, 0, 27, 0, 40 , 0, 4, 8, 1, 29, 0, 44, 0, 4, 210, 0, 255, 255, 48, 0, 2, 228, 0, 255, 255, 50, 0, 2, 246, 0, 255, 255, 0, 0, 0 , 8, 1, 31, 0, 0, 0, 0, 255, 0, 255, 255, 0, 0, 0, 8, 1, 33, 0, 0, 0, 0, 4, 1, 255, 255, 52, 0, 3, 8, 1 - , 255, 255, 55, 0, 3, 16, 1, 255, 255, 58, 0, 1, 32, 1, 37, 0, 6, 2, 1, 25, 1, 39, 0, 0, 0, 0, 32, 1, 45, 0 - , 0, 0, 0, 21, 1, 255, 255, 59, 0, 1, 25, 1, 41, 0, 60, 0, 1, 23, 1, 255, 255, 0, 0, 0, 25, 1, 43, 0, 0, 0 - , 0, 24, 1, 255, 255, 0, 0, 0, 25, 1, 255, 255, 61, 0, 1, 29, 1, 47, 0, 0, 0, 0, 32, 1, 255, 255, 0, 0, 0, 27 - , 1, 255, 255, 0, 0, 0, 29, 1, 49, 0, 0, 0, 0, 28, 1, 255, 255, 0, 0, 0, 29, 1, 255, 255, 62, 0, 1, 128, 1, 53 - , 0, 0, 0, 0, 192, 1, 55, 0, 65, 0, 1, 80, 1, 255, 255, 63, 0, 1, 128, 1, 255, 255, 64, 0, 1, 160, 1, 255, 255, 66 - , 0, 1, 192, 1, 255, 255, 67, 0, 1, 160, 2, 59, 0, 92, 0, 1, 128, 3, 75, 0, 93, 0, 1, 48, 2, 61, 0, 77, 0, 4 - , 160, 2, 69, 0, 81, 0, 4, 248, 1, 63, 0, 71, 0, 2, 48, 2, 65, 0, 73, 0, 2, 220, 1, 255, 255, 69, 0, 1, 248, 1 - , 255, 255, 70, 0, 1, 32, 2, 67, 0, 0, 0, 0, 48, 2, 255, 255, 0, 0, 0, 12, 2, 255, 255, 75, 0, 1, 32, 2, 255, 255 - , 76, 0, 1, 96, 2, 71, 0, 0, 0, 0, 160, 2, 73, 0, 0, 0, 0, 72, 2, 255, 255, 85, 0, 3, 96, 2, 255, 255, 88, 0 - , 3, 128, 2, 255, 255, 91, 0, 1, 160, 2, 255, 255, 94, 0, 1, 16, 3, 77, 0, 105, 0, 1, 128, 3, 103, 0, 106, 0, 1, 216 - , 2, 79, 0, 0, 0, 0, 16, 3, 87, 0, 0, 0, 0, 188, 2, 255, 255, 95, 0, 1, 216, 2, 81, 0, 96, 0, 1, 200, 2, 83 - , 0, 0, 0, 0, 216, 2, 85, 0, 0, 0, 0, 194, 2, 255, 255, 97, 0, 2, 200, 2, 255, 255, 99, 0, 2, 208, 2, 255, 255, 101 - , 0, 1, 216, 2, 255, 255, 102, 0, 1, 244, 2, 89, 0, 0, 0, 0, 16, 3, 255, 255, 0, 0, 0, 230, 2, 91, 0, 0, 0, 0 - , 244, 2, 255, 255, 0, 0, 0, 223, 2, 93, 0, 0, 0, 0, 230, 2, 255, 255, 0, 0, 0, 220, 2, 95, 0, 0, 0, 0, 223, 2 - , 99, 0, 0, 0, 0, 218, 2, 97, 0, 0, 0, 0, 220, 2, 255, 255, 0, 0, 0, 217, 2, 255, 255, 103, 0, 1, 218, 2, 255, 255 - , 0, 0, 0, 222, 2, 101, 0, 0, 0, 0, 223, 2, 255, 255, 0, 0, 0, 221, 2, 255, 255, 104, 0, 1, 222, 2, 255, 255, 0, 0 - , 0, 72, 3, 255, 255, 107, 0, 2, 128, 3, 105, 0, 109, 0, 2, 100, 3, 255, 255, 111, 0, 1, 128, 3, 255, 255, 112, 0, 1, 0 - , 7, 109, 0, 0, 0, 0, 192, 8, 211, 0, 203, 0, 1, 64, 5, 111, 0, 113, 0, 1, 0, 7, 161, 0, 158, 0, 1, 96, 4, 113 - , 0, 137, 0, 1, 64, 5, 129, 0, 138, 0, 1, 240, 3, 115, 0, 122, 0, 4, 96, 4, 123, 0, 126, 0, 4, 184, 3, 117, 0, 116 - , 0, 2, 240, 3, 119, 0, 118, 0, 2, 156, 3, 255, 255, 114, 0, 1, 184, 3, 255, 255, 115, 0, 1, 224, 3, 121, 0, 0, 0, 0 - , 240, 3, 255, 255, 0, 0, 0, 204, 3, 255, 255, 120, 0, 1, 224, 3, 255, 255, 121, 0, 1, 32, 4, 125, 0, 0, 0, 0, 96, 4 - , 127, 0, 0, 0, 0, 8, 4, 255, 255, 130, 0, 3, 32, 4, 255, 255, 133, 0, 3, 64, 4, 255, 255, 136, 0, 1, 96, 4, 255, 255 - , 139, 0, 1, 208, 4, 131, 0, 150, 0, 1, 64, 5, 157, 0, 151, 0, 1, 152, 4, 133, 0, 0, 0, 0, 208, 4, 141, 0, 0, 0 - , 0, 124, 4, 255, 255, 140, 0, 1, 152, 4, 135, 0, 141, 0, 1, 136, 4, 137, 0, 0, 0, 0, 152, 4, 139, 0, 0, 0, 0, 130 - , 4, 255, 255, 142, 0, 2, 136, 4, 255, 255, 144, 0, 2, 144, 4, 255, 255, 146, 0, 1, 152, 4, 255, 255, 147, 0, 1, 180, 4, 143 - , 0, 0, 0, 0, 208, 4, 255, 255, 0, 0, 0, 166, 4, 145, 0, 0, 0, 0, 180, 4, 255, 255, 0, 0, 0, 159, 4, 147, 0, 0 - , 0, 0, 166, 4, 255, 255, 0, 0, 0, 156, 4, 149, 0, 0, 0, 0, 159, 4, 153, 0, 0, 0, 0, 154, 4, 151, 0, 0, 0, 0 - , 156, 4, 255, 255, 0, 0, 0, 153, 4, 255, 255, 148, 0, 1, 154, 4, 255, 255, 0, 0, 0, 158, 4, 155, 0, 0, 0, 0, 159, 4 - , 255, 255, 0, 0, 0, 157, 4, 255, 255, 149, 0, 1, 158, 4, 255, 255, 0, 0, 0, 8, 5, 255, 255, 152, 0, 2, 64, 5, 159, 0 - , 154, 0, 2, 36, 5, 255, 255, 156, 0, 1, 64, 5, 255, 255, 157, 0, 1, 32, 6, 163, 0, 182, 0, 1, 0, 7, 179, 0, 183, 0 - , 1, 176, 5, 165, 0, 167, 0, 4, 32, 6, 173, 0, 171, 0, 4, 120, 5, 167, 0, 161, 0, 2, 176, 5, 169, 0, 163, 0, 2, 92 - , 5, 255, 255, 159, 0, 1, 120, 5, 255, 255, 160, 0, 1, 160, 5, 171, 0, 0, 0, 0, 176, 5, 255, 255, 0, 0, 0, 140, 5, 255 - , 255, 165, 0, 1, 160, 5, 255, 255, 166, 0, 1, 224, 5, 175, 0, 0, 0, 0, 32, 6, 177, 0, 0, 0, 0, 200, 5, 255, 255, 175 - , 0, 3, 224, 5, 255, 255, 178, 0, 3, 0, 6, 255, 255, 181, 0, 1, 32, 6, 255, 255, 184, 0, 1, 144, 6, 181, 0, 195, 0, 1 - , 0, 7, 207, 0, 196, 0, 1, 88, 6, 183, 0, 0, 0, 0, 144, 6, 191, 0, 0, 0, 0, 60, 6, 255, 255, 185, 0, 1, 88, 6 - , 185, 0, 186, 0, 1, 72, 6, 187, 0, 0, 0, 0, 88, 6, 189, 0, 0, 0, 0, 66, 6, 255, 255, 187, 0, 2, 72, 6, 255, 255 - , 189, 0, 2, 80, 6, 255, 255, 191, 0, 1, 88, 6, 255, 255, 192, 0, 1, 116, 6, 193, 0, 0, 0, 0, 144, 6, 255, 255, 0, 0 - , 0, 102, 6, 195, 0, 0, 0, 0, 116, 6, 255, 255, 0, 0, 0, 95, 6, 197, 0, 0, 0, 0, 102, 6, 255, 255, 0, 0, 0, 92 - , 6, 199, 0, 0, 0, 0, 95, 6, 203, 0, 0, 0, 0, 90, 6, 201, 0, 0, 0, 0, 92, 6, 255, 255, 0, 0, 0, 89, 6, 255 - , 255, 193, 0, 1, 90, 6, 255, 255, 0, 0, 0, 94, 6, 205, 0, 0, 0, 0, 95, 6, 255, 255, 0, 0, 0, 93, 6, 255, 255, 194 - , 0, 1, 94, 6, 255, 255, 0, 0, 0, 200, 6, 255, 255, 197, 0, 2, 0, 7, 209, 0, 199, 0, 2, 228, 6, 255, 255, 201, 0, 1 - , 0, 7, 255, 255, 202, 0, 1, 224, 7, 213, 0, 227, 0, 1, 192, 8, 229, 0, 228, 0, 1, 112, 7, 215, 0, 212, 0, 4, 224, 7 - , 223, 0, 216, 0, 4, 56, 7, 217, 0, 206, 0, 2, 112, 7, 219, 0, 208, 0, 2, 28, 7, 255, 255, 204, 0, 1, 56, 7, 255, 255 - , 205, 0, 1, 96, 7, 221, 0, 0, 0, 0, 112, 7, 255, 255, 0, 0, 0, 76, 7, 255, 255, 210, 0, 1, 96, 7, 255, 255, 211, 0 - , 1, 160, 7, 225, 0, 0, 0, 0, 224, 7, 227, 0, 0, 0, 0, 136, 7, 255, 255, 220, 0, 3, 160, 7, 255, 255, 223, 0, 3, 192 - , 7, 255, 255, 226, 0, 1, 224, 7, 255, 255, 229, 0, 1, 80, 8, 231, 0, 240, 0, 1, 192, 8, 1, 1, 241, 0, 1, 24, 8, 233 - , 0, 0, 0, 0, 80, 8, 241, 0, 0, 0, 0, 252, 7, 255, 255, 230, 0, 1, 24, 8, 235, 0, 231, 0, 1, 8, 8, 237, 0, 0 - , 0, 0, 24, 8, 239, 0, 0, 0, 0, 2, 8, 255, 255, 232, 0, 2, 8, 8, 255, 255, 234, 0, 2, 16, 8, 255, 255, 236, 0, 1 - , 24, 8, 255, 255, 237, 0, 1, 52, 8, 243, 0, 0, 0, 0, 80, 8, 255, 255, 0, 0, 0, 38, 8, 245, 0, 0, 0, 0, 52, 8 - , 255, 255, 0, 0, 0, 31, 8, 247, 0, 0, 0, 0, 38, 8, 255, 255, 0, 0, 0, 28, 8, 249, 0, 0, 0, 0, 31, 8, 253, 0 - , 0, 0, 0, 26, 8, 251, 0, 0, 0, 0, 28, 8, 255, 255, 0, 0, 0, 25, 8, 255, 255, 238, 0, 1, 26, 8, 255, 255, 0, 0 - , 0, 30, 8, 255, 0, 0, 0, 0, 31, 8, 255, 255, 0, 0, 0, 29, 8, 255, 255, 239, 0, 1, 30, 8, 255, 255, 0, 0, 0, 136 - , 8, 255, 255, 242, 0, 2, 192, 8, 3, 1, 244, 0, 2, 164, 8, 255, 255, 246, 0, 1, 192, 8, 255, 255, 247, 0, 1, 0, 14, 7 - , 1, 0, 0, 0, 63, 19, 161, 1, 0, 0, 0, 64, 12, 9, 1, 0, 0, 0, 0, 14, 111, 1, 82, 1, 1, 128, 10, 11, 1, 248 - , 0, 1, 64, 12, 61, 1, 37, 1, 1, 160, 9, 13, 1, 16, 1, 1, 128, 10, 29, 1, 17, 1, 1, 48, 9, 15, 1, 1, 1, 4 - , 160, 9, 23, 1, 5, 1, 4, 248, 8, 17, 1, 251, 0, 2, 48, 9, 19, 1, 253, 0, 2, 220, 8, 255, 255, 249, 0, 1, 248, 8 - , 255, 255, 250, 0, 1, 32, 9, 21, 1, 0, 0, 0, 48, 9, 255, 255, 0, 0, 0, 12, 9, 255, 255, 255, 0, 1, 32, 9, 255, 255 - , 0, 1, 1, 96, 9, 25, 1, 0, 0, 0, 160, 9, 27, 1, 0, 0, 0, 72, 9, 255, 255, 9, 1, 3, 96, 9, 255, 255, 12, 1 - , 3, 128, 9, 255, 255, 15, 1, 1, 160, 9, 255, 255, 18, 1, 1, 16, 10, 31, 1, 29, 1, 1, 128, 10, 57, 1, 30, 1, 1, 216 - , 9, 33, 1, 0, 0, 0, 16, 10, 41, 1, 0, 0, 0, 188, 9, 255, 255, 19, 1, 1, 216, 9, 35, 1, 20, 1, 1, 200, 9, 37 - , 1, 0, 0, 0, 216, 9, 39, 1, 0, 0, 0, 194, 9, 255, 255, 21, 1, 2, 200, 9, 255, 255, 23, 1, 2, 208, 9, 255, 255, 25 - , 1, 1, 216, 9, 255, 255, 26, 1, 1, 244, 9, 43, 1, 0, 0, 0, 16, 10, 255, 255, 0, 0, 0, 230, 9, 45, 1, 0, 0, 0 - , 244, 9, 255, 255, 0, 0, 0, 223, 9, 47, 1, 0, 0, 0, 230, 9, 255, 255, 0, 0, 0, 220, 9, 49, 1, 0, 0, 0, 223, 9 - , 53, 1, 0, 0, 0, 218, 9, 51, 1, 0, 0, 0, 220, 9, 255, 255, 0, 0, 0, 217, 9, 255, 255, 27, 1, 1, 218, 9, 255, 255 - , 0, 0, 0, 222, 9, 55, 1, 0, 0, 0, 223, 9, 255, 255, 0, 0, 0, 221, 9, 255, 255, 28, 1, 1, 222, 9, 255, 255, 0, 0 - , 0, 72, 10, 255, 255, 31, 1, 2, 128, 10, 59, 1, 33, 1, 2, 100, 10, 255, 255, 35, 1, 1, 128, 10, 255, 255, 36, 1, 1, 96 - , 11, 63, 1, 61, 1, 1, 64, 12, 79, 1, 62, 1, 1, 240, 10, 65, 1, 46, 1, 4, 96, 11, 73, 1, 50, 1, 4, 184, 10, 67 - , 1, 40, 1, 2, 240, 10, 69, 1, 42, 1, 2, 156, 10, 255, 255, 38, 1, 1, 184, 10, 255, 255, 39, 1, 1, 224, 10, 71, 1, 0 - , 0, 0, 240, 10, 255, 255, 0, 0, 0, 204, 10, 255, 255, 44, 1, 1, 224, 10, 255, 255, 45, 1, 1, 32, 11, 75, 1, 0, 0, 0 - , 96, 11, 77, 1, 0, 0, 0, 8, 11, 255, 255, 54, 1, 3, 32, 11, 255, 255, 57, 1, 3, 64, 11, 255, 255, 60, 1, 1, 96, 11 - , 255, 255, 63, 1, 1, 208, 11, 81, 1, 74, 1, 1, 64, 12, 107, 1, 75, 1, 1, 152, 11, 83, 1, 0, 0, 0, 208, 11, 91, 1 - , 0, 0, 0, 124, 11, 255, 255, 64, 1, 1, 152, 11, 85, 1, 65, 1, 1, 136, 11, 87, 1, 0, 0, 0, 152, 11, 89, 1, 0, 0 - , 0, 130, 11, 255, 255, 66, 1, 2, 136, 11, 255, 255, 68, 1, 2, 144, 11, 255, 255, 70, 1, 1, 152, 11, 255, 255, 71, 1, 1, 180 - , 11, 93, 1, 0, 0, 0, 208, 11, 255, 255, 0, 0, 0, 166, 11, 95, 1, 0, 0, 0, 180, 11, 255, 255, 0, 0, 0, 159, 11, 97 - , 1, 0, 0, 0, 166, 11, 255, 255, 0, 0, 0, 156, 11, 99, 1, 0, 0, 0, 159, 11, 103, 1, 0, 0, 0, 154, 11, 101, 1, 0 - , 0, 0, 156, 11, 255, 255, 0, 0, 0, 153, 11, 255, 255, 72, 1, 1, 154, 11, 255, 255, 0, 0, 0, 158, 11, 105, 1, 0, 0, 0 - , 159, 11, 255, 255, 0, 0, 0, 157, 11, 255, 255, 73, 1, 1, 158, 11, 255, 255, 0, 0, 0, 8, 12, 255, 255, 76, 1, 2, 64, 12 - , 109, 1, 78, 1, 2, 36, 12, 255, 255, 80, 1, 1, 64, 12, 255, 255, 81, 1, 1, 32, 13, 113, 1, 106, 1, 1, 0, 14, 129, 1 - , 107, 1, 1, 176, 12, 115, 1, 91, 1, 4, 32, 13, 123, 1, 95, 1, 4, 120, 12, 117, 1, 85, 1, 2, 176, 12, 119, 1, 87, 1 - , 2, 92, 12, 255, 255, 83, 1, 1, 120, 12, 255, 255, 84, 1, 1, 160, 12, 121, 1, 0, 0, 0, 176, 12, 255, 255, 0, 0, 0, 140 - , 12, 255, 255, 89, 1, 1, 160, 12, 255, 255, 90, 1, 1, 224, 12, 125, 1, 0, 0, 0, 32, 13, 127, 1, 0, 0, 0, 200, 12, 255 - , 255, 99, 1, 3, 224, 12, 255, 255, 102, 1, 3, 0, 13, 255, 255, 105, 1, 1, 32, 13, 255, 255, 108, 1, 1, 144, 13, 131, 1, 119 - , 1, 1, 0, 14, 157, 1, 120, 1, 1, 88, 13, 133, 1, 0, 0, 0, 144, 13, 141, 1, 0, 0, 0, 60, 13, 255, 255, 109, 1, 1 - , 88, 13, 135, 1, 110, 1, 1, 72, 13, 137, 1, 0, 0, 0, 88, 13, 139, 1, 0, 0, 0, 66, 13, 255, 255, 111, 1, 2, 72, 13 - , 255, 255, 113, 1, 2, 80, 13, 255, 255, 115, 1, 1, 88, 13, 255, 255, 116, 1, 1, 116, 13, 143, 1, 0, 0, 0, 144, 13, 255, 255 - , 0, 0, 0, 102, 13, 145, 1, 0, 0, 0, 116, 13, 255, 255, 0, 0, 0, 95, 13, 147, 1, 0, 0, 0, 102, 13, 255, 255, 0, 0 - , 0, 92, 13, 149, 1, 0, 0, 0, 95, 13, 153, 1, 0, 0, 0, 90, 13, 151, 1, 0, 0, 0, 92, 13, 255, 255, 0, 0, 0, 89 - , 13, 255, 255, 117, 1, 1, 90, 13, 255, 255, 0, 0, 0, 94, 13, 155, 1, 0, 0, 0, 95, 13, 255, 255, 0, 0, 0, 93, 13, 255 - , 255, 118, 1, 1, 94, 13, 255, 255, 0, 0, 0, 200, 13, 255, 255, 121, 1, 2, 0, 14, 159, 1, 123, 1, 2, 228, 13, 255, 255, 125 - , 1, 1, 0, 14, 255, 255, 126, 1, 1, 128, 17, 163, 1, 0, 0, 0, 63, 19, 9, 2, 0, 0, 0, 192, 15, 165, 1, 127, 1, 1 - , 128, 17, 215, 1, 172, 1, 1, 224, 14, 167, 1, 151, 1, 1, 192, 15, 183, 1, 152, 1, 1, 112, 14, 169, 1, 136, 1, 4, 224, 14 - , 177, 1, 140, 1, 4, 56, 14, 171, 1, 130, 1, 2, 112, 14, 173, 1, 132, 1, 2, 28, 14, 255, 255, 128, 1, 1, 56, 14, 255, 255 - , 129, 1, 1, 96, 14, 175, 1, 0, 0, 0, 112, 14, 255, 255, 0, 0, 0, 76, 14, 255, 255, 134, 1, 1, 96, 14, 255, 255, 135, 1 - , 1, 160, 14, 179, 1, 0, 0, 0, 224, 14, 181, 1, 0, 0, 0, 136, 14, 255, 255, 144, 1, 3, 160, 14, 255, 255, 147, 1, 3, 192 - , 14, 255, 255, 150, 1, 1, 224, 14, 255, 255, 153, 1, 1, 80, 15, 185, 1, 164, 1, 1, 192, 15, 211, 1, 165, 1, 1, 24, 15, 187 - , 1, 0, 0, 0, 80, 15, 195, 1, 0, 0, 0, 252, 14, 255, 255, 154, 1, 1, 24, 15, 189, 1, 155, 1, 1, 8, 15, 191, 1, 0 - , 0, 0, 24, 15, 193, 1, 0, 0, 0, 2, 15, 255, 255, 156, 1, 2, 8, 15, 255, 255, 158, 1, 2, 16, 15, 255, 255, 160, 1, 1 - , 24, 15, 255, 255, 161, 1, 1, 52, 15, 197, 1, 0, 0, 0, 80, 15, 255, 255, 0, 0, 0, 38, 15, 199, 1, 0, 0, 0, 52, 15 - , 255, 255, 0, 0, 0, 31, 15, 201, 1, 0, 0, 0, 38, 15, 255, 255, 0, 0, 0, 28, 15, 203, 1, 0, 0, 0, 31, 15, 207, 1 - , 0, 0, 0, 26, 15, 205, 1, 0, 0, 0, 28, 15, 255, 255, 0, 0, 0, 25, 15, 255, 255, 162, 1, 1, 26, 15, 255, 255, 0, 0 - , 0, 30, 15, 209, 1, 0, 0, 0, 31, 15, 255, 255, 0, 0, 0, 29, 15, 255, 255, 163, 1, 1, 30, 15, 255, 255, 0, 0, 0, 136 - , 15, 255, 255, 166, 1, 2, 192, 15, 213, 1, 168, 1, 2, 164, 15, 255, 255, 170, 1, 1, 192, 15, 255, 255, 171, 1, 1, 160, 16, 217 - , 1, 196, 1, 1, 128, 17, 233, 1, 197, 1, 1, 48, 16, 219, 1, 181, 1, 4, 160, 16, 227, 1, 185, 1, 4, 248, 15, 221, 1, 175 - , 1, 2, 48, 16, 223, 1, 177, 1, 2, 220, 15, 255, 255, 173, 1, 1, 248, 15, 255, 255, 174, 1, 1, 32, 16, 225, 1, 0, 0, 0 - , 48, 16, 255, 255, 0, 0, 0, 12, 16, 255, 255, 179, 1, 1, 32, 16, 255, 255, 180, 1, 1, 96, 16, 229, 1, 0, 0, 0, 160, 16 - , 231, 1, 0, 0, 0, 72, 16, 255, 255, 189, 1, 3, 96, 16, 255, 255, 192, 1, 3, 128, 16, 255, 255, 195, 1, 1, 160, 16, 255, 255 - , 198, 1, 1, 16, 17, 235, 1, 209, 1, 1, 128, 17, 5, 2, 210, 1, 1, 216, 16, 237, 1, 0, 0, 0, 16, 17, 245, 1, 0, 0 - , 0, 188, 16, 255, 255, 199, 1, 1, 216, 16, 239, 1, 200, 1, 1, 200, 16, 241, 1, 0, 0, 0, 216, 16, 243, 1, 0, 0, 0, 194 - , 16, 255, 255, 201, 1, 2, 200, 16, 255, 255, 203, 1, 2, 208, 16, 255, 255, 205, 1, 1, 216, 16, 255, 255, 206, 1, 1, 244, 16, 247 - , 1, 0, 0, 0, 16, 17, 255, 255, 0, 0, 0, 230, 16, 249, 1, 0, 0, 0, 244, 16, 255, 255, 0, 0, 0, 223, 16, 251, 1, 0 - , 0, 0, 230, 16, 255, 255, 0, 0, 0, 220, 16, 253, 1, 0, 0, 0, 223, 16, 1, 2, 0, 0, 0, 218, 16, 255, 1, 0, 0, 0 - , 220, 16, 255, 255, 0, 0, 0, 217, 16, 255, 255, 207, 1, 1, 218, 16, 255, 255, 0, 0, 0, 222, 16, 3, 2, 0, 0, 0, 223, 16 - , 255, 255, 0, 0, 0, 221, 16, 255, 255, 208, 1, 1, 222, 16, 255, 255, 0, 0, 0, 72, 17, 255, 255, 211, 1, 2, 128, 17, 7, 2 - , 213, 1, 2, 100, 17, 255, 255, 215, 1, 1, 128, 17, 255, 255, 216, 1, 1, 96, 18, 11, 2, 217, 1, 2, 63, 19, 27, 2, 219, 1 - , 2, 240, 17, 13, 2, 229, 1, 4, 96, 18, 21, 2, 233, 1, 4, 184, 17, 15, 2, 223, 1, 2, 240, 17, 17, 2, 225, 1, 2, 156 - , 17, 255, 255, 221, 1, 1, 184, 17, 255, 255, 222, 1, 1, 224, 17, 19, 2, 0, 0, 0, 240, 17, 255, 255, 0, 0, 0, 204, 17, 255 - , 255, 227, 1, 1, 224, 17, 255, 255, 228, 1, 1, 32, 18, 23, 2, 0, 0, 0, 96, 18, 25, 2, 0, 0, 0, 8, 18, 255, 255, 237 - , 1, 3, 32, 18, 255, 255, 240, 1, 3, 64, 18, 255, 255, 243, 1, 1, 96, 18, 255, 255, 244, 1, 1, 208, 18, 29, 2, 255, 1, 1 - , 63, 19, 55, 2, 0, 2, 1, 152, 18, 31, 2, 0, 0, 0, 208, 18, 39, 2, 0, 0, 0, 124, 18, 255, 255, 245, 1, 1, 152, 18 - , 33, 2, 246, 1, 1, 136, 18, 35, 2, 0, 0, 0, 152, 18, 37, 2, 0, 0, 0, 130, 18, 255, 255, 247, 1, 2, 136, 18, 255, 255 - , 249, 1, 2, 144, 18, 255, 255, 251, 1, 1, 152, 18, 255, 255, 252, 1, 1, 180, 18, 41, 2, 0, 0, 0, 208, 18, 255, 255, 0, 0 - , 0, 166, 18, 43, 2, 0, 0, 0, 180, 18, 255, 255, 0, 0, 0, 159, 18, 45, 2, 0, 0, 0, 166, 18, 255, 255, 0, 0, 0, 156 - , 18, 47, 2, 0, 0, 0, 159, 18, 51, 2, 0, 0, 0, 154, 18, 49, 2, 0, 0, 0, 156, 18, 255, 255, 0, 0, 0, 153, 18, 255 - , 255, 253, 1, 1, 154, 18, 255, 255, 0, 0, 0, 158, 18, 53, 2, 0, 0, 0, 159, 18, 255, 255, 0, 0, 0, 157, 18, 255, 255, 254 - , 1, 1, 158, 18, 255, 255, 0, 0, 0, 0, 19, 255, 255, 0, 0, 0, 63, 19, 57, 2, 0, 0, 0, 32, 19, 255, 255, 1, 2, 2 - , 63, 19, 59, 2, 3, 2, 1, 48, 19, 255, 255, 4, 2, 1, 63, 19, 255, 255, 5, 2, 1 + , 255, 255, 55, 0, 3, 24, 1, 37, 0, 0, 0, 0, 29, 1, 39, 0, 0, 0, 0, 16, 1, 255, 255, 58, 0, 1, 24, 1, 255, 255 + , 59, 0, 2, 27, 1, 41, 0, 0, 0, 0, 29, 1, 45, 0, 0, 0, 0, 26, 1, 43, 0, 0, 0, 0, 27, 1, 255, 255, 0, 0 + , 0, 25, 1, 255, 255, 61, 0, 1, 26, 1, 255, 255, 0, 0, 0, 28, 1, 255, 255, 0, 0, 0, 29, 1, 255, 255, 62, 0, 1, 128 + , 1, 49, 0, 0, 0, 0, 192, 1, 51, 0, 65, 0, 1, 79, 1, 255, 255, 63, 0, 1, 128, 1, 255, 255, 64, 0, 1, 160, 1, 255 + , 255, 66, 0, 1, 192, 1, 255, 255, 67, 0, 1, 160, 2, 55, 0, 92, 0, 1, 128, 3, 71, 0, 93, 0, 1, 48, 2, 57, 0, 77 + , 0, 4, 160, 2, 65, 0, 81, 0, 4, 248, 1, 59, 0, 71, 0, 2, 48, 2, 61, 0, 73, 0, 2, 220, 1, 255, 255, 69, 0, 1 + , 248, 1, 255, 255, 70, 0, 1, 32, 2, 63, 0, 0, 0, 0, 48, 2, 255, 255, 0, 0, 0, 12, 2, 255, 255, 75, 0, 1, 32, 2 + , 255, 255, 76, 0, 1, 96, 2, 67, 0, 0, 0, 0, 160, 2, 69, 0, 0, 0, 0, 72, 2, 255, 255, 85, 0, 3, 96, 2, 255, 255 + , 88, 0, 3, 128, 2, 255, 255, 91, 0, 1, 160, 2, 255, 255, 94, 0, 1, 16, 3, 73, 0, 105, 0, 1, 128, 3, 99, 0, 106, 0 + , 1, 216, 2, 75, 0, 0, 0, 0, 16, 3, 83, 0, 0, 0, 0, 188, 2, 255, 255, 95, 0, 1, 216, 2, 77, 0, 96, 0, 1, 200 + , 2, 79, 0, 0, 0, 0, 216, 2, 81, 0, 0, 0, 0, 194, 2, 255, 255, 97, 0, 2, 200, 2, 255, 255, 99, 0, 2, 208, 2, 255 + , 255, 101, 0, 1, 216, 2, 255, 255, 102, 0, 1, 244, 2, 85, 0, 0, 0, 0, 16, 3, 255, 255, 0, 0, 0, 230, 2, 87, 0, 0 + , 0, 0, 244, 2, 255, 255, 0, 0, 0, 223, 2, 89, 0, 0, 0, 0, 230, 2, 255, 255, 0, 0, 0, 220, 2, 91, 0, 0, 0, 0 + , 223, 2, 95, 0, 0, 0, 0, 218, 2, 93, 0, 0, 0, 0, 220, 2, 255, 255, 0, 0, 0, 217, 2, 255, 255, 103, 0, 1, 218, 2 + , 255, 255, 0, 0, 0, 222, 2, 97, 0, 0, 0, 0, 223, 2, 255, 255, 0, 0, 0, 221, 2, 255, 255, 104, 0, 1, 222, 2, 255, 255 + , 0, 0, 0, 72, 3, 255, 255, 107, 0, 2, 128, 3, 101, 0, 109, 0, 2, 100, 3, 255, 255, 111, 0, 1, 128, 3, 255, 255, 112, 0 + , 1, 0, 7, 105, 0, 0, 0, 0, 192, 8, 207, 0, 203, 0, 1, 64, 5, 107, 0, 113, 0, 1, 0, 7, 157, 0, 158, 0, 1, 96 + , 4, 109, 0, 137, 0, 1, 64, 5, 125, 0, 138, 0, 1, 240, 3, 111, 0, 122, 0, 4, 96, 4, 119, 0, 126, 0, 4, 184, 3, 113 + , 0, 116, 0, 2, 240, 3, 115, 0, 118, 0, 2, 156, 3, 255, 255, 114, 0, 1, 184, 3, 255, 255, 115, 0, 1, 224, 3, 117, 0, 0 + , 0, 0, 240, 3, 255, 255, 0, 0, 0, 204, 3, 255, 255, 120, 0, 1, 224, 3, 255, 255, 121, 0, 1, 32, 4, 121, 0, 0, 0, 0 + , 96, 4, 123, 0, 0, 0, 0, 8, 4, 255, 255, 130, 0, 3, 32, 4, 255, 255, 133, 0, 3, 64, 4, 255, 255, 136, 0, 1, 96, 4 + , 255, 255, 139, 0, 1, 208, 4, 127, 0, 150, 0, 1, 64, 5, 153, 0, 151, 0, 1, 152, 4, 129, 0, 0, 0, 0, 208, 4, 137, 0 + , 0, 0, 0, 124, 4, 255, 255, 140, 0, 1, 152, 4, 131, 0, 141, 0, 1, 136, 4, 133, 0, 0, 0, 0, 152, 4, 135, 0, 0, 0 + , 0, 130, 4, 255, 255, 142, 0, 2, 136, 4, 255, 255, 144, 0, 2, 144, 4, 255, 255, 146, 0, 1, 152, 4, 255, 255, 147, 0, 1, 180 + , 4, 139, 0, 0, 0, 0, 208, 4, 255, 255, 0, 0, 0, 166, 4, 141, 0, 0, 0, 0, 180, 4, 255, 255, 0, 0, 0, 159, 4, 143 + , 0, 0, 0, 0, 166, 4, 255, 255, 0, 0, 0, 156, 4, 145, 0, 0, 0, 0, 159, 4, 149, 0, 0, 0, 0, 154, 4, 147, 0, 0 + , 0, 0, 156, 4, 255, 255, 0, 0, 0, 153, 4, 255, 255, 148, 0, 1, 154, 4, 255, 255, 0, 0, 0, 158, 4, 151, 0, 0, 0, 0 + , 159, 4, 255, 255, 0, 0, 0, 157, 4, 255, 255, 149, 0, 1, 158, 4, 255, 255, 0, 0, 0, 8, 5, 255, 255, 152, 0, 2, 64, 5 + , 155, 0, 154, 0, 2, 36, 5, 255, 255, 156, 0, 1, 64, 5, 255, 255, 157, 0, 1, 32, 6, 159, 0, 182, 0, 1, 0, 7, 175, 0 + , 183, 0, 1, 176, 5, 161, 0, 167, 0, 4, 32, 6, 169, 0, 171, 0, 4, 120, 5, 163, 0, 161, 0, 2, 176, 5, 165, 0, 163, 0 + , 2, 92, 5, 255, 255, 159, 0, 1, 120, 5, 255, 255, 160, 0, 1, 160, 5, 167, 0, 0, 0, 0, 176, 5, 255, 255, 0, 0, 0, 140 + , 5, 255, 255, 165, 0, 1, 160, 5, 255, 255, 166, 0, 1, 224, 5, 171, 0, 0, 0, 0, 32, 6, 173, 0, 0, 0, 0, 200, 5, 255 + , 255, 175, 0, 3, 224, 5, 255, 255, 178, 0, 3, 0, 6, 255, 255, 181, 0, 1, 32, 6, 255, 255, 184, 0, 1, 144, 6, 177, 0, 195 + , 0, 1, 0, 7, 203, 0, 196, 0, 1, 88, 6, 179, 0, 0, 0, 0, 144, 6, 187, 0, 0, 0, 0, 60, 6, 255, 255, 185, 0, 1 + , 88, 6, 181, 0, 186, 0, 1, 72, 6, 183, 0, 0, 0, 0, 88, 6, 185, 0, 0, 0, 0, 66, 6, 255, 255, 187, 0, 2, 72, 6 + , 255, 255, 189, 0, 2, 80, 6, 255, 255, 191, 0, 1, 88, 6, 255, 255, 192, 0, 1, 116, 6, 189, 0, 0, 0, 0, 144, 6, 255, 255 + , 0, 0, 0, 102, 6, 191, 0, 0, 0, 0, 116, 6, 255, 255, 0, 0, 0, 95, 6, 193, 0, 0, 0, 0, 102, 6, 255, 255, 0, 0 + , 0, 92, 6, 195, 0, 0, 0, 0, 95, 6, 199, 0, 0, 0, 0, 90, 6, 197, 0, 0, 0, 0, 92, 6, 255, 255, 0, 0, 0, 89 + , 6, 255, 255, 193, 0, 1, 90, 6, 255, 255, 0, 0, 0, 94, 6, 201, 0, 0, 0, 0, 95, 6, 255, 255, 0, 0, 0, 93, 6, 255 + , 255, 194, 0, 1, 94, 6, 255, 255, 0, 0, 0, 200, 6, 255, 255, 197, 0, 2, 0, 7, 205, 0, 199, 0, 2, 228, 6, 255, 255, 201 + , 0, 1, 0, 7, 255, 255, 202, 0, 1, 224, 7, 209, 0, 227, 0, 1, 192, 8, 225, 0, 228, 0, 1, 112, 7, 211, 0, 212, 0, 4 + , 224, 7, 219, 0, 216, 0, 4, 56, 7, 213, 0, 206, 0, 2, 112, 7, 215, 0, 208, 0, 2, 28, 7, 255, 255, 204, 0, 1, 56, 7 + , 255, 255, 205, 0, 1, 96, 7, 217, 0, 0, 0, 0, 112, 7, 255, 255, 0, 0, 0, 76, 7, 255, 255, 210, 0, 1, 96, 7, 255, 255 + , 211, 0, 1, 160, 7, 221, 0, 0, 0, 0, 224, 7, 223, 0, 0, 0, 0, 136, 7, 255, 255, 220, 0, 3, 160, 7, 255, 255, 223, 0 + , 3, 192, 7, 255, 255, 226, 0, 1, 224, 7, 255, 255, 229, 0, 1, 80, 8, 227, 0, 240, 0, 1, 192, 8, 253, 0, 241, 0, 1, 24 + , 8, 229, 0, 0, 0, 0, 80, 8, 237, 0, 0, 0, 0, 252, 7, 255, 255, 230, 0, 1, 24, 8, 231, 0, 231, 0, 1, 8, 8, 233 + , 0, 0, 0, 0, 24, 8, 235, 0, 0, 0, 0, 2, 8, 255, 255, 232, 0, 2, 8, 8, 255, 255, 234, 0, 2, 16, 8, 255, 255, 236 + , 0, 1, 24, 8, 255, 255, 237, 0, 1, 52, 8, 239, 0, 0, 0, 0, 80, 8, 255, 255, 0, 0, 0, 38, 8, 241, 0, 0, 0, 0 + , 52, 8, 255, 255, 0, 0, 0, 31, 8, 243, 0, 0, 0, 0, 38, 8, 255, 255, 0, 0, 0, 28, 8, 245, 0, 0, 0, 0, 31, 8 + , 249, 0, 0, 0, 0, 26, 8, 247, 0, 0, 0, 0, 28, 8, 255, 255, 0, 0, 0, 25, 8, 255, 255, 238, 0, 1, 26, 8, 255, 255 + , 0, 0, 0, 30, 8, 251, 0, 0, 0, 0, 31, 8, 255, 255, 0, 0, 0, 29, 8, 255, 255, 239, 0, 1, 30, 8, 255, 255, 0, 0 + , 0, 136, 8, 255, 255, 242, 0, 2, 192, 8, 255, 0, 244, 0, 2, 164, 8, 255, 255, 246, 0, 1, 192, 8, 255, 255, 247, 0, 1, 0 + , 14, 3, 1, 0, 0, 0, 63, 19, 157, 1, 0, 0, 0, 64, 12, 5, 1, 0, 0, 0, 0, 14, 107, 1, 82, 1, 1, 128, 10, 7 + , 1, 248, 0, 1, 64, 12, 57, 1, 37, 1, 1, 160, 9, 9, 1, 16, 1, 1, 128, 10, 25, 1, 17, 1, 1, 48, 9, 11, 1, 1 + , 1, 4, 160, 9, 19, 1, 5, 1, 4, 248, 8, 13, 1, 251, 0, 2, 48, 9, 15, 1, 253, 0, 2, 220, 8, 255, 255, 249, 0, 1 + , 248, 8, 255, 255, 250, 0, 1, 32, 9, 17, 1, 0, 0, 0, 48, 9, 255, 255, 0, 0, 0, 12, 9, 255, 255, 255, 0, 1, 32, 9 + , 255, 255, 0, 1, 1, 96, 9, 21, 1, 0, 0, 0, 160, 9, 23, 1, 0, 0, 0, 72, 9, 255, 255, 9, 1, 3, 96, 9, 255, 255 + , 12, 1, 3, 128, 9, 255, 255, 15, 1, 1, 160, 9, 255, 255, 18, 1, 1, 16, 10, 27, 1, 29, 1, 1, 128, 10, 53, 1, 30, 1 + , 1, 216, 9, 29, 1, 0, 0, 0, 16, 10, 37, 1, 0, 0, 0, 188, 9, 255, 255, 19, 1, 1, 216, 9, 31, 1, 20, 1, 1, 200 + , 9, 33, 1, 0, 0, 0, 216, 9, 35, 1, 0, 0, 0, 194, 9, 255, 255, 21, 1, 2, 200, 9, 255, 255, 23, 1, 2, 208, 9, 255 + , 255, 25, 1, 1, 216, 9, 255, 255, 26, 1, 1, 244, 9, 39, 1, 0, 0, 0, 16, 10, 255, 255, 0, 0, 0, 230, 9, 41, 1, 0 + , 0, 0, 244, 9, 255, 255, 0, 0, 0, 223, 9, 43, 1, 0, 0, 0, 230, 9, 255, 255, 0, 0, 0, 220, 9, 45, 1, 0, 0, 0 + , 223, 9, 49, 1, 0, 0, 0, 218, 9, 47, 1, 0, 0, 0, 220, 9, 255, 255, 0, 0, 0, 217, 9, 255, 255, 27, 1, 1, 218, 9 + , 255, 255, 0, 0, 0, 222, 9, 51, 1, 0, 0, 0, 223, 9, 255, 255, 0, 0, 0, 221, 9, 255, 255, 28, 1, 1, 222, 9, 255, 255 + , 0, 0, 0, 72, 10, 255, 255, 31, 1, 2, 128, 10, 55, 1, 33, 1, 2, 100, 10, 255, 255, 35, 1, 1, 128, 10, 255, 255, 36, 1 + , 1, 96, 11, 59, 1, 61, 1, 1, 64, 12, 75, 1, 62, 1, 1, 240, 10, 61, 1, 46, 1, 4, 96, 11, 69, 1, 50, 1, 4, 184 + , 10, 63, 1, 40, 1, 2, 240, 10, 65, 1, 42, 1, 2, 156, 10, 255, 255, 38, 1, 1, 184, 10, 255, 255, 39, 1, 1, 224, 10, 67 + , 1, 0, 0, 0, 240, 10, 255, 255, 0, 0, 0, 204, 10, 255, 255, 44, 1, 1, 224, 10, 255, 255, 45, 1, 1, 32, 11, 71, 1, 0 + , 0, 0, 96, 11, 73, 1, 0, 0, 0, 8, 11, 255, 255, 54, 1, 3, 32, 11, 255, 255, 57, 1, 3, 64, 11, 255, 255, 60, 1, 1 + , 96, 11, 255, 255, 63, 1, 1, 208, 11, 77, 1, 74, 1, 1, 64, 12, 103, 1, 75, 1, 1, 152, 11, 79, 1, 0, 0, 0, 208, 11 + , 87, 1, 0, 0, 0, 124, 11, 255, 255, 64, 1, 1, 152, 11, 81, 1, 65, 1, 1, 136, 11, 83, 1, 0, 0, 0, 152, 11, 85, 1 + , 0, 0, 0, 130, 11, 255, 255, 66, 1, 2, 136, 11, 255, 255, 68, 1, 2, 144, 11, 255, 255, 70, 1, 1, 152, 11, 255, 255, 71, 1 + , 1, 180, 11, 89, 1, 0, 0, 0, 208, 11, 255, 255, 0, 0, 0, 166, 11, 91, 1, 0, 0, 0, 180, 11, 255, 255, 0, 0, 0, 159 + , 11, 93, 1, 0, 0, 0, 166, 11, 255, 255, 0, 0, 0, 156, 11, 95, 1, 0, 0, 0, 159, 11, 99, 1, 0, 0, 0, 154, 11, 97 + , 1, 0, 0, 0, 156, 11, 255, 255, 0, 0, 0, 153, 11, 255, 255, 72, 1, 1, 154, 11, 255, 255, 0, 0, 0, 158, 11, 101, 1, 0 + , 0, 0, 159, 11, 255, 255, 0, 0, 0, 157, 11, 255, 255, 73, 1, 1, 158, 11, 255, 255, 0, 0, 0, 8, 12, 255, 255, 76, 1, 2 + , 64, 12, 105, 1, 78, 1, 2, 36, 12, 255, 255, 80, 1, 1, 64, 12, 255, 255, 81, 1, 1, 32, 13, 109, 1, 106, 1, 1, 0, 14 + , 125, 1, 107, 1, 1, 176, 12, 111, 1, 91, 1, 4, 32, 13, 119, 1, 95, 1, 4, 120, 12, 113, 1, 85, 1, 2, 176, 12, 115, 1 + , 87, 1, 2, 92, 12, 255, 255, 83, 1, 1, 120, 12, 255, 255, 84, 1, 1, 160, 12, 117, 1, 0, 0, 0, 176, 12, 255, 255, 0, 0 + , 0, 140, 12, 255, 255, 89, 1, 1, 160, 12, 255, 255, 90, 1, 1, 224, 12, 121, 1, 0, 0, 0, 32, 13, 123, 1, 0, 0, 0, 200 + , 12, 255, 255, 99, 1, 3, 224, 12, 255, 255, 102, 1, 3, 0, 13, 255, 255, 105, 1, 1, 32, 13, 255, 255, 108, 1, 1, 144, 13, 127 + , 1, 119, 1, 1, 0, 14, 153, 1, 120, 1, 1, 88, 13, 129, 1, 0, 0, 0, 144, 13, 137, 1, 0, 0, 0, 60, 13, 255, 255, 109 + , 1, 1, 88, 13, 131, 1, 110, 1, 1, 72, 13, 133, 1, 0, 0, 0, 88, 13, 135, 1, 0, 0, 0, 66, 13, 255, 255, 111, 1, 2 + , 72, 13, 255, 255, 113, 1, 2, 80, 13, 255, 255, 115, 1, 1, 88, 13, 255, 255, 116, 1, 1, 116, 13, 139, 1, 0, 0, 0, 144, 13 + , 255, 255, 0, 0, 0, 102, 13, 141, 1, 0, 0, 0, 116, 13, 255, 255, 0, 0, 0, 95, 13, 143, 1, 0, 0, 0, 102, 13, 255, 255 + , 0, 0, 0, 92, 13, 145, 1, 0, 0, 0, 95, 13, 149, 1, 0, 0, 0, 90, 13, 147, 1, 0, 0, 0, 92, 13, 255, 255, 0, 0 + , 0, 89, 13, 255, 255, 117, 1, 1, 90, 13, 255, 255, 0, 0, 0, 94, 13, 151, 1, 0, 0, 0, 95, 13, 255, 255, 0, 0, 0, 93 + , 13, 255, 255, 118, 1, 1, 94, 13, 255, 255, 0, 0, 0, 200, 13, 255, 255, 121, 1, 2, 0, 14, 155, 1, 123, 1, 2, 228, 13, 255 + , 255, 125, 1, 1, 0, 14, 255, 255, 126, 1, 1, 128, 17, 159, 1, 0, 0, 0, 63, 19, 5, 2, 0, 0, 0, 192, 15, 161, 1, 127 + , 1, 1, 128, 17, 211, 1, 172, 1, 1, 224, 14, 163, 1, 151, 1, 1, 192, 15, 179, 1, 152, 1, 1, 112, 14, 165, 1, 136, 1, 4 + , 224, 14, 173, 1, 140, 1, 4, 56, 14, 167, 1, 130, 1, 2, 112, 14, 169, 1, 132, 1, 2, 28, 14, 255, 255, 128, 1, 1, 56, 14 + , 255, 255, 129, 1, 1, 96, 14, 171, 1, 0, 0, 0, 112, 14, 255, 255, 0, 0, 0, 76, 14, 255, 255, 134, 1, 1, 96, 14, 255, 255 + , 135, 1, 1, 160, 14, 175, 1, 0, 0, 0, 224, 14, 177, 1, 0, 0, 0, 136, 14, 255, 255, 144, 1, 3, 160, 14, 255, 255, 147, 1 + , 3, 192, 14, 255, 255, 150, 1, 1, 224, 14, 255, 255, 153, 1, 1, 80, 15, 181, 1, 164, 1, 1, 192, 15, 207, 1, 165, 1, 1, 24 + , 15, 183, 1, 0, 0, 0, 80, 15, 191, 1, 0, 0, 0, 252, 14, 255, 255, 154, 1, 1, 24, 15, 185, 1, 155, 1, 1, 8, 15, 187 + , 1, 0, 0, 0, 24, 15, 189, 1, 0, 0, 0, 2, 15, 255, 255, 156, 1, 2, 8, 15, 255, 255, 158, 1, 2, 16, 15, 255, 255, 160 + , 1, 1, 24, 15, 255, 255, 161, 1, 1, 52, 15, 193, 1, 0, 0, 0, 80, 15, 255, 255, 0, 0, 0, 38, 15, 195, 1, 0, 0, 0 + , 52, 15, 255, 255, 0, 0, 0, 31, 15, 197, 1, 0, 0, 0, 38, 15, 255, 255, 0, 0, 0, 28, 15, 199, 1, 0, 0, 0, 31, 15 + , 203, 1, 0, 0, 0, 26, 15, 201, 1, 0, 0, 0, 28, 15, 255, 255, 0, 0, 0, 25, 15, 255, 255, 162, 1, 1, 26, 15, 255, 255 + , 0, 0, 0, 30, 15, 205, 1, 0, 0, 0, 31, 15, 255, 255, 0, 0, 0, 29, 15, 255, 255, 163, 1, 1, 30, 15, 255, 255, 0, 0 + , 0, 136, 15, 255, 255, 166, 1, 2, 192, 15, 209, 1, 168, 1, 2, 164, 15, 255, 255, 170, 1, 1, 192, 15, 255, 255, 171, 1, 1, 160 + , 16, 213, 1, 196, 1, 1, 128, 17, 229, 1, 197, 1, 1, 48, 16, 215, 1, 181, 1, 4, 160, 16, 223, 1, 185, 1, 4, 248, 15, 217 + , 1, 175, 1, 2, 48, 16, 219, 1, 177, 1, 2, 220, 15, 255, 255, 173, 1, 1, 248, 15, 255, 255, 174, 1, 1, 32, 16, 221, 1, 0 + , 0, 0, 48, 16, 255, 255, 0, 0, 0, 12, 16, 255, 255, 179, 1, 1, 32, 16, 255, 255, 180, 1, 1, 96, 16, 225, 1, 0, 0, 0 + , 160, 16, 227, 1, 0, 0, 0, 72, 16, 255, 255, 189, 1, 3, 96, 16, 255, 255, 192, 1, 3, 128, 16, 255, 255, 195, 1, 1, 160, 16 + , 255, 255, 198, 1, 1, 16, 17, 231, 1, 209, 1, 1, 128, 17, 1, 2, 210, 1, 1, 216, 16, 233, 1, 0, 0, 0, 16, 17, 241, 1 + , 0, 0, 0, 188, 16, 255, 255, 199, 1, 1, 216, 16, 235, 1, 200, 1, 1, 200, 16, 237, 1, 0, 0, 0, 216, 16, 239, 1, 0, 0 + , 0, 194, 16, 255, 255, 201, 1, 2, 200, 16, 255, 255, 203, 1, 2, 208, 16, 255, 255, 205, 1, 1, 216, 16, 255, 255, 206, 1, 1, 244 + , 16, 243, 1, 0, 0, 0, 16, 17, 255, 255, 0, 0, 0, 230, 16, 245, 1, 0, 0, 0, 244, 16, 255, 255, 0, 0, 0, 223, 16, 247 + , 1, 0, 0, 0, 230, 16, 255, 255, 0, 0, 0, 220, 16, 249, 1, 0, 0, 0, 223, 16, 253, 1, 0, 0, 0, 218, 16, 251, 1, 0 + , 0, 0, 220, 16, 255, 255, 0, 0, 0, 217, 16, 255, 255, 207, 1, 1, 218, 16, 255, 255, 0, 0, 0, 222, 16, 255, 1, 0, 0, 0 + , 223, 16, 255, 255, 0, 0, 0, 221, 16, 255, 255, 208, 1, 1, 222, 16, 255, 255, 0, 0, 0, 72, 17, 255, 255, 211, 1, 2, 128, 17 + , 3, 2, 213, 1, 2, 100, 17, 255, 255, 215, 1, 1, 128, 17, 255, 255, 216, 1, 1, 96, 18, 7, 2, 217, 1, 2, 63, 19, 23, 2 + , 219, 1, 2, 240, 17, 9, 2, 229, 1, 4, 96, 18, 17, 2, 233, 1, 4, 184, 17, 11, 2, 223, 1, 2, 240, 17, 13, 2, 225, 1 + , 2, 156, 17, 255, 255, 221, 1, 1, 184, 17, 255, 255, 222, 1, 1, 224, 17, 15, 2, 0, 0, 0, 240, 17, 255, 255, 0, 0, 0, 204 + , 17, 255, 255, 227, 1, 1, 224, 17, 255, 255, 228, 1, 1, 32, 18, 19, 2, 0, 0, 0, 96, 18, 21, 2, 0, 0, 0, 8, 18, 255 + , 255, 237, 1, 3, 32, 18, 255, 255, 240, 1, 3, 64, 18, 255, 255, 243, 1, 1, 96, 18, 255, 255, 244, 1, 1, 208, 18, 25, 2, 255 + , 1, 1, 63, 19, 51, 2, 0, 2, 1, 152, 18, 27, 2, 0, 0, 0, 208, 18, 35, 2, 0, 0, 0, 124, 18, 255, 255, 245, 1, 1 + , 152, 18, 29, 2, 246, 1, 1, 136, 18, 31, 2, 0, 0, 0, 152, 18, 33, 2, 0, 0, 0, 130, 18, 255, 255, 247, 1, 2, 136, 18 + , 255, 255, 249, 1, 2, 144, 18, 255, 255, 251, 1, 1, 152, 18, 255, 255, 252, 1, 1, 180, 18, 37, 2, 0, 0, 0, 208, 18, 255, 255 + , 0, 0, 0, 166, 18, 39, 2, 0, 0, 0, 180, 18, 255, 255, 0, 0, 0, 159, 18, 41, 2, 0, 0, 0, 166, 18, 255, 255, 0, 0 + , 0, 156, 18, 43, 2, 0, 0, 0, 159, 18, 47, 2, 0, 0, 0, 154, 18, 45, 2, 0, 0, 0, 156, 18, 255, 255, 0, 0, 0, 153 + , 18, 255, 255, 253, 1, 1, 154, 18, 255, 255, 0, 0, 0, 158, 18, 49, 2, 0, 0, 0, 159, 18, 255, 255, 0, 0, 0, 157, 18, 255 + , 255, 254, 1, 1, 158, 18, 255, 255, 0, 0, 0, 0, 19, 255, 255, 0, 0, 0, 63, 19, 53, 2, 0, 0, 0, 32, 19, 255, 255, 1 + , 2, 2, 63, 19, 55, 2, 3, 2, 1, 48, 19, 255, 255, 4, 2, 1, 63, 19, 255, 255, 5, 2, 1 }, new ushort[] { // Control tree node indicies 0, 17, 18, 1, 30, 42, 31, 43, 19, 32, 33, 37, 2, 44, 45, 49, 19, 32, 33, 37, 2, 44, 45, 49, 34, 35, 36, 46, 47, 48 , 34, 35, 36, 46, 47, 48, 20, 3, 20, 3, 21, 39, 4, 51, 21, 39, 4, 51, 38, 50, 38, 50, 22, 23, 5, 22, 23, 5, 24, 25 - , 25, 26, 27, 28, 28, 29, 40, 41, 6, 52, 52, 53, 65, 53, 65, 66, 66, 54, 69, 70, 71, 54, 69, 70, 71, 67, 68, 72, 67, 68 - , 72, 55, 56, 56, 73, 74, 74, 57, 58, 57, 58, 59, 60, 61, 62, 63, 63, 64, 75, 64, 75, 76, 76, 7, 77, 77, 78, 90, 78, 90 + , 6, 26, 27, 28, 28, 29, 40, 41, 7, 52, 52, 53, 65, 53, 65, 66, 66, 54, 69, 70, 71, 54, 69, 70, 71, 67, 68, 72, 67, 68 + , 72, 55, 56, 56, 73, 74, 74, 57, 58, 57, 58, 59, 60, 61, 62, 63, 63, 64, 75, 64, 75, 76, 76, 8, 77, 77, 78, 90, 78, 90 , 91, 91, 79, 94, 95, 96, 79, 94, 95, 96, 92, 93, 97, 92, 93, 97, 80, 81, 81, 98, 99, 99, 82, 83, 82, 83, 84, 85, 86, 87 - , 88, 88, 89, 100, 89, 100, 101, 101, 8, 102, 102, 103, 115, 103, 115, 116, 116, 104, 119, 120, 121, 104, 119, 120, 121, 117, 118, 122, 117, 118 - , 122, 105, 106, 106, 123, 124, 124, 107, 108, 107, 108, 109, 110, 111, 112, 113, 113, 114, 125, 114, 125, 126, 126, 9, 127, 127, 128, 140, 128, 140 + , 88, 88, 89, 100, 89, 100, 101, 101, 9, 102, 102, 103, 115, 103, 115, 116, 116, 104, 119, 120, 121, 104, 119, 120, 121, 117, 118, 122, 117, 118 + , 122, 105, 106, 106, 123, 124, 124, 107, 108, 107, 108, 109, 110, 111, 112, 113, 113, 114, 125, 114, 125, 126, 126, 10, 127, 127, 128, 140, 128, 140 , 141, 141, 129, 144, 145, 146, 129, 144, 145, 146, 142, 143, 147, 142, 143, 147, 130, 131, 131, 148, 149, 149, 132, 133, 132, 133, 134, 135, 136, 137 - , 138, 138, 139, 150, 139, 150, 151, 151, 10, 152, 152, 153, 165, 153, 165, 166, 166, 154, 169, 170, 171, 154, 169, 170, 171, 167, 168, 172, 167, 168 - , 172, 155, 156, 156, 173, 174, 174, 157, 158, 157, 158, 159, 160, 161, 162, 163, 163, 164, 175, 164, 175, 176, 176, 11, 177, 177, 178, 190, 178, 190 + , 138, 138, 139, 150, 139, 150, 151, 151, 11, 152, 152, 153, 165, 153, 165, 166, 166, 154, 169, 170, 171, 154, 169, 170, 171, 167, 168, 172, 167, 168 + , 172, 155, 156, 156, 173, 174, 174, 157, 158, 157, 158, 159, 160, 161, 162, 163, 163, 164, 175, 164, 175, 176, 176, 12, 177, 177, 178, 190, 178, 190 , 191, 191, 179, 194, 195, 196, 179, 194, 195, 196, 192, 193, 197, 192, 193, 197, 180, 181, 181, 198, 199, 199, 182, 183, 182, 183, 184, 185, 186, 187 - , 188, 188, 189, 200, 189, 200, 201, 201, 12, 202, 202, 203, 215, 203, 215, 216, 216, 204, 219, 220, 221, 204, 219, 220, 221, 217, 218, 222, 217, 218 - , 222, 205, 206, 206, 223, 224, 224, 207, 208, 207, 208, 209, 210, 211, 212, 213, 213, 214, 225, 214, 225, 226, 226, 13, 227, 227, 228, 240, 228, 240 + , 188, 188, 189, 200, 189, 200, 201, 201, 13, 202, 202, 203, 215, 203, 215, 216, 216, 204, 219, 220, 221, 204, 219, 220, 221, 217, 218, 222, 217, 218 + , 222, 205, 206, 206, 223, 224, 224, 207, 208, 207, 208, 209, 210, 211, 212, 213, 213, 214, 225, 214, 225, 226, 226, 14, 227, 227, 228, 240, 228, 240 , 241, 241, 229, 244, 245, 246, 229, 244, 245, 246, 242, 243, 247, 242, 243, 247, 230, 231, 231, 248, 249, 249, 232, 233, 232, 233, 234, 235, 236, 237 - , 238, 238, 239, 250, 239, 250, 251, 251, 14, 252, 252, 253, 265, 253, 265, 266, 266, 254, 269, 270, 271, 254, 269, 270, 271, 267, 268, 272, 267, 268 - , 272, 255, 256, 256, 273, 274, 274, 257, 258, 257, 258, 259, 260, 261, 262, 263, 263, 264, 275, 264, 275, 276, 276, 15, 281, 15, 281, 277, 277, 278 + , 238, 238, 239, 250, 239, 250, 251, 251, 15, 252, 252, 253, 265, 253, 265, 266, 266, 254, 269, 270, 271, 254, 269, 270, 271, 267, 268, 272, 267, 268 + , 272, 255, 256, 256, 273, 274, 274, 257, 258, 257, 258, 259, 260, 261, 262, 263, 263, 264, 275, 264, 275, 276, 276, 16, 281, 16, 281, 277, 277, 278 , 290, 278, 290, 291, 291, 279, 294, 295, 296, 279, 294, 295, 296, 292, 293, 297, 292, 293, 297, 280, 298, 299, 299, 282, 283, 282, 283, 284, 285, 286 - , 287, 288, 288, 289, 300, 289, 301, 301, 16 + , 287, 288, 288, 289, 300, 289, 301, 301 }); builder.Finish(); @@ -1591,11 +1590,31 @@ private UnityEngine.InputSystem.Controls.TouchPressControl Initialize_ctrlTouchs return ctrlTouchscreenpress; } + private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscreendisplayIndex(InternedString kIntegerLayout, InputControl parent) + { + var ctrlTouchscreendisplayIndex = new UnityEngine.InputSystem.Controls.IntegerControl(); + ctrlTouchscreendisplayIndex.Setup() + .At(this, 6) + .WithParent(parent) + .WithName("displayIndex") + .WithDisplayName("Display Index") + .WithLayout(kIntegerLayout) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1113150533), + byteOffset = 34, + bitOffset = 0, + sizeInBits = 8 + }) + .Finish(); + return ctrlTouchscreendisplayIndex; + } + private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreentouch0(InternedString kTouchLayout, InputControl parent) { var ctrlTouchscreentouch0 = new UnityEngine.InputSystem.Controls.TouchControl(); ctrlTouchscreentouch0.Setup() - .At(this, 6) + .At(this, 7) .WithParent(parent) .WithChildren(52, 13) .WithName("touch0") @@ -1616,7 +1635,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen { var ctrlTouchscreentouch1 = new UnityEngine.InputSystem.Controls.TouchControl(); ctrlTouchscreentouch1.Setup() - .At(this, 7) + .At(this, 8) .WithParent(parent) .WithChildren(77, 13) .WithName("touch1") @@ -1637,7 +1656,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen { var ctrlTouchscreentouch2 = new UnityEngine.InputSystem.Controls.TouchControl(); ctrlTouchscreentouch2.Setup() - .At(this, 8) + .At(this, 9) .WithParent(parent) .WithChildren(102, 13) .WithName("touch2") @@ -1658,7 +1677,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen { var ctrlTouchscreentouch3 = new UnityEngine.InputSystem.Controls.TouchControl(); ctrlTouchscreentouch3.Setup() - .At(this, 9) + .At(this, 10) .WithParent(parent) .WithChildren(127, 13) .WithName("touch3") @@ -1679,7 +1698,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen { var ctrlTouchscreentouch4 = new UnityEngine.InputSystem.Controls.TouchControl(); ctrlTouchscreentouch4.Setup() - .At(this, 10) + .At(this, 11) .WithParent(parent) .WithChildren(152, 13) .WithName("touch4") @@ -1700,7 +1719,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen { var ctrlTouchscreentouch5 = new UnityEngine.InputSystem.Controls.TouchControl(); ctrlTouchscreentouch5.Setup() - .At(this, 11) + .At(this, 12) .WithParent(parent) .WithChildren(177, 13) .WithName("touch5") @@ -1721,7 +1740,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen { var ctrlTouchscreentouch6 = new UnityEngine.InputSystem.Controls.TouchControl(); ctrlTouchscreentouch6.Setup() - .At(this, 12) + .At(this, 13) .WithParent(parent) .WithChildren(202, 13) .WithName("touch6") @@ -1742,7 +1761,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen { var ctrlTouchscreentouch7 = new UnityEngine.InputSystem.Controls.TouchControl(); ctrlTouchscreentouch7.Setup() - .At(this, 13) + .At(this, 14) .WithParent(parent) .WithChildren(227, 13) .WithName("touch7") @@ -1763,7 +1782,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen { var ctrlTouchscreentouch8 = new UnityEngine.InputSystem.Controls.TouchControl(); ctrlTouchscreentouch8.Setup() - .At(this, 14) + .At(this, 15) .WithParent(parent) .WithChildren(252, 13) .WithName("touch8") @@ -1784,7 +1803,7 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen { var ctrlTouchscreentouch9 = new UnityEngine.InputSystem.Controls.TouchControl(); ctrlTouchscreentouch9.Setup() - .At(this, 15) + .At(this, 16) .WithParent(parent) .WithChildren(277, 13) .WithName("touch9") @@ -1801,26 +1820,6 @@ private UnityEngine.InputSystem.Controls.TouchControl Initialize_ctrlTouchscreen return ctrlTouchscreentouch9; } - private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscreendisplayIndex(InternedString kIntegerLayout, InputControl parent) - { - var ctrlTouchscreendisplayIndex = new UnityEngine.InputSystem.Controls.IntegerControl(); - ctrlTouchscreendisplayIndex.Setup() - .At(this, 16) - .WithParent(parent) - .WithName("displayIndex") - .WithDisplayName("Display Index") - .WithLayout(kIntegerLayout) - .WithStateBlock(new InputStateBlock - { - format = new FourCC(1431521364), - byteOffset = 34, - bitOffset = 0, - sizeInBits = 16 - }) - .Finish(); - return ctrlTouchscreendisplayIndex; - } - private UnityEngine.InputSystem.Controls.IntegerControl Initialize_ctrlTouchscreenprimaryTouchtouchId(InternedString kIntegerLayout, InputControl parent) { var ctrlTouchscreenprimaryTouchtouchId = new UnityEngine.InputSystem.Controls.IntegerControl(); diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Touchscreen.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Touchscreen.cs index 748802ca7c..69735b1abe 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Touchscreen.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Touchscreen.cs @@ -374,6 +374,7 @@ internal unsafe struct TouchscreenState : IInputStateTypeInfo [InputControl(name = "pressure", useStateFrom = "primaryTouch/pressure")] [InputControl(name = "radius", useStateFrom = "primaryTouch/radius")] [InputControl(name = "press", useStateFrom = "primaryTouch/phase", layout = "TouchPress", synthetic = true, usages = new string[0])] + [InputControl(name = "displayIndex", useStateFrom = "primaryTouch/displayIndex", format = "BYTE")] // added format to override the Pointer's USHT value [FieldOffset(0)] public fixed byte primaryTouchData[TouchState.kSizeInBytes]; @@ -559,7 +560,6 @@ protected override void FinishSetup() base.FinishSetup(); primaryTouch = GetChildControl("primaryTouch"); - displayIndex = primaryTouch.displayIndex; // Find out how many touch controls we have. var touchControlCount = 0;