Browse Source

Fix snapped from Vector2

RameshRavone 6 years ago
parent
commit
ca85ab244f
2 changed files with 5 additions and 7 deletions
  1. 5 1
      include/core/Vector2.hpp
  2. 0 6
      src/core/Vector2.cpp

+ 5 - 1
include/core/Vector2.hpp

@@ -208,7 +208,11 @@ struct Vector2 {
 		return Vector2(::floor(x), ::floor(y));
 		return Vector2(::floor(x), ::floor(y));
 	}
 	}
 
 
-	inline Vector2 snapped(const Vector2 &p_by) const;
+	inline Vector2 snapped(const Vector2 &p_by) const {
+		return Vector2(
+				p_by.x != 0 ? ::floor(x / p_by.x + 0.5) * p_by.x : x,
+				p_by.y != 0 ? ::floor(y / p_by.y + 0.5) * p_by.y : y);
+	}
 
 
 	inline real_t aspect() const { return width / height; }
 	inline real_t aspect() const { return width / height; }
 
 

+ 0 - 6
src/core/Vector2.cpp

@@ -54,12 +54,6 @@ Vector2 Vector2::cubic_interpolate(const Vector2 &p_b, const Vector2 &p_pre_a, c
 	return out;
 	return out;
 }
 }
 
 
-Vector2 Vector2::snapped(const Vector2 &p_by) const {
-	return Vector2(
-			p_by.x != 0 ? ::floor(x / p_by.x + 0.5) * p_by.x : x,
-			p_by.y != 0 ? ::floor(y / p_by.y + 0.5) * p_by.y : y);
-}
-
 Vector2::operator String() const {
 Vector2::operator String() const {
 	return String::num(x) + ", " + String::num(y);
 	return String::num(x) + ", " + String::num(y);
 }
 }