Browse Source

Use double instead of typename T for multiply/divide operations

gh-pages
falkTX 10 years ago
parent
commit
b55d247679
2 changed files with 24 additions and 24 deletions
  1. +8
    -8
      dgl/Geometry.hpp
  2. +16
    -16
      dgl/src/Geometry.cpp

+ 8
- 8
dgl/Geometry.hpp View File

@@ -180,12 +180,12 @@ public:
/** /**
Grow size by @a multiplier. Grow size by @a multiplier.
*/ */
void growBy(const T& multiplier) noexcept;
void growBy(double multiplier) noexcept;


/** /**
Shrink size by @a divider. Shrink size by @a divider.
*/ */
void shrinkBy(const T& divider) noexcept;
void shrinkBy(double divider) noexcept;


/** /**
Return true if size is null (0x0). Return true if size is null (0x0).
@@ -215,8 +215,8 @@ public:
Size<T>& operator=(const Size<T>& size) noexcept; Size<T>& operator=(const Size<T>& size) noexcept;
Size<T>& operator+=(const Size<T>& size) noexcept; Size<T>& operator+=(const Size<T>& size) noexcept;
Size<T>& operator-=(const Size<T>& size) noexcept; Size<T>& operator-=(const Size<T>& size) noexcept;
Size<T>& operator*=(const T& m) noexcept;
Size<T>& operator/=(const T& d) noexcept;
Size<T>& operator*=(double m) noexcept;
Size<T>& operator/=(double d) noexcept;
bool operator==(const Size<T>& size) const noexcept; bool operator==(const Size<T>& size) const noexcept;
bool operator!=(const Size<T>& size) const noexcept; bool operator!=(const Size<T>& size) const noexcept;


@@ -683,12 +683,12 @@ public:
/** /**
Grow size by @a multiplier. Grow size by @a multiplier.
*/ */
void growBy(const T& multiplier) noexcept;
void growBy(double multiplier) noexcept;


/** /**
Shrink size by @a divider. Shrink size by @a divider.
*/ */
void shrinkBy(const T& divider) noexcept;
void shrinkBy(double divider) noexcept;


/** /**
Set rectangle using @a pos and @a size. Set rectangle using @a pos and @a size.
@@ -731,8 +731,8 @@ public:
void drawOutline(); void drawOutline();


Rectangle<T>& operator=(const Rectangle<T>& rect) noexcept; Rectangle<T>& operator=(const Rectangle<T>& rect) noexcept;
Rectangle<T>& operator*=(const T& m) noexcept;
Rectangle<T>& operator/=(const T& d) noexcept;
Rectangle<T>& operator*=(double m) noexcept;
Rectangle<T>& operator/=(double d) noexcept;
bool operator==(const Rectangle<T>& size) const noexcept; bool operator==(const Rectangle<T>& size) const noexcept;
bool operator!=(const Rectangle<T>& size) const noexcept; bool operator!=(const Rectangle<T>& size) const noexcept;




+ 16
- 16
dgl/src/Geometry.cpp View File

@@ -209,17 +209,17 @@ void Size<T>::setSize(const Size<T>& size) noexcept
} }


template<typename T> template<typename T>
void Size<T>::growBy(const T& multiplier) noexcept
void Size<T>::growBy(double multiplier) noexcept
{ {
fWidth = static_cast<T>(fWidth*multiplier);
fHeight = static_cast<T>(fHeight*multiplier);
fWidth = static_cast<T>(static_cast<double>(fWidth)*multiplier);
fHeight = static_cast<T>(static_cast<double>(fHeight)*multiplier);
} }


template<typename T> template<typename T>
void Size<T>::shrinkBy(const T& divider) noexcept
void Size<T>::shrinkBy(double divider) noexcept
{ {
fWidth = static_cast<T>(fWidth/divider);
fHeight = static_cast<T>(fHeight/divider);
fWidth = static_cast<T>(static_cast<double>(fWidth)/divider);
fHeight = static_cast<T>(static_cast<double>(fHeight)/divider);
} }


template<typename T> template<typename T>
@@ -283,18 +283,18 @@ Size<T>& Size<T>::operator-=(const Size<T>& size) noexcept
} }


template<typename T> template<typename T>
Size<T>& Size<T>::operator*=(const T& m) noexcept
Size<T>& Size<T>::operator*=(double m) noexcept
{ {
fWidth = static_cast<T>(fWidth*m);
fHeight = static_cast<T>(fHeight*m);
fWidth = static_cast<T>(static_cast<double>(fWidth)*m);
fHeight = static_cast<T>(static_cast<double>(fHeight)*m);
return *this; return *this;
} }


template<typename T> template<typename T>
Size<T>& Size<T>::operator/=(const T& d) noexcept
Size<T>& Size<T>::operator/=(double d) noexcept
{ {
fWidth = static_cast<T>(fWidth/d);
fHeight = static_cast<T>(fHeight/d);
fWidth = static_cast<T>(static_cast<double>(fWidth)/d);
fHeight = static_cast<T>(static_cast<double>(fHeight)/d);
return *this; return *this;
} }


@@ -903,13 +903,13 @@ void Rectangle<T>::setSize(const Size<T>& size) noexcept
} }


template<typename T> template<typename T>
void Rectangle<T>::growBy(const T& multiplier) noexcept
void Rectangle<T>::growBy(double multiplier) noexcept
{ {
fSize.growBy(multiplier); fSize.growBy(multiplier);
} }


template<typename T> template<typename T>
void Rectangle<T>::shrinkBy(const T& divider) noexcept
void Rectangle<T>::shrinkBy(double divider) noexcept
{ {
fSize.shrinkBy(divider); fSize.shrinkBy(divider);
} }
@@ -973,14 +973,14 @@ Rectangle<T>& Rectangle<T>::operator=(const Rectangle<T>& rect) noexcept
} }


template<typename T> template<typename T>
Rectangle<T>& Rectangle<T>::operator*=(const T& m) noexcept
Rectangle<T>& Rectangle<T>::operator*=(double m) noexcept
{ {
fSize *= m; fSize *= m;
return *this; return *this;
} }


template<typename T> template<typename T>
Rectangle<T>& Rectangle<T>::operator/=(const T& d) noexcept
Rectangle<T>& Rectangle<T>::operator/=(double d) noexcept
{ {
fSize /= d; fSize /= d;
return *this; return *this;


Loading…
Cancel
Save