Replaced Util::remap() with ofMap()

nununo · May 18, 2017 · 38fecb4 · 38fecb4
1 parent fe8bf97
commit 38fecb4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/src/Clip.cpp b/src/Clip.cpp
@@ -44,7 +44,7 @@ MovieBase* Clip::createMovie(string filename) {
 
 //-----------------------------------------------------------------------
 float Clip::timeToPercentage(float time) {
-  return Util::remap(time, 0, movie->getDuration(), 0, 1);
+  return ofMap(time, 0, movie->getDuration(), 0, 1);
 }
 
 //-----------------------------------------------------------------------
@@ -69,7 +69,7 @@ int Clip::calcAlpha() {
   if (levelSettings->getLoop())
     return ALPHA_MAX;
   else {
-    float alpha = Util::remap(movie->getPosition(), 0.98-fadeOutPercentage, 0.98, 1, 0);
+    float alpha = ofMap(movie->getPosition(), 0.98-fadeOutPercentage, 0.98, 1, 0);
     return (int)(alpha * ALPHA_MAX);
   }
 }

diff --git a/src/Util.cpp b/src/Util.cpp
@@ -9,17 +9,7 @@
 #include "Util.h"
 
 //--------------------------------------------------------------
-float Util::remap(const float v, const float inMin, const float inMax, const float outMin, const float outMax) {
-  float aux =  1 - ((inMax - v) / (inMax - inMin));
-  if (aux < 0)
-    aux = 0;
-  else if (aux > 1)
-    aux = 1;
-  return outMin + (outMax-outMin)* aux;
-}
-
-//--------------------------------------------------------------
-string Util::blowIntensityToString(const BlowIntensity blowIntensity) {
+std::string Util::blowIntensityToString(const BlowIntensity blowIntensity) {
   switch (blowIntensity) {
     case BlowIntensity::IDLE:
       return "idle";

diff --git a/src/Util.h b/src/Util.h
@@ -10,12 +10,11 @@
 #define UTIL_H_INCLUDED
 
 #include "BlowIntensity.h"
-#include "ofMain.h"
+#include <string>
 
 class Util {
 public:
-  static float remap(const float v, const float inMin, const float inMax, const float outMin, const float outMax);
-  static string blowIntensityToString(const BlowIntensity blowIntensity);
+  static std::string blowIntensityToString(const BlowIntensity blowIntensity);
 };
 
 #endif // UTIL_H_INCLUDED