Archives
/
SCJMapper-V2
mirror of https://github.com/SCToolsfactory/SCJMapper-V2
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9 from standardtoaster/master

Browse Source 
Misc fixes
 - reindented joystickcls
 - better button diffs
 - nugent package for sharpdx
 - better joystick axis change detection
pull/20/head v2.00-beta.1
standardtoaster 10 years ago
parent b165864ea1 b9f597c05c
commit 5214e2838f
14 changed files with 450 additions and 282 deletions
Show Stats Download Patch File Download Diff File

116
Joystick/JoystickCls.cs
Unescape Escape View File

@ -1,11 +1,11 @@
using System;
using SharpDX;
using SharpDX.DirectInput;
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Text;
using System.Windows.Forms;
using SharpDX;
using SharpDX.DirectInput;
namespace SCJMapper_V2
{
/// <summary>
@ -62,7 +62,8 @@ namespace SCJMapper_V2
static public int JSNum(String jsTag)
{
int retNum = 0;
if ( !String.IsNullOrEmpty( jsTag ) ) {
if (!String.IsNullOrEmpty(jsTag))
{
int.TryParse(jsTag.Substring(2, 1), out retNum);
}
return retNum;
@ -102,10 +103,12 @@ namespace SCJMapper_V2
// Set the cooperative level for the device.
m_device.SetCooperativeLevel(m_hwnd, CooperativeLevel.Exclusive | CooperativeLevel.Foreground);
// Enumerate all the objects on the device.
foreach ( DeviceObjectInstance d in m_device.GetObjects( ) ) {
foreach (DeviceObjectInstance d in m_device.GetObjects())
{
// For axes that are returned, set the DIPROP_RANGE property for the
// enumerated axis in order to scale min/max values.
if ( ( 0 != ( d.ObjectId.Flags & DeviceObjectTypeFlags.Axis ) ) ) {
if ((0 != (d.ObjectId.Flags & DeviceObjectTypeFlags.Axis)))
{
// Set the range for the axis.
m_device.Properties.Range = new InputRange(-1000, +1000);
}
@ -132,32 +135,40 @@ namespace SCJMapper_V2
private void UpdateControls(DeviceObjectInstance d)
{
// Set the UI to reflect what objects the joystick supports.
if ( ObjectGuid.XAxis == d.ObjectType ) {
if (ObjectGuid.XAxis == d.ObjectType)
{
m_jPanel.Xe = true;
m_jPanel.Xname = d.Name + ":";
}
if ( ObjectGuid.YAxis == d.ObjectType ) {
if (ObjectGuid.YAxis == d.ObjectType)
{
m_jPanel.Ye = true;
m_jPanel.Yname = d.Name + ":";
}
if ( ObjectGuid.ZAxis == d.ObjectType ) {
if (ObjectGuid.ZAxis == d.ObjectType)
{
m_jPanel.Ze = true;
m_jPanel.Zname = d.Name + ":";
}
if ( ObjectGuid.RxAxis == d.ObjectType ) {
if (ObjectGuid.RxAxis == d.ObjectType)
{
m_jPanel.Xre = true;
m_jPanel.Xrname = d.Name + ":";
}
if ( ObjectGuid.RyAxis == d.ObjectType ) {
if (ObjectGuid.RyAxis == d.ObjectType)
{
m_jPanel.Yre = true;
m_jPanel.Yrname = d.Name + ":";
}
if ( ObjectGuid.RzAxis == d.ObjectType ) {
if (ObjectGuid.RzAxis == d.ObjectType)
{
m_jPanel.Zre = true;
m_jPanel.Zrname = d.Name + ":";
}
if ( ObjectGuid.Slider == d.ObjectType ) {
switch ( m_sliderCount++ ) {
if (ObjectGuid.Slider == d.ObjectType)
{
switch (m_sliderCount++)
{
case 0:
m_jPanel.S1e = true;
m_jPanel.S1name = d.Name + ":";
@ -169,8 +180,10 @@ namespace SCJMapper_V2
break;
}
}
if ( ObjectGuid.PovController == d.ObjectType ) {
switch ( m_numPOVs++ ) {
if (ObjectGuid.PovController == d.ObjectType)
{
switch (m_numPOVs++)
{
case 0:
m_jPanel.H1e = true;
m_jPanel.H1name = d.Name + ":";
@ -200,13 +213,24 @@ namespace SCJMapper_V2
/// <returns>The last action as CryEngine compatible string</returns>
public String GetLastChange()
{
if ( m_state.X != m_prevState.X ) m_lastItem = "x";
if ( m_state.Y != m_prevState.Y ) m_lastItem = "y";
if ( m_state.Z != m_prevState.Z ) m_lastItem = "throttlez"; // this is not z because it usually maps the throttle
// TODO: Expand this out into a joystick class (see commit for details)
Dictionary<string, string> axies = new Dictionary<string, string>()
{
{"X","x"},
{"Y","y"},
{"Z","throttlez"}, // this is not z because it usually maps the throttle
{"RotationX","rotx"},
{"RotationY","roty"},
{"RotationZ","rotz"}
};
foreach (KeyValuePair<string, string> entry in axies)
{
PropertyInfo axisProperty = typeof(JoystickState).GetProperty(entry.Key);
if ( m_state.RotationX != m_prevState.RotationX ) m_lastItem = "rotx";
if ( m_state.RotationY != m_prevState.RotationY ) m_lastItem = "roty";
if ( m_state.RotationZ != m_prevState.RotationZ ) m_lastItem = "rotz";
if (DidAxisChange((int)axisProperty.GetValue(this.m_state, null), (int)axisProperty.GetValue(this.m_prevState, null)))
this.m_lastItem = entry.Value;
}
int[] slider = m_state.Sliders;
int[] pslider = m_prevState.Sliders;
@ -221,12 +245,33 @@ namespace SCJMapper_V2
if (pov[3] >= 0) if (pov[3] != ppov[3]) m_lastItem = "hat4_" + HatDir(pov[0]);
bool[] buttons = m_state.Buttons;
for ( int bi=0; bi < buttons.Length; bi++ ) {
if ( buttons[bi] ) m_lastItem = "button" + ( bi + 1 ).ToString( );
bool[] prevButtons = m_prevState.Buttons;
for (int bi = 0; bi < buttons.Length; bi++)
{
if (buttons[bi] && buttons[bi] != prevButtons[bi])
m_lastItem = "button" + (bi + 1).ToString();
}
return m_lastItem;
}
///<summary>
/// Figure out if an axis changed enough to consider it as a changed state
/// </summary>
private bool DidAxisChange(int current, int prev)
{
// determine if the axis drifts more than x% to account for bounce
// old-new/old
if (current == prev)
return false;
if (prev == 0)
prev = 1;
int changepct = Math.Abs(prev) - Math.Abs(current) / Math.Abs(prev);
// if the axis has changed more than 70% relative to it's last value
return changepct > 70 ? true : false;
}
/// <summary>
/// Show the current props in the GUI
/// </summary>
@ -260,7 +305,8 @@ namespace SCJMapper_V2
bool[] buttons = m_state.Buttons;
int button = 0;
foreach ( bool b in buttons ) {
foreach (bool b in buttons)
{
if (b)
strText += (button + 1).ToString("00 "); // buttons are 1 based
button++;
@ -279,18 +325,23 @@ namespace SCJMapper_V2
return;
// Poll the device for info.
try {
try
{
m_device.Poll();
}
catch ( SharpDXException e ) {
if ( ( e.ResultCode == ResultCode.NotAcquired ) || ( e.ResultCode == ResultCode.InputLost ) ) {
catch (SharpDXException e)
{
if ((e.ResultCode == ResultCode.NotAcquired) || (e.ResultCode == ResultCode.InputLost))
{
// Check to see if either the app needs to acquire the device, or
// if the app lost the device to another process.
try {
try
{
// Acquire the device.
m_device.Acquire();
}
catch ( SharpDXException ) {
catch (SharpDXException)
{
// Failed to acquire the device.
// This could be because the app doesn't have focus.
return;
@ -304,7 +355,8 @@ namespace SCJMapper_V2
try { m_state = m_device.GetCurrentState(); }
// Catch any exceptions. None will be handled here,
// any device re-aquisition will be handled above.
catch ( SharpDXException ) {
catch (SharpDXException)
{
return;
}

2
Properties/Resources.Designer.cs generated
Unescape Escape View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18444
// Runtime Version:4.0.30319.34014
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

4
Properties/Settings.Designer.cs generated
Unescape Escape View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18444
// Runtime Version:4.0.30319.34014
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -12,7 +12,7 @@ namespace SCJMapper_V2.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

13
SCJMapper-V2.csproj
Unescape Escape View File

@ -14,6 +14,7 @@
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>3422add1</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@ -42,10 +43,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpDX">
<HintPath>E:\D\SharpDX\Bin\DirectX11-net40\SharpDX.dll</HintPath>
<HintPath>$(SharpDXPackageBinDir)\SharpDX.dll</HintPath>
</Reference>
<Reference Include="SharpDX.DirectInput">
<HintPath>E:\D\SharpDX\Bin\DirectX11-net40\SharpDX.DirectInput.dll</HintPath>
<HintPath>$(SharpDXPackageBinDir)\SharpDX.DirectInput.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@ -99,6 +100,7 @@
<None Include="actionList\MappingVars.csv" />
<None Include="actionList\MappingVars.xlsx" />
<None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@ -125,6 +127,13 @@
<Content Include="graphics\XBOX.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="packages\SharpDX.2.6.2\build\SharpDX.targets" Condition="Exists('packages\SharpDX.2.6.2\build\SharpDX.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\SharpDX.2.6.2\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SharpDX.2.6.2\build\SharpDX.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

5
packages.config
Unescape Escape View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SharpDX" version="2.6.2" targetFramework="net20" />
<package id="SharpDX.DirectInput" version="2.6.2" targetFramework="net40" />
</packages>

BIN
packages/SharpDX.2.6.2/SharpDX.2.6.2.nupkg vendored
View File

Binary file not shown.

0
packages/SharpDX.2.6.2/lib/dummy.txt vendored
Unescape Escape View File

36
packages/SharpDX.2.6.2/tools/Install.ps1 vendored
Unescape Escape View File

@ -0,0 +1,36 @@
param($installPath, $toolsPath, $package, $project)
"Installing [{0}] to project [{1}]" -f $package.Id, $project.FullName | Write-Host
# Load MSBuild assembly if it’s not loaded yet.
Add-Type -AssemblyName "Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
# Check that SharpDX.targets was correctly imported
$buildProject = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
$importsToRemove = $buildProject.Xml.Imports | Where-Object { $_.Project.Endswith('SharpDX.targets') }
if (!$importsToRemove)
{
throw ("SharpDX.targets import not found in project [{0}]" -f $project.FullName)
}
$sharpdx_package_bin_dir = $buildProject.GetProperty("SharpDXPackageBinDir").EvaluatedValue
$sharpdx_assembly_path = "{0}\{1}.dll" -f $sharpdx_package_bin_dir, $package.Id
# Add the assembly through the project in order for VS to update correctly the references in the IDE
$project.Object.References.Add($sharpdx_assembly_path)
# Find the references we just added
$sharpdx_reference = $buildProject.GetItems("Reference") | Where-Object { $_.EvaluatedInclude -eq $package.Id }
if (!$sharpdx_reference)
{
$sharpdx_reference = $buildProject.GetItems("Reference") | Where-Object { $_.EvaluatedInclude.StartsWith("{0}," -f $package.Id) }
}
if (!$sharpdx_reference)
{
throw ("Unable to find reference in project for assembly [{0}]" -f $package.Id)
}
# Replace the HintPath using the $(SharpDXPackageBinDir) variable provided by the SharpDX.targets
$sharpdx_reference.SetMetadataValue("HintPath", '$(SharpDXPackageBinDir)\{0}.dll' -f $package.Id)
# Save the project
$project.Save()

13
packages/SharpDX.2.6.2/tools/UnInstall.ps1 vendored
Unescape Escape View File

@ -0,0 +1,13 @@
param($installPath, $toolsPath, $package, $project)
"Uninstalling [{0}] from project [{1}]" -f $package.Id, $project.FullName | Write-Host
# Retrieve the reference to the package
$sharpdx_reference = $project.Object.References.Item($package.Id)
if ($sharpdx_reference)
{
# Remove the reference
$sharpdx_reference.Remove()
# Save the project
$project.Save()
}

BIN
packages/SharpDX.DirectInput.2.6.2/SharpDX.DirectInput.2.6.2.nupkg vendored
View File

Binary file not shown.

0
packages/SharpDX.DirectInput.2.6.2/lib/dummy.txt vendored
Unescape Escape View File

36
packages/SharpDX.DirectInput.2.6.2/tools/Install.ps1 vendored
Unescape Escape View File

@ -0,0 +1,36 @@
param($installPath, $toolsPath, $package, $project)
"Installing [{0}] to project [{1}]" -f $package.Id, $project.FullName | Write-Host
# Load MSBuild assembly if it’s not loaded yet.
Add-Type -AssemblyName "Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
# Check that SharpDX.targets was correctly imported
$buildProject = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
$importsToRemove = $buildProject.Xml.Imports | Where-Object { $_.Project.Endswith('SharpDX.targets') }
if (!$importsToRemove)
{
throw ("SharpDX.targets import not found in project [{0}]" -f $project.FullName)
}
$sharpdx_package_bin_dir = $buildProject.GetProperty("SharpDXPackageBinDir").EvaluatedValue
$sharpdx_assembly_path = "{0}\{1}.dll" -f $sharpdx_package_bin_dir, $package.Id
# Add the assembly through the project in order for VS to update correctly the references in the IDE
$project.Object.References.Add($sharpdx_assembly_path)
# Find the references we just added
$sharpdx_reference = $buildProject.GetItems("Reference") | Where-Object { $_.EvaluatedInclude -eq $package.Id }
if (!$sharpdx_reference)
{
$sharpdx_reference = $buildProject.GetItems("Reference") | Where-Object { $_.EvaluatedInclude.StartsWith("{0}," -f $package.Id) }
}
if (!$sharpdx_reference)
{
throw ("Unable to find reference in project for assembly [{0}]" -f $package.Id)
}
# Replace the HintPath using the $(SharpDXPackageBinDir) variable provided by the SharpDX.targets
$sharpdx_reference.SetMetadataValue("HintPath", '$(SharpDXPackageBinDir)\{0}.dll' -f $package.Id)
# Save the project
$project.Save()

13
packages/SharpDX.DirectInput.2.6.2/tools/UnInstall.ps1 vendored
Unescape Escape View File

@ -0,0 +1,13 @@
param($installPath, $toolsPath, $package, $project)
"Uninstalling [{0}] from project [{1}]" -f $package.Id, $project.FullName | Write-Host
# Retrieve the reference to the package
$sharpdx_reference = $project.Object.References.Item($package.Id)
if ($sharpdx_reference)
{
# Remove the reference
$sharpdx_reference.Remove()
# Save the project
$project.Save()
}

4
packages/repositories.config
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\packages.config" />
</repositories>
Write Preview
Loading…
Cancel
Save