diff options
| -rw-r--r-- | common/accel-classic.hpp | 12 | ||||
| -rw-r--r-- | common/accel-power.hpp | 14 | ||||
| -rw-r--r-- | common/rawaccel-base.hpp | 4 | ||||
| -rw-r--r-- | common/rawaccel-validate.hpp | 2 | ||||
| -rw-r--r-- | grapher/Models/Options/Cap/CapOptions.cs | 2 | ||||
| -rw-r--r-- | grapher/Models/Options/Cap/CapTypeOptions.cs | 18 | ||||
| -rw-r--r-- | wrapper/wrapper.cpp | 8 |
7 files changed, 30 insertions, 30 deletions
diff --git a/common/accel-classic.hpp b/common/accel-classic.hpp index ca0651c..2ca1233 100644 --- a/common/accel-classic.hpp +++ b/common/accel-classic.hpp @@ -32,7 +32,7 @@ namespace rawaccel { classic(const accel_args& args) { switch (args.cap_mode) { - case classic_cap_mode::io: + case cap_mode::io: cap = args.cap.y - 1; if (cap < 0) { @@ -45,13 +45,13 @@ namespace rawaccel { accel_raised = pow(a, args.exponent_classic - 1); } break; - case classic_cap_mode::in: + case cap_mode::in: accel_raised = pow(args.acceleration, args.exponent_classic - 1); if (args.cap.x > 0) { cap = base_fn(args.cap.x, accel_raised, args); } break; - case classic_cap_mode::out: + case cap_mode::out: default: accel_raised = pow(args.acceleration, args.exponent_classic - 1); @@ -86,7 +86,7 @@ namespace rawaccel { classic(const accel_args& args) { switch (args.cap_mode) { - case classic_cap_mode::io: + case cap_mode::io: cap.x = args.cap.x; cap.y = args.cap.y - 1; @@ -101,7 +101,7 @@ namespace rawaccel { } constant = (base_fn(cap.x, accel_raised, args) - cap.y) * cap.x; break; - case classic_cap_mode::in: + case cap_mode::in: accel_raised = pow(args.acceleration, args.exponent_classic - 1); if (args.cap.x > 0) { cap.x = args.cap.x; @@ -109,7 +109,7 @@ namespace rawaccel { constant = (base_fn(cap.x, accel_raised, args) - cap.y) * cap.x; } break; - case classic_cap_mode::out: + case cap_mode::out: default: accel_raised = pow(args.acceleration, args.exponent_classic - 1); diff --git a/common/accel-power.hpp b/common/accel-power.hpp index ffbadb0..776986d 100644 --- a/common/accel-power.hpp +++ b/common/accel-power.hpp @@ -15,7 +15,7 @@ namespace rawaccel { { auto n = args.exponent_power; - if (args.cap_mode != classic_cap_mode::io) { + if (args.cap_mode != cap_mode::io) { scale = args.scale; } else if (args.gain) { @@ -81,13 +81,13 @@ namespace rawaccel { { switch (args.cap_mode){ - case classic_cap_mode::io: + case cap_mode::io: cap = args.cap.y; break; - case classic_cap_mode::in: + case cap_mode::in: if (args.cap.x > 0) cap = base_fn(args.cap.x, args); break; - case classic_cap_mode::out: + case cap_mode::out: default: if (args.cap.y > 0) cap = args.cap.y; break; @@ -110,10 +110,10 @@ namespace rawaccel { power_base(args) { switch (args.cap_mode) { - case classic_cap_mode::io: + case cap_mode::io: cap = args.cap; break; - case classic_cap_mode::in: + case cap_mode::in: if (args.cap.x > 0) { cap.x = args.cap.x; cap.y = gain( @@ -122,7 +122,7 @@ namespace rawaccel { scale); } break; - case classic_cap_mode::out: + case cap_mode::out: default: if (args.cap.y > 0) { cap.x = gain_inverse( diff --git a/common/rawaccel-base.hpp b/common/rawaccel-base.hpp index aefee6d..91f58dc 100644 --- a/common/rawaccel-base.hpp +++ b/common/rawaccel-base.hpp @@ -34,7 +34,7 @@ namespace rawaccel { noaccel }; - enum class classic_cap_mode { + enum class cap_mode { io, in, out }; @@ -56,7 +56,7 @@ namespace rawaccel { double smooth = 0.5; vec2d cap = { 15, 1.5 }; - classic_cap_mode cap_mode = classic_cap_mode::out; + cap_mode cap_mode = cap_mode::out; int length = 0; mutable float data[LUT_RAW_DATA_CAPACITY] = {}; diff --git a/common/rawaccel-validate.hpp b/common/rawaccel-validate.hpp index f1c2980..2e892a5 100644 --- a/common/rawaccel-validate.hpp +++ b/common/rawaccel-validate.hpp @@ -64,7 +64,7 @@ namespace rawaccel { bool jump_or_io_cap = (args.mode == accel_mode::jump || ((args.mode == accel_mode::classic || args.mode == accel_mode::power) && - args.cap_mode == classic_cap_mode::io)); + args.cap_mode == cap_mode::io)); if (args.cap.x < 0) { error("cap (input) can not be negative"); diff --git a/grapher/Models/Options/Cap/CapOptions.cs b/grapher/Models/Options/Cap/CapOptions.cs index ac34abf..de0f597 100644 --- a/grapher/Models/Options/Cap/CapOptions.cs +++ b/grapher/Models/Options/Cap/CapOptions.cs @@ -131,7 +131,7 @@ namespace grapher.Models.Options.Cap double scale, double inCap, double outCap, - ClassicCapMode capMode) + CapMode capMode) { Slope.SetActiveValue(scale); In.SetActiveValue(inCap); diff --git a/grapher/Models/Options/Cap/CapTypeOptions.cs b/grapher/Models/Options/Cap/CapTypeOptions.cs index 1e7bd58..6447feb 100644 --- a/grapher/Models/Options/Cap/CapTypeOptions.cs +++ b/grapher/Models/Options/Cap/CapTypeOptions.cs @@ -107,14 +107,14 @@ namespace grapher.Models.Options.Cap private CapTypeOption Default { get; set; } - public ClassicCapMode GetSelectedCapMode() + public CapMode GetSelectedCapMode() { switch(SelectedCapType) { - case CapType.Output: return ClassicCapMode.output; - case CapType.Both: return ClassicCapMode.in_out; + case CapType.Output: return CapMode.output; + case CapType.Both: return CapMode.in_out; case CapType.Input: - default: return ClassicCapMode.input; + default: return CapMode.input; } } @@ -122,21 +122,21 @@ namespace grapher.Models.Options.Cap #region Methods - public static CapTypeOption CapTypeOptionFromSettings(ClassicCapMode capMode) + public static CapTypeOption CapTypeOptionFromSettings(CapMode capMode) { switch (capMode) { - case ClassicCapMode.output: + case CapMode.output: return OutCap; - case ClassicCapMode.in_out: + case CapMode.in_out: return BothCap; - case ClassicCapMode.input: + case CapMode.input: default: return InCap; } } - public void SetActiveValue(ClassicCapMode capMode) + public void SetActiveValue(CapMode capMode) { Default = CapTypeOptionFromSettings(capMode); SelectedCapOption = Default; diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index b81e2aa..a248010 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -41,7 +41,7 @@ public enum class AccelMode }; [JsonConverter(Converters::StringEnumConverter::typeid)] -public enum class ClassicCapMode { +public enum class CapMode { in_out, input, output }; @@ -81,7 +81,7 @@ public value struct AccelArgs Vec2<double> cap; [JsonProperty("Cap mode")] - ClassicCapMode capMode; + CapMode capMode; [JsonIgnore] int length; @@ -607,9 +607,9 @@ public: } JObject^ jObject = JObject::FromObject(this); - String^ capModes = String::Join(" | ", Enum::GetNames(ClassicCapMode::typeid)); + String^ capModes = String::Join(" | ", Enum::GetNames(CapMode::typeid)); String^ accelModes = String::Join(" | ", Enum::GetNames(AccelMode::typeid)); - jObject->AddFirst(gcnew JProperty("### Cap modes (applies to classic only) ###", capModes)); + jObject->AddFirst(gcnew JProperty("### Cap modes ###", capModes)); jObject->AddFirst(gcnew JProperty("### Accel modes ###", accelModes)); for each (auto prof in profiles) { |