diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp index 5f7d10f41..453b1fd62 100644 --- a/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp +++ b/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 AUTHORS -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Module name" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/Config.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/Config.hpp index 9527720de..c54134ee2 100644 --- a/NazaraModuleTemplate/include/Nazara/ModuleName/Config.hpp +++ b/NazaraModuleTemplate/include/Nazara/ModuleName/Config.hpp @@ -1,5 +1,5 @@ /* - Nazara Engine + Nazara Engine - Module name Copyright (C) 2012 AUTHORS (EMAIL) @@ -27,12 +27,12 @@ #ifndef NAZARA_CONFIG_MODULENAME_HPP #define NAZARA_CONFIG_MODULENAME_HPP -/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci +/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci -// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) +// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) #define NAZARA_MODULENAME_MEMORYLEAKTRACKER 0 -// Active les tests de sécurité basés sur le code (Conseillé pour le développement) +// Active les tests de sécurité basés sur le code (Conseillé pour le développement) #define NAZARA_MODULENAME_SAFE 1 #endif // NAZARA_CONFIG_MODULENAME_HPP diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/Debug.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/Debug.hpp index fa2f9482e..7d29c4775 100644 --- a/NazaraModuleTemplate/include/Nazara/ModuleName/Debug.hpp +++ b/NazaraModuleTemplate/include/Nazara/ModuleName/Debug.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 AUTHORS -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Module name" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/DebugOff.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/DebugOff.hpp index 0a21b742d..c989b8856 100644 --- a/NazaraModuleTemplate/include/Nazara/ModuleName/DebugOff.hpp +++ b/NazaraModuleTemplate/include/Nazara/ModuleName/DebugOff.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 AUTHORS -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Module name" // For conditions of distribution and use, see copyright notice in Config.hpp #if NAZARA_MODULENAME_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp index 54bc0f3b8..106ff9924 100644 --- a/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp +++ b/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 AUTHORS -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Module name" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/NazaraModuleTemplate/src/Nazara/ModuleName/ClassName.cpp b/NazaraModuleTemplate/src/Nazara/ModuleName/ClassName.cpp index f57baac14..dc4e93f80 100644 --- a/NazaraModuleTemplate/src/Nazara/ModuleName/ClassName.cpp +++ b/NazaraModuleTemplate/src/Nazara/ModuleName/ClassName.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 AUTHORS -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Module name" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/NazaraModuleTemplate/src/Nazara/ModuleName/Debug/Leaks.cpp b/NazaraModuleTemplate/src/Nazara/ModuleName/Debug/Leaks.cpp index 6c4fc1d7d..f9832e155 100644 --- a/NazaraModuleTemplate/src/Nazara/ModuleName/Debug/Leaks.cpp +++ b/NazaraModuleTemplate/src/Nazara/ModuleName/Debug/Leaks.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 AUTHORS -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Module name" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp b/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp index 7c600b5de..e38656552 100644 --- a/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp +++ b/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 AUTHORS -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Module name" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -12,9 +12,9 @@ bool NzModuleName::Initialize() { if (s_moduleReferenceCouter++ != 0) - return true; // Déjà initialisé + return true; // Déjà initialisé - // Initialisation des dépendances + // Initialisation des dépendances if (!NzCore::Initialize()) { NazaraError("Failed to initialize core module"); @@ -36,13 +36,13 @@ bool NzModuleName::IsInitialized() void NzModuleName::Uninitialize() { if (--s_moduleReferenceCouter != 0) - return; // Encore utilisé + return; // Encore utilisé - // Libération du module + // Libération du module NazaraNotice("Uninitialized: ModuleName module"); - // Libération des dépendances + // Libération des dépendances NzCore::Uninitialize(); } diff --git a/include/Nazara/Core.hpp b/include/Nazara/Core.hpp index 2fdf36497..a1f9500d0 100644 --- a/include/Nazara/Core.hpp +++ b/include/Nazara/Core.hpp @@ -1,7 +1,7 @@ // This file was automatically generated by Nazara /* - Nazara Engine + Nazara Engine - Core module Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) diff --git a/include/Nazara/Core/ByteArray.hpp b/include/Nazara/Core/ByteArray.hpp index 94b64654e..d4014ec3d 100644 --- a/include/Nazara/Core/ByteArray.hpp +++ b/include/Nazara/Core/ByteArray.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -58,7 +58,7 @@ class NAZARA_API NzByteArray : public NzHashable NzByteArray& Trim(nzUInt8 byte = '\0'); NzByteArray Trimmed(nzUInt8 byte = '\0') const; - // Méthodes compatibles STD + // Méthodes compatibles STD nzUInt8* begin(); const nzUInt8* begin() const; nzUInt8* end(); @@ -74,7 +74,7 @@ class NAZARA_API NzByteArray : public NzHashable typedef nzUInt8* iterator; //typedef nzUInt8* reverse_iterator; typedef nzUInt8 value_type; - // Méthodes compatibles STD + // Méthodes compatibles STD nzUInt8& operator[](unsigned int pos); nzUInt8 operator[](unsigned int pos) const; diff --git a/include/Nazara/Core/Clock.hpp b/include/Nazara/Core/Clock.hpp index 6ade015b7..7d1dd111e 100644 --- a/include/Nazara/Core/Clock.hpp +++ b/include/Nazara/Core/Clock.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Color.hpp b/include/Nazara/Core/Color.hpp index 96bebca0d..a63467ca5 100644 --- a/include/Nazara/Core/Color.hpp +++ b/include/Nazara/Core/Color.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Color.inl b/include/Nazara/Core/Color.inl index 13fb3fe11..c7651e24b 100644 --- a/include/Nazara/Core/Color.inl +++ b/include/Nazara/Core/Color.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp // http://www.easyrgb.com/index.php?X=MATH @@ -378,7 +378,7 @@ inline void NzColor::ToXYZ(const NzColor& color, float* x, float* y, float* z) g *= 100.0; b *= 100.0; - //Observer. = 2°, Illuminant = D65 + //Observer. = 2°, Illuminant = D65 *x = r*0.4124 + g*0.3576 + b*0.1805; *y = r*0.2126 + g*0.7152 + b*0.0722; *z = r*0.0193 + g*0.1192 + b*0.9505; diff --git a/include/Nazara/Core/ConditionVariable.hpp b/include/Nazara/Core/ConditionVariable.hpp index f031a7e57..137047fef 100644 --- a/include/Nazara/Core/ConditionVariable.hpp +++ b/include/Nazara/Core/ConditionVariable.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Config.hpp b/include/Nazara/Core/Config.hpp index 7cfef54af..ddb8efb5b 100644 --- a/include/Nazara/Core/Config.hpp +++ b/include/Nazara/Core/Config.hpp @@ -1,5 +1,5 @@ /* - Nazara Engine + Nazara Engine - Core module Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) diff --git a/include/Nazara/Core/Core.hpp b/include/Nazara/Core/Core.hpp index 9cf3bd232..14efc40e7 100644 --- a/include/Nazara/Core/Core.hpp +++ b/include/Nazara/Core/Core.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Debug.hpp b/include/Nazara/Core/Debug.hpp index c4a1f45e5..9d081b6eb 100644 --- a/include/Nazara/Core/Debug.hpp +++ b/include/Nazara/Core/Debug.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Core/Debug/MemoryLeakTracker.hpp b/include/Nazara/Core/Debug/MemoryLeakTracker.hpp index 6e0cc072d..17de7104f 100644 --- a/include/Nazara/Core/Debug/MemoryLeakTracker.hpp +++ b/include/Nazara/Core/Debug/MemoryLeakTracker.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/DebugOff.hpp b/include/Nazara/Core/DebugOff.hpp index 46023d974..7dfabd341 100644 --- a/include/Nazara/Core/DebugOff.hpp +++ b/include/Nazara/Core/DebugOff.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #if NAZARA_CORE_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) diff --git a/include/Nazara/Core/Directory.hpp b/include/Nazara/Core/Directory.hpp index d39f8d00a..319066c8d 100644 --- a/include/Nazara/Core/Directory.hpp +++ b/include/Nazara/Core/Directory.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/DynLib.hpp b/include/Nazara/Core/DynLib.hpp index 2c05a0eea..dc95e616a 100644 --- a/include/Nazara/Core/DynLib.hpp +++ b/include/Nazara/Core/DynLib.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -18,7 +18,7 @@ #endif class NzDynLibImpl; -typedef int (*NzDynLibFunc)(); // Type "générique" de pointeur sur fonction +typedef int (*NzDynLibFunc)(); // Type "générique" de pointeur sur fonction class NzDynLib : NzNonCopyable { diff --git a/include/Nazara/Core/Endianness.hpp b/include/Nazara/Core/Endianness.hpp index 1f079a70f..8c43064de 100644 --- a/include/Nazara/Core/Endianness.hpp +++ b/include/Nazara/Core/Endianness.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -11,7 +11,7 @@ #include #if !defined(NAZARA_BIG_ENDIAN) && !defined(NAZARA_LITTLE_ENDIAN) - // Détection automatique selon les macros du compilateur + // Détection automatique selon les macros du compilateur #if defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || (defined(__MIPS__) && defined(__MISPEB__)) || \ defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || defined(__sparc__) || defined(__hppa__) #define NAZARA_BIG_ENDIAN diff --git a/include/Nazara/Core/Endianness.inl b/include/Nazara/Core/Endianness.inl index 20edee20f..930b600d7 100644 --- a/include/Nazara/Core/Endianness.inl +++ b/include/Nazara/Core/Endianness.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Core/Enums.hpp b/include/Nazara/Core/Enums.hpp index 79d7e09ad..f97348afc 100644 --- a/include/Nazara/Core/Enums.hpp +++ b/include/Nazara/Core/Enums.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Error.hpp b/include/Nazara/Core/Error.hpp index 9c95ade9b..e59b76a38 100644 --- a/include/Nazara/Core/Error.hpp +++ b/include/Nazara/Core/Error.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/File.hpp b/include/Nazara/Core/File.hpp index dc28ff401..aa84ec68e 100644 --- a/include/Nazara/Core/File.hpp +++ b/include/Nazara/Core/File.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -29,7 +29,7 @@ class NAZARA_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable public: enum CursorPosition { - AtBegin, // Début du fichier + AtBegin, // Début du fichier AtCurrent, // Position du pointeur AtEnd // Fin du fichier }; @@ -38,13 +38,13 @@ class NAZARA_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable { Current = 0x00, // Utilise le mode d'ouverture actuel - Append = 0x01, // Empêche l'écriture sur la partie déjà existante et met le curseur à la fin - Lock = 0x02, // Empêche le fichier d'être modifié tant qu'il est ouvert + Append = 0x01, // Empêche l'écriture sur la partie déjà existante et met le curseur à la fin + Lock = 0x02, // Empêche le fichier d'être modifié tant qu'il est ouvert ReadOnly = 0x04, // Ouvre uniquement en lecture - ReadWrite = 0x08, // Ouvre en lecture/écriture + ReadWrite = 0x08, // Ouvre en lecture/écriture Text = 0x10, // Ouvre en mode texte - Truncate = 0x20, // Créé le fichier s'il n'existe pas et le vide s'il existe - WriteOnly = 0x40 // Ouvre uniquement en écriture, créé le fichier s'il n'existe pas + Truncate = 0x20, // Créé le fichier s'il n'existe pas et le vide s'il existe + WriteOnly = 0x40 // Ouvre uniquement en écriture, créé le fichier s'il n'existe pas }; NzFile(); diff --git a/include/Nazara/Core/Format.hpp b/include/Nazara/Core/Format.hpp index 54c553bf2..ae8e461b8 100644 --- a/include/Nazara/Core/Format.hpp +++ b/include/Nazara/Core/Format.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Functor.hpp b/include/Nazara/Core/Functor.hpp index 620423d70..656b6a866 100644 --- a/include/Nazara/Core/Functor.hpp +++ b/include/Nazara/Core/Functor.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -9,7 +9,7 @@ #include -// Inspiré du code de la SFML par Laurent Gomila +// Inspiré du code de la SFML par Laurent Gomila struct NzFunctor { diff --git a/include/Nazara/Core/Functor.inl b/include/Nazara/Core/Functor.inl index 834f4687e..e867f79ef 100644 --- a/include/Nazara/Core/Functor.inl +++ b/include/Nazara/Core/Functor.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp template NzFunctorWithoutArgs::NzFunctorWithoutArgs(F func) : diff --git a/include/Nazara/Core/Hash.hpp b/include/Nazara/Core/Hash.hpp index 2243326b4..2e2f59cf8 100644 --- a/include/Nazara/Core/Hash.hpp +++ b/include/Nazara/Core/Hash.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Hash/CRC32.hpp b/include/Nazara/Core/Hash/CRC32.hpp index 3ca48046d..3e17dfd01 100644 --- a/include/Nazara/Core/Hash/CRC32.hpp +++ b/include/Nazara/Core/Hash/CRC32.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Hash/Fletcher16.hpp b/include/Nazara/Core/Hash/Fletcher16.hpp index ea61ce4e0..6fc43fb41 100644 --- a/include/Nazara/Core/Hash/Fletcher16.hpp +++ b/include/Nazara/Core/Hash/Fletcher16.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2012 Jérôme Leclercq +// Copyright (C) 2012 Jérôme Leclercq // This file is part of the "Nazara Engine". // For conditions of distribution and use, see copyright notice in Config.hpp diff --git a/include/Nazara/Core/Hash/MD5.hpp b/include/Nazara/Core/Hash/MD5.hpp index 30dbdedc6..4c33acb0f 100644 --- a/include/Nazara/Core/Hash/MD5.hpp +++ b/include/Nazara/Core/Hash/MD5.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2012 Jérôme Leclercq +// Copyright (C) 2012 Jérôme Leclercq // This file is part of the "Nazara Engine". // For conditions of distribution and use, see copyright notice in Config.hpp diff --git a/include/Nazara/Core/Hash/SHA224.hpp b/include/Nazara/Core/Hash/SHA224.hpp index 6495180b9..63c62de16 100644 --- a/include/Nazara/Core/Hash/SHA224.hpp +++ b/include/Nazara/Core/Hash/SHA224.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2012 Jérôme Leclercq +// Copyright (C) 2012 Jérôme Leclercq // This file is part of the "Nazara Engine". // For conditions of distribution and use, see copyright notice in Config.hpp diff --git a/include/Nazara/Core/Hash/SHA256.hpp b/include/Nazara/Core/Hash/SHA256.hpp index 3a72f41e2..68f09c2bc 100644 --- a/include/Nazara/Core/Hash/SHA256.hpp +++ b/include/Nazara/Core/Hash/SHA256.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2012 Jérôme Leclercq +// Copyright (C) 2012 Jérôme Leclercq // This file is part of the "Nazara Engine". // For conditions of distribution and use, see copyright notice in Config.hpp diff --git a/include/Nazara/Core/Hash/SHA384.hpp b/include/Nazara/Core/Hash/SHA384.hpp index 08b8a2318..0a68d49e3 100644 --- a/include/Nazara/Core/Hash/SHA384.hpp +++ b/include/Nazara/Core/Hash/SHA384.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2012 Jérôme Leclercq +// Copyright (C) 2012 Jérôme Leclercq // This file is part of the "Nazara Engine". // For conditions of distribution and use, see copyright notice in Config.hpp diff --git a/include/Nazara/Core/Hash/SHA512.hpp b/include/Nazara/Core/Hash/SHA512.hpp index 0b9a58af0..52bb47916 100644 --- a/include/Nazara/Core/Hash/SHA512.hpp +++ b/include/Nazara/Core/Hash/SHA512.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2012 Jérôme Leclercq +// Copyright (C) 2012 Jérôme Leclercq // This file is part of the "Nazara Engine". // For conditions of distribution and use, see copyright notice in Config.hpp diff --git a/include/Nazara/Core/Hash/Whirlpool.hpp b/include/Nazara/Core/Hash/Whirlpool.hpp index b26cfc504..412b757aa 100644 --- a/include/Nazara/Core/Hash/Whirlpool.hpp +++ b/include/Nazara/Core/Hash/Whirlpool.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2012 Jérôme Leclercq +// Copyright (C) 2012 Jérôme Leclercq // This file is part of the "Nazara Engine". // For conditions of distribution and use, see copyright notice in Config.hpp diff --git a/include/Nazara/Core/HashDigest.hpp b/include/Nazara/Core/HashDigest.hpp index 0359318b1..bac09615b 100644 --- a/include/Nazara/Core/HashDigest.hpp +++ b/include/Nazara/Core/HashDigest.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/HashImpl.hpp b/include/Nazara/Core/HashImpl.hpp index 83f087bd6..a871c0f8f 100644 --- a/include/Nazara/Core/HashImpl.hpp +++ b/include/Nazara/Core/HashImpl.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Hashable.hpp b/include/Nazara/Core/Hashable.hpp index bb8367477..4b9395bb3 100644 --- a/include/Nazara/Core/Hashable.hpp +++ b/include/Nazara/Core/Hashable.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Initializer.hpp b/include/Nazara/Core/Initializer.hpp index 592ffb506..66108a7a9 100644 --- a/include/Nazara/Core/Initializer.hpp +++ b/include/Nazara/Core/Initializer.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Initializer.inl b/include/Nazara/Core/Initializer.inl index 83cc85612..2f814517d 100644 --- a/include/Nazara/Core/Initializer.inl +++ b/include/Nazara/Core/Initializer.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp // http://www.easyrgb.com/index.php?X=MATH diff --git a/include/Nazara/Core/InputStream.hpp b/include/Nazara/Core/InputStream.hpp index efedc20bc..28b951b85 100644 --- a/include/Nazara/Core/InputStream.hpp +++ b/include/Nazara/Core/InputStream.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/LockGuard.hpp b/include/Nazara/Core/LockGuard.hpp index c9397bc2d..698048b51 100644 --- a/include/Nazara/Core/LockGuard.hpp +++ b/include/Nazara/Core/LockGuard.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Log.hpp b/include/Nazara/Core/Log.hpp index 76d6b8776..8af87b182 100644 --- a/include/Nazara/Core/Log.hpp +++ b/include/Nazara/Core/Log.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/MemoryStream.hpp b/include/Nazara/Core/MemoryStream.hpp index 12e3d5996..ae6025e2b 100644 --- a/include/Nazara/Core/MemoryStream.hpp +++ b/include/Nazara/Core/MemoryStream.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Mutex.hpp b/include/Nazara/Core/Mutex.hpp index fe4821f00..6ca9d91d4 100644 --- a/include/Nazara/Core/Mutex.hpp +++ b/include/Nazara/Core/Mutex.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/NonCopyable.hpp b/include/Nazara/Core/NonCopyable.hpp index 5623026de..8f08623bd 100644 --- a/include/Nazara/Core/NonCopyable.hpp +++ b/include/Nazara/Core/NonCopyable.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Resource.hpp b/include/Nazara/Core/Resource.hpp index 090de9146..920c4aceb 100644 --- a/include/Nazara/Core/Resource.hpp +++ b/include/Nazara/Core/Resource.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -22,7 +22,7 @@ class NAZARA_API NzResource void SetPersistent(bool persistent = true); private: - // Je fais précéder le nom par 'resource' pour éviter les éventuels conflits de noms + // Je fais précéder le nom par 'resource' pour éviter les éventuels conflits de noms mutable bool m_resourcePersistent; mutable unsigned int m_resourceReferenceCount; }; diff --git a/include/Nazara/Core/Semaphore.hpp b/include/Nazara/Core/Semaphore.hpp index 53e7ae509..711b34acd 100644 --- a/include/Nazara/Core/Semaphore.hpp +++ b/include/Nazara/Core/Semaphore.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/String.hpp b/include/Nazara/Core/String.hpp index 34bee2504..33b323d01 100644 --- a/include/Nazara/Core/String.hpp +++ b/include/Nazara/Core/String.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -27,11 +27,11 @@ class NAZARA_API NzString : public NzHashable public: enum Flags { - None = 0x00, // Mode par défaut - CaseInsensitive = 0x01, // Insensible à la casse - HandleUtf8 = 0x02, // Traite les octets comme une suite de caractères UTF-8 - TrimOnlyLeft = 0x04, // Trim(med), ne coupe que la partie gauche de la chaîne - TrimOnlyRight = 0x08 // Trim(med), ne coupe que la partie droite de la chaîne + None = 0x00, // Mode par défaut + CaseInsensitive = 0x01, // Insensible à la casse + HandleUtf8 = 0x02, // Traite les octets comme une suite de caractères UTF-8 + TrimOnlyLeft = 0x04, // Trim(med), ne coupe que la partie gauche de la chaîne + TrimOnlyRight = 0x08 // Trim(med), ne coupe que la partie droite de la chaîne }; struct SharedString; @@ -157,7 +157,7 @@ class NAZARA_API NzString : public NzHashable NzString Trimmed(nzUInt32 flags = None) const; NzString Trimmed(char character, nzUInt32 flags = None) const; - // Méthodes STD + // Méthodes STD char* begin(); const char* begin() const; char* end(); @@ -173,7 +173,7 @@ class NAZARA_API NzString : public NzHashable typedef char* iterator; //typedef char* reverse_iterator; typedef char value_type; - // Méthodes STD + // Méthodes STD operator std::string() const; diff --git a/include/Nazara/Core/StringStream.hpp b/include/Nazara/Core/StringStream.hpp index 63b975772..719adb7b5 100644 --- a/include/Nazara/Core/StringStream.hpp +++ b/include/Nazara/Core/StringStream.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Thread.hpp b/include/Nazara/Core/Thread.hpp index 5895040b8..aa67e0beb 100644 --- a/include/Nazara/Core/Thread.hpp +++ b/include/Nazara/Core/Thread.hpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Inspiré du code de la SFML par Laurent Gomila +// Inspiré du code de la SFML par Laurent Gomila #pragma once diff --git a/include/Nazara/Core/Thread.inl b/include/Nazara/Core/Thread.inl index ddf73ca3d..301a32240 100644 --- a/include/Nazara/Core/Thread.inl +++ b/include/Nazara/Core/Thread.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Core/ThreadSafety.hpp b/include/Nazara/Core/ThreadSafety.hpp index ff6ee4907..be9d5d103 100644 --- a/include/Nazara/Core/ThreadSafety.hpp +++ b/include/Nazara/Core/ThreadSafety.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp // Pas de header guard @@ -7,7 +7,7 @@ #include #include -// Ces macros peuvent changer pour n'importe quel fichier qui l'utilise dans une même unité de compilation +// Ces macros peuvent changer pour n'importe quel fichier qui l'utilise dans une même unité de compilation #undef NazaraLock #undef NazaraMutex #undef NazaraMutexAttrib diff --git a/include/Nazara/Core/ThreadSafetyOff.hpp b/include/Nazara/Core/ThreadSafetyOff.hpp index 86c84e938..88c9fc7c0 100644 --- a/include/Nazara/Core/ThreadSafetyOff.hpp +++ b/include/Nazara/Core/ThreadSafetyOff.hpp @@ -1,10 +1,10 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp // Pas de header guard -// Ces macros peuvent changer pour n'importe quel fichier qui l'utilise dans une même unité de compilation +// Ces macros peuvent changer pour n'importe quel fichier qui l'utilise dans une même unité de compilation #undef NazaraLock #undef NazaraMutex #undef NazaraMutexAttrib diff --git a/include/Nazara/Core/Tuple.hpp b/include/Nazara/Core/Tuple.hpp index 94d0b77da..ffe5068ed 100644 --- a/include/Nazara/Core/Tuple.hpp +++ b/include/Nazara/Core/Tuple.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Core/Tuple.inl b/include/Nazara/Core/Tuple.inl index bd662256f..326ca5d97 100644 --- a/include/Nazara/Core/Tuple.inl +++ b/include/Nazara/Core/Tuple.inl @@ -1,10 +1,10 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp // http://stackoverflow.com/questions/687490/c0x-how-do-i-expand-a-tuple-into-variadic-template-function-arguments -// Merci à Ryan "FullMetal Alchemist" Lahfa -// Merci aussi à Freedom de siteduzero.com +// Merci à Ryan "FullMetal Alchemist" Lahfa +// Merci aussi à Freedom de siteduzero.com #include diff --git a/include/Nazara/Core/Unicode.hpp b/include/Nazara/Core/Unicode.hpp index f9b05d6fd..e9bccad03 100644 --- a/include/Nazara/Core/Unicode.hpp +++ b/include/Nazara/Core/Unicode.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -13,13 +13,13 @@ class NzUnicode { public: /* - Catégorie Unicode: - -Les valeurs de 0x01 à 0x80 indiquent la catégorie. - -Les valeurs de 0x100 à 0x10000 indiquent la sous-catégorie. + Catégorie Unicode: + -Les valeurs de 0x01 à 0x80 indiquent la catégorie. + -Les valeurs de 0x100 à 0x10000 indiquent la sous-catégorie. */ enum Category : nzUInt16 { - // Catégorie non-reconnue par Nazara + // Catégorie non-reconnue par Nazara Category_NoCategory = 0, // Lettres diff --git a/include/Nazara/Debug.hpp b/include/Nazara/Debug.hpp index 22ca244ef..9ca669bb7 100644 --- a/include/Nazara/Debug.hpp +++ b/include/Nazara/Debug.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/DebugOff.hpp b/include/Nazara/DebugOff.hpp index e32f36866..d76ff1bb8 100644 --- a/include/Nazara/DebugOff.hpp +++ b/include/Nazara/DebugOff.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine" // For conditions of distribution and use, see copyright notice in Config.hpp #undef delete diff --git a/include/Nazara/Math.hpp b/include/Nazara/Math.hpp index e26587f36..33747808b 100644 --- a/include/Nazara/Math.hpp +++ b/include/Nazara/Math.hpp @@ -1,10 +1,10 @@ // This file was automatically generated by Nazara /* - Nazara Engine + Nazara Engine - Mathematics module - Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) - Rémi "overdrivr" Bèges (remi.beges@laposte.net) + Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Rémi "overdrivr" Bèges (remi.beges@laposte.net) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/include/Nazara/Math/Basic.hpp b/include/Nazara/Math/Basic.hpp index ec374efe2..572afa5e3 100644 --- a/include/Nazara/Math/Basic.hpp +++ b/include/Nazara/Math/Basic.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Math/Basic.inl b/include/Nazara/Math/Basic.inl index 867002a92..92f17ddd2 100644 --- a/include/Nazara/Math/Basic.inl +++ b/include/Nazara/Math/Basic.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -55,7 +55,7 @@ unsigned int NzGetNumberLength(signed char number) if (number == 0) return 1; - // Le standard définit le char comme étant codé sur un octet + // Le standard définit le char comme étant codé sur un octet static_assert(sizeof(number) == 1, "Signed char must be one byte-sized"); if (number >= 100) @@ -71,7 +71,7 @@ unsigned int NzGetNumberLength(unsigned char number) if (number == 0) return 1; - // Le standard définit le char comme étant codé sur un octet + // Le standard définit le char comme étant codé sur un octet static_assert(sizeof(number) == 1, "Signed char must be one byte-sized"); if (number >= 100) @@ -148,19 +148,19 @@ unsigned int NzGetNumberLength(unsigned long long number) 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) = 1) return NzGetNumberLength(static_cast(number)) + precision + 1; // Plus un pour le point } 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) = 1) return NzGetNumberLength(static_cast(number)) + precision + 1; // Plus un pour le point } 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) = 1) return NzGetNumberLength(static_cast(number)) + precision + 1; // Plus un pour le point } diff --git a/include/Nazara/Math/Config.hpp b/include/Nazara/Math/Config.hpp index 1325d5ad0..6adf384cf 100644 --- a/include/Nazara/Math/Config.hpp +++ b/include/Nazara/Math/Config.hpp @@ -1,8 +1,8 @@ /* - Nazara Engine + Nazara Engine - Mathematics module - Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) - Rémi "overdrivr" Bèges (remi.beges@laposte.net) + Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Rémi "overdrivr" Bèges (remi.beges@laposte.net) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -28,24 +28,24 @@ #ifndef NAZARA_CONFIG_MATH_HPP #define NAZARA_CONFIG_MATH_HPP -/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci +/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci -// Définit le radian comme l'unité utilisée pour les angles +// Définit le radian comme l'unité utilisée pour les angles #define NAZARA_MATH_ANGLE_RADIAN 0 -// Définit la disposition des matrices en colonnes (Façon OpenGL) +// Définit la disposition des matrices en colonnes (Façon OpenGL) #define NAZARA_MATH_MATRIX_COLUMN_MAJOR 1 -// Optimise les opérations entre matrices affines (Demande plusieurs comparaisons pour déterminer si une matrice est affine) +// Optimise les opérations entre matrices affines (Demande plusieurs comparaisons pour déterminer si une matrice est affine) #define NAZARA_MATH_MATRIX4_CHECK_AFFINE 0 -// Active les tests de sécurité basés sur le code (Conseillé pour le développement) +// Active les tests de sécurité basés sur le code (Conseillé pour le développement) #define NAZARA_MATH_SAFE 1 -// Protège les classes des accès concurrentiels +// Protège les classes des accès concurrentiels #define NAZARA_MATH_THREADSAFE 1 -// Les classes à protéger des accès concurrentiels +// Les classes à protéger des accès concurrentiels #define NAZARA_THREADSAFETY_MATRIX3 1 // NzMatrix3 (COW) #define NAZARA_THREADSAFETY_MATRIX4 1 // NzMatrix4 (COW) diff --git a/include/Nazara/Math/Cube.hpp b/include/Nazara/Math/Cube.hpp index 7230c1108..8fa678d38 100644 --- a/include/Nazara/Math/Cube.hpp +++ b/include/Nazara/Math/Cube.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Math/Cube.inl b/include/Nazara/Math/Cube.inl index 64d69bf66..d96c2cfcd 100644 --- a/include/Nazara/Math/Cube.inl +++ b/include/Nazara/Math/Cube.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Math/EulerAngles.hpp b/include/Nazara/Math/EulerAngles.hpp index a9667186f..1fb14aa52 100644 --- a/include/Nazara/Math/EulerAngles.hpp +++ b/include/Nazara/Math/EulerAngles.hpp @@ -1,6 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Math/EulerAngles.inl b/include/Nazara/Math/EulerAngles.inl index 0752f2948..8797d3310 100644 --- a/include/Nazara/Math/EulerAngles.inl +++ b/include/Nazara/Math/EulerAngles.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Math/Math.hpp b/include/Nazara/Math/Math.hpp deleted file mode 100644 index f0212dde6..000000000 --- a/include/Nazara/Math/Math.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - Nazara Engine - - Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) - - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ \ No newline at end of file diff --git a/include/Nazara/Math/Matrix4.hpp b/include/Nazara/Math/Matrix4.hpp index f0c136207..076d1b373 100644 --- a/include/Nazara/Math/Matrix4.hpp +++ b/include/Nazara/Math/Matrix4.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Math/Matrix4.inl b/include/Nazara/Math/Matrix4.inl index 051b10697..2f11f83dd 100644 --- a/include/Nazara/Math/Matrix4.inl +++ b/include/Nazara/Math/Matrix4.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -16,7 +16,7 @@ #include #include //#include -///FIXME: Le MLT détecte de faux-leaks ici (Problème lié aux inline ?) +///FIXME: Le MLT détecte de faux-leaks ici (Problème lié aux inline ?) #define F(a) static_cast(a) @@ -407,7 +407,7 @@ void NzMatrix4::Set(const T matrix[16]) { EnsureOwnership(); - // Ici nous sommes certains de la continuité des éléments en mémoire + // Ici nous sommes certains de la continuité des éléments en mémoire std::memcpy(&m_sharedMatrix->m11, matrix, 16*sizeof(T)); } diff --git a/include/Nazara/Math/Quaternion.hpp b/include/Nazara/Math/Quaternion.hpp index b09518b52..6b3c0e7b7 100644 --- a/include/Nazara/Math/Quaternion.hpp +++ b/include/Nazara/Math/Quaternion.hpp @@ -1,6 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges - Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Math/Quaternion.inl b/include/Nazara/Math/Quaternion.inl index b03c588f2..c17e5b026 100644 --- a/include/Nazara/Math/Quaternion.inl +++ b/include/Nazara/Math/Quaternion.inl @@ -1,6 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges - Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -111,7 +110,7 @@ T NzQuaternion::Normalize() return magnitude; } else - return F(1.0); // Le quaternion est déjà normalisé + return F(1.0); // Le quaternion est déjà normalisé } template @@ -364,7 +363,7 @@ NzQuaternion NzQuaternion::Slerp(const NzQuaternion& quatA, const NzQuater T k0, k1; if (cosOmega > F(0.9999)) { - // Interpolation linéaire pour éviter une division par zéro + // Interpolation linéaire pour éviter une division par zéro k0 = F(1.0) - interp; k1 = interp; } @@ -373,7 +372,7 @@ NzQuaternion NzQuaternion::Slerp(const NzQuaternion& quatA, const NzQuater T sinOmega = std::sqrt(F(1.0) - cosOmega*cosOmega); T omega = std::atan2(sinOmega, cosOmega); - // Pour éviter deux divisions + // Pour éviter deux divisions sinOmega = F(1.0)/sinOmega; k0 = std::sin((F(1.0) - interp) * omega) * sinOmega; diff --git a/include/Nazara/Math/Rect.hpp b/include/Nazara/Math/Rect.hpp index 5c06e9140..938e9e1ea 100644 --- a/include/Nazara/Math/Rect.hpp +++ b/include/Nazara/Math/Rect.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Math/Rect.inl b/include/Nazara/Math/Rect.inl index 97d1a6a69..3984593c0 100644 --- a/include/Nazara/Math/Rect.inl +++ b/include/Nazara/Math/Rect.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Math/Vector2.hpp b/include/Nazara/Math/Vector2.hpp index b7fc3eff1..4f02ae77e 100644 --- a/include/Nazara/Math/Vector2.hpp +++ b/include/Nazara/Math/Vector2.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Math/Vector2.inl b/include/Nazara/Math/Vector2.inl index 3ee71da3f..f1a716f7b 100644 --- a/include/Nazara/Math/Vector2.inl +++ b/include/Nazara/Math/Vector2.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Math/Vector3.hpp b/include/Nazara/Math/Vector3.hpp index c8320b9f0..b501fee58 100644 --- a/include/Nazara/Math/Vector3.hpp +++ b/include/Nazara/Math/Vector3.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges - Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Math/Vector3.inl b/include/Nazara/Math/Vector3.inl index 136fce90b..671b3898e 100644 --- a/include/Nazara/Math/Vector3.inl +++ b/include/Nazara/Math/Vector3.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges - Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Math/Vector4.hpp b/include/Nazara/Math/Vector4.hpp index 8faa3b94c..3987a6b76 100644 --- a/include/Nazara/Math/Vector4.hpp +++ b/include/Nazara/Math/Vector4.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges - Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Math/Vector4.inl b/include/Nazara/Math/Vector4.inl index 99e868cf6..18e915e96 100644 --- a/include/Nazara/Math/Vector4.inl +++ b/include/Nazara/Math/Vector4.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges - Jérôme Leclercq +// This file is part of the "Nazara Engine - Mathematics module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -9,7 +9,7 @@ #include #include -///FIXME: Les calculs effectués ici sont probablements tous faux, la composante W étant spéciale dans le monde de la 3D +///FIXME: Les calculs effectués ici sont probablements tous faux, la composante W étant spéciale dans le monde de la 3D #define F(a) static_cast(a) diff --git a/include/Nazara/Noise.hpp b/include/Nazara/Noise.hpp index 6603cf442..4be156c28 100644 --- a/include/Nazara/Noise.hpp +++ b/include/Nazara/Noise.hpp @@ -1,9 +1,9 @@ // This file was automatically generated by Nazara /* - Nazara Engine - NzNoise Module + Nazara Engine - Noise module - Copyright (C) 2012 Rémi "Overdrivr" Bèges (remi.beges@laposte.net) + Copyright (C) 2012 Rémi "Overdrivr" Bèges (remi.beges@laposte.net) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/include/Nazara/Noise/ComplexNoiseBase.hpp b/include/Nazara/Noise/ComplexNoiseBase.hpp index a9db6870e..8e1591df0 100644 --- a/include/Nazara/Noise/ComplexNoiseBase.hpp +++ b/include/Nazara/Noise/ComplexNoiseBase.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Noise/Config.hpp b/include/Nazara/Noise/Config.hpp index dff3349d1..11b3ac5e1 100644 --- a/include/Nazara/Noise/Config.hpp +++ b/include/Nazara/Noise/Config.hpp @@ -1,7 +1,7 @@ /* - Nazara Engine - NzNoise Module + Nazara Engine - Noise module - Copyright (C) 2012 Rémi "Overdrivr" Bèges (remi.beges@laposte.net) + Copyright (C) 2012 Rémi "Overdrivr" Bèges (remi.beges@laposte.net) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -27,12 +27,12 @@ #ifndef NAZARA_CONFIG_NOISE_HPP #define NAZARA_CONFIG_NOISE_HPP -/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci +/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci -// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) +// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) #define NAZARA_NOISE_MEMORYLEAKTRACKER 0 -// Active les tests de sécurité basés sur le code (Conseillé pour le développement) +// Active les tests de sécurité basés sur le code (Conseillé pour le développement) #define NAZARA_NOISE_SAFE 1 #endif // NAZARA_CONFIG_MODULENAME_HPP diff --git a/include/Nazara/Noise/Debug.hpp b/include/Nazara/Noise/Debug.hpp index 1f8a08966..7f5b31f2c 100644 --- a/include/Nazara/Noise/Debug.hpp +++ b/include/Nazara/Noise/Debug.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi "Overdrivr" Bèges (remi.beges@laposte.net) -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Noise/DebugOff.hpp b/include/Nazara/Noise/DebugOff.hpp index 1162e79c0..0230ec332 100644 --- a/include/Nazara/Noise/DebugOff.hpp +++ b/include/Nazara/Noise/DebugOff.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi "Overdrivr" Bèges (remi.beges@laposte.net) -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #if NAZARA_NOISE_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) diff --git a/include/Nazara/Noise/Noise.hpp b/include/Nazara/Noise/Noise.hpp index 1b6206c84..464117ecc 100644 --- a/include/Nazara/Noise/Noise.hpp +++ b/include/Nazara/Noise/Noise.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Noise/NoiseBase.hpp b/include/Nazara/Noise/NoiseBase.hpp index 331d227df..6ec1d6f31 100644 --- a/include/Nazara/Noise/NoiseBase.hpp +++ b/include/Nazara/Noise/NoiseBase.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Noise/NoiseMachine.hpp b/include/Nazara/Noise/NoiseMachine.hpp index 4c221628f..d5abad75b 100644 --- a/include/Nazara/Noise/NoiseMachine.hpp +++ b/include/Nazara/Noise/NoiseMachine.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Noise/Perlin2D.hpp b/include/Nazara/Noise/Perlin2D.hpp index 18e7ae875..c9e4186e4 100644 --- a/include/Nazara/Noise/Perlin2D.hpp +++ b/include/Nazara/Noise/Perlin2D.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Noise/Perlin2D.inl b/include/Nazara/Noise/Perlin2D.inl index a823aba81..df1a383d8 100644 --- a/include/Nazara/Noise/Perlin2D.inl +++ b/include/Nazara/Noise/Perlin2D.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Noise/Perlin3D.hpp b/include/Nazara/Noise/Perlin3D.hpp index a425dc384..573dac6ae 100644 --- a/include/Nazara/Noise/Perlin3D.hpp +++ b/include/Nazara/Noise/Perlin3D.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Noise/Perlin3D.inl b/include/Nazara/Noise/Perlin3D.inl index 60231979a..b29a3adc0 100644 --- a/include/Nazara/Noise/Perlin3D.inl +++ b/include/Nazara/Noise/Perlin3D.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Noise/Perlin4D.hpp b/include/Nazara/Noise/Perlin4D.hpp index b5a25ee4d..e73e7cf72 100644 --- a/include/Nazara/Noise/Perlin4D.hpp +++ b/include/Nazara/Noise/Perlin4D.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Noise/Perlin4D.inl b/include/Nazara/Noise/Perlin4D.inl index b009098f8..c21c7e97d 100644 --- a/include/Nazara/Noise/Perlin4D.inl +++ b/include/Nazara/Noise/Perlin4D.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Noise/Simplex2D.hpp b/include/Nazara/Noise/Simplex2D.hpp index 78d896f7d..9dfa542be 100644 --- a/include/Nazara/Noise/Simplex2D.hpp +++ b/include/Nazara/Noise/Simplex2D.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Noise/Simplex2D.inl b/include/Nazara/Noise/Simplex2D.inl index 3d019fd54..c86a8408b 100644 --- a/include/Nazara/Noise/Simplex2D.inl +++ b/include/Nazara/Noise/Simplex2D.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Noise/Simplex3D.hpp b/include/Nazara/Noise/Simplex3D.hpp index 399705072..13ced155b 100644 --- a/include/Nazara/Noise/Simplex3D.hpp +++ b/include/Nazara/Noise/Simplex3D.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Noise/Simplex3D.inl b/include/Nazara/Noise/Simplex3D.inl index d0bd3bf0d..779ba5cb1 100644 --- a/include/Nazara/Noise/Simplex3D.inl +++ b/include/Nazara/Noise/Simplex3D.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Noise/Simplex4D.hpp b/include/Nazara/Noise/Simplex4D.hpp index f932d212b..8c7bb31e5 100644 --- a/include/Nazara/Noise/Simplex4D.hpp +++ b/include/Nazara/Noise/Simplex4D.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Noise/Simplex4D.inl b/include/Nazara/Noise/Simplex4D.inl index 413467b85..f49235479 100644 --- a/include/Nazara/Noise/Simplex4D.inl +++ b/include/Nazara/Noise/Simplex4D.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Prerequesites.hpp b/include/Nazara/Prerequesites.hpp index 4593dce62..af3ec7707 100644 --- a/include/Nazara/Prerequesites.hpp +++ b/include/Nazara/Prerequesites.hpp @@ -1,6 +1,26 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". -// For conditions of distribution and use, see copyright notice in Config.hpp +/* + Nazara Engine + + Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ #ifndef NAZARA_PREREQUESITES_HPP #define NAZARA_PREREQUESITES_HPP @@ -55,7 +75,7 @@ #define NAZARA_PLATFORM_WINDOWS // Des defines pour le header Windows - #if defined(NAZARA_BUILD) // Pour ne pas entrer en conflit avec les defines de l'application ou d'une autre bibliothèque + #if defined(NAZARA_BUILD) // Pour ne pas entrer en conflit avec les defines de l'application ou d'une autre bibliothèque #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif @@ -71,7 +91,7 @@ #define NAZARA_WINNT 0x0501 #endif - // Pour ne pas casser le define déjà en place s'il est applicable + // Pour ne pas casser le define déjà en place s'il est applicable #if defined(_WIN32_WINNT) #if _WIN32_WINNT < NAZARA_WINNT #undef _WIN32_WINNT @@ -98,7 +118,7 @@ #define NAZARA_PLATFORM_FREEBSD #define NAZARA_PLATFORM_POSIX*/ #else - // À commenter pour tenter quand même une compilation + // À commenter pour tenter quand même une compilation #error This operating system is not fully supported by the Nazara Engine #define NAZARA_PLATFORM_UNKNOWN diff --git a/include/Nazara/Renderer.hpp b/include/Nazara/Renderer.hpp index 98d61077e..f4c24dbfb 100644 --- a/include/Nazara/Renderer.hpp +++ b/include/Nazara/Renderer.hpp @@ -1,9 +1,9 @@ // This file was automatically generated by Nazara /* - Nazara Engine + Nazara Engine - Renderer module - Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/include/Nazara/Renderer/Config.hpp b/include/Nazara/Renderer/Config.hpp index ae970da77..5fa27a4f0 100644 --- a/include/Nazara/Renderer/Config.hpp +++ b/include/Nazara/Renderer/Config.hpp @@ -1,7 +1,7 @@ /* - Nazara Engine + Nazara Engine - Renderer module - Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -27,18 +27,18 @@ #ifndef NAZARA_CONFIG_RENDERER_HPP #define NAZARA_CONFIG_RENDERER_HPP -/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci +/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci -// Active une fenêtre de rendu (NzRenderWindow) lors de sa création +// Active une fenêtre de rendu (NzRenderWindow) lors de sa création #define NAZARA_RENDERER_ACTIVATE_RENDERWINDOW_ON_CREATION 1 -// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) +// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) #define NAZARA_RENDERER_MEMORYLEAKTRACKER 0 -// Active le paramère debug des paramètres des contextes par défaut (Perte de performances mais capable de recevoir des messages d'OpenGL) +// Active le paramère debug des paramètres des contextes par défaut (Perte de performances mais capable de recevoir des messages d'OpenGL) #define NAZARA_RENDERER_OPENGL_DEBUG 0 -// Active les tests de sécurité basés sur le code (Conseillé pour le développement) +// Active les tests de sécurité basés sur le code (Conseillé pour le développement) #define NAZARA_RENDERER_SAFE 1 #endif // NAZARA_CONFIG_MODULENAME_HPP diff --git a/include/Nazara/Renderer/Context.hpp b/include/Nazara/Renderer/Context.hpp index 08da75937..9aaf37304 100644 --- a/include/Nazara/Renderer/Context.hpp +++ b/include/Nazara/Renderer/Context.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #ifdef NAZARA_RENDERER_COMMON diff --git a/include/Nazara/Renderer/ContextParameters.hpp b/include/Nazara/Renderer/ContextParameters.hpp index 93b731e04..e11f033c9 100644 --- a/include/Nazara/Renderer/ContextParameters.hpp +++ b/include/Nazara/Renderer/ContextParameters.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Renderer/Debug.hpp b/include/Nazara/Renderer/Debug.hpp index 0ed2db662..64527355e 100644 --- a/include/Nazara/Renderer/Debug.hpp +++ b/include/Nazara/Renderer/Debug.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Renderer/DebugOff.hpp b/include/Nazara/Renderer/DebugOff.hpp index 52edf35d4..724669a51 100644 --- a/include/Nazara/Renderer/DebugOff.hpp +++ b/include/Nazara/Renderer/DebugOff.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #if NAZARA_RENDERER_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) diff --git a/include/Nazara/Renderer/Enums.hpp b/include/Nazara/Renderer/Enums.hpp index 47678946e..459ea4d4a 100644 --- a/include/Nazara/Renderer/Enums.hpp +++ b/include/Nazara/Renderer/Enums.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Renderer/OcclusionQuery.hpp b/include/Nazara/Renderer/OcclusionQuery.hpp index e6ea73e3a..aa48cabfa 100644 --- a/include/Nazara/Renderer/OcclusionQuery.hpp +++ b/include/Nazara/Renderer/OcclusionQuery.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Renderer/OpenGL.hpp b/include/Nazara/Renderer/OpenGL.hpp index 9adee291f..72bd906a4 100644 --- a/include/Nazara/Renderer/OpenGL.hpp +++ b/include/Nazara/Renderer/OpenGL.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #ifdef NAZARA_RENDERER_COMMON @@ -11,7 +11,7 @@ #ifndef NAZARA_OPENGL_HPP #define NAZARA_OPENGL_HPP -// gl3.h définit WIN32_LEAN_AND_MEAN qui entre en conflit avec la définition de Nazara et doit donc être inclut en premier +// gl3.h définit WIN32_LEAN_AND_MEAN qui entre en conflit avec la définition de Nazara et doit donc être inclut en premier #include #include #include diff --git a/include/Nazara/Renderer/RenderTarget.hpp b/include/Nazara/Renderer/RenderTarget.hpp index 8a065a31c..347bf90fb 100644 --- a/include/Nazara/Renderer/RenderTarget.hpp +++ b/include/Nazara/Renderer/RenderTarget.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Renderer/RenderTargetParameters.hpp b/include/Nazara/Renderer/RenderTargetParameters.hpp index bd823e021..5a54d59ab 100644 --- a/include/Nazara/Renderer/RenderTargetParameters.hpp +++ b/include/Nazara/Renderer/RenderTargetParameters.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Renderer/RenderWindow.hpp b/include/Nazara/Renderer/RenderWindow.hpp index 391314c31..d9b932d09 100644 --- a/include/Nazara/Renderer/RenderWindow.hpp +++ b/include/Nazara/Renderer/RenderWindow.hpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Interface inspirée de la SFML par Laurent Gomila +// Interface inspirée de la SFML par Laurent Gomila #pragma once diff --git a/include/Nazara/Renderer/Renderer.hpp b/include/Nazara/Renderer/Renderer.hpp index b73fb07a5..b34b16965 100644 --- a/include/Nazara/Renderer/Renderer.hpp +++ b/include/Nazara/Renderer/Renderer.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Renderer/Shader.hpp b/include/Nazara/Renderer/Shader.hpp index f1ebb9ed2..bf270b63c 100644 --- a/include/Nazara/Renderer/Shader.hpp +++ b/include/Nazara/Renderer/Shader.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Renderer/Texture.hpp b/include/Nazara/Renderer/Texture.hpp index af056c0db..d0e1b8856 100644 --- a/include/Nazara/Renderer/Texture.hpp +++ b/include/Nazara/Renderer/Texture.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility.hpp b/include/Nazara/Utility.hpp index 449b99967..c578347d9 100644 --- a/include/Nazara/Utility.hpp +++ b/include/Nazara/Utility.hpp @@ -1,9 +1,9 @@ // This file was automatically generated by Nazara /* - Nazara Engine + Nazara Engine - Window module - Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/include/Nazara/Utility/Animation.hpp b/include/Nazara/Utility/Animation.hpp index 11b2c08bb..15ecd6b78 100644 --- a/include/Nazara/Utility/Animation.hpp +++ b/include/Nazara/Utility/Animation.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/AxisAlignedBox.hpp b/include/Nazara/Utility/AxisAlignedBox.hpp index a12658c30..174ff5fc8 100644 --- a/include/Nazara/Utility/AxisAlignedBox.hpp +++ b/include/Nazara/Utility/AxisAlignedBox.hpp @@ -1,6 +1,6 @@ -// Copyright (C) 2011 Jérôme Leclercq -// This file is part of the "Ungine". -// For conditions of distribution and use, see copyright notice in Core.h +// Copyright (C) 2011 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" +// For conditions of distribution and use, see copyright notice in Config.hpp #ifndef NAZARA_AXISALIGNEDBOX_HPP #define NAZARA_AXISALIGNEDBOX_HPP diff --git a/include/Nazara/Utility/Buffer.hpp b/include/Nazara/Utility/Buffer.hpp index 5c728473a..db03d85f6 100644 --- a/include/Nazara/Utility/Buffer.hpp +++ b/include/Nazara/Utility/Buffer.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/BufferImpl.hpp b/include/Nazara/Utility/BufferImpl.hpp index 7821c3c76..f1015d75d 100644 --- a/include/Nazara/Utility/BufferImpl.hpp +++ b/include/Nazara/Utility/BufferImpl.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/Config.hpp b/include/Nazara/Utility/Config.hpp index f18cea996..2f9e23ffc 100644 --- a/include/Nazara/Utility/Config.hpp +++ b/include/Nazara/Utility/Config.hpp @@ -1,7 +1,7 @@ /* - Nazara Engine + Nazara Engine - Window module - Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -27,24 +27,24 @@ #ifndef NAZARA_CONFIG_UTILITY_HPP #define NAZARA_CONFIG_UTILITY_HPP -/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci +/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci -// Force les buffers à posséder un stride multiple de 32 bytes (Gain de performances sur certaines cartes/plus de consommation mémoire) +// Force les buffers à posséder un stride multiple de 32 bytes (Gain de performances sur certaines cartes/plus de consommation mémoire) #define NAZARA_UTILITY_FORCE_DECLARATION_STRIDE_MULTIPLE_OF_32 0 -// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) +// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) #define NAZARA_UTILITY_MEMORYLEAKTRACKER 0 -// Active les tests de sécurité basés sur le code (Conseillé pour le développement) +// Active les tests de sécurité basés sur le code (Conseillé pour le développement) #define NAZARA_UTILITY_SAFE 1 -// Fait tourner chaque fenêtre dans un thread séparé si le système le supporte -#define NAZARA_UTILITY_THREADED_WINDOW 0 ///FIXME: Buggé depuis GCC 4.7 +// Fait tourner chaque fenêtre dans un thread séparé si le système le supporte +#define NAZARA_UTILITY_THREADED_WINDOW 0 ///FIXME: Buggé depuis GCC 4.7 -// Protège les classes des accès concurrentiels +// Protège les classes des accès concurrentiels #define NAZARA_UTILITY_THREADSAFE 1 -// Les classes à protéger des accès concurrentiels +// Les classes à protéger des accès concurrentiels #define NAZARA_THREADSAFETY_IMAGE 1 // NzImage (COW) #define NAZARA_THREADSAFETY_VERTEXDECLARATION 1 // NzVertexDeclaration (COW) diff --git a/include/Nazara/Utility/Cursor.hpp b/include/Nazara/Utility/Cursor.hpp index 56156346f..46ba6a940 100644 --- a/include/Nazara/Utility/Cursor.hpp +++ b/include/Nazara/Utility/Cursor.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/Debug.hpp b/include/Nazara/Utility/Debug.hpp index 31cc4d329..b41890db5 100644 --- a/include/Nazara/Utility/Debug.hpp +++ b/include/Nazara/Utility/Debug.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Utility/DebugOff.hpp b/include/Nazara/Utility/DebugOff.hpp index e6305ae55..04a295c3f 100644 --- a/include/Nazara/Utility/DebugOff.hpp +++ b/include/Nazara/Utility/DebugOff.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #if NAZARA_UTILITY_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) diff --git a/include/Nazara/Utility/Enums.hpp b/include/Nazara/Utility/Enums.hpp index 5758f14ea..71e5418c0 100644 --- a/include/Nazara/Utility/Enums.hpp +++ b/include/Nazara/Utility/Enums.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -45,7 +45,7 @@ enum nzBufferUsage enum nzCubemapFace { - // Cette énumération est prévue pour remplacer l'argument "z" des méthodes de NzImage contenant un cubemap + // Cette énumération est prévue pour remplacer l'argument "z" des méthodes de NzImage contenant un cubemap // L'ordre est X, -X, Y, -Y, Z, -Z nzCubemapFace_PositiveX = 0, nzCubemapFace_PositiveY = 2, diff --git a/include/Nazara/Utility/Event.hpp b/include/Nazara/Utility/Event.hpp index 6f8d28dee..88b984c5c 100644 --- a/include/Nazara/Utility/Event.hpp +++ b/include/Nazara/Utility/Event.hpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Interface inspirée de la SFML par Laurent Gomila +// Interface inspirée de la SFML par Laurent Gomila #pragma once @@ -14,7 +14,7 @@ struct NzEvent { - // Utilisé par: + // Utilisé par: // -nzEventType_KeyPressed // -nzEventType_KeyReleased struct KeyEvent @@ -27,7 +27,7 @@ struct NzEvent bool system; }; - // Utilisé par: + // Utilisé par: // -nzEventType_MouseButtonDoubleClicked // -nzEventType_MouseButtonPressed struct MouseButtonEvent @@ -37,7 +37,7 @@ struct NzEvent unsigned int y; }; - // Utilisé par: + // Utilisé par: // -nzEventType_MouseMoved struct MouseMoveEvent { @@ -47,14 +47,14 @@ struct NzEvent unsigned int y; }; - // Utilisé par: + // Utilisé par: // -nzEventType_MouseWheelMoved struct MouseWheelEvent { float delta; }; - // Utilisé par: + // Utilisé par: // -nzEventType_Moved struct PositionEvent { @@ -62,7 +62,7 @@ struct NzEvent int y; }; - // Utilisé par: + // Utilisé par: // -nzEventType_Resized struct SizeEvent { @@ -70,7 +70,7 @@ struct NzEvent unsigned int width; }; - // Utilisé par: + // Utilisé par: // -nzEventType_TextEntered struct TextEvent { @@ -82,33 +82,33 @@ struct NzEvent union { - // Utilisé par: + // Utilisé par: // -nzEventType_KeyPressed // -nzEventType_KeyReleased KeyEvent key; - // Utilisé par: + // Utilisé par: // -nzEventType_MouseButtonDoubleClicked // -nzEventType_MouseButtonPressed MouseButtonEvent mouseButton; - // Utilisé par: + // Utilisé par: // -nzEventType_MouseMoved MouseMoveEvent mouseMove; - // Utilisé par: + // Utilisé par: // -nzEventType_MouseWheelMoved MouseWheelEvent mouseWheel; - // Utilisé par: + // Utilisé par: // -nzEventType_Moved PositionEvent position; - // Utilisé par: + // Utilisé par: // -nzEventType_Resized SizeEvent size; - // Utilisé par: + // Utilisé par: // -nzEventType_TextEntered TextEvent text; }; diff --git a/include/Nazara/Utility/Icon.hpp b/include/Nazara/Utility/Icon.hpp index fa724a62c..d2797517a 100644 --- a/include/Nazara/Utility/Icon.hpp +++ b/include/Nazara/Utility/Icon.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/Image.hpp b/include/Nazara/Utility/Image.hpp index 3a98656e1..7c682b7cb 100644 --- a/include/Nazara/Utility/Image.hpp +++ b/include/Nazara/Utility/Image.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/IndexBuffer.hpp b/include/Nazara/Utility/IndexBuffer.hpp index dd6f99fd0..8dcb10a0b 100644 --- a/include/Nazara/Utility/IndexBuffer.hpp +++ b/include/Nazara/Utility/IndexBuffer.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/Keyboard.hpp b/include/Nazara/Utility/Keyboard.hpp index d9f35921b..a7bb39f3a 100644 --- a/include/Nazara/Utility/Keyboard.hpp +++ b/include/Nazara/Utility/Keyboard.hpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Interface inspirée de la SFML par Laurent Gomila +// Interface inspirée de la SFML par Laurent Gomila #pragma once @@ -63,13 +63,13 @@ class NAZARA_API NzKeyboard F14, F15, - // Flèches directionnelles + // Flèches directionnelles Down, Left, Right, Up, - // Pavé numérique + // Pavé numérique Add, Divide, Multiply, @@ -140,18 +140,18 @@ class NAZARA_API NzKeyboard Browser_Search, Browser_Stop, - // Touches de contrôle de lecture + // Touches de contrôle de lecture Media_Next, Media_Play, Media_Previous, Media_Stop, - // Touches de contrôle du volume + // Touches de contrôle du volume Volume_Down, Volume_Mute, Volume_Up, - // Touches à verrouillage + // Touches à verrouillage CapsLock, NumLock, ScrollLock, diff --git a/include/Nazara/Utility/KeyframeMesh.hpp b/include/Nazara/Utility/KeyframeMesh.hpp index d2e894c51..eec42bbb9 100644 --- a/include/Nazara/Utility/KeyframeMesh.hpp +++ b/include/Nazara/Utility/KeyframeMesh.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/Mesh.hpp b/include/Nazara/Utility/Mesh.hpp index 7b4072035..8fb29dbd5 100644 --- a/include/Nazara/Utility/Mesh.hpp +++ b/include/Nazara/Utility/Mesh.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/Mouse.hpp b/include/Nazara/Utility/Mouse.hpp index 37befe3ca..cad6046f0 100644 --- a/include/Nazara/Utility/Mouse.hpp +++ b/include/Nazara/Utility/Mouse.hpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Interface inspirée de la SFML par Laurent Gomila +// Interface inspirée de la SFML par Laurent Gomila #pragma once diff --git a/include/Nazara/Utility/PixelFormat.hpp b/include/Nazara/Utility/PixelFormat.hpp index 2f71927b7..611819d27 100644 --- a/include/Nazara/Utility/PixelFormat.hpp +++ b/include/Nazara/Utility/PixelFormat.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/PixelFormat.inl b/include/Nazara/Utility/PixelFormat.inl index bac3ff377..9660a3d63 100644 --- a/include/Nazara/Utility/PixelFormat.inl +++ b/include/Nazara/Utility/PixelFormat.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -83,7 +83,7 @@ inline bool NzPixelFormat::Flip(nzPixelFlipping flipping, nzPixelFormat format, it->second(width, height, depth, reinterpret_cast(src), reinterpret_cast(dst)); else { - // Flipping générique + // Flipping générique #if NAZARA_UTILITY_SAFE if (IsCompressed(format)) diff --git a/include/Nazara/Utility/ResourceLoader.hpp b/include/Nazara/Utility/ResourceLoader.hpp index 732d6de98..6cc1a08e1 100644 --- a/include/Nazara/Utility/ResourceLoader.hpp +++ b/include/Nazara/Utility/ResourceLoader.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/ResourceLoader.inl b/include/Nazara/Utility/ResourceLoader.inl index 9833cf40b..ee004d32e 100644 --- a/include/Nazara/Utility/ResourceLoader.inl +++ b/include/Nazara/Utility/ResourceLoader.inl @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -27,7 +27,7 @@ bool NzResourceLoader::LoadFromFile(Type* resource, const NzSt return false; } - // Récupération de tous les loaders de cette extension + // Récupération de tous les loaders de cette extension auto range = Type::s_fileLoaders.equal_range(ext); if (range.first == range.second) { @@ -35,7 +35,7 @@ bool NzResourceLoader::LoadFromFile(Type* resource, const NzSt return false; } - // range.second est un itérateur vers l'élément après le dernier élémént du range + // range.second est un itérateur vers l'élément après le dernier élémént du range auto it = range.second; do @@ -74,7 +74,7 @@ bool NzResourceLoader::LoadFromMemory(Type* resource, const vo for (auto loader = Type::s_memoryLoaders.rbegin(); loader != Type::s_memoryLoaders.rend(); ++loader) { - // Le loader supporte-t-il les données ? + // Le loader supporte-t-il les données ? if (!loader->first(data, size, parameters)) continue; @@ -111,7 +111,7 @@ bool NzResourceLoader::LoadFromStream(Type* resource, NzInputS { stream.SetCursorPos(streamPos); - // Le loader supporte-t-il les données ? + // Le loader supporte-t-il les données ? if (!loader->first(stream, parameters)) continue; @@ -158,7 +158,7 @@ void NzResourceLoader::UnregisterFileLoader(const NzString& ex for (const NzString& ext : exts) { - // Récupération de tous les loaders de cette extension + // Récupération de tous les loaders de cette extension auto range = Type::s_fileLoaders.equal_range(ext); for (auto it = range.first; it != range.second; ++it) diff --git a/include/Nazara/Utility/StaticMesh.hpp b/include/Nazara/Utility/StaticMesh.hpp index dbdbf2cc1..2d8ae3ec1 100644 --- a/include/Nazara/Utility/StaticMesh.hpp +++ b/include/Nazara/Utility/StaticMesh.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/SubMesh.hpp b/include/Nazara/Utility/SubMesh.hpp index ee4c6bd5a..f1acc4687 100644 --- a/include/Nazara/Utility/SubMesh.hpp +++ b/include/Nazara/Utility/SubMesh.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/Utility.hpp b/include/Nazara/Utility/Utility.hpp index 1133f0210..e7ce5fd90 100644 --- a/include/Nazara/Utility/Utility.hpp +++ b/include/Nazara/Utility/Utility.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/VertexBuffer.hpp b/include/Nazara/Utility/VertexBuffer.hpp index 51c5f154d..600152f7d 100644 --- a/include/Nazara/Utility/VertexBuffer.hpp +++ b/include/Nazara/Utility/VertexBuffer.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Utility/VertexDeclaration.hpp b/include/Nazara/Utility/VertexDeclaration.hpp index 049fb43f7..09977ebe9 100644 --- a/include/Nazara/Utility/VertexDeclaration.hpp +++ b/include/Nazara/Utility/VertexDeclaration.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #ifndef NAZARA_VERTEXDECLARATION_HPP diff --git a/include/Nazara/Utility/VideoMode.hpp b/include/Nazara/Utility/VideoMode.hpp index 248010977..f4a77815f 100644 --- a/include/Nazara/Utility/VideoMode.hpp +++ b/include/Nazara/Utility/VideoMode.hpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Interface inspirée de la SFML par Laurent Gomila +// Interface inspirée de la SFML par Laurent Gomila #pragma once diff --git a/include/Nazara/Utility/Window.hpp b/include/Nazara/Utility/Window.hpp index ab803d30b..e7f070300 100644 --- a/include/Nazara/Utility/Window.hpp +++ b/include/Nazara/Utility/Window.hpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Interface inspirée de la SFML par Laurent Gomila +// Interface inspirée de la SFML par Laurent Gomila #pragma once diff --git a/include/Nazara/Utility/WindowHandle.hpp b/include/Nazara/Utility/WindowHandle.hpp index 72cefce63..debf9ae4b 100644 --- a/include/Nazara/Utility/WindowHandle.hpp +++ b/include/Nazara/Utility/WindowHandle.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Core/ByteArray.cpp b/src/Nazara/Core/ByteArray.cpp index dcd688d24..d390d6611 100644 --- a/src/Nazara/Core/ByteArray.cpp +++ b/src/Nazara/Core/ByteArray.cpp @@ -1,4 +1,9 @@ -/*#include +/* +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" +// For conditions of distribution and use, see copyright notice in Config.hpp + +#include #include #include #include @@ -12,7 +17,7 @@ inline unsigned int nzPow2(unsigned int n) return x; } -// Cet algorithme est inspiré de la documentation de Qt +// Cet algorithme est inspiré de la documentation de Qt inline unsigned int nzGetNewSize(unsigned int newSize) { if (newSize < 20) @@ -146,7 +151,7 @@ NzByteArray& NzByteArray::Insert(int pos, const nzUInt8* buffer, unsigned int bu unsigned int start = std::min(static_cast(pos), m_sharedArray->size); - // Si le buffer est déjà suffisamment grand + // Si le buffer est déjà suffisamment grand if (m_sharedArray->capacity >= m_sharedArray->size + bufferLength) { EnsureOwnership(); @@ -195,7 +200,7 @@ NzByteArray& NzByteArray::Insert(int pos, const NzByteArray& byteArray) unsigned int start = std::min(static_cast(pos), m_sharedArray->size); - // Si le buffer est déjà suffisamment grand + // Si le buffer est déjà suffisamment grand if (m_sharedArray->capacity >= m_sharedArray->size + string.m_sharedArray->size) { EnsureOwnership(); diff --git a/src/Nazara/Core/Clock.cpp b/src/Nazara/Core/Clock.cpp index 5f685b3dc..a0a389a1e 100644 --- a/src/Nazara/Core/Clock.cpp +++ b/src/Nazara/Core/Clock.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Color.cpp b/src/Nazara/Core/Color.cpp index e7e583f2d..12144f0d5 100644 --- a/src/Nazara/Core/Color.cpp +++ b/src/Nazara/Core/Color.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/ConditionVariable.cpp b/src/Nazara/Core/ConditionVariable.cpp index 88337bb64..46900f1a8 100644 --- a/src/Nazara/Core/ConditionVariable.cpp +++ b/src/Nazara/Core/ConditionVariable.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Core.cpp b/src/Nazara/Core/Core.cpp index 0bd2ff041..bbe3d8950 100644 --- a/src/Nazara/Core/Core.cpp +++ b/src/Nazara/Core/Core.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 AUTHORS -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -11,11 +11,11 @@ bool NzCore::Initialize() { if (s_moduleReferenceCouter++ != 0) - return true; // Déjà initialisé + return true; // Déjà initialisé // Initialisation du module - // Le noyau de Nazara n'a pour l'instant aucun besoin d'initialisation, mais dans le futur il est très probable que ce soit le cas. - // Donc en prévision, tous les modules initialisent le noyau + // Le noyau de Nazara n'a pour l'instant aucun besoin d'initialisation, mais dans le futur il est très probable que ce soit le cas. + // Donc en prévision, tous les modules initialisent le noyau NazaraNotice("Initialized: Core"); @@ -30,9 +30,9 @@ bool NzCore::IsInitialized() void NzCore::Uninitialize() { if (--s_moduleReferenceCouter != 0) - return; // Encore utilisé + return; // Encore utilisé - // Libération du module + // Libération du module NazaraNotice("Uninitialized: Core"); } diff --git a/src/Nazara/Core/Debug/Leaks.cpp b/src/Nazara/Core/Debug/Leaks.cpp index 732b99a20..3fc4d3417 100644 --- a/src/Nazara/Core/Debug/Leaks.cpp +++ b/src/Nazara/Core/Debug/Leaks.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Debug/MemoryLeakTracker.cpp b/src/Nazara/Core/Debug/MemoryLeakTracker.cpp index 35e96a967..b88073725 100644 --- a/src/Nazara/Core/Debug/MemoryLeakTracker.cpp +++ b/src/Nazara/Core/Debug/MemoryLeakTracker.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Directory.cpp b/src/Nazara/Core/Directory.cpp index a614ba695..95bfe7a82 100644 --- a/src/Nazara/Core/Directory.cpp +++ b/src/Nazara/Core/Directory.cpp @@ -1,12 +1,12 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include #include #include #include -//#include +//#include #if defined(NAZARA_PLATFORM_WINDOWS) #include @@ -21,7 +21,7 @@ namespace { NzString currentPath(NzDirectoryImpl::GetCurrent()); - //static ThreadLocalVar currentPath(NzDirectoryImpl::GetCurrent()); + //static ThreadLocal currentPath(NzDirectoryImpl::GetCurrent()); } NzDirectory::NzDirectory() : @@ -247,7 +247,7 @@ bool NzDirectory::Create(const NzString& dirPath, bool recursive) return false; #ifdef NAZARA_PLATFORM_WINDOWS - // Contrairement au disque (Ex: "C:"), le chemin réseau n'est pas considéré comme un dossier (Ex: "\\Laptop") + // Contrairement au disque (Ex: "C:"), le chemin réseau n'est pas considéré comme un dossier (Ex: "\\Laptop") if (path.Match("\\\\*")) { foundPos = path.Find('\\', 2); @@ -304,7 +304,7 @@ bool NzDirectory::Remove(const NzString& dirPath, bool emptyDirectory) { NzDirectory dir(dirPath); if (!dir.Open()) - return NzDirectoryImpl::Remove(dirPath); // Si on n'arrive pas à ouvrir le dossier, on tente de le supprimer + return NzDirectoryImpl::Remove(dirPath); // Si on n'arrive pas à ouvrir le dossier, on tente de le supprimer while (dir.NextResult(true)) { diff --git a/src/Nazara/Core/DynLib.cpp b/src/Nazara/Core/DynLib.cpp index 4877698df..92e6d555a 100644 --- a/src/Nazara/Core/DynLib.cpp +++ b/src/Nazara/Core/DynLib.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Error.cpp b/src/Nazara/Core/Error.cpp index a81012b2e..302b12e88 100644 --- a/src/Nazara/Core/Error.cpp +++ b/src/Nazara/Core/Error.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -52,7 +52,7 @@ NzString NzGetLastSystemError(unsigned int code) NzString error(NzString::Unicode(buffer)); LocalFree(buffer); - error.Trim(); // Pour une raison inconnue, Windows met deux-trois retours à la ligne après le message + error.Trim(); // Pour une raison inconnue, Windows met deux-trois retours à la ligne après le message return error; #elif defined(NAZARA_PLATFORM_POSIX) diff --git a/src/Nazara/Core/File.cpp b/src/Nazara/Core/File.cpp index 6a4d8ae20..55cba809e 100644 --- a/src/Nazara/Core/File.cpp +++ b/src/Nazara/Core/File.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -207,7 +207,7 @@ NzString NzFile::GetLine(unsigned int lineSize) #endif NzString line; - if (lineSize == 0) // Taille maximale indéterminée + if (lineSize == 0) // Taille maximale indéterminée { while (!m_impl->EndOfFile()) { @@ -293,7 +293,7 @@ std::size_t NzFile::Read(void* buffer, std::size_t size) return m_impl->Read(buffer, size); else { - // Si nous ne devons rien lire, nous avançons simplement + // Si nous ne devons rien lire, nous avançons simplement nzUInt64 currentPos = m_impl->GetCursorPos(); m_impl->SetCursorPos(NzFile::AtCurrent, size); @@ -464,7 +464,7 @@ bool NzFile::Write(const NzString& string) #if defined(NAZARA_PLATFORM_WINDOWS) temp.Replace("\n", "\r\n"); #elif defined(NAZARA_PLATFORM_LINUX) - // Rien à faire + // Rien à faire #elif defined(NAZARA_PLATFORM_MACOS) temp.Replace('\n', '\r'); #else @@ -554,7 +554,7 @@ NzString NzFile::AbsolutePath(const NzString& filePath) base = "\\\\"; start = 2; } - else if (path.StartsWith('\\')) // Spécial : '\' fait référence au disque racine + else if (path.StartsWith('\\')) // Spécial : '\' fait référence au disque racine { NzString drive = NzDirectory::GetCurrent().SubstrTo('\\'); NzString end = path.Substr(1, -1); @@ -594,7 +594,7 @@ NzString NzFile::AbsolutePath(const NzString& filePath) sep.erase(sep.begin() + i--); else if (sep[i] == "..") { - if (i > start) // Si nous ne sommes pas dans la partie protégée + if (i > start) // Si nous ne sommes pas dans la partie protégée sep.erase(sep.begin() + i--); sep.erase(sep.begin() + i--); @@ -605,7 +605,7 @@ NzString NzFile::AbsolutePath(const NzString& filePath) pathLen += sep.size()-1; - ///FIXME: Le destructeur de NzStringStream provoque un bug lors de la libération de son vector + ///FIXME: Le destructeur de NzStringStream provoque un bug lors de la libération de son vector //NzStringStream stream(base); NzString stream; @@ -714,7 +714,7 @@ bool NzFile::IsAbsolute(const NzString& path) return true; else if (path.Match("\\\\*")) return true; - else if (wpath.StartsWith('\\')) // Spécial : '\' fait référence au disque racine + else if (wpath.StartsWith('\\')) // Spécial : '\' fait référence au disque racine return true; else return false; diff --git a/src/Nazara/Core/Hash.cpp b/src/Nazara/Core/Hash.cpp index c3d48b39a..10c7a5685 100644 --- a/src/Nazara/Core/Hash.cpp +++ b/src/Nazara/Core/Hash.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Hash/CRC32.cpp b/src/Nazara/Core/Hash/CRC32.cpp index 6a481e1c4..72c1ba982 100644 --- a/src/Nazara/Core/Hash/CRC32.cpp +++ b/src/Nazara/Core/Hash/CRC32.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -70,7 +70,7 @@ NzHashCRC32::NzHashCRC32(nzUInt32 polynomial) m_state = new NzHashCRC32_state; if (polynomial == 0x04c11db7) - m_state->table = crc32_table; // Table précalculée (Bien plus rapide) + m_state->table = crc32_table; // Table précalculée (Bien plus rapide) else { nzUInt32* table = new nzUInt32[256]; diff --git a/src/Nazara/Core/Hash/Fletcher16.cpp b/src/Nazara/Core/Hash/Fletcher16.cpp index e3c20b32d..d8e3cef40 100644 --- a/src/Nazara/Core/Hash/Fletcher16.cpp +++ b/src/Nazara/Core/Hash/Fletcher16.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Hash/MD5.cpp b/src/Nazara/Core/Hash/MD5.cpp index 3095746e0..8ed3a724e 100644 --- a/src/Nazara/Core/Hash/MD5.cpp +++ b/src/Nazara/Core/Hash/MD5.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp /* diff --git a/src/Nazara/Core/Hash/SHA/Internal.cpp b/src/Nazara/Core/Hash/SHA/Internal.cpp index 40f9fcd68..d03ad9b9c 100644 --- a/src/Nazara/Core/Hash/SHA/Internal.cpp +++ b/src/Nazara/Core/Hash/SHA/Internal.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp /* diff --git a/src/Nazara/Core/Hash/SHA/Internal.hpp b/src/Nazara/Core/Hash/SHA/Internal.hpp index 8230964b0..57e733618 100644 --- a/src/Nazara/Core/Hash/SHA/Internal.hpp +++ b/src/Nazara/Core/Hash/SHA/Internal.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp /* diff --git a/src/Nazara/Core/Hash/SHA1.cpp b/src/Nazara/Core/Hash/SHA1.cpp index dd34c5b40..54b03169f 100644 --- a/src/Nazara/Core/Hash/SHA1.cpp +++ b/src/Nazara/Core/Hash/SHA1.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Hash/SHA224.cpp b/src/Nazara/Core/Hash/SHA224.cpp index 499a8637b..b9cf3fd8e 100644 --- a/src/Nazara/Core/Hash/SHA224.cpp +++ b/src/Nazara/Core/Hash/SHA224.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Hash/SHA256.cpp b/src/Nazara/Core/Hash/SHA256.cpp index 8f815f0b5..d99fdebf0 100644 --- a/src/Nazara/Core/Hash/SHA256.cpp +++ b/src/Nazara/Core/Hash/SHA256.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Hash/SHA384.cpp b/src/Nazara/Core/Hash/SHA384.cpp index 33a2efccc..8252b5a1e 100644 --- a/src/Nazara/Core/Hash/SHA384.cpp +++ b/src/Nazara/Core/Hash/SHA384.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Hash/SHA512.cpp b/src/Nazara/Core/Hash/SHA512.cpp index 5978e2718..2614b7d03 100644 --- a/src/Nazara/Core/Hash/SHA512.cpp +++ b/src/Nazara/Core/Hash/SHA512.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Hash/Whirlpool.cpp b/src/Nazara/Core/Hash/Whirlpool.cpp index 337f41b58..907de024a 100644 --- a/src/Nazara/Core/Hash/Whirlpool.cpp +++ b/src/Nazara/Core/Hash/Whirlpool.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp /** diff --git a/src/Nazara/Core/HashDigest.cpp b/src/Nazara/Core/HashDigest.cpp index d86a0e53f..5b9802b80 100644 --- a/src/Nazara/Core/HashDigest.cpp +++ b/src/Nazara/Core/HashDigest.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Hashable.cpp b/src/Nazara/Core/Hashable.cpp index aa017f89c..65d0db8e6 100644 --- a/src/Nazara/Core/Hashable.cpp +++ b/src/Nazara/Core/Hashable.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/InputStream.cpp b/src/Nazara/Core/InputStream.cpp index d4705061d..2759f4d83 100644 --- a/src/Nazara/Core/InputStream.cpp +++ b/src/Nazara/Core/InputStream.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/LockGuard.cpp b/src/Nazara/Core/LockGuard.cpp index 34f04fd16..d2c3144f9 100644 --- a/src/Nazara/Core/LockGuard.cpp +++ b/src/Nazara/Core/LockGuard.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Log.cpp b/src/Nazara/Core/Log.cpp index 946182d62..7705651ee 100644 --- a/src/Nazara/Core/Log.cpp +++ b/src/Nazara/Core/Log.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/MemoryStream.cpp b/src/Nazara/Core/MemoryStream.cpp index 182d7f12e..03196651e 100644 --- a/src/Nazara/Core/MemoryStream.cpp +++ b/src/Nazara/Core/MemoryStream.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Mutex.cpp b/src/Nazara/Core/Mutex.cpp index 18df21009..67feba11c 100644 --- a/src/Nazara/Core/Mutex.cpp +++ b/src/Nazara/Core/Mutex.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Resource.cpp b/src/Nazara/Core/Resource.cpp index 810d02e0a..c83346d78 100644 --- a/src/Nazara/Core/Resource.cpp +++ b/src/Nazara/Core/Resource.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Semaphore.cpp b/src/Nazara/Core/Semaphore.cpp index 809af5b8d..d43c524a9 100644 --- a/src/Nazara/Core/Semaphore.cpp +++ b/src/Nazara/Core/Semaphore.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/String.cpp b/src/Nazara/Core/String.cpp index 40642cb4e..419e748de 100644 --- a/src/Nazara/Core/String.cpp +++ b/src/Nazara/Core/String.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -19,13 +19,13 @@ inline unsigned int nzPow2(unsigned int n) { unsigned int x = 1; - // Tant que x est plus petit que n, on décale ses bits vers la gauche, ce qui revient à multiplier par deux + // Tant que x est plus petit que n, on décale ses bits vers la gauche, ce qui revient à multiplier par deux while(x <= n) x <<= 1; return x; } -// Cet algorithme est inspiré de la documentation de Qt +// Cet algorithme est inspiré de la documentation de Qt inline unsigned int nzGetNewSize(unsigned int newSize) { if (newSize < 20) @@ -1174,7 +1174,7 @@ unsigned int NzString::FindLast(const char* string, int start, nzUInt32 flags) c if (flags & HandleUtf8) { if (utf8::internal::is_trail(*ptr)) - utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère + utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère utf8::unchecked::iterator it(ptr); const char* t = string; @@ -1282,9 +1282,9 @@ unsigned int NzString::FindLast(const NzString& string, int start, nzUInt32 flag { if (flags & HandleUtf8) { - ///Algo 1.FindLast#3 (Itérateur non-adapté) + ///Algo 1.FindLast#3 (Itérateur non-adapté) if (utf8::internal::is_trail(*ptr)) - utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère + utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère utf8::unchecked::iterator it(ptr); const char* t = string.m_sharedString->string; @@ -1559,13 +1559,13 @@ unsigned int NzString::FindLastWord(const char* string, int start, nzUInt32 flag if (flags & HandleUtf8) { if (utf8::internal::is_trail(*ptr)) - utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère + utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère utf8::unchecked::iterator it(ptr); if (flags & CaseInsensitive) { - const char* t = string; // utf8(::unchecked)::next affecte l'itérateur en argument + const char* t = string; // utf8(::unchecked)::next affecte l'itérateur en argument nzUInt32 c = NzUnicode::GetLowercase(utf8::unchecked::next(t)); do { @@ -1607,7 +1607,7 @@ unsigned int NzString::FindLastWord(const char* string, int start, nzUInt32 flag } else { - const char* t = string; // utf8(::unchecked)::next affecte l'itérateur en argument + const char* t = string; // utf8(::unchecked)::next affecte l'itérateur en argument nzUInt32 c = utf8::unchecked::next(t); do { @@ -1742,13 +1742,13 @@ unsigned int NzString::FindLastWord(const NzString& string, int start, nzUInt32 if (flags & HandleUtf8) { if (utf8::internal::is_trail(*ptr)) - utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère + utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère utf8::unchecked::iterator it(ptr); if (flags & CaseInsensitive) { - const char* t = string.m_sharedString->string; // utf8(::unchecked)::next affecte l'itérateur en argument + const char* t = string.m_sharedString->string; // utf8(::unchecked)::next affecte l'itérateur en argument nzUInt32 c = NzUnicode::GetLowercase(utf8::unchecked::next(t)); do { @@ -1790,7 +1790,7 @@ unsigned int NzString::FindLastWord(const NzString& string, int start, nzUInt32 } else { - const char* t = string.m_sharedString->string; // utf8(::unchecked)::next affecte l'itérateur en argument + const char* t = string.m_sharedString->string; // utf8(::unchecked)::next affecte l'itérateur en argument nzUInt32 c = utf8::unchecked::next(t); do { @@ -1917,13 +1917,13 @@ unsigned int NzString::FindWord(const char* string, int start, nzUInt32 flags) c if (flags & HandleUtf8) { if (utf8::internal::is_trail(*ptr)) - utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère + utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère utf8::unchecked::iterator it(ptr); if (flags & CaseInsensitive) { - const char* t = string; // utf8(::unchecked)::next affecte l'itérateur en argument + const char* t = string; // utf8(::unchecked)::next affecte l'itérateur en argument nzUInt32 c = NzUnicode::GetLowercase(utf8::unchecked::next(t)); do @@ -1963,7 +1963,7 @@ unsigned int NzString::FindWord(const char* string, int start, nzUInt32 flags) c } else { - const char* t = string; // utf8(::unchecked)::next affecte l'itérateur en argument + const char* t = string; // utf8(::unchecked)::next affecte l'itérateur en argument nzUInt32 c = NzUnicode::GetLowercase(utf8::unchecked::next(t)); do @@ -2087,15 +2087,15 @@ unsigned int NzString::FindWord(const NzString& string, int start, nzUInt32 flag char* ptr = m_sharedString->string; if (flags & HandleUtf8) { - ///Algo 3.FindWord#3 (Itérateur trop lent pour #2) + ///Algo 3.FindWord#3 (Itérateur trop lent pour #2) if (utf8::internal::is_trail(*ptr)) - utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère + utf8::unchecked::prior(ptr); // On s'assure d'avoir un pointeur vers le début d'un caractère utf8::unchecked::iterator it(ptr); if (flags & CaseInsensitive) { - const char* t = string.m_sharedString->string; // utf8(::unchecked)::next affecte l'itérateur en argument + const char* t = string.m_sharedString->string; // utf8(::unchecked)::next affecte l'itérateur en argument nzUInt32 c = NzUnicode::GetLowercase(utf8::unchecked::next(t)); do @@ -2135,7 +2135,7 @@ unsigned int NzString::FindWord(const NzString& string, int start, nzUInt32 flag } else { - const char* t = string.m_sharedString->string; // utf8(::unchecked)::next affecte l'itérateur en argument + const char* t = string.m_sharedString->string; // utf8(::unchecked)::next affecte l'itérateur en argument nzUInt32 c = NzUnicode::GetLowercase(utf8::unchecked::next(t)); do @@ -2213,7 +2213,7 @@ unsigned int NzString::FindWord(const NzString& string, int start, nzUInt32 flag { while ((ptr = std::strstr(ptr, string.m_sharedString->string))) { - // Si le mot est bien isolé + // Si le mot est bien isolé if ((ptr == m_sharedString->string || std::isspace(*(ptr-1))) && (*(ptr+m_sharedString->size) == '\0' || std::isspace(*(ptr+m_sharedString->size)))) return ptr - m_sharedString->string; @@ -2396,11 +2396,11 @@ NzString NzString::GetWord(unsigned int index, nzUInt32 flags) const if (m_sharedString->size == 0) return NzString(); - NzString temp = Simplified(flags); // Évitons les mauvaises surprises + NzString temp = Simplified(flags); // Évitons les mauvaises surprises if (temp.IsEmpty()) return NzString(); - unsigned int foundPos = temp.Find(' '); // Simplified nous assure que nous n'avons plus que des espaces comme séparation + unsigned int foundPos = temp.Find(' '); // Simplified nous assure que nous n'avons plus que des espaces comme séparation unsigned int lastPos = 0; for (; index > 0; --index) { @@ -2475,7 +2475,7 @@ NzString& NzString::Insert(int pos, char character) unsigned int start = std::min(static_cast(pos), m_sharedString->size); - // Si le buffer est déjà suffisamment grand + // Si le buffer est déjà suffisamment grand if (m_sharedString->capacity >= m_sharedString->size+1) { EnsureOwnership(); @@ -2520,7 +2520,7 @@ NzString& NzString::Insert(int pos, const char* string) unsigned int start = std::min(static_cast(pos), m_sharedString->size); - // Si le buffer est déjà suffisamment grand + // Si le buffer est déjà suffisamment grand unsigned int len = std::strlen(string); if (m_sharedString->capacity >= m_sharedString->size+len) { @@ -2571,7 +2571,7 @@ NzString& NzString::Insert(int pos, const NzString& string) unsigned int start = std::min(static_cast(pos), m_sharedString->size); - // Si le buffer est déjà suffisamment grand + // Si le buffer est déjà suffisamment grand if (m_sharedString->capacity >= m_sharedString->size + string.m_sharedString->size) { EnsureOwnership(); @@ -2828,7 +2828,7 @@ unsigned int NzString::Replace(const char* oldString, const char* replaceString, { bool found = false; - // Si aucun changement de taille n'est nécessaire, nous pouvons alors utiliser un algorithme bien plus rapide + // Si aucun changement de taille n'est nécessaire, nous pouvons alors utiliser un algorithme bien plus rapide while ((pos = Find(oldString, pos, flags)) != npos) { if (!found) @@ -2869,7 +2869,7 @@ unsigned int NzString::Replace(const char* oldString, const char* replaceString, count++; } - std::strcpy(ptr, p); // Ajoute le caractère de fin par la même occasion + std::strcpy(ptr, p); // Ajoute le caractère de fin par la même occasion ReleaseString(); m_sharedString = new SharedString; @@ -2898,7 +2898,7 @@ unsigned int NzString::Replace(const NzString& oldString, const NzString& replac { bool found = false; - // Si aucun changement de taille n'est nécessaire, nous pouvons alors utiliser un algorithme bien plus rapide + // Si aucun changement de taille n'est nécessaire, nous pouvons alors utiliser un algorithme bien plus rapide while ((pos = Find(oldString, pos, flags)) != npos) { if (!found) @@ -2939,7 +2939,7 @@ unsigned int NzString::Replace(const NzString& oldString, const NzString& replac count++; } - std::strcpy(ptr, p); // Ajoute le caractère de fin par la même occasion + std::strcpy(ptr, p); // Ajoute le caractère de fin par la même occasion ReleaseString(); m_sharedString = new SharedString; @@ -2953,7 +2953,7 @@ unsigned int NzString::Replace(const NzString& oldString, const NzString& replac unsigned int NzString::ReplaceAny(const char* oldCharacters, char replaceCharacter, int start, nzUInt32 flags) { - ///FIXME: Ne gère pas l'UTF-8 + ///FIXME: Ne gère pas l'UTF-8 if (!oldCharacters || !oldCharacters[0]) return 0; @@ -3040,7 +3040,7 @@ unsigned int NzString::ReplaceAny(const char* oldCharacters, char replaceCharact unsigned int count = 0; - if (rSize == 1) // On utilise un algorithme optimisé + if (rSize == 1) // On utilise un algorithme optimisé { EnsureOwnership(); @@ -3070,7 +3070,7 @@ unsigned int NzString::ReplaceAny(const char* oldCharacters, char replaceCharact unsigned int j = 0; for (unsigned int i = 0; i < m_sharedString->size; ++i) { - if (i < pos) // Avant la position où on est censé commencer à remplacer, on ne fait que recopier + if (i < pos) // Avant la position où on est censé commencer à remplacer, on ne fait que recopier newString[j++] = m_sharedString->string[i]; else { @@ -3084,7 +3084,7 @@ unsigned int NzString::ReplaceAny(const char* oldCharacters, char replaceCharact ++count; found = true; - break; // Simple façon d'éviter la ligne après la boucle + break; // Simple façon d'éviter la ligne après la boucle } } @@ -3119,7 +3119,7 @@ unsigned int NzString::ReplaceAny(const char* oldCharacters, char replaceCharact unsigned int count = 0; - if (replaceString.m_sharedString->size == 1) // On utilise un algorithme optimisé + if (replaceString.m_sharedString->size == 1) // On utilise un algorithme optimisé { EnsureOwnership(); @@ -3149,7 +3149,7 @@ unsigned int NzString::ReplaceAny(const char* oldCharacters, char replaceCharact unsigned int j = 0; for (unsigned int i = 0; i < m_sharedString->size; ++i) { - if (i < pos) // Avant la position où on est censé commencer à remplacer, on ne fait que recopier + if (i < pos) // Avant la position où on est censé commencer à remplacer, on ne fait que recopier newString[j++] = m_sharedString->string[i]; else { @@ -3163,7 +3163,7 @@ unsigned int NzString::ReplaceAny(const char* oldCharacters, char replaceCharact ++count; found = true; - break; // Simple façon d'éviter la ligne après la boucle + break; // Simple façon d'éviter la ligne après la boucle } } @@ -3217,7 +3217,7 @@ NzString& NzString::Resize(int size, char character) { EnsureOwnership(); - // Nous avons déjà la place requise, contentons-nous de remplir le buffer + // Nous avons déjà la place requise, contentons-nous de remplir le buffer if (character != '\0' && newSize > m_sharedString->size) { char* ptr = &m_sharedString->string[m_sharedString->size]; @@ -3229,7 +3229,7 @@ NzString& NzString::Resize(int size, char character) m_sharedString->size = newSize; m_sharedString->string[newSize] = '\0'; } - else // On veut forcément agrandir la chaine + else // On veut forcément agrandir la chaine { char* newString = new char[newSize+1]; if (m_sharedString->size != 0) @@ -3832,7 +3832,7 @@ bool NzString::ToBool(bool* value, nzUInt32 flags) const else { if (flags & CaseInsensitive) - word = word.ToLower(); // Les mots identifiés sont en ASCII, inutile de passer le flag unicode + word = word.ToLower(); // Les mots identifiés sont en ASCII, inutile de passer le flag unicode if (word == "true") { diff --git a/src/Nazara/Core/StringStream.cpp b/src/Nazara/Core/StringStream.cpp index 600537fdf..04e2a281f 100644 --- a/src/Nazara/Core/StringStream.cpp +++ b/src/Nazara/Core/StringStream.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Thread.cpp b/src/Nazara/Core/Thread.cpp index 5938fe305..78fc2053b 100644 --- a/src/Nazara/Core/Thread.cpp +++ b/src/Nazara/Core/Thread.cpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Inspiré du code de la SFML par Laurent Gomila +// Inspiré du code de la SFML par Laurent Gomila #include #include diff --git a/src/Nazara/Core/Unicode.cpp b/src/Nazara/Core/Unicode.cpp index 95828049b..1cf9020aa 100644 --- a/src/Nazara/Core/Unicode.cpp +++ b/src/Nazara/Core/Unicode.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -9,16 +9,16 @@ #if NAZARA_CORE_INCLUDE_UNICODEDATA struct Character { - nzUInt16 category; // Le type du caractère - nzUInt8 direction; // Le sens de lecure du caractère - nzUInt32 lowerCase; // Le caractère correspondant en minuscule - nzUInt32 titleCase; // Le caractère correspondant en titre - nzUInt32 upperCase; // Le caractère correspondant en majuscule + nzUInt16 category; // Le type du caractère + nzUInt8 direction; // Le sens de lecure du caractère + nzUInt32 lowerCase; // Le caractère correspondant en minuscule + nzUInt32 titleCase; // Le caractère correspondant en titre + nzUInt32 upperCase; // Le caractère correspondant en majuscule }; #include -#else // Implémentation bidon +#else // Implémentation bidon NzUnicode::Category NzUnicode::GetCategory(char32_t character) { diff --git a/src/Nazara/Core/Win32/ClockImpl.cpp b/src/Nazara/Core/Win32/ClockImpl.cpp index 440d521c9..91772e3ea 100644 --- a/src/Nazara/Core/Win32/ClockImpl.cpp +++ b/src/Nazara/Core/Win32/ClockImpl.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Win32/ClockImpl.hpp b/src/Nazara/Core/Win32/ClockImpl.hpp index 6267951f2..83e54bb05 100644 --- a/src/Nazara/Core/Win32/ClockImpl.hpp +++ b/src/Nazara/Core/Win32/ClockImpl.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Core/Win32/ConditionVariableImpl.cpp b/src/Nazara/Core/Win32/ConditionVariableImpl.cpp index 76cdf8cd9..1ddb7b9a9 100644 --- a/src/Nazara/Core/Win32/ConditionVariableImpl.cpp +++ b/src/Nazara/Core/Win32/ConditionVariableImpl.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp // Source: http://www.cs.wustl.edu/~schmidt/win32-cv-1.html diff --git a/src/Nazara/Core/Win32/ConditionVariableImpl.hpp b/src/Nazara/Core/Win32/ConditionVariableImpl.hpp index f4afa4545..11c700ff2 100644 --- a/src/Nazara/Core/Win32/ConditionVariableImpl.hpp +++ b/src/Nazara/Core/Win32/ConditionVariableImpl.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp // http://www.cs.wustl.edu/~schmidt/win32-cv-1.html diff --git a/src/Nazara/Core/Win32/DirectoryImpl.cpp b/src/Nazara/Core/Win32/DirectoryImpl.cpp index 59258cc27..03dce2f2c 100644 --- a/src/Nazara/Core/Win32/DirectoryImpl.cpp +++ b/src/Nazara/Core/Win32/DirectoryImpl.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Win32/DirectoryImpl.hpp b/src/Nazara/Core/Win32/DirectoryImpl.hpp index 799cee9c6..6b6e25d94 100644 --- a/src/Nazara/Core/Win32/DirectoryImpl.hpp +++ b/src/Nazara/Core/Win32/DirectoryImpl.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Core/Win32/DynLibImpl.cpp b/src/Nazara/Core/Win32/DynLibImpl.cpp index 1cd9fa4a2..bfe2d9d87 100644 --- a/src/Nazara/Core/Win32/DynLibImpl.cpp +++ b/src/Nazara/Core/Win32/DynLibImpl.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Win32/DynLibImpl.hpp b/src/Nazara/Core/Win32/DynLibImpl.hpp index 6688a98fd..7d742d32f 100644 --- a/src/Nazara/Core/Win32/DynLibImpl.hpp +++ b/src/Nazara/Core/Win32/DynLibImpl.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Core/Win32/FileImpl.cpp b/src/Nazara/Core/Win32/FileImpl.cpp index 6154b1b65..56ad64855 100644 --- a/src/Nazara/Core/Win32/FileImpl.cpp +++ b/src/Nazara/Core/Win32/FileImpl.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Win32/FileImpl.hpp b/src/Nazara/Core/Win32/FileImpl.hpp index 8f3cf3ad0..37d66219c 100644 --- a/src/Nazara/Core/Win32/FileImpl.hpp +++ b/src/Nazara/Core/Win32/FileImpl.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Core/Win32/MutexImpl.cpp b/src/Nazara/Core/Win32/MutexImpl.cpp index 9bebb187c..a8b735d3c 100644 --- a/src/Nazara/Core/Win32/MutexImpl.cpp +++ b/src/Nazara/Core/Win32/MutexImpl.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Win32/MutexImpl.hpp b/src/Nazara/Core/Win32/MutexImpl.hpp index 6356f9e9e..cb02f4e07 100644 --- a/src/Nazara/Core/Win32/MutexImpl.hpp +++ b/src/Nazara/Core/Win32/MutexImpl.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Core/Win32/SemaphoreImpl.cpp b/src/Nazara/Core/Win32/SemaphoreImpl.cpp index c9df1ad4f..30af1edb4 100644 --- a/src/Nazara/Core/Win32/SemaphoreImpl.cpp +++ b/src/Nazara/Core/Win32/SemaphoreImpl.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Win32/SemaphoreImpl.hpp b/src/Nazara/Core/Win32/SemaphoreImpl.hpp index 637cc3664..49ef54843 100644 --- a/src/Nazara/Core/Win32/SemaphoreImpl.hpp +++ b/src/Nazara/Core/Win32/SemaphoreImpl.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Core/Win32/ThreadImpl.cpp b/src/Nazara/Core/Win32/ThreadImpl.cpp index b38b6304f..e2d69bc84 100644 --- a/src/Nazara/Core/Win32/ThreadImpl.cpp +++ b/src/Nazara/Core/Win32/ThreadImpl.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp // Inspiré du code de la SFML par Laurent Gomila diff --git a/src/Nazara/Core/Win32/ThreadImpl.hpp b/src/Nazara/Core/Win32/ThreadImpl.hpp index 2e7cbd8ce..31b544869 100644 --- a/src/Nazara/Core/Win32/ThreadImpl.hpp +++ b/src/Nazara/Core/Win32/ThreadImpl.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp // Inspiré du code de la SFML par Laurent Gomila diff --git a/src/Nazara/Core/Win32/Time.cpp b/src/Nazara/Core/Win32/Time.cpp index 23643d39e..a7da94cb1 100644 --- a/src/Nazara/Core/Win32/Time.cpp +++ b/src/Nazara/Core/Win32/Time.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Core/Win32/Time.hpp b/src/Nazara/Core/Win32/Time.hpp index 952c2f240..0353c73ce 100644 --- a/src/Nazara/Core/Win32/Time.hpp +++ b/src/Nazara/Core/Win32/Time.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Noise/ComplexNoiseBase.cpp b/src/Nazara/Noise/ComplexNoiseBase.cpp index 0388a7786..dab569db5 100644 --- a/src/Nazara/Noise/ComplexNoiseBase.cpp +++ b/src/Nazara/Noise/ComplexNoiseBase.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Noise/Debug/Leaks.cpp b/src/Nazara/Noise/Debug/Leaks.cpp index aaba6c452..76e45432d 100644 --- a/src/Nazara/Noise/Debug/Leaks.cpp +++ b/src/Nazara/Noise/Debug/Leaks.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Noise/Noise.cpp b/src/Nazara/Noise/Noise.cpp index a5d1b00ed..a38a8346d 100644 --- a/src/Nazara/Noise/Noise.cpp +++ b/src/Nazara/Noise/Noise.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -12,9 +12,9 @@ bool NzNoise::Initialize() { if (s_moduleReferenceCouter++ != 0) - return true; // Déjà initialisé + return true; // Déjà initialisé - // Initialisation des dépendances + // Initialisation des dépendances if (!NzCore::Initialize()) { NazaraError("Failed to initialize core module"); @@ -36,11 +36,11 @@ bool NzNoise::IsInitialized() void NzNoise::Uninitialize() { if (--s_moduleReferenceCouter != 0) - return; // Encore utilisé + return; // Encore utilisé - // Libération du module + // Libération du module - // Libération des dépendances + // Libération des dépendances NzCore::Uninitialize(); NazaraNotice("Uninitialized: Noise module"); diff --git a/src/Nazara/Noise/NoiseBase.cpp b/src/Nazara/Noise/NoiseBase.cpp index 410e2b95d..f08546a02 100644 --- a/src/Nazara/Noise/NoiseBase.cpp +++ b/src/Nazara/Noise/NoiseBase.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Noise/NoiseMachine.cpp b/src/Nazara/Noise/NoiseMachine.cpp index e695d46fe..e053eeff1 100644 --- a/src/Nazara/Noise/NoiseMachine.cpp +++ b/src/Nazara/Noise/NoiseMachine.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Rémi Bèges -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Rémi Bèges +// This file is part of the "Nazara Engine - Noise module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Renderer/Context.cpp b/src/Nazara/Renderer/Context.cpp index 29d69ce0e..1dfc9787e 100644 --- a/src/Nazara/Renderer/Context.cpp +++ b/src/Nazara/Renderer/Context.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -62,7 +62,7 @@ namespace break; default: - // Peut être rajouté par une extension + // Peut être rajouté par une extension ss << "Unknown"; break; } @@ -96,7 +96,7 @@ namespace break; default: - // Peut être rajouté par une extension + // Peut être rajouté par une extension ss << "Unknown"; break; } @@ -118,7 +118,7 @@ namespace break; default: - // Peut être rajouté par une extension + // Peut être rajouté par une extension ss << "Unknown"; break; } @@ -230,7 +230,7 @@ bool NzContext::SetActive(bool active) } #endif - // Si le contexte est déjà activé/désactivé + // Si le contexte est déjà activé/désactivé if ((currentContext == this) == active) return true; @@ -322,7 +322,7 @@ bool NzContext::Initialize() { NzContextParameters parameters; // parameters.compatibilityProfile = true; - parameters.shared = false; // Difficile de partager le contexte de référence avec lui-même + parameters.shared = false; // Difficile de partager le contexte de référence avec lui-même s_reference = new NzContext; if (!s_reference->Create(parameters)) @@ -333,7 +333,7 @@ bool NzContext::Initialize() return false; } - // Le contexte de référence doit rester désactivé pour le partage + // Le contexte de référence doit rester désactivé pour le partage s_reference->SetActive(false); NzContextParameters::defaultShareContext = s_reference; @@ -346,7 +346,7 @@ void NzContext::Uninitialize() for (NzContext* context : contexts) delete context; - contexts.clear(); // On supprime tous les contextes créés + contexts.clear(); // On supprime tous les contextes créés delete s_reference; s_reference = nullptr; diff --git a/src/Nazara/Renderer/ContextParameters.cpp b/src/Nazara/Renderer/ContextParameters.cpp index 04ecffee8..4f3914f7f 100644 --- a/src/Nazara/Renderer/ContextParameters.cpp +++ b/src/Nazara/Renderer/ContextParameters.cpp @@ -1,24 +1,24 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include #include #include -// Version majeure d'OpenGL, initialisé par NzOpenGL::Initialize() +// Version majeure d'OpenGL, initialisé par NzOpenGL::Initialize() nzUInt8 NzContextParameters::defaultMajorVersion; - // Version majeure d'OpenGL, initialisé par NzOpenGL::Initialize() + // Version majeure d'OpenGL, initialisé par NzOpenGL::Initialize() nzUInt8 NzContextParameters::defaultMinorVersion; -// Contexte de partage par défaut, initialisé par NzOpenGL::Initialize() +// Contexte de partage par défaut, initialisé par NzOpenGL::Initialize() const NzContext* NzContextParameters::defaultShareContext = nullptr; -// Si possible, garder la compatibilité avec les fonctionnalités dépréciées +// Si possible, garder la compatibilité avec les fonctionnalités dépréciées bool NzContextParameters::defaultCompatibilityProfile = false; -// Mode debug d'OpenGL par défaut +// Mode debug d'OpenGL par défaut #if NAZARA_RENDERER_OPENGL_DEBUG || defined(NAZARA_DEBUG) bool NzContextParameters::defaultDebugMode = true; #else diff --git a/src/Nazara/Renderer/Debug/Leaks.cpp b/src/Nazara/Renderer/Debug/Leaks.cpp index ee8f4be88..0d6c99ccd 100644 --- a/src/Nazara/Renderer/Debug/Leaks.cpp +++ b/src/Nazara/Renderer/Debug/Leaks.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Renderer/GLSLShader.cpp b/src/Nazara/Renderer/GLSLShader.cpp index aa17c7ede..22ebcc6fe 100644 --- a/src/Nazara/Renderer/GLSLShader.cpp +++ b/src/Nazara/Renderer/GLSLShader.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -14,7 +14,7 @@ namespace { - ///FIXME: Déclaré deux fois (ici et dans Renderer.cpp) + ///FIXME: Déclaré deux fois (ici et dans Renderer.cpp) const nzUInt8 attribIndex[] = { 2, // nzElementUsage_Diffuse @@ -111,9 +111,9 @@ bool NzGLSLShader::Compile() if (length > 1) { m_log.Clear(true); - m_log.Reserve(length+19-1); // La taille retournée est celle du buffer (Avec caractère de fin) + m_log.Reserve(length+19-1); // La taille retournée est celle du buffer (Avec caractère de fin) m_log.Prepend("Linkage error: "); - m_log.Resize(length+19-1); // Extension du buffer d'écriture pour ajouter le log + m_log.Resize(length+19-1); // Extension du buffer d'écriture pour ajouter le log glGetProgramInfoLog(m_program, length-1, nullptr, &m_log[19]); } @@ -191,7 +191,7 @@ NzString NzGLSLShader::GetSourceCode(nzShaderType type) const glGetShaderiv(m_shaders[type], GL_SHADER_SOURCE_LENGTH, &length); if (length > 1) { - source.Resize(length-1); // La taille retournée est celle du buffer (Avec caractère de fin) + source.Resize(length-1); // La taille retournée est celle du buffer (Avec caractère de fin) glGetShaderSource(m_shaders[type], length, nullptr, &source[0]); } @@ -260,9 +260,9 @@ bool NzGLSLShader::Load(nzShaderType type, const NzString& source) if (length > 1) { m_log.Clear(true); - m_log.Reserve(length+19-1); // La taille retournée est celle du buffer (Avec caractère de fin) + m_log.Reserve(length+19-1); // La taille retournée est celle du buffer (Avec caractère de fin) m_log.Prepend("Compilation error: "); - m_log.Resize(length+19-1); // Extension du buffer d'écriture pour ajouter le log + m_log.Resize(length+19-1); // Extension du buffer d'écriture pour ajouter le log glGetShaderInfoLog(shader, length-1, nullptr, &m_log[19]); } @@ -384,7 +384,7 @@ bool NzGLSLShader::SendTexture(int location, const NzTexture* texture) auto it = m_textures.find(location); if (it != m_textures.end()) { - // Slot déjà utilisé + // Slot déjà utilisé TextureSlot& slot = it->second; if (slot.texture != texture) { @@ -412,21 +412,21 @@ bool NzGLSLShader::SendTexture(int location, const NzTexture* texture) return false; } - // À partir d'ici nous savons qu'il y a au moins un identifiant de texture libre + // À partir d'ici nous savons qu'il y a au moins un identifiant de texture libre nzUInt8 unit; if (unitUsed == 0) - // Pas d'unité utilisée, la tâche est simple + // Pas d'unité utilisée, la tâche est simple unit = 0; else { - auto it2 = m_textures.rbegin(); // Itérateur vers la fin de la map + auto it2 = m_textures.rbegin(); // Itérateur vers la fin de la map unit = it2->second.unit; if (unit == maxUnits-1) { - // Il y a une place libre, mais pas à la fin + // Il y a une place libre, mais pas à la fin for (; it2 != m_textures.rend(); ++it2) { - if (unit - it2->second.unit > 1) // Si l'espace entre les indices est supérieur à 1, alors il y a une place libre + if (unit - it2->second.unit > 1) // Si l'espace entre les indices est supérieur à 1, alors il y a une place libre { unit--; break; @@ -434,7 +434,7 @@ bool NzGLSLShader::SendTexture(int location, const NzTexture* texture) } } else - // Il y a une place libre à la fin + // Il y a une place libre à la fin unit++; } diff --git a/src/Nazara/Renderer/GLSLShader.hpp b/src/Nazara/Renderer/GLSLShader.hpp index b429daced..4cfb4d269 100644 --- a/src/Nazara/Renderer/GLSLShader.hpp +++ b/src/Nazara/Renderer/GLSLShader.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Renderer/HardwareBuffer.cpp b/src/Nazara/Renderer/HardwareBuffer.cpp index a56223103..4549a46c8 100644 --- a/src/Nazara/Renderer/HardwareBuffer.cpp +++ b/src/Nazara/Renderer/HardwareBuffer.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -37,8 +37,8 @@ namespace }; GLenum bufferUsage[] = { - // J'ai choisi DYNAMIC à la place de STREAM car DYNAMIC semble plus adapté au profil "une mise à jour pour quelques rendus" - // Ce qui est je pense le scénario qui arrivera le plus souvent (Prévoir une option pour permettre d'utiliser le STREAM_DRAW ?) + // J'ai choisi DYNAMIC à la place de STREAM car DYNAMIC semble plus adapté au profil "une mise à jour pour quelques rendus" + // Ce qui est je pense le scénario qui arrivera le plus souvent (Prévoir une option pour permettre d'utiliser le STREAM_DRAW ?) // Source: http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showflat&Number=160839 GL_DYNAMIC_DRAW, // nzBufferUsage_Dynamic GL_STATIC_DRAW // nzBufferUsage_Static @@ -125,7 +125,7 @@ bool NzHardwareBuffer::Create(unsigned int size, nzBufferUsage usage) glBindBuffer(bufferTarget[m_type], m_buffer); glBufferData(bufferTarget[m_type], size, nullptr, bufferUsage[usage]); - // Pour ne pas perturber le rendu, on interfère pas avec le binding déjà présent + // Pour ne pas perturber le rendu, on interfère pas avec le binding déjà présent if (previous != 0) glBindBuffer(bufferTarget[m_type], previous); @@ -172,7 +172,7 @@ bool NzHardwareBuffer::Fill(const void* data, unsigned int offset, unsigned int if (glUnmapBuffer(bufferTarget[m_type]) != GL_TRUE) { - // Une erreur rare est survenue, nous devons réinitialiser le buffer + // Une erreur rare est survenue, nous devons réinitialiser le buffer NazaraError("Failed to unmap buffer, reinitialising content... (OpenGL error : 0x" + NzString::Number(glGetError(), 16) + ')'); glBufferData(bufferTarget[m_type], m_parent->GetSize(), nullptr, bufferUsage[m_parent->GetStorage()]); @@ -181,7 +181,7 @@ bool NzHardwareBuffer::Fill(const void* data, unsigned int offset, unsigned int } } - // Inutile de rebinder s'il n'y avait aucun buffer (Optimise les opérations chaînées) + // Inutile de rebinder s'il n'y avait aucun buffer (Optimise les opérations chaînées) if (previous != m_buffer && previous != 0) glBindBuffer(bufferTarget[m_type], previous); @@ -202,7 +202,7 @@ void* NzHardwareBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned { NzContext::EnsureContext(); - // Pour ne pas perturber le rendu, on interfère pas avec le binding déjà présent + // Pour ne pas perturber le rendu, on interfère pas avec le binding déjà présent GLuint previous; glGetIntegerv(bufferTargetBinding[m_type], reinterpret_cast(&previous)); @@ -211,7 +211,7 @@ void* NzHardwareBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned void* ptr = mapBuffer(m_type, access, offset, size); - // Inutile de rebinder s'il n'y avait aucun buffer (Optimise les opérrations chaînées) + // Inutile de rebinder s'il n'y avait aucun buffer (Optimise les opérrations chaînées) if (previous != m_buffer && previous != 0) glBindBuffer(bufferTarget[m_type], previous); @@ -230,19 +230,19 @@ bool NzHardwareBuffer::Unmap() if (glUnmapBuffer(bufferTarget[m_type]) != GL_TRUE) { - // Une erreur rare est survenue, nous devons réinitialiser le buffer + // Une erreur rare est survenue, nous devons réinitialiser le buffer NazaraError("Failed to unmap buffer, reinitialising content... (OpenGL error : 0x" + NzString::Number(glGetError(), 16) + ')'); glBufferData(bufferTarget[m_type], m_parent->GetSize(), nullptr, bufferUsage[m_parent->GetStorage()]); - // Inutile de rebinder s'il n'y avait aucun buffer (Optimise les opérations chaînées) + // Inutile de rebinder s'il n'y avait aucun buffer (Optimise les opérations chaînées) if (previous != m_buffer && previous != 0) glBindBuffer(bufferTarget[m_type], previous); return false; } - // Inutile de rebinder s'il n'y avait aucun buffer (Optimise les opérations chaînées) + // Inutile de rebinder s'il n'y avait aucun buffer (Optimise les opérations chaînées) if (previous != m_buffer && previous != 0) glBindBuffer(bufferTarget[m_type], previous); diff --git a/src/Nazara/Renderer/HardwareBuffer.hpp b/src/Nazara/Renderer/HardwareBuffer.hpp index c2451adc2..d13d7ec1d 100644 --- a/src/Nazara/Renderer/HardwareBuffer.hpp +++ b/src/Nazara/Renderer/HardwareBuffer.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Renderer/OcclusionQuery.cpp b/src/Nazara/Renderer/OcclusionQuery.cpp index 2b2d062cd..de2c7a660 100644 --- a/src/Nazara/Renderer/OcclusionQuery.cpp +++ b/src/Nazara/Renderer/OcclusionQuery.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Renderer/OpenGL.cpp b/src/Nazara/Renderer/OpenGL.cpp index a8dfda1ea..992c58d05 100644 --- a/src/Nazara/Renderer/OpenGL.cpp +++ b/src/Nazara/Renderer/OpenGL.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -69,7 +69,7 @@ namespace return false; } - // On peut sûrement faire plus rapide mais comme ça ne se fait qu'une fois et que NzString implémente le COW... + // On peut sûrement faire plus rapide mais comme ça ne se fait qu'une fois et que NzString implémente le COW... std::vector ext; extensionString.Split(ext); @@ -124,18 +124,18 @@ bool NzOpenGL::Initialize() return false; } - // Le chargement des fonctions OpenGL nécessite un contexte OpenGL + // Le chargement des fonctions OpenGL nécessite un contexte OpenGL NzContextParameters parameters; parameters.majorVersion = 2; parameters.minorVersion = 0; parameters.shared = false; /* - Note: Même le contexte de chargement nécessite quelques fonctions de base pour correctement s'initialiser - Pour cette raison, deux contextes sont créés, le premier sert à récupérer les fonctions permetttant - de créer le second avec les bons paramètres. + Note: Même le contexte de chargement nécessite quelques fonctions de base pour correctement s'initialiser + Pour cette raison, deux contextes sont créés, le premier sert à récupérer les fonctions permetttant + de créer le second avec les bons paramètres. - Non sérieusement si quelqu'un a une meilleure idée qu'il me le dise + Non sérieusement si quelqu'un a une meilleure idée qu'il me le dise */ /****************************************Initialisation****************************************/ @@ -158,9 +158,9 @@ bool NzOpenGL::Initialize() glXCreateContextAttribs = reinterpret_cast(LoadEntry("glXCreateContextAttribsARB", false)); #endif - // Récupération de la version d'OpenGL - // Ce code se base sur le fait que la carte graphique renverra un contexte de compatibilité avec la plus haute version supportée - // Ce qui semble vrai au moins chez ATI/AMD et NVidia, mais si quelqu'un à une meilleure idée ... + // Récupération de la version d'OpenGL + // Ce code se base sur le fait que la carte graphique renverra un contexte de compatibilité avec la plus haute version supportée + // Ce qui semble vrai au moins chez ATI/AMD et NVidia, mais si quelqu'un à une meilleure idée ... glGetString = reinterpret_cast(LoadEntry("glGetString", false)); if (!glGetString) { @@ -440,7 +440,7 @@ bool NzOpenGL::Initialize() glProgramUniform4fv = reinterpret_cast(LoadEntry("glProgramUniform4fv")); glProgramUniformMatrix4fv = reinterpret_cast(LoadEntry("glProgramUniformMatrix4fv")); - // Si ARB_gpu_shader_fp64 est supporté, alors cette extension donne également accès aux fonctions utilisant des double + // Si ARB_gpu_shader_fp64 est supporté, alors cette extension donne également accès aux fonctions utilisant des double if (openGLextensions[NzOpenGL::FP64]) { glProgramUniform1d = reinterpret_cast(LoadEntry("glProgramUniform1d")); @@ -469,9 +469,9 @@ bool NzOpenGL::Initialize() { try { - // Hacky: Normalement incompatible à cause du internalFormat, GLenum pour l'extension et GLint pour le noyau - // Mais la taille du type étant la même (GLenum est un typedef équivalent à GLint) et Nazara n'utilisant pas - // Ce qui cause l'incompatibilité (les paramètres 1,2,3,4), je prends cette liberté + // Hacky: Normalement incompatible à cause du internalFormat, GLenum pour l'extension et GLint pour le noyau + // Mais la taille du type étant la même (GLenum est un typedef équivalent à GLint) et Nazara n'utilisant pas + // Ce qui cause l'incompatibilité (les paramètres 1,2,3,4), je prends cette liberté glTexImage3D = reinterpret_cast(LoadEntry("glTexImage3DEXT")); glTexSubImage3D = reinterpret_cast(LoadEntry("glTexSubImage3DEXT")); @@ -528,9 +528,9 @@ bool NzOpenGL::Initialize() if (!glGenerateMipmap) glGenerateMipmap = reinterpret_cast(LoadEntry("glGenerateMipmapEXT", false)); - /****************************************Contexte de référence****************************************/ + /****************************************Contexte de référence****************************************/ - ///FIXME: Utiliser le contexte de chargement comme référence ? (Vérifier mode debug) + ///FIXME: Utiliser le contexte de chargement comme référence ? (Vérifier mode debug) if (!NzContext::Initialize()) { NazaraError("Failed to initialize contexts"); diff --git a/src/Nazara/Renderer/RenderTarget.cpp b/src/Nazara/Renderer/RenderTarget.cpp index 9a9be298d..e68761722 100644 --- a/src/Nazara/Renderer/RenderTarget.cpp +++ b/src/Nazara/Renderer/RenderTarget.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -25,5 +25,5 @@ bool NzRenderTarget::SetActive(bool active) void NzRenderTarget::Desactivate() { - // Seuls les target sans contextes (ex: NzRenderTexture) nécessitent une désactivation + // Seuls les target sans contextes (ex: NzRenderTexture) nécessitent une désactivation } diff --git a/src/Nazara/Renderer/RenderWindow.cpp b/src/Nazara/Renderer/RenderWindow.cpp index 46861f4eb..ffdbc21cc 100644 --- a/src/Nazara/Renderer/RenderWindow.cpp +++ b/src/Nazara/Renderer/RenderWindow.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -39,7 +39,7 @@ NzRenderWindow::NzRenderWindow(NzWindowHandle handle, const NzContextParameters& NzRenderWindow::~NzRenderWindow() { - // Nécessaire si NzWindow::Destroy est appelé par son destructeur + // Nécessaire si NzWindow::Destroy est appelé par son destructeur OnWindowDestroying(); } @@ -268,7 +268,7 @@ bool NzRenderWindow::OnWindowCreated() EnableVerticalSync(false); #if NAZARA_RENDERER_ACTIVATE_RENDERWINDOW_ON_CREATION - if (!SetActive(true)) // Les fenêtres s'activent à la création + if (!SetActive(true)) // Les fenêtres s'activent à la création NazaraWarning("Failed to activate window"); #endif diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp index 65e1aceee..01ec4afca 100644 --- a/src/Nazara/Renderer/Renderer.cpp +++ b/src/Nazara/Renderer/Renderer.cpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include // Pour éviter une redéfinition de WIN32_LEAN_AND_MEAN +#include // Pour éviter une redéfinition de WIN32_LEAN_AND_MEAN #include #include #include @@ -31,7 +31,7 @@ namespace 0, // nzElementUsage_Position 3, // nzElementUsage_Tangent - 4 // nzElementUsage_TexCoord (Doit être le dernier de la liste car extensible) + 4 // nzElementUsage_TexCoord (Doit être le dernier de la liste car extensible) }; @@ -132,7 +132,7 @@ namespace GL_ZERO // nzStencilOperation_Zero }; - ///FIXME: Solution temporaire pour plus de facilité + ///FIXME: Solution temporaire pour plus de facilité enum nzMatrixCombination { nzMatrixCombination_ViewProj = nzMatrixType_Max+1, @@ -391,9 +391,9 @@ bool NzRenderer::HasCapability(nzRendererCap capability) bool NzRenderer::Initialize() { if (s_moduleReferenceCouter++ != 0) - return true; // Déjà initialisé + return true; // Déjà initialisé - // Initialisation des dépendances + // Initialisation des dépendances if (!NzUtility::Initialize()) { NazaraError("Failed to initialize utility module"); @@ -431,7 +431,7 @@ bool NzRenderer::Initialize() s_vertexBuffer = nullptr; s_vertexDeclaration = nullptr; - // Récupération des capacités + // Récupération des capacités s_capabilities[nzRendererCap_AnisotropicFilter] = NzOpenGL::IsSupported(NzOpenGL::AnisotropicFilter); s_capabilities[nzRendererCap_FP64] = NzOpenGL::IsSupported(NzOpenGL::FP64); s_capabilities[nzRendererCap_HardwareBuffer] = true; // Natif depuis OpenGL 1.5 @@ -471,7 +471,7 @@ bool NzRenderer::Initialize() GLint maxVertexAttribs; glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &maxVertexAttribs); - // Impossible de binder plus de texcoords que d'attributes (en sachant qu'un certain nombre est déjà pris par les autres attributs) + // Impossible de binder plus de texcoords que d'attributes (en sachant qu'un certain nombre est déjà pris par les autres attributs) s_maxTextureUnit = static_cast(std::min(maxTextureUnits, maxVertexAttribs-attribIndex[nzElementUsage_TexCoord])); } else @@ -603,7 +603,7 @@ void NzRenderer::SetMatrix(nzMatrixType type, const NzMatrix4f& matrix) { s_matrix[type] = matrix; - // Cas particulier, la matrice projection doit être inversée sur l'axe Y à cause des conventions d'OpenGL + // Cas particulier, la matrice projection doit être inversée sur l'axe Y à cause des conventions d'OpenGL if (type == nzMatrixType_Projection) s_matrix[type] *= NzMatrix4f::Scale(NzVector3f(1.f, -1.f, 1.f)); @@ -648,7 +648,7 @@ bool NzRenderer::SetShader(NzShader* shader) return false; } - // Récupération des indices des variables uniformes (-1 si la variable n'existe pas) + // Récupération des indices des variables uniformes (-1 si la variable n'existe pas) s_matrixLocation[nzMatrixType_Projection] = shader->GetUniformLocation("ProjMatrix"); s_matrixLocation[nzMatrixType_View] = shader->GetUniformLocation("ViewMatrix"); s_matrixLocation[nzMatrixType_World] = shader->GetUniformLocation("WorldMatrix"); @@ -815,12 +815,12 @@ void NzRenderer::SetViewport(const NzRectui& viewport) void NzRenderer::Uninitialize() { if (--s_moduleReferenceCouter != 0) - return; // Encore utilisé + return; // Encore utilisé - // Libération du module + // Libération du module NzContext::EnsureContext(); - // Libération des VAOs + // Libération des VAOs for (auto it = s_vaos.begin(); it != s_vaos.end(); ++it) { GLuint vao = static_cast(it->second); @@ -831,7 +831,7 @@ void NzRenderer::Uninitialize() NazaraNotice("Uninitialized: Renderer module"); - // Libération des dépendances + // Libération des dépendances NzUtility::Uninitialize(); } @@ -853,7 +853,7 @@ bool NzRenderer::EnsureStateUpdate() } #endif - // Il est plus rapide d'opérer sur l'implémentation du shader directement + // Il est plus rapide d'opérer sur l'implémentation du shader directement NzShaderImpl* shaderImpl = s_shader->m_impl; if (!shaderImpl->BindTextures()) @@ -868,7 +868,7 @@ bool NzRenderer::EnsureStateUpdate() } } - // Cas spéciaux car il faut recalculer la matrice + // Cas spéciaux car il faut recalculer la matrice if (!s_matrixUpdated[nzMatrixCombination_ViewProj]) { s_matrix[nzMatrixCombination_ViewProj] = s_matrix[nzMatrixType_View] * s_matrix[nzMatrixType_Projection]; @@ -925,21 +925,21 @@ bool NzRenderer::EnsureStateUpdate() bool update; GLuint vao; - // Si les VAOs sont supportés, on entoure nos appels par ceux-ci + // Si les VAOs sont supportés, on entoure nos appels par ceux-ci if (vaoSupported) { - // On recherche si un VAO existe déjà avec notre configuration - // Note: Les VAOs ne sont pas partagés entre les contextes, ces derniers font donc partie de notre configuration + // On recherche si un VAO existe déjà avec notre configuration + // Note: Les VAOs ne sont pas partagés entre les contextes, ces derniers font donc partie de notre configuration auto key = std::make_tuple(NzContext::GetCurrent(), s_indexBuffer, s_vertexBuffer, s_vertexDeclaration); auto it = s_vaos.find(key); if (it == s_vaos.end()) { - // On créé notre VAO + // On créé notre VAO glGenVertexArrays(1, &vao); glBindVertexArray(vao); - // On l'ajoute à notre liste + // On l'ajoute à notre liste s_vaos.insert(std::make_pair(key, static_cast(vao))); // Et on indique qu'on veut le programmer @@ -947,14 +947,14 @@ bool NzRenderer::EnsureStateUpdate() } else { - // Notre VAO existe déjà, il est donc inutile de le reprogrammer + // Notre VAO existe déjà, il est donc inutile de le reprogrammer vao = it->second; update = false; } } else - update = true; // Fallback si les VAOs ne sont pas supportés + update = true; // Fallback si les VAOs ne sont pas supportés if (update) { @@ -991,11 +991,11 @@ bool NzRenderer::EnsureStateUpdate() if (vaoSupported) { - // Si nous venons de définir notre VAO, nous devons le débinder pour indiquer la fin de sa construction + // Si nous venons de définir notre VAO, nous devons le débinder pour indiquer la fin de sa construction if (update) glBindVertexArray(0); - // Nous (re)bindons le VAO pour définir les attributs de vertice + // Nous (re)bindons le VAO pour définir les attributs de vertice glBindVertexArray(vao); } diff --git a/src/Nazara/Renderer/Shader.cpp b/src/Nazara/Renderer/Shader.cpp index ec12ee1d1..51f0f89db 100644 --- a/src/Nazara/Renderer/Shader.cpp +++ b/src/Nazara/Renderer/Shader.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Renderer/ShaderImpl.cpp b/src/Nazara/Renderer/ShaderImpl.cpp index 5f2b2976b..a05df390c 100644 --- a/src/Nazara/Renderer/ShaderImpl.cpp +++ b/src/Nazara/Renderer/ShaderImpl.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Renderer/ShaderImpl.hpp b/src/Nazara/Renderer/ShaderImpl.hpp index 94916904f..c47e526c8 100644 --- a/src/Nazara/Renderer/ShaderImpl.hpp +++ b/src/Nazara/Renderer/ShaderImpl.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Renderer/Texture.cpp b/src/Nazara/Renderer/Texture.cpp index cfe154a33..9c362d2f6 100644 --- a/src/Nazara/Renderer/Texture.cpp +++ b/src/Nazara/Renderer/Texture.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -456,7 +456,7 @@ bool NzTexture::Create(nzImageType type, nzPixelFormat format, unsigned int widt LockTexture(impl); - // Vérification du support par la carte graphique + // Vérification du support par la carte graphique /*if (!CreateTexture(impl, true)) { NazaraError("Texture's parameters not supported by driver"); @@ -467,7 +467,7 @@ bool NzTexture::Create(nzImageType type, nzPixelFormat format, unsigned int widt return false; }*/ - // Création de la texture + // Création de la texture if (!CreateTexture(impl, false)) { NazaraError("Failed to create texture"); @@ -480,7 +480,7 @@ bool NzTexture::Create(nzImageType type, nzPixelFormat format, unsigned int widt m_impl = impl; - // Paramètres par défaut + // Paramètres par défaut SetFilterMode(nzTextureFilter_Nearest); SetMipmapRange(0, m_impl->levelCount); SetWrapMode(nzTextureWrap_Repeat); @@ -549,7 +549,7 @@ bool NzTexture::Download(NzImage* image) const unsigned int height = m_impl->height; unsigned int depth = m_impl->depth; - // Téléchargement... + // Téléchargement... for (nzUInt8 level = 0; level < m_impl->levelCount; ++level) { glGetTexImage(openglTarget[m_impl->type], level, format.dataFormat, format.dataType, image->GetPixels(level)); @@ -566,7 +566,7 @@ bool NzTexture::Download(NzImage* image) const UnlockTexture(m_impl); - // Inversion de la texture pour le repère d'OpenGL + // Inversion de la texture pour le repère d'OpenGL if (!image->FlipVertically()) NazaraWarning("Failed to flip image"); @@ -1253,7 +1253,7 @@ bool NzTexture::Update(const nzUInt8* pixels, const NzRectui& rect, unsigned int nzUInt8 bpp = NzPixelFormat::GetBPP(m_impl->format); - // Inversion de la texture pour le repère d'OpenGL + // Inversion de la texture pour le repère d'OpenGL NzImage mirrored; mirrored.Create(m_impl->type, m_impl->format, rect.width, rect.height); mirrored.Update(pixels); @@ -1350,7 +1350,7 @@ bool NzTexture::Update(const nzUInt8* pixels, const NzCubeui& cube, nzUInt8 leve nzUInt8 bpp = NzPixelFormat::GetBPP(m_impl->format); - // Inversion de la texture pour le repère d'OpenGL + // Inversion de la texture pour le repère d'OpenGL unsigned int size = cube.width*cube.height*cube.depth*bpp; nzUInt8* mirrored = new nzUInt8[size]; if (!NzPixelFormat::Flip(nzPixelFlipping_Vertically, m_impl->format, cube.width, cube.height, cube.depth, pixels, mirrored)) @@ -1505,7 +1505,7 @@ bool NzTexture::UpdateFace(nzCubemapFace face, const nzUInt8* pixels, const NzRe nzUInt8 bpp = NzPixelFormat::GetBPP(m_impl->format); - // Inversion de la texture pour le repère d'OpenGL + // Inversion de la texture pour le repère d'OpenGL unsigned int size = rect.width*rect.height*bpp; nzUInt8* mirrored = new nzUInt8[size]; if (!NzPixelFormat::Flip(nzPixelFlipping_Vertically, m_impl->format, rect.width, rect.height, 1, pixels, mirrored)) @@ -1562,12 +1562,12 @@ bool NzTexture::IsFormatSupported(nzPixelFormat format) case nzPixelFormat_RGBA8: return true; - // Packed formats supportés depuis OpenGL 1.2 + // Packed formats supportés depuis OpenGL 1.2 case nzPixelFormat_RGB5A1: case nzPixelFormat_RGBA4: return true; - // Dépréciés depuis OpenGL 3 (FIXME: Il doit bien exister des remplaçants ..) + // Dépréciés depuis OpenGL 3 (FIXME: Il doit bien exister des remplaçants ..) case nzPixelFormat_L8: case nzPixelFormat_LA8: return false; @@ -1602,7 +1602,7 @@ bool NzTexture::IsTypeSupported(nzImageType type) case nzImageType_2D: case nzImageType_3D: case nzImageType_Cubemap: - return true; // Tous supportés nativement dans OpenGL 2 + return true; // Tous supportés nativement dans OpenGL 2 case nzImageType_1D_Array: case nzImageType_2D_Array: diff --git a/src/Nazara/Renderer/Win32/ContextImpl.cpp b/src/Nazara/Renderer/Win32/ContextImpl.cpp index 61fdb8388..5cb657f48 100644 --- a/src/Nazara/Renderer/Win32/ContextImpl.cpp +++ b/src/Nazara/Renderer/Win32/ContextImpl.cpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Code inspiré de NeHe (Lesson1) et de la SFML par Laurent Gomila +// Code inspiré de NeHe (Lesson1) et de la SFML par Laurent Gomila #include #include @@ -129,7 +129,7 @@ bool NzContextImpl::Create(NzContextParameters& parameters) return false; } - // Arrivé ici, le format de pixel est choisi, nous récupérons donc les paramètres réels du futur contexte + // Arrivé ici, le format de pixel est choisi, nous récupérons donc les paramètres réels du futur contexte if (DescribePixelFormat(m_deviceContext, pixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &descriptor) != 0) { parameters.bitsPerPixel = descriptor.cColorBits + descriptor.cAlphaBits; diff --git a/src/Nazara/Renderer/Win32/ContextImpl.hpp b/src/Nazara/Renderer/Win32/ContextImpl.hpp index 218829fb1..f640da789 100644 --- a/src/Nazara/Renderer/Win32/ContextImpl.hpp +++ b/src/Nazara/Renderer/Win32/ContextImpl.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2012 Jérôme Leclercq +// Copyright (C) 2012 Jérôme Leclercq // This file is part of the "Nazara Engine". // For conditions of distribution and use, see copyright notice in Config.hpp diff --git a/src/Nazara/Utility/Animation.cpp b/src/Nazara/Utility/Animation.cpp index 92e815f9c..eb4dcf3ca 100644 --- a/src/Nazara/Utility/Animation.cpp +++ b/src/Nazara/Utility/Animation.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/AxisAlignedBox.cpp b/src/Nazara/Utility/AxisAlignedBox.cpp index 81b76cbb6..67a9fe15e 100644 --- a/src/Nazara/Utility/AxisAlignedBox.cpp +++ b/src/Nazara/Utility/AxisAlignedBox.cpp @@ -1,6 +1,6 @@ -// Copyright (C) 2011 Jérôme Leclercq -// This file is part of the "Ungine". -// For conditions of distribution and use, see copyright notice in Core.h +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" +// For conditions of distribution and use, see copyright notice in Config.hpp #include #include @@ -55,7 +55,7 @@ void NzAxisAlignedBox::ExtendTo(const NzAxisAlignedBox& box) } case nzExtend_Infinite: - // Rien à faire + // Rien à faire break; case nzExtend_Null: @@ -74,11 +74,11 @@ void NzAxisAlignedBox::ExtendTo(const NzVector3f& vector) break; case nzExtend_Infinite: - // Rien à faire + // Rien à faire break; case nzExtend_Null: - // Nous étendons l'AABB en la construisant de l'origine jusqu'au vecteur + // Nous étendons l'AABB en la construisant de l'origine jusqu'au vecteur m_cube.x = 0.f; m_cube.y = 0.f; m_cube.z = 0.f; diff --git a/src/Nazara/Utility/Buffer.cpp b/src/Nazara/Utility/Buffer.cpp index c537aeb03..cebc3e28a 100644 --- a/src/Nazara/Utility/Buffer.cpp +++ b/src/Nazara/Utility/Buffer.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -88,7 +88,7 @@ bool NzBuffer::Create(unsigned int length, nzUInt8 typeSize, nzBufferStorage sto { Destroy(); - // On tente d'abord de faire un buffer hardware, si supporté + // On tente d'abord de faire un buffer hardware, si supporté if (s_bufferFunctions[storage]) { NzBufferImpl* impl = s_bufferFunctions[storage](this, m_type); @@ -113,7 +113,7 @@ bool NzBuffer::Create(unsigned int length, nzUInt8 typeSize, nzBufferStorage sto m_storage = storage; m_usage = usage; - // Si on arrive ici c'est que tout s'est bien passé. + // Si on arrive ici c'est que tout s'est bien passé. return true; } diff --git a/src/Nazara/Utility/BufferImpl.cpp b/src/Nazara/Utility/BufferImpl.cpp index 93ad045c4..16a037a87 100644 --- a/src/Nazara/Utility/BufferImpl.cpp +++ b/src/Nazara/Utility/BufferImpl.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/Cursor.cpp b/src/Nazara/Utility/Cursor.cpp index f19b61cae..3f8e17873 100644 --- a/src/Nazara/Utility/Cursor.cpp +++ b/src/Nazara/Utility/Cursor.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/Debug/Leaks.cpp b/src/Nazara/Utility/Debug/Leaks.cpp index 46b4e1abf..6089daa46 100644 --- a/src/Nazara/Utility/Debug/Leaks.cpp +++ b/src/Nazara/Utility/Debug/Leaks.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/Icon.cpp b/src/Nazara/Utility/Icon.cpp index e2b8db5ce..f16506467 100644 --- a/src/Nazara/Utility/Icon.cpp +++ b/src/Nazara/Utility/Icon.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/Image.cpp b/src/Nazara/Utility/Image.cpp index 79d4d16d9..3e6986677 100644 --- a/src/Nazara/Utility/Image.cpp +++ b/src/Nazara/Utility/Image.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -84,7 +84,7 @@ bool NzImage::Convert(nzPixelFormat format) unsigned int width = m_sharedImage->width; unsigned int height = m_sharedImage->height; - // Les images 3D et cubemaps sont stockés de la même façon + // Les images 3D et cubemaps sont stockés de la même façon unsigned int depth = (m_sharedImage->type == nzImageType_Cubemap) ? 6 : m_sharedImage->depth; for (unsigned int i = 0; i < m_sharedImage->levelCount; ++i) @@ -101,7 +101,7 @@ bool NzImage::Convert(nzPixelFormat format) { NazaraError("Failed to convert image"); - // Nettoyage de la mémoire + // Nettoyage de la mémoire delete[] ptr; // Permet une optimisation de boucle (GCC) for (unsigned int j = 0; j < i; ++j) delete[] levels[j]; @@ -159,11 +159,11 @@ bool NzImage::Copy(const NzImage& source, const NzCubeui& srcCube, const NzVecto } /* - Correctif temporaire : Update veut de la mémoire contigüe - Il est donc nécessaire de prendre la partie de la texture que nous voulons mettre à jour + Correctif temporaire : Update veut de la mémoire contigüe + Il est donc nécessaire de prendre la partie de la texture que nous voulons mettre à jour - FIXME: Trouver une interface pour gérer ce genre de problème (Façon OpenGL?) - (Appliquer l'interface à NzTexture également) + FIXME: Trouver une interface pour gérer ce genre de problème (Façon OpenGL?) + (Appliquer l'interface à NzTexture également) */ nzUInt8 bpp = NzPixelFormat::GetBPP(m_sharedImage->format); unsigned int dstLineStride = srcCube.width*bpp; @@ -269,7 +269,7 @@ bool NzImage::Create(nzImageType type, nzPixelFormat format, unsigned int width, for (unsigned int i = 0; i < levelCount; ++i) { - // Cette allocation est protégée car sa taille dépend directement de paramètres utilisateurs + // Cette allocation est protégée car sa taille dépend directement de paramètres utilisateurs try { levels[i] = new nzUInt8[w * h * d * NzPixelFormat::GetBPP(format)]; @@ -1013,7 +1013,7 @@ bool NzImage::Update(const nzUInt8* pixels, const NzRectui& rect, unsigned int z bool NzImage::Update(const nzUInt8* pixels, const NzCubeui& cube, nzUInt8 level) { - ///FIXME: Vérifier que ça fonctionne correctement + ///FIXME: Vérifier que ça fonctionne correctement #if NAZARA_UTILITY_SAFE if (!IsValid()) { diff --git a/src/Nazara/Utility/IndexBuffer.cpp b/src/Nazara/Utility/IndexBuffer.cpp index e14f30424..e6d7d3889 100644 --- a/src/Nazara/Utility/IndexBuffer.cpp +++ b/src/Nazara/Utility/IndexBuffer.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/Keyboard.cpp b/src/Nazara/Utility/Keyboard.cpp index 236a04b2a..d463c6cb2 100644 --- a/src/Nazara/Utility/Keyboard.cpp +++ b/src/Nazara/Utility/Keyboard.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/KeyframeMesh.cpp b/src/Nazara/Utility/KeyframeMesh.cpp index c9d5fe0ff..fa9ee4e04 100644 --- a/src/Nazara/Utility/KeyframeMesh.cpp +++ b/src/Nazara/Utility/KeyframeMesh.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/Loaders/MD2.hpp b/src/Nazara/Utility/Loaders/MD2.hpp index a0be386e6..16ad00424 100644 --- a/src/Nazara/Utility/Loaders/MD2.hpp +++ b/src/Nazara/Utility/Loaders/MD2.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Utility/Loaders/MD2/Constants.cpp b/src/Nazara/Utility/Loaders/MD2/Constants.cpp index 872e5c7dd..be963a524 100644 --- a/src/Nazara/Utility/Loaders/MD2/Constants.cpp +++ b/src/Nazara/Utility/Loaders/MD2/Constants.cpp @@ -1,6 +1,6 @@ -// Copyright (C) 2011 Jérôme Leclercq -// This file is part of the "Ungine". -// For conditions of distribution and use, see copyright notice in Core.h +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" +// For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/Loaders/MD2/Constants.hpp b/src/Nazara/Utility/Loaders/MD2/Constants.hpp index ae4263a98..9e9d9062b 100644 --- a/src/Nazara/Utility/Loaders/MD2/Constants.hpp +++ b/src/Nazara/Utility/Loaders/MD2/Constants.hpp @@ -1,6 +1,6 @@ -// Copyright (C) 2011 Jérôme Leclercq -// This file is part of the "Ungine". -// For conditions of distribution and use, see copyright notice in Core.h +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" +// For conditions of distribution and use, see copyright notice in Config.hpp #ifndef NAZARA_LOADERS_MD2_CONSTANTS_HPP #define NAZARA_LOADERS_MD2_CONSTANTS_HPP @@ -21,16 +21,16 @@ struct md2_header nzUInt32 num_skins; // nombre de skins nzUInt32 num_vertices; // nombre de vertices par frame - nzUInt32 num_st; // nombre de coordonnées de texture + nzUInt32 num_st; // nombre de coordonnées de texture nzUInt32 num_tris; // nombre de triangles nzUInt32 num_glcmds; // nombre de commandes opengl nzUInt32 num_frames; // nombre de frames - nzUInt32 offset_skins; // offset données skins - nzUInt32 offset_st; // offset données coordonnées de texture - nzUInt32 offset_tris; // offset données triangles - nzUInt32 offset_frames; // offset données frames - nzUInt32 offset_glcmds; // offset données commandes OpenGL + nzUInt32 offset_skins; // offset données skins + nzUInt32 offset_st; // offset données coordonnées de texture + nzUInt32 offset_tris; // offset données triangles + nzUInt32 offset_frames; // offset données frames + nzUInt32 offset_glcmds; // offset données commandes OpenGL nzUInt32 offset_end; // offset fin de fichier }; diff --git a/src/Nazara/Utility/Loaders/MD2/Loader.cpp b/src/Nazara/Utility/Loaders/MD2/Loader.cpp index cd9fc862b..d2fa86371 100644 --- a/src/Nazara/Utility/Loaders/MD2/Loader.cpp +++ b/src/Nazara/Utility/Loaders/MD2/Loader.cpp @@ -1,6 +1,6 @@ -// Copyright (C) 2011 Jérôme Leclercq -// This file is part of the "Ungine". -// For conditions of distribution and use, see copyright notice in Core.h +// Copyright (C) 2011 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" +// For conditions of distribution and use, see copyright notice in Config.hpp #include #include @@ -92,8 +92,8 @@ namespace return false; } - /// Création du mesh - // Animé ou statique, c'est la question + /// Création du mesh + // Animé ou statique, c'est la question bool animated; unsigned int startFrame = NzClamp(parameters.animation.startFrame, 0U, static_cast(header.num_frames-1)); unsigned int endFrame = NzClamp(parameters.animation.endFrame, 0U, static_cast(header.num_frames-1)); @@ -103,7 +103,7 @@ namespace else animated = false; - if (!mesh->Create((animated) ? nzAnimationType_Keyframe : nzAnimationType_Static)) // Ne devrait pas échouer + if (!mesh->Create((animated) ? nzAnimationType_Keyframe : nzAnimationType_Static)) // Ne devrait pas échouer { NazaraInternalError("Failed to create mesh"); return false; @@ -129,11 +129,11 @@ namespace NzAnimation* animation = new NzAnimation; if (animation->Create(nzAnimationType_Keyframe, endFrame-startFrame+1)) { - // Décodage des séquences + // Décodage des séquences NzString frameName; NzSequence sequence; - sequence.framePerSecond = 10; // Par défaut pour les animations MD2 + sequence.framePerSecond = 10; // Par défaut pour les animations MD2 char name[16], last[16]; stream.SetCursorPos(header.offset_frames + startFrame*header.framesize + offsetof(md2_frame, name)); @@ -165,9 +165,9 @@ namespace } name[pos+1] = '\0'; - if (std::strcmp(name, last) != 0) // Si les deux frames n'ont pas le même nom + if (std::strcmp(name, last) != 0) // Si les deux frames n'ont pas le même nom { - // Alors on enregistre la séquence + // Alors on enregistre la séquence sequence.firstFrame = i-numFrames; sequence.lastFrame = i-1; sequence.name = last; @@ -181,7 +181,7 @@ namespace numFrames++; } - // On ajoute la dernière frame (Qui n'a pas été traitée par la boucle) + // On ajoute la dernière frame (Qui n'a pas été traitée par la boucle) sequence.firstFrame = endFrame-numFrames; sequence.lastFrame = endFrame; sequence.name = last; @@ -196,7 +196,7 @@ namespace /// Chargement des submesh // Actuellement le loader ne charge qu'un submesh - // TODO: Utiliser les commandes OpenGL pour accélérer le rendu + // TODO: Utiliser les commandes OpenGL pour accélérer le rendu NzMD2Mesh* subMesh = new NzMD2Mesh(mesh); if (!subMesh->Create(header, stream, parameters)) { diff --git a/src/Nazara/Utility/Loaders/MD2/Mesh.cpp b/src/Nazara/Utility/Loaders/MD2/Mesh.cpp index 1accab406..63db23e6b 100644 --- a/src/Nazara/Utility/Loaders/MD2/Mesh.cpp +++ b/src/Nazara/Utility/Loaders/MD2/Mesh.cpp @@ -1,6 +1,6 @@ -// Copyright (C) 2011 Jérôme Leclercq -// This file is part of the "Ungine". -// For conditions of distribution and use, see copyright notice in Core.h +// Copyright (C) 2011 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" +// For conditions of distribution and use, see copyright notice in Config.hpp #include #include @@ -37,7 +37,7 @@ bool NzMD2Mesh::Create(const md2_header& header, NzInputStream& stream, const Nz std::vector texCoords(header.num_st); std::vector triangles(header.num_tris); - // Lecture des coordonnées de texture + // Lecture des coordonnées de texture stream.SetCursorPos(header.offset_st); stream.Read(&texCoords[0], header.num_st*sizeof(md2_texCoord)); @@ -71,7 +71,7 @@ bool NzMD2Mesh::Create(const md2_header& header, NzInputStream& stream, const Nz md2_frame frame; frame.vertices.resize(header.num_vertices); - // Pour que le modèle soit correctement aligné, on génère une matrice de rotation que nous appliquerons à chacune des vertices + // Pour que le modèle soit correctement aligné, on génère une matrice de rotation que nous appliquerons à chacune des vertices NzMatrix4f rotationMatrix = NzMatrix4f::Rotate(NzEulerAnglesf(90.f, -90.f, 0.f)); unsigned int stride = s_declaration.GetStride(nzElementStream_VertexData); @@ -94,7 +94,7 @@ bool NzMD2Mesh::Create(const md2_header& header, NzInputStream& stream, const Nz NzByteSwap(&frame.translate.z, sizeof(float)); #endif - m_frames[i].normal = new nzUInt8[m_vertexCount]; // Nous stockons l'indice de la normale plutôt que la normale (gain d'espace) + m_frames[i].normal = new nzUInt8[m_vertexCount]; // Nous stockons l'indice de la normale plutôt que la normale (gain d'espace) m_frames[i].vertices = new NzVector3f[m_vertexCount]; NzVector3f max, min; @@ -128,7 +128,7 @@ bool NzMD2Mesh::Create(const md2_header& header, NzInputStream& stream, const Nz return false; } - // On avance jusqu'aux premières coordonnées de texture + // On avance jusqu'aux premières coordonnées de texture ptr += s_declaration.GetElement(nzElementStream_VertexData, nzElementUsage_TexCoord)->offset; for (unsigned int t = 0; t < header.num_tris; ++t) { diff --git a/src/Nazara/Utility/Loaders/MD2/Mesh.hpp b/src/Nazara/Utility/Loaders/MD2/Mesh.hpp index baa5cc9a8..7135cd106 100644 --- a/src/Nazara/Utility/Loaders/MD2/Mesh.hpp +++ b/src/Nazara/Utility/Loaders/MD2/Mesh.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Utility/Loaders/PCX.hpp b/src/Nazara/Utility/Loaders/PCX.hpp index 40bd5d3c2..efcfcd29a 100644 --- a/src/Nazara/Utility/Loaders/PCX.hpp +++ b/src/Nazara/Utility/Loaders/PCX.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Utility/Loaders/PCX/Loader.cpp b/src/Nazara/Utility/Loaders/PCX/Loader.cpp index abf21a8a7..6240461e3 100644 --- a/src/Nazara/Utility/Loaders/PCX/Loader.cpp +++ b/src/Nazara/Utility/Loaders/PCX/Loader.cpp @@ -1,6 +1,6 @@ -// Copyright (C) 2011 Jérôme Leclercq -// This file is part of the "Ungine". -// For conditions of distribution and use, see copyright notice in Core.h +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" +// For conditions of distribution and use, see copyright notice in Config.hpp #include #include @@ -339,7 +339,7 @@ namespace } default: - NazaraError("Unable to load " + NzString::Number(bitCount) + " bitcount pcx files"); + NazaraError("Failed to load " + NzString::Number(bitCount) + " bitcount pcx files"); return false; } diff --git a/src/Nazara/Utility/Loaders/STB.hpp b/src/Nazara/Utility/Loaders/STB.hpp index 97886d7f3..9ea7d05c4 100644 --- a/src/Nazara/Utility/Loaders/STB.hpp +++ b/src/Nazara/Utility/Loaders/STB.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Utility/Loaders/STB/Loader.cpp b/src/Nazara/Utility/Loaders/STB/Loader.cpp index d5b260de0..ebdbac78f 100644 --- a/src/Nazara/Utility/Loaders/STB/Loader.cpp +++ b/src/Nazara/Utility/Loaders/STB/Loader.cpp @@ -1,6 +1,6 @@ -// Copyright (C) 2011 Jérôme Leclercq -// This file is part of the "Ungine". -// For conditions of distribution and use, see copyright notice in Core.h +// Copyright (C) 2011 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" +// For conditions of distribution and use, see copyright notice in Config.hpp #include #include diff --git a/src/Nazara/Utility/Mesh.cpp b/src/Nazara/Utility/Mesh.cpp index db61476ce..f082517da 100644 --- a/src/Nazara/Utility/Mesh.cpp +++ b/src/Nazara/Utility/Mesh.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/Mouse.cpp b/src/Nazara/Utility/Mouse.cpp index 206ea6c1d..17f44f992 100644 --- a/src/Nazara/Utility/Mouse.cpp +++ b/src/Nazara/Utility/Mouse.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/PixelFormat.cpp b/src/Nazara/Utility/PixelFormat.cpp index ee440c489..7c812f030 100644 --- a/src/Nazara/Utility/PixelFormat.cpp +++ b/src/Nazara/Utility/PixelFormat.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -1139,7 +1139,7 @@ bool NzPixelFormat::Initialize() RegisterConverter(); /**********************************DXT1***********************************/ - ///TODO: Décompresseur DXT1 + ///TODO: Décompresseur DXT1 /* RegisterConverter(); RegisterConverter(); @@ -1162,7 +1162,7 @@ bool NzPixelFormat::Initialize() */ /**********************************DXT3***********************************/ - ///TODO: Décompresseur DXT3 + ///TODO: Décompresseur DXT3 /* RegisterConverter(); RegisterConverter(); @@ -1185,7 +1185,7 @@ bool NzPixelFormat::Initialize() */ /**********************************DXT5***********************************/ - ///TODO: Décompresseur DXT5 + ///TODO: Décompresseur DXT5 /* RegisterConverter(); RegisterConverter(); diff --git a/src/Nazara/Utility/SoftwareBuffer.cpp b/src/Nazara/Utility/SoftwareBuffer.cpp index 0fb3537c9..f2a7e8b13 100644 --- a/src/Nazara/Utility/SoftwareBuffer.cpp +++ b/src/Nazara/Utility/SoftwareBuffer.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -23,7 +23,7 @@ bool NzSoftwareBuffer::Create(unsigned int size, nzBufferUsage usage) { NazaraUnused(usage); - // Cette allocation est protégée car sa taille dépend directement de paramètres utilisateurs + // Cette allocation est protégée car sa taille dépend directement de paramètres utilisateurs try { m_buffer = new nzUInt8[size]; diff --git a/src/Nazara/Utility/SoftwareBuffer.hpp b/src/Nazara/Utility/SoftwareBuffer.hpp index 8df91b919..9c07b9e2d 100644 --- a/src/Nazara/Utility/SoftwareBuffer.hpp +++ b/src/Nazara/Utility/SoftwareBuffer.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Utility/StaticMesh.cpp b/src/Nazara/Utility/StaticMesh.cpp index 7d72e29c6..a85273327 100644 --- a/src/Nazara/Utility/StaticMesh.cpp +++ b/src/Nazara/Utility/StaticMesh.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -95,7 +95,7 @@ bool NzStaticMesh::GenerateAABB() const NzVertexElement* position = m_vertexDeclaration->GetElement(nzElementStream_VertexData, nzElementUsage_Position); if (position && position->type == nzElementType_Float3) // Si nous avons des positions du type Vec3 { - // On lock le buffer pour itérer sur toutes les positions et composer notre AABB + // On lock le buffer pour itérer sur toutes les positions et composer notre AABB nzUInt8* buffer = reinterpret_cast(m_vertexBuffer->Map(nzBufferAccess_ReadOnly)); if (!buffer) { @@ -181,6 +181,6 @@ void NzStaticMesh::AnimateImpl(unsigned int frameA, unsigned int frameB, float i NazaraUnused(frameB); NazaraUnused(interpolation); - // Le safe mode est censé nous protéger de cet appel + // Le safe mode est censé nous protéger de cet appel NazaraError("Static mesh have no animation, please enable safe mode"); } diff --git a/src/Nazara/Utility/SubMesh.cpp b/src/Nazara/Utility/SubMesh.cpp index a44420423..fb382d97a 100644 --- a/src/Nazara/Utility/SubMesh.cpp +++ b/src/Nazara/Utility/SubMesh.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -11,7 +11,7 @@ #include NzSubMesh::NzSubMesh(const NzMesh* parent) : -NzResource(false), // Un SubMesh n'est pas persistant par défaut +NzResource(false), // Un SubMesh n'est pas persistant par défaut m_parent(parent) { #ifdef NAZARA_DEBUG diff --git a/src/Nazara/Utility/Utility.cpp b/src/Nazara/Utility/Utility.cpp index 755b05120..095161214 100644 --- a/src/Nazara/Utility/Utility.cpp +++ b/src/Nazara/Utility/Utility.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -18,9 +18,9 @@ bool NzUtility::Initialize() { if (s_moduleReferenceCouter++ != 0) - return true; // Déjà initialisé + return true; // Déjà initialisé - // Initialisation des dépendances + // Initialisation des dépendances if (!NzCore::Initialize()) { NazaraError("Failed to initialize core module"); @@ -48,16 +48,16 @@ bool NzUtility::Initialize() return false; } - /// Loaders spécialisés + /// Loaders spécialisés // Mesh NzLoaders_MD2_Register(); // Loader de fichiers .MD2 (v8) // Image NzLoaders_PCX_Register(); // Loader de fichiers .PCX (1, 4, 8, 24) - /// Loaders génériques (En dernier pour donner la priorité aux loaders spécialisés) + /// Loaders génériques (En dernier pour donner la priorité aux loaders spécialisés) // Image - NzLoaders_STB_Register(); // Loader générique (STB) + NzLoaders_STB_Register(); // Loader générique (STB) NazaraNotice("Initialized: Utility module"); @@ -72,9 +72,9 @@ bool NzUtility::IsInitialized() void NzUtility::Uninitialize() { if (--s_moduleReferenceCouter != 0) - return; // Encore utilisé + return; // Encore utilisé - // Libération du module + // Libération du module NzLoaders_MD2_Unregister(); NzLoaders_PCX_Unregister(); NzLoaders_STB_Unregister(); @@ -85,7 +85,7 @@ void NzUtility::Uninitialize() NazaraNotice("Uninitialized: Utility module"); - // Libération des dépendances + // Libération des dépendances NzCore::Uninitialize(); } diff --git a/src/Nazara/Utility/VertexBuffer.cpp b/src/Nazara/Utility/VertexBuffer.cpp index 639355e49..5062ee830 100644 --- a/src/Nazara/Utility/VertexBuffer.cpp +++ b/src/Nazara/Utility/VertexBuffer.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/VertexDeclaration.cpp b/src/Nazara/Utility/VertexDeclaration.cpp index 1d8f546f7..f6be21c60 100644 --- a/src/Nazara/Utility/VertexDeclaration.cpp +++ b/src/Nazara/Utility/VertexDeclaration.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -113,7 +113,7 @@ bool NzVertexDeclaration::Create(const NzVertexElement* elements, unsigned int e std::memset(&impl->elementPos, -1, (nzElementStream_Max+1)*(nzElementUsage_Max+1)*sizeof(int)); std::memset(&impl->streamPos, -1, (nzElementStream_Max+1)*sizeof(int)); - // On copie et trie les éléments + // On copie et trie les éléments impl->elements.resize(elementCount); std::memcpy(&impl->elements[0], elements, elementCount*sizeof(NzVertexElement)); std::sort(impl->elements.begin(), impl->elements.end(), VertexElementCompare); @@ -122,13 +122,13 @@ bool NzVertexDeclaration::Create(const NzVertexElement* elements, unsigned int e { NzVertexElement& current = impl->elements[i]; #if NAZARA_UTILITY_SAFE - // Notre tableau étant trié, s'il y a collision, les deux éléments identiques se suivent... + // Notre tableau étant trié, s'il y a collision, les deux éléments identiques se suivent... if (i > 0) { - NzVertexElement& previous = impl->elements[i-1]; // On accède à l'élément précédent + NzVertexElement& previous = impl->elements[i-1]; // On accède à l'élément précédent if (previous.usage == current.usage && previous.usageIndex == current.usageIndex && previous.stream == current.stream) { - // Les deux éléments sont identiques là où ils ne devraient pas, nous avons une collision... + // Les deux éléments sont identiques là où ils ne devraient pas, nous avons une collision... NazaraError("Element usage 0x" + NzString::Number(current.usage, 16) + " collision with usage index " + NzString::Number(current.usageIndex) + " on stream 0x" + NzString::Number(current.stream, 16)); delete impl; @@ -141,7 +141,7 @@ bool NzVertexDeclaration::Create(const NzVertexElement* elements, unsigned int e impl->elementPos[current.stream][current.usage] = i; if (impl->streamPos[current.stream] == -1) - impl->streamPos[current.stream] = i; // Premier élément du stream (via le triage) + impl->streamPos[current.stream] = i; // Premier élément du stream (via le triage) impl->stride[current.stream] += size[current.type]; } diff --git a/src/Nazara/Utility/VideoMode.cpp b/src/Nazara/Utility/VideoMode.cpp index 85488b865..3beb43743 100644 --- a/src/Nazara/Utility/VideoMode.cpp +++ b/src/Nazara/Utility/VideoMode.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/VideoModeImpl.hpp b/src/Nazara/Utility/VideoModeImpl.hpp index 510d491fd..ee6bbddfa 100644 --- a/src/Nazara/Utility/VideoModeImpl.hpp +++ b/src/Nazara/Utility/VideoModeImpl.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Utility/Win32/CursorImpl.cpp b/src/Nazara/Utility/Win32/CursorImpl.cpp index 10010535f..165e008d5 100644 --- a/src/Nazara/Utility/Win32/CursorImpl.cpp +++ b/src/Nazara/Utility/Win32/CursorImpl.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/Win32/CursorImpl.hpp b/src/Nazara/Utility/Win32/CursorImpl.hpp index ba9fa63b7..b6cb61851 100644 --- a/src/Nazara/Utility/Win32/CursorImpl.hpp +++ b/src/Nazara/Utility/Win32/CursorImpl.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Utility/Win32/IconImpl.cpp b/src/Nazara/Utility/Win32/IconImpl.cpp index 730017241..455b6a410 100644 --- a/src/Nazara/Utility/Win32/IconImpl.cpp +++ b/src/Nazara/Utility/Win32/IconImpl.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Utility/Win32/IconImpl.hpp b/src/Nazara/Utility/Win32/IconImpl.hpp index 9747283c3..2c9cc71be 100644 --- a/src/Nazara/Utility/Win32/IconImpl.hpp +++ b/src/Nazara/Utility/Win32/IconImpl.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Utility/Win32/InputImpl.cpp b/src/Nazara/Utility/Win32/InputImpl.cpp index a91c92cce..0bc96168d 100644 --- a/src/Nazara/Utility/Win32/InputImpl.cpp +++ b/src/Nazara/Utility/Win32/InputImpl.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -31,7 +31,7 @@ NzVector2i NzEventImpl::GetMousePosition(const NzWindow& relativeTo) { NazaraError("Window's handle is invalid"); - // Attention que (-1, -1) est une position tout à fait valide et ne doit pas être utilisée pour tester l'erreur + // Attention que (-1, -1) est une position tout à fait valide et ne doit pas être utilisée pour tester l'erreur return NzVector2i(-1, -1); } } @@ -84,13 +84,13 @@ bool NzEventImpl::IsKeyPressed(NzKeyboard::Key key) VK_F14, // Key::F14 VK_F15, // Key::F15 - // Flèches directionnelles + // Flèches directionnelles VK_DOWN, // Key::Down VK_LEFT, // Key::Left VK_RIGHT, // Key::Right VK_UP, // Key::Up - // Pavé numérique + // Pavé numérique VK_ADD, // Key::Add VK_DIVIDE, // Key::Divide VK_MULTIPLY, // Key::Multiply @@ -167,12 +167,12 @@ bool NzEventImpl::IsKeyPressed(NzKeyboard::Key key) VK_MEDIA_PREV_TRACK, // Key::Media_Previous, VK_MEDIA_STOP, // Key::Media_Stop, - // Touches de contrôle du volume + // Touches de contrôle du volume VK_VOLUME_DOWN, // Key::Volume_Down VK_VOLUME_MUTE, // Key::Volume_Mute VK_VOLUME_UP, // Key::Volume_Up - // Touches à verrouillage + // Touches à verrouillage VK_CAPITAL, // Key::CapsLock VK_NUMLOCK, // Key::NumLock VK_SCROLL // Key::ScrollLock diff --git a/src/Nazara/Utility/Win32/InputImpl.hpp b/src/Nazara/Utility/Win32/InputImpl.hpp index e140d21c8..41961312e 100644 --- a/src/Nazara/Utility/Win32/InputImpl.hpp +++ b/src/Nazara/Utility/Win32/InputImpl.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Utility/Win32/VideoModeImpl.cpp b/src/Nazara/Utility/Win32/VideoModeImpl.cpp index 73411cb63..147673979 100644 --- a/src/Nazara/Utility/Win32/VideoModeImpl.cpp +++ b/src/Nazara/Utility/Win32/VideoModeImpl.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -25,7 +25,7 @@ void NzVideoModeImpl::GetFullscreenModes(std::vector& modes) { NzVideoMode mode(win32Mode.dmPelsWidth, win32Mode.dmPelsHeight, win32Mode.dmBitsPerPel); - // Il existe plusieurs modes avec ces trois caractéristques identiques + // Il existe plusieurs modes avec ces trois caractéristques identiques if (std::find(modes.begin(), modes.end(), mode) == modes.end()) modes.push_back(mode); } diff --git a/src/Nazara/Utility/Win32/WindowImpl.cpp b/src/Nazara/Utility/Win32/WindowImpl.cpp index ec8dd7b96..b44e6b9ee 100644 --- a/src/Nazara/Utility/Win32/WindowImpl.cpp +++ b/src/Nazara/Utility/Win32/WindowImpl.cpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Un grand merci à Laurent Gomila pour la SFML qui m'aura bien aidé à réaliser cette implémentation +// Un grand merci à Laurent Gomila pour la SFML qui m'aura bien aidé à réaliser cette implémentation #define OEMRESOURCE @@ -26,12 +26,12 @@ #define GWL_USERDATA GWLP_USERDATA #endif -// N'est pas définit avec MinGW apparemment +// N'est pas définit avec MinGW apparemment #ifndef MAPVK_VK_TO_VSC #define MAPVK_VK_TO_VSC 0 #endif -#undef IsMinimized // Conflit avec la méthode du même nom +#undef IsMinimized // Conflit avec la méthode du même nom namespace { @@ -71,20 +71,20 @@ bool NzWindowImpl::Create(NzVideoMode mode, const NzString& title, nzUInt32 styl if (ChangeDisplaySettings(&win32Mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) { - // Situation extrêmement rare grâce à NzVideoMode::IsValid appelé par NzWindow + // Situation extrêmement rare grâce à NzVideoMode::IsValid appelé par NzWindow NazaraError("Failed to change display settings for fullscreen, this video mode is not supported by your computer"); fullscreen = false; } } - // Testé une seconde fois car sa valeur peut changer + // Testé une seconde fois car sa valeur peut changer if (fullscreen) { x = 0; y = 0; win32Style = WS_CLIPCHILDREN | WS_POPUP; - // Pour cacher la barre des tâches + // Pour cacher la barre des tâches // http://msdn.microsoft.com/en-us/library/windows/desktop/ff700543(v=vs.85).aspx win32StyleEx = WS_EX_APPWINDOW; @@ -126,7 +126,7 @@ bool NzWindowImpl::Create(NzVideoMode mode, const NzString& title, nzUInt32 styl m_thread = new NzThread(WindowThread, &m_handle, win32StyleEx, wtitle, win32Style, x, y, width, height, this, &mutex, &condition); m_threadActive = true; - // On attend que la fenêtre soit créée + // On attend que la fenêtre soit créée mutex.Lock(); m_thread->Launch(); condition.Wait(&mutex); @@ -178,7 +178,7 @@ void NzWindowImpl::Destroy() if (m_thread) { m_threadActive = false; - PostMessageW(m_handle, WM_NULL, 0, 0); // Pour réveiller le thread + PostMessageW(m_handle, WM_NULL, 0, 0); // Pour réveiller le thread m_thread->Join(); delete m_thread; @@ -234,7 +234,7 @@ NzString NzWindowImpl::GetTitle() const if (titleSize == 0) return NzString(); - titleSize++; // Caractère nul + titleSize++; // Caractère nul wchar_t* wTitle = new wchar_t[titleSize]; GetWindowTextW(m_handle, wTitle, titleSize); @@ -353,7 +353,7 @@ void NzWindowImpl::SetCursor(nzWindowCursor cursor) break; } - // Pas besoin de libérer le curseur par la suite s'il est partagé + // Pas besoin de libérer le curseur par la suite s'il est partagé // http://msdn.microsoft.com/en-us/library/windows/desktop/ms648045(v=vs.85).aspx ::SetCursor(m_cursor); } @@ -437,7 +437,7 @@ void NzWindowImpl::SetPosition(int x, int y) void NzWindowImpl::SetSize(unsigned int width, unsigned int height) { - // SetWindowPos demande la taille totale de la fenêtre + // SetWindowPos demande la taille totale de la fenêtre RECT rect = {0, 0, static_cast(width), static_cast(height)}; AdjustWindowRect(&rect, GetWindowLongPtr(m_handle, GWL_STYLE), false); @@ -466,7 +466,7 @@ void NzWindowImpl::SetVisible(bool visible) bool NzWindowImpl::HandleMessage(HWND window, UINT message, WPARAM wParam, LPARAM lParam) { - // Inutile de récupérer des évènements ne venant pas de notre fenêtre + // Inutile de récupérer des évènements ne venant pas de notre fenêtre if (m_handle != window) return false; @@ -531,7 +531,7 @@ bool NzWindowImpl::HandleMessage(HWND window, UINT message, WPARAM wParam, LPARA event.type = nzEventType_Quit; m_parent->PushEvent(event); - return true; // Afin que Windows ne ferme pas la fenêtre automatiquement + return true; // Afin que Windows ne ferme pas la fenêtre automatiquement } #if !NAZARA_UTILITY_THREADED_WINDOW @@ -545,7 +545,7 @@ bool NzWindowImpl::HandleMessage(HWND window, UINT message, WPARAM wParam, LPARA { m_sizemove = false; - // On vérifie ce qui a changé + // On vérifie ce qui a changé NzVector2i position = GetPosition(); if (m_position != position) { @@ -621,8 +621,8 @@ bool NzWindowImpl::HandleMessage(HWND window, UINT message, WPARAM wParam, LPARA case WM_LBUTTONDBLCLK: { - // Cet évènement est généré à la place d'un WM_LBUTTONDOWN lors d'un double-clic. - // Comme nous désirons quand même notifier chaque clic, nous envoyons les deux évènements. + // Cet évènement est généré à la place d'un WM_LBUTTONDOWN lors d'un double-clic. + // Comme nous désirons quand même notifier chaque clic, nous envoyons les deux évènements. NzEvent event; event.mouseButton.button = NzMouse::Left; event.mouseButton.x = GET_X_LPARAM(lParam); @@ -701,7 +701,7 @@ bool NzWindowImpl::HandleMessage(HWND window, UINT message, WPARAM wParam, LPARA break; } - // Nécessite un appel précédent à TrackMouseEvent (Fait dans WM_MOUSEMOVE) + // Nécessite un appel précédent à TrackMouseEvent (Fait dans WM_MOUSEMOVE) // http://msdn.microsoft.com/en-us/library/windows/desktop/ms645615(v=vs.85).aspx case WM_MOUSELEAVE: { @@ -860,7 +860,7 @@ bool NzWindowImpl::HandleMessage(HWND window, UINT message, WPARAM wParam, LPARA if (!m_sizemove && wParam != SIZE_MINIMIZED) #endif { - NzVector2ui size = GetSize(); // On récupère uniquement la taille de la zone client + NzVector2ui size = GetSize(); // On récupère uniquement la taille de la zone client #if !NAZARA_UTILITY_THREADED_WINDOW if (m_size == size) break; @@ -941,14 +941,14 @@ bool NzWindowImpl::HandleMessage(HWND window, UINT message, WPARAM wParam, LPARA bool NzWindowImpl::Initialize() { - // Nous devons faire un type Unicode pour que la fenêtre le soit également + // Nous devons faire un type Unicode pour que la fenêtre le soit également // http://msdn.microsoft.com/en-us/library/windows/desktop/ms633574(v=vs.85).aspx WNDCLASSW windowClass; windowClass.cbClsExtra = 0; windowClass.cbWndExtra = 0; windowClass.hbrBackground = nullptr; - windowClass.hCursor = nullptr; // Le curseur est définit dynamiquement - windowClass.hIcon = nullptr; // L'icône est définie dynamiquement + windowClass.hCursor = nullptr; // Le curseur est définit dynamiquement + windowClass.hIcon = nullptr; // L'icône est définie dynamiquement windowClass.hInstance = GetModuleHandle(nullptr); windowClass.lpfnWndProc = MessageHandler; windowClass.lpszClassName = className; @@ -1125,7 +1125,7 @@ void NzWindowImpl::WindowThread(HWND* handle, DWORD styleEx, const wchar_t* titl mutex->Lock(); condition->Signal(); mutex->Unlock(); - // mutex et condition sont considérés invalides à partir d'ici + // mutex et condition sont considérés invalides à partir d'ici while (window->m_threadActive) window->ProcessEvents(true); diff --git a/src/Nazara/Utility/Win32/WindowImpl.hpp b/src/Nazara/Utility/Win32/WindowImpl.hpp index bb566ebda..5dc4cd458 100644 --- a/src/Nazara/Utility/Win32/WindowImpl.hpp +++ b/src/Nazara/Utility/Win32/WindowImpl.hpp @@ -1,8 +1,8 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Interface inspirée de la SFML par Laurent Gomila +// Interface inspirée de la SFML par Laurent Gomila #pragma once @@ -26,7 +26,7 @@ class NzThread; #endif class NzWindow; -#undef IsMinimized // Conflit avec la méthode du même nom +#undef IsMinimized // Conflit avec la méthode du même nom class NzWindowImpl : NzNonCopyable { diff --git a/src/Nazara/Utility/Window.cpp b/src/Nazara/Utility/Window.cpp index 5e476dbaf..a9d3e1ed2 100644 --- a/src/Nazara/Utility/Window.cpp +++ b/src/Nazara/Utility/Window.cpp @@ -1,5 +1,5 @@ -// Copyright (C) 2012 Jérôme Leclercq -// This file is part of the "Nazara Engine". +// Copyright (C) 2012 Jérôme Leclercq +// This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp #include @@ -87,7 +87,7 @@ NzWindow::~NzWindow() bool NzWindow::Create(NzVideoMode mode, const NzString& title, nzUInt32 style) { - // Si la fenêtre est déjà ouverte, nous conservons sa position + // Si la fenêtre est déjà ouverte, nous conservons sa position bool opened = IsOpen(); NzVector2i position; if (opened) @@ -95,7 +95,7 @@ bool NzWindow::Create(NzVideoMode mode, const NzString& title, nzUInt32 style) Destroy(); - // Inspiré du code de la SFML par Laurent Gomila + // Inspiré du code de la SFML par Laurent Gomila if (style & nzWindowStyle_Fullscreen) { if (fullscreenWindow) @@ -138,7 +138,7 @@ bool NzWindow::Create(NzVideoMode mode, const NzString& title, nzUInt32 style) return false; } - // Paramètres par défaut + // Paramètres par défaut m_impl->EnableKeyRepeat(true); m_impl->EnableSmoothScrolling(false); m_impl->SetCursor(nzWindowCursor_Default); @@ -337,7 +337,7 @@ void NzWindow::SetEventListener(bool listener) m_impl->SetEventListener(listener); if (!listener) { - // On vide la pile des évènements + // On vide la pile des évènements NzLockGuard lock(m_eventMutex); while (!m_events.empty()) m_events.pop(); @@ -345,7 +345,7 @@ void NzWindow::SetEventListener(bool listener) #else if (m_ownsWindow) { - // Inutile de transmettre l'ordre dans ce cas-là + // Inutile de transmettre l'ordre dans ce cas-là if (!listener) NazaraError("A non-threaded window needs to listen to events"); }