Merge pull request #20 from JacobPalecki/GUI

GUI: Add By Component & Anisotropy; Remove Logarithm and Sigmoid; Delete Console; Some Refactoring

5 files changed, 2 insertions, 64 deletions

diff --git a/common/accel-logarithmic.hpp b/common/accel-logarithmic.hpp
deleted file mode 100644
index 1ab0e53..0000000
--- a/common/accel-logarithmic.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <math.h>
-
-#include "accel-base.hpp"
-
-namespace rawaccel {
-
-	/// <summary> Struct to hold logarithmic acceleration implementation. </summary>
-	struct logarithmic_impl {
-		double accel;
-
-		logarithmic_impl(const accel_args& args) : accel(args.accel) {}
-
-		inline double operator()(double speed) const {
-			//f(x) = log(m*x+1)
-			return log(accel * speed + 1);
-		}
-		
-		// incorrect but this style is slated for removal
-		inline double legacy_offset(double speed) const { return operator()(speed); }
-	};
-
-	using accel_logarithmic = additive_accel<logarithmic_impl>;
-}
diff --git a/common/accel-sigmoid.hpp b/common/accel-sigmoid.hpp
deleted file mode 100644
index 239bd9d..0000000
--- a/common/accel-sigmoid.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <math.h>
-
-#include "accel-base.hpp"
-
-namespace rawaccel {
-
-	/// <summary> Struct to hold sigmoid (s-shaped) acceleration implementation. </summary>
-	struct sigmoid_impl {
-		double rate;
-		double limit;
-		double midpoint;
-
-		sigmoid_impl(const accel_args& args) :
-			rate(args.accel), limit(args.limit - 1), midpoint(args.midpoint)
-		{}
-
-		inline double operator()(double speed) const {
-			//f(x) = k/(1+e^(-m(x-c)))
-			return limit / (exp(-rate * (speed - midpoint)) + 1);
-		}
-
-		inline double legacy_offset(double speed) const { return operator()(speed); }
-	};
-
-	using accel_sigmoid = additive_accel<sigmoid_impl>;
-
-}
diff --git a/common/common.vcxitems b/common/common.vcxitems
index 52d4f8a..2913080 100644
--- a/common/common.vcxitems
+++ b/common/common.vcxitems
@@ -17,12 +17,10 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-base.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-classic.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-linear.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)accel-logarithmic.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-natural.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-naturalgain.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-noaccel.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-power.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)accel-sigmoid.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-sigmoidgain.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)rawaccel-error.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)rawaccel-io.hpp" />
diff --git a/common/rawaccel-settings.h b/common/rawaccel-settings.h
index b9ff946..12f136d 100644
--- a/common/rawaccel-settings.h
+++ b/common/rawaccel-settings.h
@@ -6,7 +6,7 @@
 namespace rawaccel {
 
     enum class accel_mode {
-        linear, classic, natural, logarithmic, sigmoid, naturalgain, sigmoidgain, power, noaccel
+        linear, classic, natural, naturalgain, sigmoidgain, power, noaccel
     };
 
     struct settings {
diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp
index d3a2a03..08ac322 100644
--- a/common/rawaccel.hpp
+++ b/common/rawaccel.hpp
@@ -10,10 +10,8 @@
 #include "accel-classic.hpp"
 #include "accel-natural.hpp"
 #include "accel-naturalgain.hpp"
-#include "accel-logarithmic.hpp"
-#include "accel-sigmoid.hpp"
-#include "accel-sigmoidgain.hpp"
 #include "accel-power.hpp"
+#include "accel-sigmoidgain.hpp"
 #include "accel-noaccel.hpp"
 
 namespace rawaccel {
@@ -83,8 +81,6 @@ namespace rawaccel {
         case accel_mode::linear:      return vis(var.u.linear);
         case accel_mode::classic:     return vis(var.u.classic);
         case accel_mode::natural:     return vis(var.u.natural);
-        case accel_mode::logarithmic: return vis(var.u.logarithmic);
-        case accel_mode::sigmoid:     return vis(var.u.sigmoid);
         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);
@@ -99,8 +95,6 @@ namespace rawaccel {
             accel_linear linear;
             accel_classic classic;
             accel_natural natural;
-            accel_logarithmic logarithmic;
-            accel_sigmoid sigmoid;
             accel_naturalgain naturalgain;
             accel_sigmoidgain sigmoidgain;
             accel_power power;