Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/moto/include/MT_Vector3.inl')
-rw-r--r--intern/moto/include/MT_Vector3.inl14
1 files changed, 7 insertions, 7 deletions
diff --git a/intern/moto/include/MT_Vector3.inl b/intern/moto/include/MT_Vector3.inl
index 09c92c6ab54..8a2328fa295 100644
--- a/intern/moto/include/MT_Vector3.inl
+++ b/intern/moto/include/MT_Vector3.inl
@@ -17,7 +17,7 @@ GEN_INLINE MT_Vector3& MT_Vector3::operator*=(MT_Scalar s) {
GEN_INLINE MT_Vector3& MT_Vector3::operator/=(MT_Scalar s) {
MT_assert(!MT_fuzzyZero(s));
- return *this *= MT_Scalar(1.0) / s;
+ return *this *= MT_Scalar(1.0f) / s;
}
GEN_INLINE MT_Vector3 operator+(const MT_Vector3& v1, const MT_Vector3& v2) {
@@ -40,7 +40,7 @@ GEN_INLINE MT_Vector3 operator*(MT_Scalar s, const MT_Vector3& v) { return v * s
GEN_INLINE MT_Vector3 operator/(const MT_Vector3& v, MT_Scalar s) {
MT_assert(!MT_fuzzyZero(s));
- return v * (MT_Scalar(1.0) / s);
+ return v * (MT_Scalar(1.0f) / s);
}
GEN_INLINE MT_Vector3 operator*(const MT_Vector3& v1, const MT_Vector3& v2) {
@@ -64,7 +64,7 @@ GEN_INLINE bool MT_Vector3::fuzzyZero() const {
GEN_INLINE void MT_Vector3::noiseGate(MT_Scalar threshold) {
if (length2() < threshold) {
- setValue(MT_Scalar(0.0), MT_Scalar(0.0), MT_Scalar(0.0));
+ setValue(MT_Scalar(0.0f), MT_Scalar(0.0f), MT_Scalar(0.0f));
}
}
@@ -73,7 +73,7 @@ GEN_INLINE MT_Vector3 MT_Vector3::normalized() const { return *this / length();
GEN_INLINE MT_Vector3 MT_Vector3::safe_normalized() const {
MT_Scalar len = length();
return MT_fuzzyZero(len) ?
- MT_Vector3(MT_Scalar(1.0), MT_Scalar(0.0), MT_Scalar(0.0)) :
+ MT_Vector3(MT_Scalar(1.0f), MT_Scalar(0.0f), MT_Scalar(0.0f)) :
*this / len;
}
@@ -116,9 +116,9 @@ GEN_INLINE int MT_Vector3::closestAxis() const {
}
GEN_INLINE MT_Vector3 MT_Vector3::random() {
- MT_Scalar z = MT_Scalar(2.0) * MT_random() - MT_Scalar(1.0);
- MT_Scalar r = sqrt(MT_Scalar(1.0) - z * z);
- MT_Scalar t = MT_2_PI * MT_random();
+ MT_Scalar z = MT_Scalar(2.0f) * MT_random() - MT_Scalar(1.0f);
+ MT_Scalar r = sqrt(MT_Scalar(1.0f) - z * z);
+ MT_Scalar t = (float)MT_2_PI * MT_random();
return MT_Vector3(r * cos(t), r * sin(t), z);
}