From 18cf2351721fb94f3540d6fe620114e20180d4f6 Mon Sep 17 00:00:00 2001 From: Gawaboumga Date: Wed, 27 Aug 2014 14:30:22 +0200 Subject: [PATCH 1/3] Update of two headers Former-commit-id: 813c36932bf842d6ad6c26aace9249894359c8de --- include/Nazara/Core.hpp | 1 + include/Nazara/Math.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Core.hpp b/include/Nazara/Core.hpp index bccbcaad6..71c845bfc 100644 --- a/include/Nazara/Core.hpp +++ b/include/Nazara/Core.hpp @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include diff --git a/include/Nazara/Math.hpp b/include/Nazara/Math.hpp index e70158c4a..b80211a25 100644 --- a/include/Nazara/Math.hpp +++ b/include/Nazara/Math.hpp @@ -30,7 +30,7 @@ #ifndef NAZARA_GLOBAL_MATH_HPP #define NAZARA_GLOBAL_MATH_HPP -#include +#include #include #include #include From fc4d84f206db74fa40725d66c7ec707669c50551 Mon Sep 17 00:00:00 2001 From: Gawaboumga Date: Wed, 27 Aug 2014 14:34:35 +0200 Subject: [PATCH 2/3] Littles fixes -Light Manager: I prefer iterators -OpenGL: The UV problem is solved, but you forget to change the cubemaps -Texture: GetSize() could return a int instead a NzVector2ui -Algorithm: Simplification -Utility: Couldn't compile Former-commit-id: db890711b451d03427871fb997549a1b13c7d80a --- src/Nazara/Graphics/LightManager.cpp | 6 +++--- src/Nazara/Renderer/OpenGL.cpp | 4 ++-- src/Nazara/Renderer/Texture.cpp | 2 +- src/Nazara/Utility/Algorithm.cpp | 6 ++---- src/Nazara/Utility/Utility.cpp | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/Nazara/Graphics/LightManager.cpp b/src/Nazara/Graphics/LightManager.cpp index 107a170bc..8153e7d2a 100644 --- a/src/Nazara/Graphics/LightManager.cpp +++ b/src/Nazara/Graphics/LightManager.cpp @@ -37,10 +37,10 @@ unsigned int NzLightManager::ComputeClosestLights(const NzVector3f& position, fl light.score = std::numeric_limits::max(); // Nous jouons au Golf } - for (unsigned int i = 0; i < m_lights.size(); ++i) + for (auto it = m_lights.begin(); it != m_lights.end(); ++it) { - const NzLight** lights = m_lights[i].first; - unsigned int lightCount = m_lights[i].second; + const NzLight** lights = it->first; + unsigned int lightCount = it->second; for (unsigned int j = 0; j < lightCount; ++j) { diff --git a/src/Nazara/Renderer/OpenGL.cpp b/src/Nazara/Renderer/OpenGL.cpp index 476800edf..ef9e096d9 100644 --- a/src/Nazara/Renderer/OpenGL.cpp +++ b/src/Nazara/Renderer/OpenGL.cpp @@ -1941,8 +1941,8 @@ GLenum NzOpenGL::CubemapFace[] = { GL_TEXTURE_CUBE_MAP_POSITIVE_X, // nzCubemapFace_PositiveX GL_TEXTURE_CUBE_MAP_NEGATIVE_X, // nzCubemapFace_NegativeX - GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, // nzCubemapFace_PositiveY (Inversion pour les standards OpenGL) - GL_TEXTURE_CUBE_MAP_POSITIVE_Y, // nzCubemapFace_NegativeY (Inversion pour les standards OpenGL) + GL_TEXTURE_CUBE_MAP_POSITIVE_Y, // nzCubemapFace_PositiveY + GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, // nzCubemapFace_NegativeY GL_TEXTURE_CUBE_MAP_POSITIVE_Z, // nzCubemapFace_PositiveZ GL_TEXTURE_CUBE_MAP_NEGATIVE_Z // nzCubemapFace_NegativeZ }; diff --git a/src/Nazara/Renderer/Texture.cpp b/src/Nazara/Renderer/Texture.cpp index e19ef2bbf..cb5b4ff45 100644 --- a/src/Nazara/Renderer/Texture.cpp +++ b/src/Nazara/Renderer/Texture.cpp @@ -468,7 +468,7 @@ NzVector2ui NzTexture::GetSize() const if (!m_impl) { NazaraError("Texture must be valid"); - return 0; + return NzVector2ui(0, 0); } #endif diff --git a/src/Nazara/Utility/Algorithm.cpp b/src/Nazara/Utility/Algorithm.cpp index 628444000..e22f937fa 100644 --- a/src/Nazara/Utility/Algorithm.cpp +++ b/src/Nazara/Utility/Algorithm.cpp @@ -189,11 +189,9 @@ namespace void MoveTriangleToEnd(int tri) { auto it = std::find(tri_indices.begin(), tri_indices.end(), tri); - int t_ind = (it != tri_indices.end()) ? std::distance(tri_indices.begin(), it) : -1; + NazaraAssert(it != tri_indices.end(), "Triangle not found"); - NazaraAssert(t_ind >= 0, "Triangle not found"); - - tri_indices.erase(tri_indices.begin() + t_ind, tri_indices.begin() + t_ind + 1); + tri_indices.erase(it); tri_indices.push_back(tri); } }; diff --git a/src/Nazara/Utility/Utility.cpp b/src/Nazara/Utility/Utility.cpp index df38b312c..885e4a578 100644 --- a/src/Nazara/Utility/Utility.cpp +++ b/src/Nazara/Utility/Utility.cpp @@ -146,7 +146,7 @@ unsigned int NzUtility::ComponentCount[nzComponentType_Max+1] = static_assert(nzComponentType_Max+1 == 14, "Component count array is incomplete"); -unsigned int NzUtility::ComponentStride[nzComponentType_Max+1] = +std::size_t NzUtility::ComponentStride[nzComponentType_Max+1] = { 4*sizeof(nzUInt8), // nzComponentType_Color 1*sizeof(double), // nzComponentType_Double1 From 177ed1f3c7f4ad82c28fa8d4efc24fb3ac65899f Mon Sep 17 00:00:00 2001 From: Gawaboumga Date: Wed, 27 Aug 2014 14:40:19 +0200 Subject: [PATCH 3/3] Writing style file Add of a file for the standard writing in the project. I think it could be helpful. Former-commit-id: 3c61109ce5fd558e0675bf684d66262613acbe1e --- writing style.md | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 writing style.md diff --git a/writing style.md b/writing style.md new file mode 100644 index 000000000..cc6da29f7 --- /dev/null +++ b/writing style.md @@ -0,0 +1,84 @@ +Examples writing-style: + +Alphabetical order for everything and try to regroup each methods beginning with the same letter in the header + +Class header: + +// Copyright (C) 2014 AUTHOR +// This file is part of the "Nazara Engine - MODULE module" +// For conditions of distribution and use, see copyright notice in Config.hpp + +#pragma once + +#ifndef NAZARA_FILENAME_HPP +#define NAZARA_FILENAME_HPP + +#include +#include +#include + +struct NzPossibleImplementation; + +class NAZARA_API NzClassName +{ + friend NzClassFriend; + + public: + Constructors(); + Destructor(); + + FunctionInAClass(); + + protected: + + private: + NzClass m_variableName; + STL m_variableName; + dataType m_variableName; + + NzPossibleImplementation* m_impl; +}; + +#endif // NAZARA_FILENAME_HPP + +Class source: + +// Copyright (C) 2014 AUTHOR +// This file is part of the "Nazara Engine - MODULE module" +// For conditions of distribution and use, see copyright notice in Config.hpp + +#include +#include +#include +#include + +struct NzPossibleImplementation {}; + +NzClassName::Constructors() : +m_variableName(init) +{ + testsAndOtherInits; +} + +NzClassName::PublicFunctions() +NzClassName::ProtectedFunctions() +NzClassName::PrivateFunctions() + +Structure: + +/!\ enum in Enums.hpp + +enum nzEnum +{ + nzEnum_1, + nzEnum_2, + + nzEnum_Max = nzEnum_2 +}; + +Function: + +FunctionName() +{ + variableName = init; +} \ No newline at end of file