projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/savegame'
[supertux.git]
/
src
/
math
/
sizef.hpp
diff --git
a/src/math/sizef.hpp
b/src/math/sizef.hpp
index
448cb55
..
636416a
100644
(file)
--- a/
src/math/sizef.hpp
+++ b/
src/math/sizef.hpp
@@
-30,8
+30,8
@@
public:
{}
Sizef(float width_, float height_) :
{}
Sizef(float width_, float height_) :
- width(width_),
- height(height_)
+ width(width_),
+ height(height_)
{}
Sizef(const Sizef& rhs) :
{}
Sizef(const Sizef& rhs) :
@@
-56,17
+56,17
@@
public:
}
Sizef& operator+=(const Sizef& rhs)
}
Sizef& operator+=(const Sizef& rhs)
- {
- width += rhs.width;
- height += rhs.height;
- return *this;
+ {
+ width += rhs.width;
+ height += rhs.height;
+ return *this;
}
Sizef& operator-=(const Sizef& rhs)
}
Sizef& operator-=(const Sizef& rhs)
- {
- width -= rhs.width;
- height -= rhs.height;
- return *this;
+ {
+ width -= rhs.width;
+ height -= rhs.height;
+ return *this;
}
public:
}
public:
@@
-75,43
+75,43
@@
public:
};
inline Sizef operator*(const Sizef& lhs, float factor)
};
inline Sizef operator*(const Sizef& lhs, float factor)
-{
- return Sizef(lhs.width * factor,
- lhs.height * factor);
+{
+ return Sizef(lhs.width * factor,
+ lhs.height * factor);
}
inline Sizef operator*(float factor, const Sizef& rhs)
}
inline Sizef operator*(float factor, const Sizef& rhs)
-{
- return Sizef(rhs.width * factor,
- rhs.height * factor);
+{
+ return Sizef(rhs.width * factor,
+ rhs.height * factor);
}
inline Sizef operator/(const Sizef& lhs, float divisor)
}
inline Sizef operator/(const Sizef& lhs, float divisor)
-{
- return Sizef(lhs.width / divisor,
- lhs.height / divisor);
+{
+ return Sizef(lhs.width / divisor,
+ lhs.height / divisor);
}
inline Sizef operator+(const Sizef& lhs, const Sizef& rhs)
}
inline Sizef operator+(const Sizef& lhs, const Sizef& rhs)
-{
- return Sizef(lhs.width + rhs.width,
- lhs.height + rhs.height);
+{
+ return Sizef(lhs.width + rhs.width,
+ lhs.height + rhs.height);
}
inline Sizef operator-(const Sizef& lhs, const Sizef& rhs)
{
}
inline Sizef operator-(const Sizef& lhs, const Sizef& rhs)
{
- return Sizef(lhs.width - rhs.width,
- lhs.height - rhs.height);
+ return Sizef(lhs.width - rhs.width,
+ lhs.height - rhs.height);
}
inline bool operator==(const Sizef& lhs, const Sizef& rhs)
{
}
inline bool operator==(const Sizef& lhs, const Sizef& rhs)
{
- return (lhs.width == rhs.width) && (rhs.height == rhs.height);
+ return (lhs.width == rhs.width) && (rhs.height == rhs.height);
}
inline bool operator!=(const Sizef& lhs, const Sizef& rhs)
}
inline bool operator!=(const Sizef& lhs, const Sizef& rhs)
-{
- return (lhs.width != rhs.width) || (lhs.height != rhs.height);
+{
+ return (lhs.width != rhs.width) || (lhs.height != rhs.height);
}
std::ostream& operator<<(std::ostream& s, const Sizef& size);
}
std::ostream& operator<<(std::ostream& s, const Sizef& size);