From 60d5c09c189833efc1dd4124671285eb12e08802 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 28 Jul 2014 15:18:39 +0200 Subject: [PATCH] Renamed Basic.hpp to Algorithm.hpp Former-commit-id: ba2858d26fb55069313fafc3e4464dc2e9224b7d --- include/Nazara/Math/{Basic.hpp => Algorithm.hpp} | 8 ++++---- include/Nazara/Math/{Basic.inl => Algorithm.inl} | 6 +++--- include/Nazara/Math/BoundingVolume.inl | 2 +- include/Nazara/Math/Box.inl | 2 +- include/Nazara/Math/EulerAngles.inl | 2 +- include/Nazara/Math/Frustum.inl | 2 +- include/Nazara/Math/Matrix4.inl | 5 +---- include/Nazara/Math/OrientedBox.inl | 2 +- include/Nazara/Math/Plane.inl | 2 +- include/Nazara/Math/Quaternion.inl | 2 +- include/Nazara/Math/Rect.inl | 2 +- include/Nazara/Math/Sphere.inl | 2 +- include/Nazara/Math/Vector2.inl | 2 +- include/Nazara/Math/Vector3.inl | 2 +- include/Nazara/Math/Vector4.inl | 2 +- src/Nazara/Core/ByteArray.cpp | 2 +- src/Nazara/Core/Log.cpp | 1 - src/Nazara/Core/String.cpp | 2 +- src/Nazara/Graphics/Light.cpp | 2 +- src/Nazara/Noise/Abstract2DNoise.cpp | 1 - src/Nazara/Noise/Abstract3DNoise.cpp | 1 - src/Nazara/Noise/Abstract4DNoise.cpp | 1 - src/Nazara/Noise/MappedNoiseBase.cpp | 2 +- src/Nazara/Renderer/OpenGL.cpp | 2 +- src/Nazara/Utility/Algorithm.cpp | 7 +++---- src/Nazara/Utility/Loaders/MD2/Loader.cpp | 2 +- src/Nazara/Utility/Loaders/MD5Anim/Parser.cpp | 2 +- src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp | 2 +- src/Nazara/Utility/Mesh.cpp | 2 +- 29 files changed, 32 insertions(+), 40 deletions(-) rename include/Nazara/Math/{Basic.hpp => Algorithm.hpp} (93%) rename include/Nazara/Math/{Basic.inl => Algorithm.inl} (99%) diff --git a/include/Nazara/Math/Basic.hpp b/include/Nazara/Math/Algorithm.hpp similarity index 93% rename from include/Nazara/Math/Basic.hpp rename to include/Nazara/Math/Algorithm.hpp index a7c90e5a0..46d11645f 100644 --- a/include/Nazara/Math/Basic.hpp +++ b/include/Nazara/Math/Algorithm.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BASIC_HPP -#define NAZARA_BASIC_HPP +#ifndef NAZARA_ALGORITHM_MATH_HPP +#define NAZARA_ALGORITHM_MATH_HPP #include #include @@ -44,6 +44,6 @@ template T NzRadians(T radians); template T NzRadianToDegree(T radians); long long NzStringToNumber(NzString str, nzUInt8 radix = 10, bool* ok = nullptr); -#include +#include -#endif // NAZARA_BASIC_HPP +#endif // NAZARA_ALGORITHM_MATH_HPP diff --git a/include/Nazara/Math/Basic.inl b/include/Nazara/Math/Algorithm.inl similarity index 99% rename from include/Nazara/Math/Basic.inl rename to include/Nazara/Math/Algorithm.inl index 6fc2f7506..7f6884da8 100644 --- a/include/Nazara/Math/Basic.inl +++ b/include/Nazara/Math/Algorithm.inl @@ -125,19 +125,19 @@ inline unsigned int NzGetNumberLength(unsigned long long number) 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(number)) + precision + 1; // Plus un pour le point } 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(number)) + precision + 1; // Plus un pour le point } 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(number)) + precision + 1; // Plus un pour le point } diff --git a/include/Nazara/Math/BoundingVolume.inl b/include/Nazara/Math/BoundingVolume.inl index 32378d9e4..71c0c2cea 100644 --- a/include/Nazara/Math/BoundingVolume.inl +++ b/include/Nazara/Math/BoundingVolume.inl @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/Nazara/Math/Box.inl b/include/Nazara/Math/Box.inl index e8f9b8fed..744d513ab 100644 --- a/include/Nazara/Math/Box.inl +++ b/include/Nazara/Math/Box.inl @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include #include diff --git a/include/Nazara/Math/EulerAngles.inl b/include/Nazara/Math/EulerAngles.inl index af9f8e521..d92821189 100644 --- a/include/Nazara/Math/EulerAngles.inl +++ b/include/Nazara/Math/EulerAngles.inl @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include #include diff --git a/include/Nazara/Math/Frustum.inl b/include/Nazara/Math/Frustum.inl index 8541a34f1..0a7b02215 100644 --- a/include/Nazara/Math/Frustum.inl +++ b/include/Nazara/Math/Frustum.inl @@ -7,7 +7,7 @@ // http://www.lighthouse3d.com/tutorials/view-frustum-culling/ #include -#include +#include #include #include diff --git a/include/Nazara/Math/Matrix4.inl b/include/Nazara/Math/Matrix4.inl index 989302bd1..7caa3cb04 100644 --- a/include/Nazara/Math/Matrix4.inl +++ b/include/Nazara/Math/Matrix4.inl @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include @@ -640,8 +640,6 @@ NzMatrix4& NzMatrix4::MakeTransform(const NzVector3& translation, const m34 = F(0.0); m44 = F(1.0); - // Pas besoin de mettre à jour l'identité (Déjà fait par Set*) - return *this; } @@ -818,7 +816,6 @@ NzVector4 NzMatrix4::Transform(const NzVector4& vector) const template NzMatrix4& NzMatrix4::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(m13, m31); std::swap(m14, m41); diff --git a/include/Nazara/Math/OrientedBox.inl b/include/Nazara/Math/OrientedBox.inl index 33a131c72..992698bad 100644 --- a/include/Nazara/Math/OrientedBox.inl +++ b/include/Nazara/Math/OrientedBox.inl @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include diff --git a/include/Nazara/Math/Plane.inl b/include/Nazara/Math/Plane.inl index 4e7c81029..b87464bc7 100644 --- a/include/Nazara/Math/Plane.inl +++ b/include/Nazara/Math/Plane.inl @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include diff --git a/include/Nazara/Math/Quaternion.inl b/include/Nazara/Math/Quaternion.inl index 3e27982f6..76290c0c7 100644 --- a/include/Nazara/Math/Quaternion.inl +++ b/include/Nazara/Math/Quaternion.inl @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include #include diff --git a/include/Nazara/Math/Rect.inl b/include/Nazara/Math/Rect.inl index ab35b30c5..611403706 100644 --- a/include/Nazara/Math/Rect.inl +++ b/include/Nazara/Math/Rect.inl @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include #include diff --git a/include/Nazara/Math/Sphere.inl b/include/Nazara/Math/Sphere.inl index b9a97eb43..c85f12000 100644 --- a/include/Nazara/Math/Sphere.inl +++ b/include/Nazara/Math/Sphere.inl @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include #include diff --git a/include/Nazara/Math/Vector2.inl b/include/Nazara/Math/Vector2.inl index b457f0ad0..7bfe930e0 100644 --- a/include/Nazara/Math/Vector2.inl +++ b/include/Nazara/Math/Vector2.inl @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include #include diff --git a/include/Nazara/Math/Vector3.inl b/include/Nazara/Math/Vector3.inl index 2ca0c5051..15ad4c95e 100644 --- a/include/Nazara/Math/Vector3.inl +++ b/include/Nazara/Math/Vector3.inl @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include #include diff --git a/include/Nazara/Math/Vector4.inl b/include/Nazara/Math/Vector4.inl index 77229fd5c..2f6002fbc 100644 --- a/include/Nazara/Math/Vector4.inl +++ b/include/Nazara/Math/Vector4.inl @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include #include diff --git a/src/Nazara/Core/ByteArray.cpp b/src/Nazara/Core/ByteArray.cpp index 4636b826e..135a72895 100644 --- a/src/Nazara/Core/ByteArray.cpp +++ b/src/Nazara/Core/ByteArray.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Nazara/Core/Log.cpp b/src/Nazara/Core/Log.cpp index 946548479..0726d886c 100644 --- a/src/Nazara/Core/Log.cpp +++ b/src/Nazara/Core/Log.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include diff --git a/src/Nazara/Core/String.cpp b/src/Nazara/Core/String.cpp index cac71d221..259b59006 100644 --- a/src/Nazara/Core/String.cpp +++ b/src/Nazara/Core/String.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Nazara/Graphics/Light.cpp b/src/Nazara/Graphics/Light.cpp index d3ce97152..ff3d5bfdd 100644 --- a/src/Nazara/Graphics/Light.cpp +++ b/src/Nazara/Graphics/Light.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Nazara/Noise/Abstract2DNoise.cpp b/src/Nazara/Noise/Abstract2DNoise.cpp index c8cef53f0..86ab9243b 100644 --- a/src/Nazara/Noise/Abstract2DNoise.cpp +++ b/src/Nazara/Noise/Abstract2DNoise.cpp @@ -3,7 +3,6 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include #include #include #include diff --git a/src/Nazara/Noise/Abstract3DNoise.cpp b/src/Nazara/Noise/Abstract3DNoise.cpp index 9a386160c..48a9c5ec9 100644 --- a/src/Nazara/Noise/Abstract3DNoise.cpp +++ b/src/Nazara/Noise/Abstract3DNoise.cpp @@ -3,7 +3,6 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include #include #include #include diff --git a/src/Nazara/Noise/Abstract4DNoise.cpp b/src/Nazara/Noise/Abstract4DNoise.cpp index 5e9afe9ff..e8ca084e3 100644 --- a/src/Nazara/Noise/Abstract4DNoise.cpp +++ b/src/Nazara/Noise/Abstract4DNoise.cpp @@ -3,7 +3,6 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include #include #include #include diff --git a/src/Nazara/Noise/MappedNoiseBase.cpp b/src/Nazara/Noise/MappedNoiseBase.cpp index 2200fdb8f..cb5a2717f 100644 --- a/src/Nazara/Noise/MappedNoiseBase.cpp +++ b/src/Nazara/Noise/MappedNoiseBase.cpp @@ -3,8 +3,8 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include #include +#include #include #include #include diff --git a/src/Nazara/Renderer/OpenGL.cpp b/src/Nazara/Renderer/OpenGL.cpp index 3d57503a6..b7d2675bd 100644 --- a/src/Nazara/Renderer/OpenGL.cpp +++ b/src/Nazara/Renderer/OpenGL.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Nazara/Utility/Algorithm.cpp b/src/Nazara/Utility/Algorithm.cpp index 7d7e6c939..628444000 100644 --- a/src/Nazara/Utility/Algorithm.cpp +++ b/src/Nazara/Utility/Algorithm.cpp @@ -26,7 +26,7 @@ */ #include -#include +#include #include #include #include @@ -546,15 +546,14 @@ namespace TriangleCacheData* t = &m_triangles[tri]; // calculate vertex scores - float sum = 0.0f; + float sum = 0.f; for (unsigned int i = 0; i < 3; ++i) { VertexCacheData *v = &m_vertices[t->verts[i]]; float sc = v->current_score; if (!v->calculated) - { sc = CalculateVertexScore(t->verts[i]); - } + v->current_score = sc; v->calculated = true; sum += sc; diff --git a/src/Nazara/Utility/Loaders/MD2/Loader.cpp b/src/Nazara/Utility/Loaders/MD2/Loader.cpp index 84653a8ae..693711f75 100644 --- a/src/Nazara/Utility/Loaders/MD2/Loader.cpp +++ b/src/Nazara/Utility/Loaders/MD2/Loader.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Nazara/Utility/Loaders/MD5Anim/Parser.cpp b/src/Nazara/Utility/Loaders/MD5Anim/Parser.cpp index 4b035a5e7..2e3abc7d3 100644 --- a/src/Nazara/Utility/Loaders/MD5Anim/Parser.cpp +++ b/src/Nazara/Utility/Loaders/MD5Anim/Parser.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp b/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp index c9747371f..4bc76d018 100644 --- a/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp +++ b/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Nazara/Utility/Mesh.cpp b/src/Nazara/Utility/Mesh.cpp index fc1c7109b..61427fa3d 100644 --- a/src/Nazara/Utility/Mesh.cpp +++ b/src/Nazara/Utility/Mesh.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include