diff --git a/DS4Windows/DS4Control/Mapping.cs b/DS4Windows/DS4Control/Mapping.cs
index d663640..5664715 100644
--- a/DS4Windows/DS4Control/Mapping.cs
+++ b/DS4Windows/DS4Control/Mapping.cs
@@ -822,6 +822,15 @@ namespace DS4Windows
dState.LX = (byte)(outputX * capX + 128.0);
dState.LY = (byte)(outputY * capY + 128.0);
}
+ else if (lsOutCurveMode == 4)
+ {
+ double absX = Math.Abs(tempX);
+ double absY = Math.Abs(tempY);
+ double outputX = absX * (absX - 2.0);
+ double outputY = absY * (absY - 2.0);
+ dState.LX = (byte)(-1.0 * outputX * signX * capX + 128.0);
+ dState.LY = (byte)(-1.0 * outputY * signY * capY + 128.0);
+ }
}
int rsOutCurveMode = rsOutCurveModeArray[device] = getRsOutCurveMode(device);
@@ -884,6 +893,15 @@ namespace DS4Windows
dState.RX = (byte)(outputX * capX + 128.0);
dState.RY = (byte)(outputY * capY + 128.0);
}
+ else if (rsOutCurveMode == 4)
+ {
+ double absX = Math.Abs(tempX);
+ double absY = Math.Abs(tempY);
+ double outputX = absX * (absX - 2.0);
+ double outputY = absY * (absY - 2.0);
+ dState.RX = (byte)(-1.0 * outputX * signX * capX + 128.0);
+ dState.RY = (byte)(-1.0 * outputY * signY * capY + 128.0);
+ }
}
int l2OutCurveMode = tempIntArray[device] = getL2OutCurveMode(device);
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index bed1180..49a2906 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -1579,6 +1579,7 @@ namespace DS4Windows
case 1: result = "enhanced-precision"; break;
case 2: result = "quadratic"; break;
case 3: result = "cubic"; break;
+ case 4: result = "easeout-quad"; break;
default: break;
}
@@ -1594,6 +1595,7 @@ namespace DS4Windows
case "enhanced-precision": id = 1; break;
case "quadratic": id = 2; break;
case "cubic": id = 3; break;
+ case "easeout-quad": id = 4; break;
default: break;
}
diff --git a/DS4Windows/DS4Forms/Options.Designer.cs b/DS4Windows/DS4Forms/Options.Designer.cs
index cd9742a..184e813 100644
--- a/DS4Windows/DS4Forms/Options.Designer.cs
+++ b/DS4Windows/DS4Forms/Options.Designer.cs
@@ -315,6 +315,8 @@
this.rBSAControls = new System.Windows.Forms.RadioButton();
this.rBSAMouse = new System.Windows.Forms.RadioButton();
this.pnlSAMouse = new System.Windows.Forms.Panel();
+ this.label26 = new System.Windows.Forms.Label();
+ this.triggerCondAndCombo = new System.Windows.Forms.ComboBox();
this.cBGyroMouseXAxis = new System.Windows.Forms.ComboBox();
this.label16 = new System.Windows.Forms.Label();
this.lbGyroSmooth = new System.Windows.Forms.Label();
@@ -386,8 +388,6 @@
this.optionsTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.shareTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.psTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.triggerCondAndCombo = new System.Windows.Forms.ComboBox();
- this.label26 = new System.Windows.Forms.Label();
this.advColorDialog = new DS4Windows.AdvancedColorDialog();
((System.ComponentModel.ISupportInitialize)(this.nUDRainbow)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tBBlueBar)).BeginInit();
@@ -3210,7 +3210,8 @@
resources.GetString("rsOutCurveComboBox.Items"),
resources.GetString("rsOutCurveComboBox.Items1"),
resources.GetString("rsOutCurveComboBox.Items2"),
- resources.GetString("rsOutCurveComboBox.Items3")});
+ resources.GetString("rsOutCurveComboBox.Items3"),
+ resources.GetString("rsOutCurveComboBox.Items4")});
resources.ApplyResources(this.rsOutCurveComboBox, "rsOutCurveComboBox");
this.rsOutCurveComboBox.Name = "rsOutCurveComboBox";
this.rsOutCurveComboBox.SelectedIndexChanged += new System.EventHandler(this.rsOutCurveComboBox_SelectedIndexChanged);
@@ -3224,7 +3225,8 @@
resources.GetString("lsOutCurveComboBox.Items"),
resources.GetString("lsOutCurveComboBox.Items1"),
resources.GetString("lsOutCurveComboBox.Items2"),
- resources.GetString("lsOutCurveComboBox.Items3")});
+ resources.GetString("lsOutCurveComboBox.Items3"),
+ resources.GetString("lsOutCurveComboBox.Items4")});
resources.ApplyResources(this.lsOutCurveComboBox, "lsOutCurveComboBox");
this.lsOutCurveComboBox.Name = "lsOutCurveComboBox";
this.lsOutCurveComboBox.SelectedIndexChanged += new System.EventHandler(this.lsOutCurveComboBox_SelectedIndexChanged);
@@ -3408,6 +3410,21 @@
resources.ApplyResources(this.pnlSAMouse, "pnlSAMouse");
this.pnlSAMouse.Name = "pnlSAMouse";
//
+ // label26
+ //
+ resources.ApplyResources(this.label26, "label26");
+ this.label26.Name = "label26";
+ //
+ // triggerCondAndCombo
+ //
+ this.triggerCondAndCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.triggerCondAndCombo.FormattingEnabled = true;
+ this.triggerCondAndCombo.Items.AddRange(new object[] {
+ resources.GetString("triggerCondAndCombo.Items"),
+ resources.GetString("triggerCondAndCombo.Items1")});
+ resources.ApplyResources(this.triggerCondAndCombo, "triggerCondAndCombo");
+ this.triggerCondAndCombo.Name = "triggerCondAndCombo";
+ //
// cBGyroMouseXAxis
//
this.cBGyroMouseXAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -4110,21 +4127,6 @@
resources.ApplyResources(this.psTouchInvStripMenuItem, "psTouchInvStripMenuItem");
this.psTouchInvStripMenuItem.CheckedChanged += new System.EventHandler(this.TouchDisableInvert_CheckedChanged);
//
- // triggerCondAndCombo
- //
- this.triggerCondAndCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.triggerCondAndCombo.FormattingEnabled = true;
- this.triggerCondAndCombo.Items.AddRange(new object[] {
- resources.GetString("triggerCondAndCombo.Items"),
- resources.GetString("triggerCondAndCombo.Items1")});
- resources.ApplyResources(this.triggerCondAndCombo, "triggerCondAndCombo");
- this.triggerCondAndCombo.Name = "triggerCondAndCombo";
- //
- // label26
- //
- resources.ApplyResources(this.label26, "label26");
- this.label26.Name = "label26";
- //
// Options
//
resources.ApplyResources(this, "$this");
diff --git a/DS4Windows/DS4Forms/Options.resx b/DS4Windows/DS4Forms/Options.resx
index dc50f18..f32fa8c 100644
--- a/DS4Windows/DS4Forms/Options.resx
+++ b/DS4Windows/DS4Forms/Options.resx
@@ -7165,6 +7165,9 @@ with profile
Cubic
+
+ Easeout Quad
+
111, 3
@@ -7198,6 +7201,9 @@ with profile
Cubic
+
+ Easeout Quad
+
31, 2
@@ -8971,9 +8977,6 @@ with profile
1011, 481
-
- NoControl
-
4, 4, 4, 4
@@ -9392,7 +9395,7 @@ with profile
advColorDialog
- DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.5.8.0, Culture=neutral, PublicKeyToken=null
+ DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.6.8.0, Culture=neutral, PublicKeyToken=null
Options