Merge pull request #5921 from neikeq/pr-issue-5919

Prettier str() for some math types

5 files changed, 17 insertions, 10 deletions

diff --git a/core/math/math_2d.cpp b/core/math/math_2d.cpp
index 0e2060008c..cf01e972a4 100644
--- a/core/math/math_2d.cpp
+++ b/core/math/math_2d.cpp
@@ -658,5 +658,5 @@ Matrix32 Matrix32::interpolate_with(const Matrix32& p_transform, float p_c) cons
 
 Matrix32::operator String() const {
 
-	return String(String()+elements[0]+", "+elements[1]+", "+elements[2]);
+	return "("+String(String()+elements[0]+", "+elements[1]+", "+elements[2])+")";
 }
diff --git a/core/math/math_2d.h b/core/math/math_2d.h
index ad4655b8f7..5f511c933e 100644
--- a/core/math/math_2d.h
+++ b/core/math/math_2d.h
@@ -157,7 +157,7 @@ struct Vector2 {
 	float get_aspect() const { return width/height; }
 
 
-	operator String() const { return String::num(x)+","+String::num(y); }
+	operator String() const { return "("+String::num(x)+", "+String::num(y)+")"; }
 
 	_FORCE_INLINE_ Vector2(float p_x,float p_y) { x=p_x; y=p_y; }
 	_FORCE_INLINE_ Vector2() { x=0; y=0; }
@@ -356,7 +356,7 @@ struct Rect2 {
 	}
 
 
-	operator String() const { return String(pos)+","+String(size); }
+	operator String() const { return "("+String(pos)+", "+String(size)+")"; }
 
 	Rect2() {}
 	Rect2( float p_x, float p_y, float p_width, float p_height) { pos=Point2(p_x,p_y); size=Size2( p_width, p_height ); }
@@ -409,7 +409,7 @@ struct Point2i {
 
 	float get_aspect() const { return width/(float)height; }
 
-	operator String() const { return String::num(x)+","+String::num(y); }
+	operator String() const { return "("+String::num(x)+", "+String::num(y)+")"; }
 
 	operator Vector2() const { return Vector2(x,y); }
 	inline Point2i(const Vector2& p_vec2) { x=(int)p_vec2.x; y=(int)p_vec2.y; }
@@ -540,7 +540,7 @@ struct Rect2i {
 	}
 
 
-	operator String() const { return String(pos)+","+String(size); }
+	operator String() const { return "("+String(pos)+", "+String(size)+")"; }
 
 	operator Rect2() const { return Rect2(pos,size); }
 	Rect2i(const Rect2& p_r2) { pos=p_r2.pos; size=p_r2.size; }
diff --git a/core/math/matrix3.cpp b/core/math/matrix3.cpp
index 71e6b62212..7b811c245c 100644
--- a/core/math/matrix3.cpp
+++ b/core/math/matrix3.cpp
@@ -233,19 +233,26 @@ bool Matrix3::operator!=(const Matrix3& p_matrix) const {
 
 Matrix3::operator String() const {
 
-	String mtx;
+	String mtx("(");
 	for (int i=0;i<3;i++) {
 
+		if (i!=0)
+			mtx+=", ";
+
+		mtx+="(";
+
 		for (int j=0;j<3;j++) {
 
-			if (i!=0 || j!=0)
+			if (j!=0)
 				mtx+=", ";
 
 			mtx+=rtos( elements[i][j] );
 		}
+
+		mtx+=")";
 	}
 
-	return mtx;
+	return mtx+")";
 }
 
 Matrix3::operator Quat() const {
diff --git a/core/math/quat.cpp b/core/math/quat.cpp
index c6c12129b3..5457638ada 100644
--- a/core/math/quat.cpp
+++ b/core/math/quat.cpp
@@ -252,7 +252,7 @@ Quat Quat::cubic_slerp(const Quat& q, const Quat& prep, const Quat& postq,const
 
 Quat::operator String() const {
 
-	return String::num(x)+","+String::num(y)+","+ String::num(z)+","+ String::num(w);
+	return "("+String::num(x)+", "+String::num(y)+", "+ String::num(z)+", "+ String::num(w)+")";
 }
 
 Quat::Quat(const Vector3& axis, const real_t& angle) {
diff --git a/core/math/vector3.cpp b/core/math/vector3.cpp
index 8afd73f482..8a0a6e963d 100644
--- a/core/math/vector3.cpp
+++ b/core/math/vector3.cpp
@@ -182,5 +182,5 @@ Vector3 Vector3::cubic_interpolate(const Vector3& p_b,const Vector3& p_pre_a, co
 # endif
 Vector3::operator String() const {
 
-	return (rtos(x)+", "+rtos(y)+", "+rtos(z));
+	return "("+(rtos(x)+", "+rtos(y)+", "+rtos(z))+")";
 }