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

Renamed Basic.hpp to Algorithm.hpp 

Former-commit-id: ba2858d26fb55069313fafc3e4464dc2e9224b7d
This commit is contained in:
Lynix 2014-07-28 15:18:39 +02:00
parent 90a616a26f
commit 60d5c09c18
29 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Math/Basic.hpp → include/Nazara/Math/Algorithm.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#ifndef NAZARA_BASIC_HPP #ifndef NAZARA_ALGORITHM_MATH_HPP
#define NAZARA_BASIC_HPP #define NAZARA_ALGORITHM_MATH_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
@ -44,6 +44,6 @@ template<typename T> T NzRadians(T radians);
template<typename T> T NzRadianToDegree(T radians); template<typename T> T NzRadianToDegree(T radians);
long long NzStringToNumber(NzString str, nzUInt8 radix = 10, bool* ok = nullptr); long long NzStringToNumber(NzString str, nzUInt8 radix = 10, bool* ok = nullptr);
#include <Nazara/Math/Basic.inl> #include <Nazara/Math/Algorithm.inl>
#endif // NAZARA_BASIC_HPP #endif // NAZARA_ALGORITHM_MATH_HPP

6
include/Nazara/Math/Basic.inl → include/Nazara/Math/Algorithm.inl
View File

@ -125,19 +125,19 @@ inline unsigned int NzGetNumberLength(unsigned long long number)
inline unsigned int NzGetNumberLength(float number, nzUInt8 precision) inline unsigned int NzGetNumberLength(float number, nzUInt8 precision)
{ {
// L'imprécision des flottants nécessite un cast (log10(9.99999) = 1) // L'imprécision des flottants nécessite un cast (log10(9.99999) = 0.99999)
return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point
} }
inline unsigned int NzGetNumberLength(double number, nzUInt8 precision) inline unsigned int NzGetNumberLength(double number, nzUInt8 precision)
{ {
// L'imprécision des flottants nécessite un cast (log10(9.99999) = 1) // L'imprécision des flottants nécessite un cast (log10(9.99999) = 0.99999)
return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point
} }
inline unsigned int NzGetNumberLength(long double number, nzUInt8 precision) inline unsigned int NzGetNumberLength(long double number, nzUInt8 precision)
{ {
// L'imprécision des flottants nécessite un cast (log10(9.99999) = 1) // L'imprécision des flottants nécessite un cast (log10(9.99999) = 0.99999)
return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point
} }

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

@ -4,7 +4,7 @@
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>

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

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>

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

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Math/Config.hpp> #include <Nazara/Math/Config.hpp>
#include <Nazara/Math/Quaternion.hpp> #include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp> #include <Nazara/Math/Vector3.hpp>

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

@ -7,7 +7,7 @@
// http://www.lighthouse3d.com/tutorials/view-frustum-culling/ // http://www.lighthouse3d.com/tutorials/view-frustum-culling/
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <cstring> #include <cstring>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>

5
include/Nazara/Math/Matrix4.inl
View File

