remove Math

inc/Math.hpp

@@ -1,5 +0,0 @@
-#include <raylib.h>
-
-Color ColorAdd(Color c1, Color c2);
-Color ColorAddValue(Color c, int add);
-Rectangle TextInSpace(Rectangle box, float textH, float textW, float margin, bool topOrBottom);

src/App.cpp

@@ -2,7 +2,6 @@
 #include <cmath>
 
 #include "App.hpp"
-#include "Math.hpp"
 
 #include <raylib.h>
 #include <raymath.h>
@@ -10,6 +9,44 @@
 #define TOP (1 - pos)
 #define BOTTOM pos
 
+Rectangle TextInSpace(Rectangle box, float textH, float textW, float margin, bool topOrBottom)
+{
+  float br = box.width / box.height;
+  float tr = textW / textH;
+
+  Rectangle ret = {0, 0, 0, 0};
+
+  float hm = box.height * margin;
+  float wm = box.width * margin;
+
+  ret.height = box.height - hm;
+  ret.width = box.width - wm;
+
+  if (br < tr)
+  {
+    // bolj kvadrat izracunaj visino iz sirine
+    ret.height = ret.width / tr;
+  }
+  else
+  {
+    // bolj podolgovat izracunaj sirino iz visine
+    ret.width = ret.height * tr;
+  }
+
+  if (topOrBottom)
+  {
+    ret.y = box.y + hm;
+  }
+  else
+  {
+    ret.y = box.y + box.height - hm - ret.height;
+  }
+
+  ret.x = box.x + wm;
+
+  return ret;
+}
+
 // Dimentions for font size 20
 // DISLIKE 83
 // LIKE 46

src/Math.cpp

@@ -1,64 +0,0 @@
-#include <cmath>
-#include <algorithm>
-
-#include "Math.hpp"
-#include "values/mrand.hpp"
-
-#include <raymath.h>
-
-Color ColorAddValue(Color c, int add)
-{
-  int r = std::clamp(c.r + add, 0, 255);
-  int g = std::clamp(c.g + add, 0, 255);
-  int b = std::clamp(c.b + add, 0, 255);
-
-  return {(unsigned char)r, (unsigned char)g, (unsigned char)b, c.a};
-}
-
-Color ColorAdd(Color c1, Color c2)
-{
-  int r = std::clamp(c1.r + c2.r, 0, 255);
-  int g = std::clamp(c1.g + c2.g, 0, 255);
-  int b = std::clamp(c1.b + c2.b, 0, 255);
-  int a = std::clamp(c1.a + c2.a, 0, 255);
-
-  return {(unsigned char)r, (unsigned char)g, (unsigned char)b, (unsigned char)a};
-}
-
-Rectangle TextInSpace(Rectangle box, float textH, float textW, float margin, bool topOrBottom)
-{
-  float br = box.width / box.height;
-  float tr = textW / textH;
-
-  Rectangle ret = {0, 0, 0, 0};
-
-  float hm = box.height * margin;
-  float wm = box.width * margin;
-
-  ret.height = box.height - hm;
-  ret.width = box.width - wm;
-
-  if (br < tr)
-  {
-    // bolj kvadrat izracunaj visino iz sirine
-    ret.height = ret.width / tr;
-  }
-  else
-  {
-    // bolj podolgovat izracunaj sirino iz visine
-    ret.width = ret.height * tr;
-  }
-
-  if (topOrBottom)
-  {
-    ret.y = box.y + hm;
-  }
-  else
-  {
-    ret.y = box.y + box.height - hm - ret.height;
-  }
-
-  ret.x = box.x + wm;
-
-  return ret;
-}

src/canvas/BackGround.cpp

@@ -3,7 +3,6 @@
 #include "canvas/BackGround.hpp"
 #include "canvas/BackGroundColors.hpp"
 #include "canvas/Circle.hpp"
-#include "Math.hpp"
 #include "stb_perlin.h"
 
 #include <raylib.h>
@@ -28,6 +27,25 @@ constexpr static float mounten2max = 0.90;
 constexpr static float mounten3min = 0.90f;
 constexpr static float mounten3max = 0.95f;
 
+Color ColorAddValue(Color c, int add)
+{
+  int r = std::clamp(c.r + add, 0, 255);
+  int g = std::clamp(c.g + add, 0, 255);
+  int b = std::clamp(c.b + add, 0, 255);
+
+  return {(unsigned char)r, (unsigned char)g, (unsigned char)b, c.a};
+}
+
+Color ColorAdd(Color c1, Color c2)
+{
+  int r = std::clamp(c1.r + c2.r, 0, 255);
+  int g = std::clamp(c1.g + c2.g, 0, 255);
+  int b = std::clamp(c1.b + c2.b, 0, 255);
+  int a = std::clamp(c1.a + c2.a, 0, 255);
+
+  return {(unsigned char)r, (unsigned char)g, (unsigned char)b, (unsigned char)a};
+}
+
 // Public
 void BackGround::init(int canvasSize)
 {

src/canvas/Circle.cpp

@@ -1,8 +1,6 @@
 #include "canvas/Circle.hpp"
 #include "sunShader.hpp"
 
-#include "Math.hpp"
-
 #include <raylib.h>
 #include <rlgl.h>
 

src/canvas/Tree.cpp

@@ -2,7 +2,6 @@
 
 #include "canvas/Tree.hpp"
 #include "canvas/Circle.hpp"
-#include "Math.hpp"
 
 #include <raylib.h>
 #include <raymath.h>