From 6a5cfb45bf4a9d3151a9de6f320fdaf4b7296f18 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sat, 3 Jul 2021 15:18:47 -0700 Subject: Guide updates and accel type choice fixed --- doc/Guide.md | 6 +++--- doc/images/LUT_example.png | Bin 69389 -> 55969 bytes doc/images/jump_example.png | Bin 0 -> 47816 bytes doc/images/linear_example.png | Bin 51428 -> 50547 bytes doc/images/motivity_example.png | Bin 60657 -> 50916 bytes doc/images/natural_gain_example.png | Bin 51433 -> 50679 bytes doc/images/power_example.png | Bin 51330 -> 50340 bytes grapher/Models/Options/AccelTypeOptions.cs | 2 +- 8 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 doc/images/jump_example.png diff --git a/doc/Guide.md b/doc/Guide.md index 6909a2d..8002ea9 100644 --- a/doc/Guide.md +++ b/doc/Guide.md @@ -122,18 +122,18 @@ This is the style found in CS:GO and Source Engine games (m_customaccel 3). The ### Natural & NaturalGain Natural features a concave curve which starts at 1 and approaches some maximum sensitivity. The sensitivity version of this curve can be found in the game Diabotical. This style is unique and useful but causes an ugly dip in the gain graph. The gain version of this curve recreates the Natural style shape in the gain graph without any dips and therefore we recommend this version. Natural is an excellent choice for new users due to only needing a two intuitive parameters which achieve what many users are looking for. -![NaturalExample](images/natural_example.png) ![NaturalGainExample](images/natural_gain_example.png) ### Jump This style applies one sensitivity below a certain threshold, and another above it. It can be useful for those who want one constant sensitivity and gain for slow hand motions and a different constant sensitivity or gain for fast hand motions. Users can set a "smooth" parameter which dictates whether the jump happens instaneously (at smooth 0) or with a slight tailing in and out (smooth 1) leading to a small sigmoid shape (s-shape). (Note that this "smooth" parameter has nothing to do with averaging over mouse counts like in sensor smoothing on mice or mouse smoothing in games.) +![NaturalGainExample](images/jump_example.png) ### Motivity -This curve looks like an "S" with the top half bigger than the bottom. Mathematically it's a "Sigmoid function on a log-log plot". A user can set the "midpoint" of the S, the "acceleration" (i.e. slantedness) of the S, and the "motivity". "Motivity" sets min and max sensitivity, where the maximum is just "motivity", and the minimum is "1/motivity." (Sensitivity or gain is 1 at the midpoint.) The gain version of this curve is calculated and stored in a lookup table before applying acceleration, which makes the gain graph look a little funny. This is an excellent choice for power users and new users who don't mind playing with the settings a little. +This curve looks like an "S" with the top half bigger than the bottom. Mathematically it's a "Sigmoid function on a log-log plot". A user can set the "midpoint" of the S, the "growth rate" (i.e. slantedness) of the S, and the "motivity". "Motivity" sets min and max sensitivity, where the maximum is just "motivity", and the minimum is "1/motivity." (Sensitivity or gain is 1 at the midpoint.) The gain version of this curve is calculated and stored in a lookup table before applying acceleration, which makes the gain graph look a little funny. This is an excellent choice for power users and new users who don't mind playing with the settings a little. ![MotivityExample](images/motivity_example.png) ### Look Up Table -This curve style is a blank canvas on which to create a curve. It allows the user to define the points which will make up the curve. For this reason, this mode is only for experts who know exactly what they want. Points can be supplied in the GUI according to format x1,y1;x2,y2;...xn.yn or in the settings.json in json format. The default Windows mouse acceleration settings (Enhanced Pointer Precision) can be very closely emulated with this style, using points: "". +This curve style is a blank canvas on which to create a curve. It allows the user to define the points which will make up the curve. For this reason, this mode is only for experts who know exactly what they want. Points can be supplied in the GUI according to format x1,y1;x2,y2;...xn.yn or in the settings.json in json format. The default Windows mouse acceleration settings (Enhanced Pointer Precision) can be very closely emulated with this style, using points: "1.505035,0.85549892;4.375,3.30972978;13.51,15.17478447;140,354.7026875;". ![LUTExample](images/lut_example.png) ## Further Help diff --git a/doc/images/LUT_example.png b/doc/images/LUT_example.png index c89b4b7..71f9ce3 100644 Binary files a/doc/images/LUT_example.png and b/doc/images/LUT_example.png differ diff --git a/doc/images/jump_example.png b/doc/images/jump_example.png new file mode 100644 index 0000000..770bab2 Binary files /dev/null and b/doc/images/jump_example.png differ diff --git a/doc/images/linear_example.png b/doc/images/linear_example.png index 5530529..be1410e 100644 Binary files a/doc/images/linear_example.png and b/doc/images/linear_example.png differ diff --git a/doc/images/motivity_example.png b/doc/images/motivity_example.png index 521bf85..6041ec6 100644 Binary files a/doc/images/motivity_example.png and b/doc/images/motivity_example.png differ diff --git a/doc/images/natural_gain_example.png b/doc/images/natural_gain_example.png index 48a05e4..3b66dbe 100644 Binary files a/doc/images/natural_gain_example.png and b/doc/images/natural_gain_example.png differ diff --git a/doc/images/power_example.png b/doc/images/power_example.png index c8a58c9..414a252 100644 Binary files a/doc/images/power_example.png and b/doc/images/power_example.png differ diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index 30940ad..02f4acb 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -387,7 +387,7 @@ namespace grapher switch (args.mode) { - case AccelMode.classic: return (args.power == 2) ? Linear : Classic; + case AccelMode.classic: return (args.exponent == 2) ? Linear : Classic; case AccelMode.jump: return Jump; case AccelMode.natural: return Natural; case AccelMode.motivity: return Motivity; -- cgit v1.2.3