Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prettier str() for some math types #5921

Merged
merged 1 commit into from Jul 27, 2016
Merged

Prettier str() for some math types #5921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/math/math_2d.cpp
View file
Open in desktop
Expand Up @@ -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])+")";
}
8 changes: 4 additions & 4 deletions core/math/math_2d.h
View file
Open in desktop
Expand Up @@ -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; }
Expand Down Expand Up @@ -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 ); }
Expand Down Expand Up @@ -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; }
Expand Down Expand Up @@ -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; }
Expand Down
13 changes: 10 additions & 3 deletions core/math/matrix3.cpp
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion core/math/quat.cpp
View file
Open in desktop
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion core/math/vector3.cpp
View file
Open in desktop
Expand Up @@ -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))+")";
}