sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Math/VectorI: Make array/pointer constructor explicit

This commit is contained in:
Jérôme Leclercq 2017-11-23 13:21:51 +01:00
parent 4d195e0e08
commit 0a5cbe656f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SDK/include/NDK/Widgets/TextAreaWidget.inl
View File

@ -8,7 +8,7 @@ namespace Ndk
{ {
inline void TextAreaWidget::Clear() inline void TextAreaWidget::Clear()
{ {
m_cursorPosition = 0; m_cursorPosition.MakeZero();
m_drawer.Clear(); m_drawer.Clear();
m_textSprite->Update(m_drawer); m_textSprite->Update(m_drawer);
@ -119,7 +119,7 @@ namespace Ndk
OnTextAreaCursorMove(this, &glyphIndex); OnTextAreaCursorMove(this, &glyphIndex);
glyphIndex = std::min(glyphIndex, m_drawer.GetGlyphCount()); glyphIndex = std::min(glyphIndex, m_drawer.GetGlyphCount());
std::size_t lineCount = m_drawer.GetLineCount(); std::size_t lineCount = m_drawer.GetLineCount();
std::size_t line = 0U; std::size_t line = 0U;
for (std::size_t i = line + 1; i < lineCount; ++i) for (std::size_t i = line + 1; i < lineCount; ++i)

2
include/Nazara/Math/Vector2.hpp
View File

@ -24,7 +24,7 @@ namespace Nz
Vector2() = default; Vector2() = default;
Vector2(T X, T Y); Vector2(T X, T Y);
explicit Vector2(T scale); explicit Vector2(T scale);
Vector2(const T vec[2]); explicit Vector2(const T vec[2]);
template<typename U> explicit Vector2(const Vector2<U>& vec); template<typename U> explicit Vector2(const Vector2<U>& vec);
Vector2(const Vector2& vec) = default; Vector2(const Vector2& vec) = default;
explicit Vector2(const Vector3<T>& vec); explicit Vector2(const Vector3<T>& vec);

2
include/Nazara/Math/Vector3.hpp
View File

@ -25,7 +25,7 @@ namespace Nz
Vector3(T X, T Y, T Z); Vector3(T X, T Y, T Z);
Vector3(T X, const Vector2<T>& vec); Vector3(T X, const Vector2<T>& vec);
explicit Vector3(T scale); explicit Vector3(T scale);
Vector3(const T vec[3]); explicit Vector3(const T vec[3]);
Vector3(const Vector2<T>& vec, T Z = 0.0); Vector3(const Vector2<T>& vec, T Z = 0.0);
template<typename U> explicit Vector3(const Vector3<U>& vec); template<typename U> explicit Vector3(const Vector3<U>& vec);
Vector3(const Vector3& vec) = default; Vector3(const Vector3& vec) = default;

2
include/Nazara/Math/Vector4.hpp
View File

@ -27,7 +27,7 @@ namespace Nz
Vector4(T X, const Vector2<T>& vec, T W); Vector4(T X, const Vector2<T>& vec, T W);
Vector4(T X, const Vector3<T>& vec); Vector4(T X, const Vector3<T>& vec);
explicit Vector4(T scale); explicit Vector4(T scale);
Vector4(const T vec[4]); explicit Vector4(const T vec[4]);
Vector4(const Vector2<T>& vec, T Z = 0.0, T W = 1.0); Vector4(const Vector2<T>& vec, T Z = 0.0, T W = 1.0);
Vector4(const Vector3<T>& vec, T W = 1.0); Vector4(const Vector3<T>& vec, T W = 1.0);
template<typename U> explicit Vector4(const Vector4<U>& vec); template<typename U> explicit Vector4(const Vector4<U>& vec);