Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/math
diff options
context:
space:
mode:
Diffstat (limited to 'src/math')
-rw-r--r--src/math/functions.h7
-rw-r--r--src/math/vector3f.cc4
2 files changed, 8 insertions, 3 deletions
diff --git a/src/math/functions.h b/src/math/functions.h
index 3d5d056..be6919d 100644
--- a/src/math/functions.h
+++ b/src/math/functions.h
@@ -49,9 +49,12 @@ float degrees180f(float angle);
float degrees360f(float angle);
/// clamp a float to a specified range
-inline void clamp(float &value, float min=0.0f, float max=1.0f)
+inline void clamp(float &value, const float min=0.0f, const float max=1.0f)
{
- if (value < min) value = min; else if (value > max) value = max;
+ if (value < min)
+ value = min;
+ else if (value > max)
+ value = max;
}
/// return the absolute value of a float
diff --git a/src/math/vector3f.cc b/src/math/vector3f.cc
index d5173bb..57ad52a 100644
--- a/src/math/vector3f.cc
+++ b/src/math/vector3f.cc
@@ -49,7 +49,9 @@ void Vector3f::assign(const float vx, const float vy, const float vz)
void Vector3f::assign(Vector3f const & other)
{
- memcpy(coord, other.coord, sizeof(coord));
+ coord[0] = other.coord[0];
+ coord[1] = other.coord[1];
+ coord[2] = other.coord[2];
}
Vector3f & Vector3f::operator=(const Vector3f & other)