Merge branch 'jay' into vigem-udpserver

This commit is contained in:
Travis Nickles 2018-07-23 00:17:08 -05:00
commit cb8ffee055
8 changed files with 19 additions and 10 deletions

View File

@ -3,10 +3,12 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Runtime.InteropServices;
using System.Security;
using Microsoft.Win32.SafeHandles;
namespace DS4Windows
{
[SuppressUnmanagedCodeSecurity]
public partial class ScpDevice : Component
{
public virtual Boolean IsActive

View File

@ -506,6 +506,11 @@ namespace DS4Windows
get { return m_Config.minToTaskbar; }
}
public static bool GetMinToTaskbar()
{
return m_Config.minToTaskbar;
}
public static int FormWidth
{
set { m_Config.formWidth = value; }

View File

@ -898,14 +898,15 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
protected void Form_Resize(object sender, EventArgs e)
{
if (FormWindowState.Minimized == WindowState && !MinToTaskbar)
bool minToTask = GetMinToTaskbar();
if (FormWindowState.Minimized == WindowState && minToTask)
{
Hide();
ShowInTaskbar = false;
FormBorderStyle = FormBorderStyle.None;
}
else if (FormWindowState.Normal == WindowState && !MinToTaskbar)
else if (FormWindowState.Normal == WindowState && minToTask)
{
//mAllowVisible = true;
Show();

View File

@ -997,9 +997,9 @@ namespace DS4Windows
{
pbAccel[i-6] = pbInput[i];
}
}
sixAxis.handleSixaxis(gyro, accel, cState, elapsedDeltaTime);
sixAxis.handleSixaxis(pbGyro, pbAccel, cState, elapsedDeltaTime);
}
/* Debug output of incoming HID data:
if (cState.L2 == 0xff && cState.R2 == 0xff)

View File

@ -220,7 +220,7 @@ namespace DS4Windows
accelZ = temInt = (int)(temInt * (current.sensNumer / (float)current.sensDenom));
}
public void handleSixaxis(byte[] gyro, byte[] accel, DS4State state,
public unsafe void handleSixaxis(byte* gyro, byte* accel, DS4State state,
double elapsedDelta)
{
int currentYaw = (short)((ushort)(gyro[3] << 8) | gyro[2]);

View File

@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.123")]
[assembly: AssemblyFileVersion("1.4.123")]
[assembly: AssemblyVersion("1.5.0")]
[assembly: AssemblyFileVersion("1.5.0")]
[assembly: NeutralResourcesLanguage("en")]

View File

@ -8,12 +8,12 @@ You can find the latest and older versions [here](https://github.com/Ryochan7/DS
UdpServer builds for using Gyro motion controls in Cemu.
http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.121_UdpServer_x64.zip
http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.121_ViGEm_UdpServer_x64.zip
http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.123_UdpServer_x64.zip
http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.123_ViGEm_UdpServer_x64.zip
ViGEm build.
http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.121_ViGEm_x64.zip
http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.123_ViGEm_x64.zip
This project is a fork of the work of Jays2Kings. You can find the old project
website at [ds4windows.com](http://ds4windows.com).

View File

@ -1,5 +1,6 @@
Travis Nickles (Ryochan7)
Korney Czukowski (czukowski)
jdfeng
Rajko Stojadinovic (rajkosto)
Yuki-nyan