diff --git a/Qwilight/Assets/AMD64/Microsoft.Graphics.Canvas.dll b/Qwilight/Assets/AMD64/Microsoft.Graphics.Canvas.dll index e3d35fe..9a7c2ac 100644 --- a/Qwilight/Assets/AMD64/Microsoft.Graphics.Canvas.dll +++ b/Qwilight/Assets/AMD64/Microsoft.Graphics.Canvas.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:062cf81086a2ea40b1f979475ab63a90801ea9e9e76f677587cf8eb216f52521 -size 1728000 +oid sha256:58b59932bc8edb2c99603010b1cb4444e0a4c4eeb7ac67310c9126062e93cc63 +size 1718784 diff --git a/Qwilight/Assets/AMD64/avcodec-61.dll b/Qwilight/Assets/AMD64/avcodec-61.dll index ed2b2eb..a1f1ce3 100644 --- a/Qwilight/Assets/AMD64/avcodec-61.dll +++ b/Qwilight/Assets/AMD64/avcodec-61.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bb548bdcc93e5970acdefd2a082dd6afd6204a5fa07886ce681efa25171fbbc -size 83859968 +oid sha256:d84c1d56ac085607225bca6dea174ca7a23ce202b65318605e3d151af0466355 +size 89262080 diff --git a/Qwilight/Assets/AMD64/avdevice-61.dll b/Qwilight/Assets/AMD64/avdevice-61.dll index b8bbd66..a40d22f 100644 --- a/Qwilight/Assets/AMD64/avdevice-61.dll +++ b/Qwilight/Assets/AMD64/avdevice-61.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b35c7aa725d89740e00996ea97edee7e5b103188eec3c3ff8ab98d93de170a23 -size 4454912 +oid sha256:910bdd0998abe27d42e7e30ea6b39cc99af9fba742a2e560dda3597551ce5a11 +size 4483072 diff --git a/Qwilight/Assets/AMD64/avfilter-10.dll b/Qwilight/Assets/AMD64/avfilter-10.dll index 031c129..b79a02a 100644 --- a/Qwilight/Assets/AMD64/avfilter-10.dll +++ b/Qwilight/Assets/AMD64/avfilter-10.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9303b2f9af25eecc31ecc1981667c586cbd70a14fe06d66ddb91f0c1a78696c2 -size 41396736 +oid sha256:319fe785c5467aa67fc2e0da6d2d78f9fb370b5bd56ffa62567a902532e5ab35 +size 41905152 diff --git a/Qwilight/Assets/AMD64/avformat-61.dll b/Qwilight/Assets/AMD64/avformat-61.dll index 0b9f097..2695008 100644 --- a/Qwilight/Assets/AMD64/avformat-61.dll +++ b/Qwilight/Assets/AMD64/avformat-61.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c3cb6776cee21b6a02be8be91b47cf8ee48a4303b4163bfde6caadbe5c948f1 -size 18293248 +oid sha256:db5636a41cf9d125a993359a6f0d963733bd4743bb333ea203d911e9f199eaa0 +size 18482176 diff --git a/Qwilight/Assets/AMD64/avutil-59.dll b/Qwilight/Assets/AMD64/avutil-59.dll index 1cd0edf..636217c 100644 --- a/Qwilight/Assets/AMD64/avutil-59.dll +++ b/Qwilight/Assets/AMD64/avutil-59.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:002cd1845b3fb67055d3e352c3cfee705b57e28a5a9c3f05f2b757ace926d5e0 -size 2743296 +oid sha256:a6a71f986c0acf40bee8cc1f17b3d5cd300f65ed6c6a9c37a72eb0788ea6a602 +size 2814976 diff --git a/Qwilight/Assets/AMD64/ffmpeg.exe b/Qwilight/Assets/AMD64/ffmpeg.exe index 1a1e192..7ba7f39 100644 --- a/Qwilight/Assets/AMD64/ffmpeg.exe +++ b/Qwilight/Assets/AMD64/ffmpeg.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5a7cfc3237a6e332b5883417328325ca4675d4151c7d21030c3a66e283c0c14 -size 437248 +oid sha256:20ef4175d89d5eb23ef01044f1cac188db0e5a31c881bbd47f86c551d7e800c0 +size 431616 diff --git a/Qwilight/Assets/AMD64/ffprobe.exe b/Qwilight/Assets/AMD64/ffprobe.exe index 3780498..324213d 100644 --- a/Qwilight/Assets/AMD64/ffprobe.exe +++ b/Qwilight/Assets/AMD64/ffprobe.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8893b751138119cf8869b8d1abb32c8729c1c7a84b4b297c7fd9e413b0f71e9 -size 210432 +oid sha256:c0edee0b9aead8775210cc5e5894fe51fa7ef8fedd86b3e69ce8c46eb08d614c +size 220672 diff --git a/Qwilight/Assets/AMD64/postproc-58.dll b/Qwilight/Assets/AMD64/postproc-58.dll index a8e93b0..3a1dcaa 100644 --- a/Qwilight/Assets/AMD64/postproc-58.dll +++ b/Qwilight/Assets/AMD64/postproc-58.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf0d49c3b342a6e5a801a8a13777e9bcf425a13ac9693945c7984c18f8c07d93 -size 88576 +oid sha256:903b9c2f3e35ae8e5e9e0d21146e9f00e021e65d7e2cf825aae16cc3265cdebc +size 87552 diff --git a/Qwilight/Assets/AMD64/swresample-5.dll b/Qwilight/Assets/AMD64/swresample-5.dll index e899e2d..de77d89 100644 --- a/Qwilight/Assets/AMD64/swresample-5.dll +++ b/Qwilight/Assets/AMD64/swresample-5.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75011af0734fa7d116c58ef196d4251531624cf4aecbdd960522f2d2e67d719d -size 435200 +oid sha256:2501936f861d6bdc874a6e5ba8d903b07d186d2f33a7a8d5866e7308ad14b940 +size 438784 diff --git a/Qwilight/Assets/AMD64/swscale-8.dll b/Qwilight/Assets/AMD64/swscale-8.dll index c79375b..30997bf 100644 --- a/Qwilight/Assets/AMD64/swscale-8.dll +++ b/Qwilight/Assets/AMD64/swscale-8.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e979e6b56fa292405b6c1c89c6bcbaaa01f076f7f5eaacbe1390320272ac6c6 -size 645632 +oid sha256:a745cf080f10b743f08b1bbcce2d4459708cbcb9045de7fcd82e4ec190dd9d78 +size 707584 diff --git a/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll b/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll index d342e95..ee30d3e 100644 --- a/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll +++ b/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7876bf1c6ad67f24dae394591b3f3e805318ecdb8084cfc7bea907e5fea2fea6 -size 50176 +oid sha256:7cb24fbfedd63edf4b78117d5837bc95f40c8de9f786bde5a9acbf3fc588e384 +size 61576 diff --git a/Qwilight/Assets/ARM64/Microsoft.Graphics.Canvas.dll b/Qwilight/Assets/ARM64/Microsoft.Graphics.Canvas.dll index 332a428..9548ae5 100644 --- a/Qwilight/Assets/ARM64/Microsoft.Graphics.Canvas.dll +++ b/Qwilight/Assets/ARM64/Microsoft.Graphics.Canvas.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cd29cb929825da8a026b4501eee5d38beb5b772737d6351c4ac39ff93145cca -size 2299904 +oid sha256:3df5de5fbbeb12070a5b13b5e6de8c810e608485ae467d3b47262f0e6e221b8d +size 2296320 diff --git a/Qwilight/Microsoft.Graphics.Canvas.Interop.dll b/Qwilight/Microsoft.Graphics.Canvas.Interop.dll index 4f8f315..9bfb70a 100644 --- a/Qwilight/Microsoft.Graphics.Canvas.Interop.dll +++ b/Qwilight/Microsoft.Graphics.Canvas.Interop.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e172f62fdf092209294d1bd004d434563cfbc4c3a86c39950cd3c82af26feefa -size 1157632 +oid sha256:74e1b9a9375199e7bbae541b6490f12417822221f5ff266dca0e9003e897065f +size 1171968 diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj index 9e55bf6..0df8e2f 100644 --- a/Qwilight/Qwilight.csproj +++ b/Qwilight/Qwilight.csproj @@ -60,8 +60,8 @@ - - + + diff --git a/Qwilight/System/ControllerSystem/ControllerSystem.cs b/Qwilight/System/ControllerSystem/ControllerSystem.cs index 4e4962e..9021a80 100644 --- a/Qwilight/System/ControllerSystem/ControllerSystem.cs +++ b/Qwilight/System/ControllerSystem/ControllerSystem.cs @@ -488,16 +488,16 @@ #endregion #region XInput - var lastXInputs = new List(); + var lastXInputs = new List(); var mainXInputLower0 = new[] { Vortice.XInput.GamepadButtons.DPadDown.ToString(), Vortice.XInput.GamepadButtons.DPadLeft.ToString(), Vortice.XInput.GamepadButtons.DPadRight.ToString(), Vortice.XInput.GamepadButtons.DPadUp.ToString(), Vortice.XInput.GamepadButtons.LeftShoulder.ToString(), Vortice.XInput.GamepadButtons.LeftThumb.ToString(), Vortice.XInput.GamepadButtons.Back.ToString(), "+LT", "-LTX", "-LTY", "+LTX", "+LTY" }; var mainXInputLower1 = new[] { Vortice.XInput.GamepadButtons.A.ToString(), Vortice.XInput.GamepadButtons.B.ToString(), Vortice.XInput.GamepadButtons.X.ToString(), Vortice.XInput.GamepadButtons.Y.ToString(), Vortice.XInput.GamepadButtons.RightShoulder.ToString(), Vortice.XInput.GamepadButtons.RightThumb.ToString(), Vortice.XInput.GamepadButtons.Start.ToString(), "+RT", "-RTX", "-RTY", "+RTX", "+RTY" }; - var targetXInputControllers = new List(); - var mainXInputLowerValues = new Dictionary>(); - var lastXInputInputs = new Dictionary(); - var lastXInputVibrations = new Dictionary(); + var targetXInputControllers = new List(); + var mainXInputLowerValues = new Dictionary>(); + var lastXInputInputs = new Dictionary(); + var lastXInputVibrations = new Dictionary(); var onHandleXInput1000 = new Action(() => { - var targetXInputs = Enumerable.Range(0, 4).Where(targetXInput => XInput.GetCapabilities(targetXInput, DeviceQueryType.Gamepad, out _)).ToArray(); + var targetXInputs = Enumerable.Range(0, 4).Select(targetXInput => (uint)targetXInput).Where(targetXInput => XInput.GetCapabilities(targetXInput, DeviceQueryType.Gamepad, out _)).ToArray(); if (Utility.IsItemsEqual(targetXInputs, lastXInputs) == false) { lock (targetXInputControllers) diff --git a/Qwilight/View/AvatarWindow.xaml b/Qwilight/View/AvatarWindow.xaml index 7df4ed7..7b3bb08 100644 --- a/Qwilight/View/AvatarWindow.xaml +++ b/Qwilight/View/AvatarWindow.xaml @@ -138,6 +138,15 @@ + + + + + + + + +