summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/accel-motivity.hpp (renamed from common/accel-experimenttwo.hpp)6
-rw-r--r--common/common.vcxitems2
-rw-r--r--common/rawaccel-settings.h2
-rw-r--r--common/rawaccel.hpp14
-rw-r--r--grapher/Layouts/MotivityLayout.cs (renamed from grapher/Layouts/ExperimentOneLayout.cs)8
-rw-r--r--grapher/Models/Charts/ChartXY.cs1
-rw-r--r--grapher/Models/Mouse/MouseData.cs49
-rw-r--r--grapher/Models/Mouse/MouseWatcher.cs3
-rw-r--r--grapher/Models/Options/AccelTypeOptions.cs2
-rw-r--r--grapher/Models/Serialized/DriverSettings.cs2
-rw-r--r--grapher/grapher.csproj3
11 files changed, 72 insertions, 20 deletions
diff --git a/common/accel-experimenttwo.hpp b/common/accel-motivity.hpp
index b248364..a37d1ce 100644
--- a/common/accel-experimenttwo.hpp
+++ b/common/accel-motivity.hpp
@@ -16,13 +16,13 @@ namespace rawaccel {
};
/// <summary> Struct to hold sigmoid (s-shaped) gain implementation. </summary>
- struct experimenttwo_impl {
+ struct motivity_impl {
double rate;
double limit;
double midpoint;
double subtractive_constant;
- experimenttwo_impl(const accel_args& args) :
+ motivity_impl(const accel_args& args) :
rate(pow(10,args.rate)), limit(2*log10(args.limit)), midpoint(log10(args.midpoint))
{
subtractive_constant = limit / 2;
@@ -84,6 +84,6 @@ namespace rawaccel {
}
};
- using accel_experimentone = nonadditive_accel<experimenttwo_impl>;
+ using accel_motivity = nonadditive_accel<motivity_impl>;
}
diff --git a/common/common.vcxitems b/common/common.vcxitems
index b5cd374..fdf5cf4 100644
--- a/common/common.vcxitems
+++ b/common/common.vcxitems
@@ -17,7 +17,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)accel-base.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-classic.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-experimentone.hpp" />
- <ClInclude Include="$(MSBuildThisFileDirectory)accel-experimenttwo.hpp" />
+ <ClInclude Include="$(MSBuildThisFileDirectory)accel-motivity.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-linear.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-logarithm.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-natural.hpp" />
diff --git a/common/rawaccel-settings.h b/common/rawaccel-settings.h
index db5e192..00289b6 100644
--- a/common/rawaccel-settings.h
+++ b/common/rawaccel-settings.h
@@ -6,7 +6,7 @@
namespace rawaccel {
enum class accel_mode {
- linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, experimentone, noaccel
+ linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, motivity, noaccel
};
struct settings {
diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp
index ca2d4d7..3eb9181 100644
--- a/common/rawaccel.hpp
+++ b/common/rawaccel.hpp
@@ -13,7 +13,7 @@
#include "accel-naturalgain.hpp"
#include "accel-power.hpp"
#include "accel-sigmoidgain.hpp"
-#include "accel-experimenttwo.hpp"
+#include "accel-motivity.hpp"
#include "accel-noaccel.hpp"
namespace rawaccel {
@@ -87,7 +87,7 @@ namespace rawaccel {
case accel_mode::sigmoidgain: return vis(var.u.sigmoidgain);
case accel_mode::power: return vis(var.u.power);
case accel_mode::logarithm: return vis(var.u.logarithm);
- case accel_mode::experimentone: return vis(var.u.experimentone);
+ case accel_mode::motivity: return vis(var.u.motivity);
default: return vis(var.u.noaccel);
}
}
@@ -105,7 +105,7 @@ namespace rawaccel {
accel_sigmoidgain sigmoidgain;
accel_power power;
accel_logarithm logarithm;
- accel_experimentone experimentone;
+ accel_motivity motivity;
accel_noaccel noaccel = {};
} u = {};
@@ -116,15 +116,15 @@ namespace rawaccel {
impl = { args };
}, *this);
- if (lookup && tag == accel_mode::experimentone) {
- u.experimentone.fn.fill(lookup);
+ if (lookup && tag == accel_mode::motivity) {
+ u.motivity.fn.fill(lookup);
}
}
inline double apply(double speed) const {
- if (lookup && tag == accel_mode::experimentone) {
- return u.experimentone.fn.apply(lookup, speed);
+ if (lookup && tag == accel_mode::motivity) {
+ return u.motivity.fn.apply(lookup, speed);
}
return visit_accel([=](auto&& impl) {
diff --git a/grapher/Layouts/ExperimentOneLayout.cs b/grapher/Layouts/MotivityLayout.cs
index ad6f61a..dfef2de 100644
--- a/grapher/Layouts/ExperimentOneLayout.cs
+++ b/grapher/Layouts/MotivityLayout.cs
@@ -7,13 +7,13 @@ using System.Threading.Tasks;
namespace grapher.Layouts
{
- public class ExperimentOneLayout : LayoutBase
+ public class MotivityLayout : LayoutBase
{
- public ExperimentOneLayout()
+ public MotivityLayout()
: base()
{
- Name = "Experiment 1";
- Index = (int)AccelMode.experimentone;
+ Name = "Motivity";
+ Index = (int)AccelMode.motivity;
LogarithmicCharts = true;
AccelLayout = new OptionLayout(true, Acceleration);
diff --git a/grapher/Models/Charts/ChartXY.cs b/grapher/Models/Charts/ChartXY.cs
index c5c00d1..3850e42 100644
--- a/grapher/Models/Charts/ChartXY.cs
+++ b/grapher/Models/Charts/ChartXY.cs
@@ -128,7 +128,6 @@ namespace grapher
pointTwo.Get(out x, out y);
chart.Series[3].Points.DataBindXY(x, y);
}
- chart.Update();
}
}
diff --git a/grapher/Models/Mouse/MouseData.cs b/grapher/Models/Mouse/MouseData.cs
new file mode 100644
index 0000000..e59a969
--- /dev/null
+++ b/grapher/Models/Mouse/MouseData.cs
@@ -0,0 +1,49 @@
+using System;
+
+namespace grapher.Models.Mouse
+{
+ public class MouseData
+ {
+ #region Constructors
+
+ public MouseData()
+ {
+ Lock = new Object();
+ X = 0;
+ Y = 0;
+ }
+
+ #endregion Constructors
+
+ #region Properties
+
+ public Object Lock { get; }
+
+ private int X { get; set; }
+ private int Y { get; set; }
+
+ public void Set(int x, int y)
+ {
+ lock (Lock)
+ {
+ X = x;
+ Y = y;
+ }
+ }
+
+ #endregion Properties
+
+ #region Methods
+
+ public void Get(out int x, out int y)
+ {
+ lock (Lock)
+ {
+ x = X;
+ y = Y;
+ }
+ }
+
+ #endregion Methods
+ }
+}
diff --git a/grapher/Models/Mouse/MouseWatcher.cs b/grapher/Models/Mouse/MouseWatcher.cs
index 405110e..86b1c2e 100644
--- a/grapher/Models/Mouse/MouseWatcher.cs
+++ b/grapher/Models/Mouse/MouseWatcher.cs
@@ -682,6 +682,7 @@ namespace grapher.Models.Mouse
ContainingForm = containingForm;
Display = display;
AccelCharts = accelCharts;
+ MouseData = new MouseData();
RAWINPUTDEVICE device = new RAWINPUTDEVICE();
device.WindowHandle = ContainingForm.Handle;
@@ -705,6 +706,8 @@ namespace grapher.Models.Mouse
private AccelCharts AccelCharts { get; }
+ private MouseData MouseData { get; }
+
private double PollTime { get; }
#endregion Properties
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index ce5ec54..1302387 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -21,7 +21,7 @@ namespace grapher
new LogarithmLayout(),
new NaturalGainLayout(),
new SigmoidGainLayout(),
- new ExperimentOneLayout(),
+ new MotivityLayout(),
new OffLayout()
}.ToDictionary(k => k.Name);
diff --git a/grapher/Models/Serialized/DriverSettings.cs b/grapher/Models/Serialized/DriverSettings.cs
index 03c5687..119b684 100644
--- a/grapher/Models/Serialized/DriverSettings.cs
+++ b/grapher/Models/Serialized/DriverSettings.cs
@@ -8,7 +8,7 @@ namespace grapher.Models.Serialized
public enum AccelMode
{
- linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, experimentone, noaccel
+ linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, motivity, noaccel
}
#endregion Enumerations
diff --git a/grapher/grapher.csproj b/grapher/grapher.csproj
index ebe224a..b283e37 100644
--- a/grapher/grapher.csproj
+++ b/grapher/grapher.csproj
@@ -54,7 +54,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Constants\Constants.cs" />
- <Compile Include="Layouts\ExperimentOneLayout.cs" />
+ <Compile Include="Layouts\MotivityLayout.cs" />
<Compile Include="Layouts\LogarithmLayout.cs" />
<Compile Include="Layouts\NaturalGainLayout.cs" />
<Compile Include="Layouts\SigmoidGainLayout.cs" />
@@ -70,6 +70,7 @@
<Compile Include="Models\Charts\EstimatedPoints.cs" />
<Compile Include="Models\Charts\ChartState\XYOneGraphState.cs" />
<Compile Include="Models\Charts\ChartState\XYTwoGraphState.cs" />
+ <Compile Include="Models\Mouse\MouseData.cs" />
<Compile Include="Models\Mouse\MouseWatcher.cs" />
<Compile Include="Models\Mouse\PointData.cs" />
<Compile Include="Models\Options\AccelTypeOptions.cs" />
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-22 19:59:33 +0000