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

Indentations 

Former-commit-id: 0d82a4464cb9369bc4ca5cf2d7780c921eff953d
This commit is contained in:
Gawaboumga 2015-08-21 11:32:29 +02:00
parent 0b390e45a1
commit 376df6a3b7
9 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Core/Color.inl
View File

@ -312,8 +312,8 @@ inline void NzColor::ToHSV(const NzColor& color, float* hue, float* saturation,
float g = color.g / 255.f; float g = color.g / 255.f;
float b = color.b / 255.f; float b = color.b / 255.f;
float min = std::min(std::min(r, g), b); //Min. value of RGB float min = std::min({r, g, b}); //Min. value of RGB
float max = std::max(std::max(r, g), b); //Max. value of RGB float max = std::max({r, g, b}); //Max. value of RGB
float deltaMax = max - min; //Delta RGB value float deltaMax = max - min; //Delta RGB value

1
include/Nazara/Math/Matrix4.hpp
View File

@ -80,7 +80,6 @@ class NzMatrix4
NzMatrix4& Set(const T matrix[16]); NzMatrix4& Set(const T matrix[16]);
//NzMatrix4(const NzMatrix3<T>& matrix); //NzMatrix4(const NzMatrix3<T>& matrix);
NzMatrix4& Set(const NzMatrix4& matrix); NzMatrix4& Set(const NzMatrix4& matrix);
NzMatrix4& Set(NzMatrix4&& matrix);
template<typename U> NzMatrix4& Set(const NzMatrix4<U>& matrix); template<typename U> NzMatrix4& Set(const NzMatrix4<U>& matrix);
NzMatrix4& SetRotation(const NzQuaternion<T>& rotation); NzMatrix4& SetRotation(const NzQuaternion<T>& rotation);
NzMatrix4& SetScale(const NzVector3<T>& scale); NzMatrix4& SetScale(const NzVector3<T>& scale);

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

@ -28,14 +28,12 @@ class NzVector3
~NzVector3() = default; ~NzVector3() = default;
T AbsDotProduct(const NzVector3& vec) const; T AbsDotProduct(const NzVector3& vec) const;
T AngleBetween(const NzVector3& vec) const; T AngleBetween(const NzVector3& vec) const;
NzVector3 CrossProduct(const NzVector3& vec) const; NzVector3 CrossProduct(const NzVector3& vec) const;
T Distance(const NzVector3& vec) const; T Distance(const NzVector3& vec) const;
float Distancef(const NzVector3& vec) const; float Distancef(const NzVector3& vec) const;
T DotProduct(const NzVector3& vec) const; T DotProduct(const NzVector3& vec) const;
T GetLength() const; T GetLength() const;

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

@ -325,7 +325,7 @@ NzVector3<T>& NzVector3<T>::Set(const NzVector4<T>& vec)
template<typename T> template<typename T>
T NzVector3<T>::SquaredDistance(const NzVector3& vec) const T NzVector3<T>::SquaredDistance(const NzVector3& vec) const
{ {
return operator-(vec).GetSquaredLength(); return (*this - vec).GetSquaredLength();
} }
template<typename T> template<typename T>

1
src/Nazara/Core/String.cpp
View File

@ -11,6 +11,7 @@
#include <Nazara/Core/Unicode.hpp> #include <Nazara/Core/Unicode.hpp>
#include <Nazara/Math/Algorithm.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <algorithm> #include <algorithm>
#include <cctype>
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <limits> #include <limits>

2
src/Nazara/Utility/VertexBuffer.cpp
View File

@ -53,7 +53,7 @@ bool NzVertexBuffer::FillRaw(const void* data, unsigned int offset, unsigned int
if (!m_buffer) if (!m_buffer)
{ {
NazaraError("No buffer"); NazaraError("No buffer");
return nullptr; return false;
} }
if (m_startOffset + offset + size > m_endOffset) if (m_startOffset + offset + size > m_endOffset)