Merge pull request #21 from JacobPalecki/GUI

GUI: Icon, Separate X/Y sens mode, some fixes

5 files changed, 38 insertions, 2 deletions

diff --git a/common/accel-base.hpp b/common/accel-base.hpp
index 714162f..d536923 100644
--- a/common/accel-base.hpp
+++ b/common/accel-base.hpp
@@ -40,7 +40,7 @@ namespace rawaccel {
 
         inline double operator()(double speed) const {
             double offset_speed = speed - offset;
-            return offset_speed > 0 ? ( legacy_offset ? 1 + fn.legacy_offset(offset_speed) * weight : 1 + fn(offset_speed) ) : 1;
+            return offset_speed > 0 ? ( legacy_offset ? 1 + fn.legacy_offset(offset_speed) * weight : 1 + fn(offset_speed) * weight) : 1;
         }
     };
 
diff --git a/common/accel-logarithm.hpp b/common/accel-logarithm.hpp
new file mode 100644
index 0000000..044d23c
--- /dev/null
+++ b/common/accel-logarithm.hpp
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <math.h>
+
+#include "accel-base.hpp"
+
+namespace rawaccel {
+
+	/// <summary> Struct to hold sigmoid (s-shaped) gain implementation. </summary>
+	struct logarithm_impl {
+		double rate;
+		double offset;
+		double additive_const;
+
+		logarithm_impl (const accel_args& args) :
+			rate(args.rate), offset (args.offset) {
+			additive_const = offset * rate;
+		}
+
+		inline double operator()(double speed) const {
+			double scaled_speed = rate * speed + 1;
+			double base_speed = speed + offset;
+
+			return (scaled_speed * log(scaled_speed) + additive_const ) / ( rate * base_speed) - 1;
+		}
+
+		inline double legacy_offset(double speed) const { return operator()(speed); }
+	};
+
+	using accel_logarithm = additive_accel<logarithm_impl>;
+
+}
diff --git a/common/common.vcxitems b/common/common.vcxitems
index 2913080..fcd3ae8 100644
--- a/common/common.vcxitems
+++ b/common/common.vcxitems
@@ -17,6 +17,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-base.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-classic.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-linear.hpp" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)accel-logarithm.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-natural.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-naturalgain.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-noaccel.hpp" />
diff --git a/common/rawaccel-settings.h b/common/rawaccel-settings.h
index 12f136d..8c483eb 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, noaccel
+        linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, noaccel
     };
 
     struct settings {
diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp
index 08ac322..8819302 100644
--- a/common/rawaccel.hpp
+++ b/common/rawaccel.hpp
@@ -8,6 +8,7 @@
 
 #include "accel-linear.hpp"
 #include "accel-classic.hpp"
+#include "accel-logarithm.hpp"
 #include "accel-natural.hpp"
 #include "accel-naturalgain.hpp"
 #include "accel-power.hpp"
@@ -84,6 +85,7 @@ namespace rawaccel {
         case accel_mode::naturalgain: return vis(var.u.naturalgain);
         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);
         default:                      return vis(var.u.noaccel);
         }
     }
@@ -98,6 +100,7 @@ namespace rawaccel {
             accel_naturalgain naturalgain;
             accel_sigmoidgain sigmoidgain;
             accel_power power;
+            accel_logarithm logarithm;
             accel_noaccel noaccel = {};
         } u = {};