@ -4,7 +4,7 @@
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Math/Config.hpp> #include <Nazara/Math/Config.hpp>
#include <Nazara/Math/EulerAngles.hpp> #include <Nazara/Math/EulerAngles.hpp>
#include <Nazara/Math/Quaternion.hpp> #include <Nazara/Math/Quaternion.hpp>
@ -640,8 +640,6 @@ NzMatrix4<T>& NzMatrix4<T>::MakeTransform(const NzVector3<T>& translation, const
m34 = F(0.0); m34 = F(0.0);
m44 = F(1.0); m44 = F(1.0);
// Pas besoin de mettre à jour l'identité (Déjà fait par Set*)
return *this; return *this;
} }
@ -818,7 +816,6 @@ NzVector4<T> NzMatrix4<T>::Transform(const NzVector4<T>& vector) const
template<typename T> template<typename T>
NzMatrix4<T>& NzMatrix4<T>::Transpose() NzMatrix4<T>& NzMatrix4<T>::Transpose()
{ {
// N'affecte pas l'identité (La transposée d'une matrice identité est la matrice identité elle-même)
std::swap(m12, m21); std::swap(m12, m21);
std::swap(m13, m31); std::swap(m13, m31);
std::swap(m14, m41); std::swap(m14, m41);

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

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <cstring> #include <cstring>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>

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

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <cstring> #include <cstring>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>

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

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Math/Config.hpp> #include <Nazara/Math/Config.hpp>
#include <Nazara/Math/EulerAngles.hpp> #include <Nazara/Math/EulerAngles.hpp>
#include <Nazara/Math/Vector3.hpp> #include <Nazara/Math/Vector3.hpp>

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

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>

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

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Math/Box.hpp> #include <Nazara/Math/Box.hpp>
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>

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

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <cstring> #include <cstring>
#include <limits> #include <limits>
#include <stdexcept> #include <stdexcept>

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

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <cstring> #include <cstring>
#include <limits> #include <limits>
#include <stdexcept> #include <stdexcept>

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

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <cstring> #include <cstring>
#include <stdexcept> #include <stdexcept>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>

2
src/Nazara/Core/ByteArray.cpp
View File

@ -4,7 +4,7 @@
#include <Nazara/Core/ByteArray.hpp> #include <Nazara/Core/ByteArray.hpp>
#include <Nazara/Core/AbstractHash.hpp> #include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include <limits> #include <limits>

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

@ -6,7 +6,6 @@
#include <Nazara/Core/Config.hpp> #include <Nazara/Core/Config.hpp>
#include <Nazara/Core/File.hpp> #include <Nazara/Core/File.hpp>
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp>
#include <ctime> #include <ctime>
#include <cstring> #include <cstring>

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

@ -9,7 +9,7 @@
#include <Nazara/Core/Config.hpp> #include <Nazara/Core/Config.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Unicode.hpp> #include <Nazara/Core/Unicode.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <algorithm> #include <algorithm>
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>

2
src/Nazara/Graphics/Light.cpp
View File

@ -6,7 +6,7 @@
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Graphics/AbstractRenderQueue.hpp> #include <Nazara/Graphics/AbstractRenderQueue.hpp>
#include <Nazara/Graphics/Camera.hpp> #include <Nazara/Graphics/Camera.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Math/Sphere.hpp> #include <Nazara/Math/Sphere.hpp>
#include <Nazara/Renderer/Renderer.hpp> #include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/Shader.hpp> #include <Nazara/Renderer/Shader.hpp>

1
src/Nazara/Noise/Abstract2DNoise.cpp
View File

@ -3,7 +3,6 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp> #include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Abstract2DNoise.hpp> #include <Nazara/Noise/Abstract2DNoise.hpp>

1
src/Nazara/Noise/Abstract3DNoise.cpp
View File

@ -3,7 +3,6 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp> #include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Abstract3DNoise.hpp> #include <Nazara/Noise/Abstract3DNoise.hpp>

1
src/Nazara/Noise/Abstract4DNoise.cpp
View File

@ -3,7 +3,6 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp> #include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Abstract4DNoise.hpp> #include <Nazara/Noise/Abstract4DNoise.hpp>

2
src/Nazara/Noise/MappedNoiseBase.cpp
View File

@ -3,8 +3,8 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/StringStream.hpp> #include <Nazara/Core/StringStream.hpp>
#include <Nazara/Math/Basic.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Noise/Config.hpp> #include <Nazara/Noise/Config.hpp>
#include <stdexcept> #include <stdexcept>
#include <Nazara/Noise/MappedNoiseBase.hpp> #include <Nazara/Noise/MappedNoiseBase.hpp>

2
src/Nazara/Renderer/OpenGL.cpp
View File

@ -6,7 +6,7 @@
#include <Nazara/Core/CallOnExit.hpp> #include <Nazara/Core/CallOnExit.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp> #include <Nazara/Core/Log.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Renderer/Context.hpp> #include <Nazara/Renderer/Context.hpp>
#include <Nazara/Renderer/RenderTarget.hpp> #include <Nazara/Renderer/RenderTarget.hpp>
#include <cstring> #include <cstring>

7
src/Nazara/Utility/Algorithm.cpp
View File

@ -26,7 +26,7 @@
*/ */
#include <Nazara/Utility/Algorithm.hpp> #include <Nazara/Utility/Algorithm.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Utility/IndexIterator.hpp> #include <Nazara/Utility/IndexIterator.hpp>
#include <algorithm> #include <algorithm>
#include <unordered_map> #include <unordered_map>
@ -546,15 +546,14 @@ namespace
TriangleCacheData* t = &m_triangles[tri]; TriangleCacheData* t = &m_triangles[tri];
// calculate vertex scores // calculate vertex scores
float sum = 0.0f; float sum = 0.f;
for (unsigned int i = 0; i < 3; ++i) for (unsigned int i = 0; i < 3; ++i)
{ {
VertexCacheData *v = &m_vertices[t->verts[i]]; VertexCacheData *v = &m_vertices[t->verts[i]];
float sc = v->current_score; float sc = v->current_score;
if (!v->calculated) if (!v->calculated)
{
sc = CalculateVertexScore(t->verts[i]); sc = CalculateVertexScore(t->verts[i]);
}
v->current_score = sc; v->current_score = sc;
v->calculated = true; v->calculated = true;
sum += sc; sum += sc;

2
src/Nazara/Utility/Loaders/MD2/Loader.cpp
View File

@ -6,7 +6,7 @@
#include <Nazara/Core/Endianness.hpp> #include <Nazara/Core/Endianness.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/InputStream.hpp> #include <Nazara/Core/InputStream.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Math/Quaternion.hpp> #include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Utility/BufferMapper.hpp> #include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/Mesh.hpp> #include <Nazara/Utility/Mesh.hpp>

2
src/Nazara/Utility/Loaders/MD5Anim/Parser.cpp
View File

@ -4,7 +4,7 @@
#include <Nazara/Utility/Loaders/MD5Anim/Parser.hpp> #include <Nazara/Utility/Loaders/MD5Anim/Parser.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Utility/Config.hpp> #include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/SkeletalMesh.hpp> #include <Nazara/Utility/SkeletalMesh.hpp>
#include <Nazara/Utility/StaticMesh.hpp> #include <Nazara/Utility/StaticMesh.hpp>

2
src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp
View File

@ -4,7 +4,7 @@
#include <Nazara/Utility/Loaders/MD5Mesh/Parser.hpp> #include <Nazara/Utility/Loaders/MD5Mesh/Parser.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Utility/BufferMapper.hpp> #include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/Config.hpp> #include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/IndexIterator.hpp> #include <Nazara/Utility/IndexIterator.hpp>

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

@ -6,7 +6,7 @@
#include <Nazara/Core/Enums.hpp> #include <Nazara/Core/Enums.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/PrimitiveList.hpp> #include <Nazara/Core/PrimitiveList.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Utility/Algorithm.hpp> #include <Nazara/Utility/Algorithm.hpp>
#include <Nazara/Utility/Animation.hpp> #include <Nazara/Utility/Animation.hpp>
#include <Nazara/Utility/Buffer.hpp> #include <Nazara/Utility/Buffer.hpp>