merged with master

2019-03-25 12:43:23 +11:00
parent e2c5c87a0a a3c1342f77
commit 93c009c7fd
83 changed files with 7823 additions and 1469 deletions
@@ -21,6 +21,8 @@
 #ifndef MATH_H
 #define MATH_H

+#include <QRect>
+
 int lerp(int a, int b, double t);
 float float_lerp(float a, float b, float t);
 double double_lerp(double a, double b, double t);
@@ -30,6 +32,8 @@ double cubic_from_t(double a, double b, double c, double d, double t);
 double cubic_t_from_x(double x_target, double a, double b, double c, double d);
 double solveCubicBezier(double p0, double p1, double p2, double p3, double x);

+QRect fit_size_into_rect(const QRect& r, int width, int height);
+
 // decibel conversion functions
 double amplitude_to_db(double amplitude);
 double db_to_amplitude(double db);