Skip to content

Commit

Permalink
rename classic_cap_mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@a1xd
a1xd committed Sep 24, 2021
1 parent 94ce154 commit d270a96
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 30 deletions.
12 changes: 6 additions & 6 deletions common/accel-classic.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);

Expand Down Expand Up @@ -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;

Expand All @@ -101,15 +101,15 @@ 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;
cap.y = gain(cap.x, args.acceleration, args.exponent_classic, args.input_offset);
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);

Expand Down
14 changes: 7 additions & 7 deletions common/accel-power.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand All @@ -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(
Expand All @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions common/rawaccel-base.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace rawaccel {
noaccel
};

enum class classic_cap_mode {
enum class cap_mode {
io, in, out
};

Expand All @@ -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] = {};
Expand Down
2 changes: 1 addition & 1 deletion common/rawaccel-validate.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion grapher/Models/Options/Cap/CapOptions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void SetActiveValues(
double scale,
double inCap,
double outCap,
ClassicCapMode capMode)
CapMode capMode)
{
Slope.SetActiveValue(scale);
In.SetActiveValue(inCap);
Expand Down
18 changes: 9 additions & 9 deletions grapher/Models/Options/Cap/CapTypeOptions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,36 +107,36 @@ public CapTypeOption SelectedCapOption

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;
}
}

#endregion Properties

#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;
Expand Down
8 changes: 4 additions & 4 deletions wrapper/wrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public enum class AccelMode
};

[JsonConverter(Converters::StringEnumConverter::typeid)]
public enum class ClassicCapMode {
public enum class CapMode {
in_out, input, output
};

Expand Down Expand Up @@ -81,7 +81,7 @@ public value struct AccelArgs
Vec2<double> cap;

[JsonProperty("Cap mode")]
ClassicCapMode capMode;
CapMode capMode;

[JsonIgnore]
int length;
Expand Down Expand Up @@ -607,9 +607,9 @@ public ref class DriverConfig {
}

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) {
Expand Down

0 comments on commit d270a96

Please sign in to comment.