Skip to content

Commit

Permalink
Merge pull request #108 from a1xd/1.6r2
Browse files Browse the repository at this point in the history 
v1.6
  • Loading branch information
@a1xd
a1xd committed Sep 24, 2021
2 parents c67f04a + e9705ec commit 2896b8a
Show file tree
Hide file tree
Showing 88 changed files with 5,044 additions and 2,517 deletions.
135 changes: 97 additions & 38 deletions common/accel-classic.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,84 +3,142 @@
#include "rawaccel-base.hpp"
#include "utility.hpp"

#include <math.h>
#include <float.h>

namespace rawaccel {

/// <summary> Struct to hold "classic" (linear raised to power) acceleration implementation. </summary>
struct classic_base {
double offset;
double power;
double accel_raised;

classic_base(const accel_args& args) :
offset(args.offset),
power(args.power),
accel_raised(pow(args.accel_classic, power - 1)) {}
double base_fn(double x, double accel_raised, const accel_args& args) const
{
return accel_raised * pow(x - args.input_offset, args.exponent_classic) / x;
}

double base_fn(double x) const
static double base_accel(double x, double y, const accel_args& args)
{
return accel_raised * pow(x - offset, power) / x;
auto power = args.exponent_classic;
return pow(x * y * pow(x - args.input_offset, -power), 1 / (power - 1));
}
};

struct classic_legacy : classic_base {
double sens_cap = DBL_MAX;
template <bool Gain> struct classic;

template<>
struct classic<LEGACY> : classic_base {
double accel_raised;
double cap = DBL_MAX;
double sign = 1;

classic_legacy(const accel_args& args) :
classic_base(args)
classic(const accel_args& args)
{
if (args.cap > 0) {
sens_cap = args.cap - 1;
switch (args.cap_mode) {
case cap_mode::io:
cap = args.cap.y - 1;

if (sens_cap < 0) {
sens_cap = -sens_cap;
if (cap < 0) {
cap = -cap;
sign = -sign;
}

{
double a = base_accel(args.cap.x, cap, args);
accel_raised = pow(a, args.exponent_classic - 1);
}
break;
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 cap_mode::out:
default:
accel_raised = pow(args.acceleration, args.exponent_classic - 1);

if (args.cap.y > 0) {
cap = args.cap.y - 1;

if (cap < 0) {
cap = -cap;
sign = -sign;
}
}

break;
}
}

double operator()(double x) const
double operator()(double x, const accel_args& args) const
{
if (x <= offset) return 1;
return sign * minsd(base_fn(x), sens_cap) + 1;
}
if (x <= args.input_offset) return 1;
return sign * minsd(base_fn(x, accel_raised, args), cap) + 1;
}

};

struct classic : classic_base {
vec2d gain_cap = { DBL_MAX, DBL_MAX };
template<>
struct classic<GAIN> : classic_base {
double accel_raised;
vec2d cap = { DBL_MAX, DBL_MAX };
double constant = 0;
double sign = 1;

classic(const accel_args& args) :
classic_base(args)
classic(const accel_args& args)
{
if (args.cap > 0) {
gain_cap.y = args.cap - 1;
switch (args.cap_mode) {
case cap_mode::io:
cap.x = args.cap.x;
cap.y = args.cap.y - 1;

if (gain_cap.y < 0) {
gain_cap.y = -gain_cap.y;
if (cap.y < 0) {
cap.y = -cap.y;
sign = -sign;
}

gain_cap.x = gain_inverse(gain_cap.y, args.accel_classic, power, offset);
constant = (base_fn(gain_cap.x) - gain_cap.y) * gain_cap.x;
{
double a = gain_accel(cap.x, cap.y, args.exponent_classic, args.input_offset);
accel_raised = pow(a, args.exponent_classic - 1);
}
constant = (base_fn(cap.x, accel_raised, args) - cap.y) * cap.x;
break;
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 cap_mode::out:
default:
accel_raised = pow(args.acceleration, args.exponent_classic - 1);

if (args.cap.y > 0) {
cap.y = args.cap.y - 1;

if (cap.y < 0) {
cap.y = -cap.y;
sign = -sign;
}

cap.x = gain_inverse(cap.y, args.acceleration, args.exponent_classic, args.input_offset);
constant = (base_fn(cap.x, accel_raised, args) - cap.y) * cap.x;
}
break;
}
}

double operator()(double x) const
double operator()(double x, const accel_args& args) const
{
double output;

if (x <= offset) return 1;
if (x <= args.input_offset) return 1;

if (x < gain_cap.x) {
output = base_fn(x);
if (x < cap.x) {
output = base_fn(x, accel_raised, args);
}
else {
output = constant / x + gain_cap.y;
output = constant / x + cap.y;
}

return sign * output + 1;
Expand All @@ -100,6 +158,7 @@ namespace rawaccel {
{
return -pow(y / power, 1 / (power - 1)) / (offset - x);
}

};

}
52 changes: 0 additions & 52 deletions common/accel-invoke.hpp
View file

This file was deleted.

18 changes: 12 additions & 6 deletions common/accel-jump.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
namespace rawaccel {

struct jump_base {
static constexpr double smooth_scale = 2 * PI;
static constexpr double smooth_scale = 2 * M_PI;

vec2d step;
double smooth_rate;

// requirements: args.smooth in range [0, 1]
jump_base(const accel_args& args) :
step({ args.offset, args.cap - 1 })
step({ args.cap.x, args.cap.y - 1 })
{
double rate_inverse = args.smooth * step.x;

Expand Down Expand Up @@ -43,27 +43,32 @@ namespace rawaccel {
{
return step.y * (x + log(1 + decay(x)) / smooth_rate);
}

};

struct jump_legacy : jump_base {
template <bool Gain> struct jump;

template<>
struct jump<LEGACY> : jump_base {
using jump_base::jump_base;

double operator()(double x) const
double operator()(double x, const accel_args&) const
{
if (is_smooth()) return smooth(x) + 1;
else if (x < step.x) return 1;
else return 1 + step.y;
}
};

struct jump : jump_base {
template<>
struct jump<GAIN> : jump_base {
double C;

jump(const accel_args& args) :
jump_base(args),
C(-smooth_antideriv(0)) {}

double operator()(double x) const
double operator()(double x, const accel_args&) const
{
if (x <= 0) return 1;

Expand All @@ -72,6 +77,7 @@ namespace rawaccel {
if (x < step.x) return 1;
else return 1 + step.y * (x - step.x) / x;
}

};

}
Loading

0 comments on commit 2896b8a

Please sign in to comment.