Move function into class body

Cultrarius · Jul 25, 2016 · ced785d · ced785d
1 parent a1c482e
commit ced785d
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/swarmz.h b/swarmz.h
@@ -141,25 +141,6 @@ namespace sw {
         }
     };
 
-    float TransformDistance(float distance, DistanceType type) {
-        if (type == DistanceType::LINEAR) {
-            return distance;
-        }
-        else if (type == DistanceType::INVERSE_LINEAR) {
-            return distance == 0 ? 0 : 1 / distance;
-        }
-        else if (type == DistanceType::QUADRATIC) {
-            return std::pow(distance, 2);
-        }
-        else if (type == DistanceType::INVERSE_QUADRATIC) {
-            float quad = std::pow(distance, 2);
-            return quad == 0 ? 0 : 1 / quad;
-        }
-        else {
-            return distance; // throw exception instead?
-        }
-    }
-
     struct Boid {
         Vec3 Position;
         Vec3 Velocity;
@@ -333,5 +314,24 @@ namespace sw {
             voxelPos.Z = static_cast<int>(p.Z / r);
             return voxelPos;
         }
+
+        float TransformDistance(float distance, DistanceType type) {
+            if (type == DistanceType::LINEAR) {
+                return distance;
+            }
+            else if (type == DistanceType::INVERSE_LINEAR) {
+                return distance == 0 ? 0 : 1 / distance;
+            }
+            else if (type == DistanceType::QUADRATIC) {
+                return std::pow(distance, 2);
+            }
+            else if (type == DistanceType::INVERSE_QUADRATIC) {
+                float quad = std::pow(distance, 2);
+                return quad == 0 ? 0 : 1 / quad;
+            }
+            else {
+                return distance; // throw exception instead?
+            }
+        }
     };
 }