diff --git a/include/Nazara/Audio.hpp b/include/Nazara/Audio.hpp index 5becbb066..5531f3123 100644 --- a/include/Nazara/Audio.hpp +++ b/include/Nazara/Audio.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Audio module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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/Audio/Algorithm.hpp b/include/Nazara/Audio/Algorithm.hpp index b7dbb9244..951a3500d 100644 --- a/include/Nazara/Audio/Algorithm.hpp +++ b/include/Nazara/Audio/Algorithm.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ALGORITHM_AUDIO_HPP -#define NAZARA_ALGORITHM_AUDIO_HPP +#ifndef NAZARA_AUDIO_ALGORITHM_HPP +#define NAZARA_AUDIO_ALGORITHM_HPP #include #include @@ -18,4 +18,4 @@ namespace Nz #include -#endif // NAZARA_ALGORITHM_AUDIO_HPP +#endif // NAZARA_AUDIO_ALGORITHM_HPP diff --git a/include/Nazara/Audio/Config.hpp b/include/Nazara/Audio/Config.hpp index f3dc0a93b..31af9d358 100644 --- a/include/Nazara/Audio/Config.hpp +++ b/include/Nazara/Audio/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_AUDIO_HPP -#define NAZARA_CONFIG_AUDIO_HPP +#ifndef NAZARA_AUDIO_CONFIG_HPP +#define NAZARA_AUDIO_CONFIG_HPP /*! * \defgroup audio (NazaraAudio) Audio module @@ -56,4 +56,4 @@ #define NAZARA_AUDIO_API #endif -#endif // NAZARA_CONFIG_AUDIO_HPP +#endif // NAZARA_AUDIO_CONFIG_HPP diff --git a/include/Nazara/Audio/ConfigCheck.hpp b/include/Nazara/Audio/ConfigCheck.hpp index d2d2294eb..2af2f0d54 100644 --- a/include/Nazara/Audio/ConfigCheck.hpp +++ b/include/Nazara/Audio/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_AUDIO_HPP -#define NAZARA_CONFIG_CHECK_AUDIO_HPP +#ifndef NAZARA_AUDIO_CONFIGCHECK_HPP +#define NAZARA_AUDIO_CONFIGCHECK_HPP /// This file is used to check the constant values defined in Config.hpp @@ -22,4 +22,4 @@ NazaraCheckTypeAndVal(NAZARA_AUDIO_STREAMED_BUFFER_COUNT, integral, >, 0, " shal #undef NazaraCheckTypeAndVal -#endif // NAZARA_CONFIG_CHECK_AUDIO_HPP +#endif // NAZARA_AUDIO_CONFIGCHECK_HPP diff --git a/include/Nazara/Audio/Debug.hpp b/include/Nazara/Audio/Debug.hpp index c3d023e90..a9ed9a064 100644 --- a/include/Nazara/Audio/Debug.hpp +++ b/include/Nazara/Audio/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Audio module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_AUDIO_MANAGE_MEMORY #include diff --git a/include/Nazara/Audio/DebugOff.hpp b/include/Nazara/Audio/DebugOff.hpp index a1683230a..4f0182ad3 100644 --- a/include/Nazara/Audio/DebugOff.hpp +++ b/include/Nazara/Audio/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Audio module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // We assume that Debug.hpp has already been included, same thing for Config.hpp #if NAZARA_AUDIO_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Audio/Enums.hpp b/include/Nazara/Audio/Enums.hpp index 23de8bbc6..184b2f251 100644 --- a/include/Nazara/Audio/Enums.hpp +++ b/include/Nazara/Audio/Enums.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENUMS_AUDIO_HPP -#define NAZARA_ENUMS_AUDIO_HPP +#ifndef NAZARA_AUDIO_ENUMS_HPP +#define NAZARA_AUDIO_ENUMS_HPP namespace Nz { @@ -37,4 +37,4 @@ namespace Nz constexpr std::size_t SoundStatusCount = static_cast(SoundStatus::Max) + 1; } -#endif // NAZARA_ENUMS_AUDIO_HPP +#endif // NAZARA_AUDIO_ENUMS_HPP diff --git a/include/Nazara/Audio/Music.hpp b/include/Nazara/Audio/Music.hpp index 78eeeafc2..f615e4559 100644 --- a/include/Nazara/Audio/Music.hpp +++ b/include/Nazara/Audio/Music.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MUSIC_HPP -#define NAZARA_MUSIC_HPP +#ifndef NAZARA_AUDIO_MUSIC_HPP +#define NAZARA_AUDIO_MUSIC_HPP #include #include @@ -64,4 +64,4 @@ namespace Nz }; } -#endif // NAZARA_MUSIC_HPP +#endif // NAZARA_AUDIO_MUSIC_HPP diff --git a/include/Nazara/Audio/OpenAL.hpp b/include/Nazara/Audio/OpenAL.hpp index a256154a6..dcf2ce0fa 100644 --- a/include/Nazara/Audio/OpenAL.hpp +++ b/include/Nazara/Audio/OpenAL.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENAL_HPP -#define NAZARA_OPENAL_HPP +#ifndef NAZARA_AUDIO_OPENAL_HPP +#define NAZARA_AUDIO_OPENAL_HPP #if defined(NAZARA_AUDIO_OPENAL) || defined(NAZARA_AUDIO_BUILD) @@ -189,4 +189,4 @@ NAZARA_AUDIO_API extern OpenALDetail::LPALCSUSPENDCONTEXT alcSuspendContext; #endif // NAZARA_AUDIO_OPENAL -#endif // NAZARA_OPENAL_HPP +#endif // NAZARA_AUDIO_OPENAL_HPP diff --git a/include/Nazara/Audio/Sound.hpp b/include/Nazara/Audio/Sound.hpp index 3bef42bd0..f991ed1ad 100644 --- a/include/Nazara/Audio/Sound.hpp +++ b/include/Nazara/Audio/Sound.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOUND_HPP -#define NAZARA_SOUND_HPP +#ifndef NAZARA_AUDIO_SOUND_HPP +#define NAZARA_AUDIO_SOUND_HPP #include #include @@ -53,4 +53,4 @@ namespace Nz }; } -#endif // NAZARA_SOUND_HPP +#endif // NAZARA_AUDIO_SOUND_HPP diff --git a/include/Nazara/Audio/SoundBuffer.hpp b/include/Nazara/Audio/SoundBuffer.hpp index 3449727b2..6fbb936d0 100644 --- a/include/Nazara/Audio/SoundBuffer.hpp +++ b/include/Nazara/Audio/SoundBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOUNDBUFFER_HPP -#define NAZARA_SOUNDBUFFER_HPP +#ifndef NAZARA_AUDIO_SOUNDBUFFER_HPP +#define NAZARA_AUDIO_SOUNDBUFFER_HPP #include #include @@ -75,4 +75,4 @@ namespace Nz #include -#endif // NAZARA_SOUNDBUFFER_HPP +#endif // NAZARA_AUDIO_SOUNDBUFFER_HPP diff --git a/include/Nazara/Audio/SoundEmitter.hpp b/include/Nazara/Audio/SoundEmitter.hpp index 54f18b271..c79c7bd2c 100644 --- a/include/Nazara/Audio/SoundEmitter.hpp +++ b/include/Nazara/Audio/SoundEmitter.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOUNDEMITTER_HPP -#define NAZARA_SOUNDEMITTER_HPP +#ifndef NAZARA_AUDIO_SOUNDEMITTER_HPP +#define NAZARA_AUDIO_SOUNDEMITTER_HPP #include #include @@ -71,4 +71,4 @@ namespace Nz #include -#endif // NAZARA_SOUNDEMITTER_HPP +#endif // NAZARA_AUDIO_SOUNDEMITTER_HPP diff --git a/include/Nazara/Audio/SoundStream.hpp b/include/Nazara/Audio/SoundStream.hpp index b4bba926d..37e9b906b 100644 --- a/include/Nazara/Audio/SoundStream.hpp +++ b/include/Nazara/Audio/SoundStream.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOUNDSTREAM_HPP -#define NAZARA_SOUNDSTREAM_HPP +#ifndef NAZARA_AUDIO_SOUNDSTREAM_HPP +#define NAZARA_AUDIO_SOUNDSTREAM_HPP #include #include @@ -51,4 +51,4 @@ namespace Nz }; } -#endif // NAZARA_SOUNDSTREAM_HPP +#endif // NAZARA_AUDIO_SOUNDSTREAM_HPP diff --git a/include/Nazara/Core.hpp b/include/Nazara/Core.hpp index 4862726d9..ac271b25e 100644 --- a/include/Nazara/Core.hpp +++ b/include/Nazara/Core.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Core module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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/Core/AbstractHash.hpp b/include/Nazara/Core/AbstractHash.hpp index 8d2846475..64e34430a 100644 --- a/include/Nazara/Core/AbstractHash.hpp +++ b/include/Nazara/Core/AbstractHash.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ABSTRACTHASH_HPP -#define NAZARA_ABSTRACTHASH_HPP +#ifndef NAZARA_CORE_ABSTRACTHASH_HPP +#define NAZARA_CORE_ABSTRACTHASH_HPP #include #include @@ -37,4 +37,4 @@ namespace Nz }; } -#endif // NAZARA_ABSTRACTHASH_HPP +#endif // NAZARA_CORE_ABSTRACTHASH_HPP diff --git a/include/Nazara/Core/AbstractLogger.hpp b/include/Nazara/Core/AbstractLogger.hpp index 18aa602fc..3673df296 100644 --- a/include/Nazara/Core/AbstractLogger.hpp +++ b/include/Nazara/Core/AbstractLogger.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ABSTRACTLOGGER_HPP -#define NAZARA_ABSTRACTLOGGER_HPP +#ifndef NAZARA_CORE_ABSTRACTLOGGER_HPP +#define NAZARA_CORE_ABSTRACTLOGGER_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_ABSTRACTLOGGER_HPP +#endif // NAZARA_CORE_ABSTRACTLOGGER_HPP diff --git a/include/Nazara/Core/Algorithm.hpp b/include/Nazara/Core/Algorithm.hpp index 1857bb0f7..dcba6a776 100644 --- a/include/Nazara/Core/Algorithm.hpp +++ b/include/Nazara/Core/Algorithm.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ALGORITHM_CORE_HPP -#define NAZARA_ALGORITHM_CORE_HPP +#ifndef NAZARA_CORE_ALGORITHM_HPP +#define NAZARA_CORE_ALGORITHM_HPP #include #include @@ -95,4 +95,4 @@ namespace Nz #include -#endif // NAZARA_ALGORITHM_CORE_HPP +#endif // NAZARA_CORE_ALGORITHM_HPP diff --git a/include/Nazara/Core/Bitset.hpp b/include/Nazara/Core/Bitset.hpp index 7e29f675a..a9719865f 100644 --- a/include/Nazara/Core/Bitset.hpp +++ b/include/Nazara/Core/Bitset.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BITSET_HPP -#define NAZARA_BITSET_HPP +#ifndef NAZARA_CORE_BITSET_HPP +#define NAZARA_CORE_BITSET_HPP #include #include @@ -205,4 +205,4 @@ namespace std #include -#endif // NAZARA_BITSET_HPP +#endif // NAZARA_CORE_BITSET_HPP diff --git a/include/Nazara/Core/ByteArray.hpp b/include/Nazara/Core/ByteArray.hpp index 95edc5609..c14fde704 100644 --- a/include/Nazara/Core/ByteArray.hpp +++ b/include/Nazara/Core/ByteArray.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BYTEARRAY_HPP -#define NAZARA_BYTEARRAY_HPP +#ifndef NAZARA_CORE_BYTEARRAY_HPP +#define NAZARA_CORE_BYTEARRAY_HPP #include #include @@ -139,4 +139,4 @@ namespace std #include -#endif // NAZARA_BYTEARRAY_HPP +#endif // NAZARA_CORE_BYTEARRAY_HPP diff --git a/include/Nazara/Core/ByteArrayPool.hpp b/include/Nazara/Core/ByteArrayPool.hpp index adb8f7ab6..cae8fc386 100644 --- a/include/Nazara/Core/ByteArrayPool.hpp +++ b/include/Nazara/Core/ByteArrayPool.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BYTEARRAYPOOL_HPP -#define NAZARA_BYTEARRAYPOOL_HPP +#ifndef NAZARA_CORE_BYTEARRAYPOOL_HPP +#define NAZARA_CORE_BYTEARRAYPOOL_HPP #include #include @@ -39,4 +39,4 @@ namespace Nz #include -#endif // NAZARA_BYTEARRAYPOOL_HPP +#endif // NAZARA_CORE_BYTEARRAYPOOL_HPP diff --git a/include/Nazara/Core/ByteStream.hpp b/include/Nazara/Core/ByteStream.hpp index 4084173bb..18fc8af00 100644 --- a/include/Nazara/Core/ByteStream.hpp +++ b/include/Nazara/Core/ByteStream.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BYTESTREAM_HPP -#define NAZARA_BYTESTREAM_HPP +#ifndef NAZARA_CORE_BYTESTREAM_HPP +#define NAZARA_CORE_BYTESTREAM_HPP #include #include @@ -64,4 +64,4 @@ namespace Nz #include -#endif // NAZARA_BYTESTREAM_HPP +#endif // NAZARA_CORE_BYTESTREAM_HPP diff --git a/include/Nazara/Core/CallOnExit.hpp b/include/Nazara/Core/CallOnExit.hpp index 8d20d20f4..f1dccc1ad 100644 --- a/include/Nazara/Core/CallOnExit.hpp +++ b/include/Nazara/Core/CallOnExit.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CALLONEXIT_HPP -#define NAZARA_CALLONEXIT_HPP +#ifndef NAZARA_CORE_CALLONEXIT_HPP +#define NAZARA_CORE_CALLONEXIT_HPP #include #include @@ -35,4 +35,4 @@ namespace Nz #include -#endif // NAZARA_CALLONEXIT_HPP +#endif // NAZARA_CORE_CALLONEXIT_HPP diff --git a/include/Nazara/Core/Clock.hpp b/include/Nazara/Core/Clock.hpp index e5cbeb39a..dbbc3d6d3 100644 --- a/include/Nazara/Core/Clock.hpp +++ b/include/Nazara/Core/Clock.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CLOCK_HPP -#define NAZARA_CLOCK_HPP +#ifndef NAZARA_CORE_CLOCK_HPP +#define NAZARA_CORE_CLOCK_HPP #include @@ -44,4 +44,4 @@ namespace Nz extern NAZARA_CORE_API ClockFunction GetElapsedMilliseconds; } -#endif // NAZARA_CLOCK_HPP +#endif // NAZARA_CORE_CLOCK_HPP diff --git a/include/Nazara/Core/Color.hpp b/include/Nazara/Core/Color.hpp index eba414818..bf8e3b59f 100644 --- a/include/Nazara/Core/Color.hpp +++ b/include/Nazara/Core/Color.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_COLOR_HPP -#define NAZARA_COLOR_HPP +#ifndef NAZARA_CORE_COLOR_HPP +#define NAZARA_CORE_COLOR_HPP #include #include @@ -79,4 +79,4 @@ std::ostream& operator<<(std::ostream& out, const Nz::Color& color); #include -#endif // NAZARA_COLOR_HPP +#endif // NAZARA_CORE_COLOR_HPP diff --git a/include/Nazara/Core/Config.hpp b/include/Nazara/Core/Config.hpp index 33d219c18..5567b03ab 100644 --- a/include/Nazara/Core/Config.hpp +++ b/include/Nazara/Core/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CORE_HPP -#define NAZARA_CONFIG_CORE_HPP +#ifndef NAZARA_CORE_CONFIG_HPP +#define NAZARA_CORE_CONFIG_HPP /*! * \defgroup core (NazaraCore) Core module @@ -83,4 +83,4 @@ #endif #endif -#endif // NAZARA_CONFIG_CORE_HPP +#endif // NAZARA_CORE_CONFIG_HPP diff --git a/include/Nazara/Core/ConfigCheck.hpp b/include/Nazara/Core/ConfigCheck.hpp index 6c624e864..b1a2c3e07 100644 --- a/include/Nazara/Core/ConfigCheck.hpp +++ b/include/Nazara/Core/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_CORE_HPP -#define NAZARA_CONFIG_CHECK_CORE_HPP +#ifndef NAZARA_CORE_CONFIGCHECK_HPP +#define NAZARA_CORE_CONFIGCHECK_HPP /// This file is used to check the constant values defined in Config.hpp @@ -24,4 +24,4 @@ NazaraCheckTypeAndVal(NAZARA_CORE_WINDOWS_CS_SPINLOCKS, integral, >=, 0, " shall #undef NazaraCheckTypeAndVal -#endif // NAZARA_CONFIG_CHECK_CORE_HPP +#endif // NAZARA_CORE_CONFIGCHECK_HPP diff --git a/include/Nazara/Core/Debug.hpp b/include/Nazara/Core/Debug.hpp index cbbdb6d4f..7321b5fc4 100644 --- a/include/Nazara/Core/Debug.hpp +++ b/include/Nazara/Core/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_CORE_MANAGE_MEMORY #include diff --git a/include/Nazara/Core/Debug/NewRedefinition.hpp b/include/Nazara/Core/Debug/NewRedefinition.hpp index 8c9c0aaf1..0553d86f8 100644 --- a/include/Nazara/Core/Debug/NewRedefinition.hpp +++ b/include/Nazara/Core/Debug/NewRedefinition.hpp @@ -2,13 +2,14 @@ // This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp -// Pas de #pragma once car ce fichier est prévu pour être inclus plusieurs fois +// no header guards #include + #if NAZARA_CORE_MANAGE_MEMORY -#ifndef NAZARA_DEBUG_NEWREDEFINITION_HPP -#define NAZARA_DEBUG_NEWREDEFINITION_HPP +#ifndef NAZARA_CORE_DEBUG_NEWREDEFINITION_HPP +#define NAZARA_CORE_DEBUG_NEWREDEFINITION_HPP #include #include @@ -25,4 +26,4 @@ NAZARA_CORE_API void operator delete[](void* ptr, const char* file, unsigned int #define new new(__FILE__, __LINE__) #endif -#endif // NAZARA_CORE_MANAGE_MEMORY +#endif // NAZARA_CORE_DEBUG_NEWREDEFINITION_HPP diff --git a/include/Nazara/Core/DebugOff.hpp b/include/Nazara/Core/DebugOff.hpp index 2153a471a..2bfbdd563 100644 --- a/include/Nazara/Core/DebugOff.hpp +++ b/include/Nazara/Core/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // We assume that Debug.hpp has already been included, same thing for Config.hpp #if NAZARA_CORE_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Core/DynLib.hpp b/include/Nazara/Core/DynLib.hpp index 4b6255bf7..43884ed82 100644 --- a/include/Nazara/Core/DynLib.hpp +++ b/include/Nazara/Core/DynLib.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_DYNLIB_HPP -#define NAZARA_DYNLIB_HPP +#ifndef NAZARA_CORE_DYNLIB_HPP +#define NAZARA_CORE_DYNLIB_HPP #include #include @@ -52,4 +52,4 @@ namespace Nz }; } -#endif // NAZARA_DYNLIB_HPP +#endif // NAZARA_CORE_DYNLIB_HPP diff --git a/include/Nazara/Core/ECS.hpp b/include/Nazara/Core/ECS.hpp index 116cfd05f..49261e190 100644 --- a/include/Nazara/Core/ECS.hpp +++ b/include/Nazara/Core/ECS.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ECS_HPP -#define NAZARA_ECS_HPP +#ifndef NAZARA_CORE_ECS_HPP +#define NAZARA_CORE_ECS_HPP #include #include @@ -45,4 +45,4 @@ namespace Nz #include -#endif +#endif // NAZARA_CORE_ECS_HPP diff --git a/include/Nazara/Core/EmptyStream.hpp b/include/Nazara/Core/EmptyStream.hpp index 6f3d1ab81..9821a65f8 100644 --- a/include/Nazara/Core/EmptyStream.hpp +++ b/include/Nazara/Core/EmptyStream.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_EMPTYSTREAM_HPP -#define NAZARA_EMPTYSTREAM_HPP +#ifndef NAZARA_CORE_EMPTYSTREAM_HPP +#define NAZARA_CORE_EMPTYSTREAM_HPP #include #include @@ -43,4 +43,4 @@ namespace Nz #include -#endif // NAZARA_EMPTYSTREAM_HPP +#endif // NAZARA_CORE_EMPTYSTREAM_HPP diff --git a/include/Nazara/Core/Endianness.hpp b/include/Nazara/Core/Endianness.hpp index 67ee97408..62ba15dab 100644 --- a/include/Nazara/Core/Endianness.hpp +++ b/include/Nazara/Core/Endianness.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENDIANNESS_HPP -#define NAZARA_ENDIANNESS_HPP +#ifndef NAZARA_CORE_ENDIANNESS_HPP +#define NAZARA_CORE_ENDIANNESS_HPP #include #include @@ -34,4 +34,4 @@ namespace Nz #include -#endif // NAZARA_ENDIANNESS_HPP +#endif // NAZARA_CORE_ENDIANNESS_HPP diff --git a/include/Nazara/Core/Enums.hpp b/include/Nazara/Core/Enums.hpp index 471963b8f..1f8426f8f 100644 --- a/include/Nazara/Core/Enums.hpp +++ b/include/Nazara/Core/Enums.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENUMS_CORE_HPP -#define NAZARA_ENUMS_CORE_HPP +#ifndef NAZARA_CORE_ENUMS_HPP +#define NAZARA_CORE_ENUMS_HPP #include @@ -232,4 +232,4 @@ namespace Nz }; } -#endif // NAZARA_ENUMS_CORE_HPP +#endif // NAZARA_CORE_ENUMS_HPP diff --git a/include/Nazara/Core/Error.hpp b/include/Nazara/Core/Error.hpp index 81d9d379e..e8d43fdf6 100644 --- a/include/Nazara/Core/Error.hpp +++ b/include/Nazara/Core/Error.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ERROR_HPP -#define NAZARA_ERROR_HPP +#ifndef NAZARA_CORE_ERROR_HPP +#define NAZARA_CORE_ERROR_HPP #include #include @@ -51,4 +51,4 @@ namespace Nz }; } -#endif // NAZARA_ERROR_HPP +#endif // NAZARA_CORE_ERROR_HPP diff --git a/include/Nazara/Core/ErrorFlags.hpp b/include/Nazara/Core/ErrorFlags.hpp index 901e4a2b8..dba2168da 100644 --- a/include/Nazara/Core/ErrorFlags.hpp +++ b/include/Nazara/Core/ErrorFlags.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ERRORFLAGS_HPP -#define NAZARA_ERRORFLAGS_HPP +#ifndef NAZARA_CORE_ERRORFLAGS_HPP +#define NAZARA_CORE_ERRORFLAGS_HPP #include #include @@ -32,4 +32,4 @@ namespace Nz }; } -#endif // NAZARA_ERRORFLAGS_HPP +#endif // NAZARA_CORE_ERRORFLAGS_HPP diff --git a/include/Nazara/Core/File.hpp b/include/Nazara/Core/File.hpp index 144f67b32..3d490a89e 100644 --- a/include/Nazara/Core/File.hpp +++ b/include/Nazara/Core/File.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FILE_HPP -#define NAZARA_FILE_HPP +#ifndef NAZARA_CORE_FILE_HPP +#define NAZARA_CORE_FILE_HPP #include #include @@ -76,4 +76,4 @@ namespace Nz #include -#endif // NAZARA_FILE_HPP +#endif // NAZARA_CORE_FILE_HPP diff --git a/include/Nazara/Core/FileLogger.hpp b/include/Nazara/Core/FileLogger.hpp index 060333bed..5371477fc 100644 --- a/include/Nazara/Core/FileLogger.hpp +++ b/include/Nazara/Core/FileLogger.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FILELOGGER_HPP -#define NAZARA_FILELOGGER_HPP +#ifndef NAZARA_CORE_FILELOGGER_HPP +#define NAZARA_CORE_FILELOGGER_HPP #include #include @@ -45,4 +45,4 @@ namespace Nz }; } -#endif // NAZARA_FILELOGGER_HPP +#endif // NAZARA_CORE_FILELOGGER_HPP diff --git a/include/Nazara/Core/Flags.hpp b/include/Nazara/Core/Flags.hpp index a9423895d..0a542b7da 100644 --- a/include/Nazara/Core/Flags.hpp +++ b/include/Nazara/Core/Flags.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FLAGS_HPP -#define NAZARA_FLAGS_HPP +#ifndef NAZARA_CORE_FLAGS_HPP +#define NAZARA_CORE_FLAGS_HPP #include #include @@ -101,4 +101,4 @@ using namespace Nz::FlagsOperators; #include -#endif // NAZARA_FLAGS_HPP +#endif // NAZARA_CORE_FLAGS_HPP diff --git a/include/Nazara/Core/Functor.hpp b/include/Nazara/Core/Functor.hpp index 3598094b6..6b802a247 100644 --- a/include/Nazara/Core/Functor.hpp +++ b/include/Nazara/Core/Functor.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FUNCTOR_HPP -#define NAZARA_FUNCTOR_HPP +#ifndef NAZARA_CORE_FUNCTOR_HPP +#define NAZARA_CORE_FUNCTOR_HPP #include @@ -58,4 +58,4 @@ namespace Nz #include -#endif // NAZARA_FUNCTOR_HPP +#endif // NAZARA_CORE_FUNCTOR_HPP diff --git a/include/Nazara/Core/GuillotineBinPack.hpp b/include/Nazara/Core/GuillotineBinPack.hpp index 7ba6d2f22..f2a661d19 100644 --- a/include/Nazara/Core/GuillotineBinPack.hpp +++ b/include/Nazara/Core/GuillotineBinPack.hpp @@ -7,8 +7,8 @@ #pragma once -#ifndef NAZARA_GUILLOTINEBINPACK_HPP -#define NAZARA_GUILLOTINEBINPACK_HPP +#ifndef NAZARA_CORE_GUILLOTINEBINPACK_HPP +#define NAZARA_CORE_GUILLOTINEBINPACK_HPP #include #include @@ -87,4 +87,4 @@ namespace Nz }; } -#endif // NAZARA_GUILLOTINEBINPACK_HPP +#endif // NAZARA_CORE_GUILLOTINEBINPACK_HPP diff --git a/include/Nazara/Core/HandledObject.hpp b/include/Nazara/Core/HandledObject.hpp index 8afed3ad4..4d86094bc 100644 --- a/include/Nazara/Core/HandledObject.hpp +++ b/include/Nazara/Core/HandledObject.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OBJECTHANDLER_HPP -#define NAZARA_OBJECTHANDLER_HPP +#ifndef NAZARA_CORE_HANDLEDOBJECT_HPP +#define NAZARA_CORE_HANDLEDOBJECT_HPP #include #include @@ -59,4 +59,4 @@ namespace Nz #include -#endif // NAZARA_OBJECTHANDLER_HPP +#endif // NAZARA_CORE_HANDLEDOBJECT_HPP diff --git a/include/Nazara/Core/HardwareInfo.hpp b/include/Nazara/Core/HardwareInfo.hpp index de6883885..abe8fa4cb 100644 --- a/include/Nazara/Core/HardwareInfo.hpp +++ b/include/Nazara/Core/HardwareInfo.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HARDWAREINFO_HPP -#define NAZARA_HARDWAREINFO_HPP +#ifndef NAZARA_CORE_HARDWAREINFO_HPP +#define NAZARA_CORE_HARDWAREINFO_HPP #include #include @@ -38,4 +38,4 @@ namespace Nz }; } -#endif // NAZARA_HARDWAREINFO_HPP +#endif // NAZARA_CORE_HARDWAREINFO_HPP diff --git a/include/Nazara/Core/Hash/CRC32.hpp b/include/Nazara/Core/Hash/CRC32.hpp index 09ac931a5..27393b903 100644 --- a/include/Nazara/Core/Hash/CRC32.hpp +++ b/include/Nazara/Core/Hash/CRC32.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HASH_CRC32_HPP -#define NAZARA_HASH_CRC32_HPP +#ifndef NAZARA_CORE_HASH_CRC32_HPP +#define NAZARA_CORE_HASH_CRC32_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_HASH_CRC32_HPP +#endif // NAZARA_CORE_HASH_CRC32_HPP diff --git a/include/Nazara/Core/Hash/CRC64.hpp b/include/Nazara/Core/Hash/CRC64.hpp index f9ba85928..c427ac349 100644 --- a/include/Nazara/Core/Hash/CRC64.hpp +++ b/include/Nazara/Core/Hash/CRC64.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HASH_CRC64_HPP -#define NAZARA_HASH_CRC64_HPP +#ifndef NAZARA_CORE_HASH_CRC64_HPP +#define NAZARA_CORE_HASH_CRC64_HPP #include #include @@ -31,4 +31,4 @@ namespace Nz }; } -#endif // NAZARA_HASH_CRC64_HPP +#endif // NAZARA_CORE_HASH_CRC64_HPP diff --git a/include/Nazara/Core/Hash/Fletcher16.hpp b/include/Nazara/Core/Hash/Fletcher16.hpp index 276d5707a..7e8b1fe41 100644 --- a/include/Nazara/Core/Hash/Fletcher16.hpp +++ b/include/Nazara/Core/Hash/Fletcher16.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HASH_FLETCHER16_HPP -#define NAZARA_HASH_FLETCHER16_HPP +#ifndef NAZARA_CORE_HASH_FLETCHER16_HPP +#define NAZARA_CORE_HASH_FLETCHER16_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_HASH_FLETCHER16_HPP +#endif // NAZARA_CORE_HASH_FLETCHER16_HPP diff --git a/include/Nazara/Core/Hash/MD5.hpp b/include/Nazara/Core/Hash/MD5.hpp index 98cb3bdaf..6db0258d3 100644 --- a/include/Nazara/Core/Hash/MD5.hpp +++ b/include/Nazara/Core/Hash/MD5.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HASH_MD5_HPP -#define NAZARA_HASH_MD5_HPP +#ifndef NAZARA_CORE_HASH_MD5_HPP +#define NAZARA_CORE_HASH_MD5_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_HASH_MD5_HPP +#endif // NAZARA_CORE_HASH_MD5_HPP diff --git a/include/Nazara/Core/Hash/SHA1.hpp b/include/Nazara/Core/Hash/SHA1.hpp index 316d77332..79419d115 100644 --- a/include/Nazara/Core/Hash/SHA1.hpp +++ b/include/Nazara/Core/Hash/SHA1.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HASH_SHA1_HPP -#define NAZARA_HASH_SHA1_HPP +#ifndef NAZARA_CORE_HASH_SHA1_HPP +#define NAZARA_CORE_HASH_SHA1_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_HASH_SHA1_HPP +#endif // NAZARA_CORE_HASH_SHA1_HPP diff --git a/include/Nazara/Core/Hash/SHA224.hpp b/include/Nazara/Core/Hash/SHA224.hpp index 4552c94aa..acb019ddc 100644 --- a/include/Nazara/Core/Hash/SHA224.hpp +++ b/include/Nazara/Core/Hash/SHA224.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HASH_SHA224_HPP -#define NAZARA_HASH_SHA224_HPP +#ifndef NAZARA_CORE_HASH_SHA224_HPP +#define NAZARA_CORE_HASH_SHA224_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_HASH_SHA224_HPP +#endif // NAZARA_CORE_HASH_SHA224_HPP diff --git a/include/Nazara/Core/Hash/SHA256.hpp b/include/Nazara/Core/Hash/SHA256.hpp index 11edd7917..6a7578179 100644 --- a/include/Nazara/Core/Hash/SHA256.hpp +++ b/include/Nazara/Core/Hash/SHA256.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HASH_SHA256_HPP -#define NAZARA_HASH_SHA256_HPP +#ifndef NAZARA_CORE_HASH_SHA256_HPP +#define NAZARA_CORE_HASH_SHA256_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_HASH_SHA256_HPP +#endif // NAZARA_CORE_HASH_SHA256_HPP diff --git a/include/Nazara/Core/Hash/SHA384.hpp b/include/Nazara/Core/Hash/SHA384.hpp index ef22dd7a4..dd3000972 100644 --- a/include/Nazara/Core/Hash/SHA384.hpp +++ b/include/Nazara/Core/Hash/SHA384.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HASH_SHA384_HPP -#define NAZARA_HASH_SHA384_HPP +#ifndef NAZARA_CORE_HASH_SHA384_HPP +#define NAZARA_CORE_HASH_SHA384_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_HASH_SHA384_HPP +#endif // NAZARA_CORE_HASH_SHA384_HPP diff --git a/include/Nazara/Core/Hash/SHA512.hpp b/include/Nazara/Core/Hash/SHA512.hpp index 6e5be37f4..c1b0bc662 100644 --- a/include/Nazara/Core/Hash/SHA512.hpp +++ b/include/Nazara/Core/Hash/SHA512.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HASH_SHA512_HPP -#define NAZARA_HASH_SHA512_HPP +#ifndef NAZARA_CORE_HASH_SHA512_HPP +#define NAZARA_CORE_HASH_SHA512_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_HASH_SHA512_HPP +#endif // NAZARA_CORE_HASH_SHA512_HPP diff --git a/include/Nazara/Core/Hash/Whirlpool.hpp b/include/Nazara/Core/Hash/Whirlpool.hpp index a6ef4f4a3..13d19f75f 100644 --- a/include/Nazara/Core/Hash/Whirlpool.hpp +++ b/include/Nazara/Core/Hash/Whirlpool.hpp @@ -2,8 +2,10 @@ // This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp -#ifndef NAZARA_HASH_WHIRLPOOL_HPP -#define NAZARA_HASH_WHIRLPOOL_HPP +#pragma once + +#ifndef NAZARA_CORE_HASH_WHIRLPOOL_HPP +#define NAZARA_CORE_HASH_WHIRLPOOL_HPP #include #include @@ -31,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_HASH_WHIRLPOOL_HPP +#endif // NAZARA_CORE_HASH_WHIRLPOOL_HPP diff --git a/include/Nazara/Core/Initializer.hpp b/include/Nazara/Core/Initializer.hpp index 1fce1c376..e61d3993a 100644 --- a/include/Nazara/Core/Initializer.hpp +++ b/include/Nazara/Core/Initializer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_INITIALIZER_HPP -#define NAZARA_INITIALIZER_HPP +#ifndef NAZARA_CORE_INITIALIZER_HPP +#define NAZARA_CORE_INITIALIZER_HPP #include @@ -36,4 +36,4 @@ namespace Nz #include -#endif // NAZARA_INITIALIZER_HPP +#endif // NAZARA_CORE_INITIALIZER_HPP diff --git a/include/Nazara/Core/Log.hpp b/include/Nazara/Core/Log.hpp index 15445e091..5b9b19721 100644 --- a/include/Nazara/Core/Log.hpp +++ b/include/Nazara/Core/Log.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOG_HPP -#define NAZARA_LOG_HPP +#ifndef NAZARA_CORE_LOG_HPP +#define NAZARA_CORE_LOG_HPP #include #include @@ -51,4 +51,4 @@ namespace Nz }; } -#endif // NAZARA_LOGGER_HPP +#endif // NAZARA_CORE_LOG_HPP diff --git a/include/Nazara/Core/MemoryHelper.hpp b/include/Nazara/Core/MemoryHelper.hpp index 67b35df0e..ca023a27b 100644 --- a/include/Nazara/Core/MemoryHelper.hpp +++ b/include/Nazara/Core/MemoryHelper.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MEMORYHELPER_HPP -#define NAZARA_MEMORYHELPER_HPP +#ifndef NAZARA_CORE_MEMORYHELPER_HPP +#define NAZARA_CORE_MEMORYHELPER_HPP #if defined(NAZARA_COMPILER_MSVC) || defined(NAZARA_COMPILER_MINGW) @@ -41,4 +41,4 @@ namespace Nz #include -#endif // NAZARA_MEMORYHELPER_HPP +#endif // NAZARA_CORE_MEMORYHELPER_HPP diff --git a/include/Nazara/Core/MemoryManager.hpp b/include/Nazara/Core/MemoryManager.hpp index b3016bd6f..280ceeee1 100644 --- a/include/Nazara/Core/MemoryManager.hpp +++ b/include/Nazara/Core/MemoryManager.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MEMORYMANAGER_HPP -#define NAZARA_MEMORYMANAGER_HPP +#ifndef NAZARA_CORE_MEMORYMANAGER_HPP +#define NAZARA_CORE_MEMORYMANAGER_HPP #include #include @@ -41,4 +41,4 @@ namespace Nz }; } -#endif // NAZARA_MEMORYMANAGER_HPP +#endif // NAZARA_CORE_MEMORYMANAGER_HPP diff --git a/include/Nazara/Core/MemoryPool.hpp b/include/Nazara/Core/MemoryPool.hpp index dd9ebfd65..27c8cf07e 100644 --- a/include/Nazara/Core/MemoryPool.hpp +++ b/include/Nazara/Core/MemoryPool.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MEMORYPOOL_HPP -#define NAZARA_MEMORYPOOL_HPP +#ifndef NAZARA_CORE_MEMORYPOOL_HPP +#define NAZARA_CORE_MEMORYPOOL_HPP #include #include @@ -52,4 +52,4 @@ namespace Nz #include -#endif // NAZARA_MEMORYPOOL_HPP +#endif // NAZARA_CORE_MEMORYPOOL_HPP diff --git a/include/Nazara/Core/MemoryStream.hpp b/include/Nazara/Core/MemoryStream.hpp index 3fb3c8e88..0470d616f 100644 --- a/include/Nazara/Core/MemoryStream.hpp +++ b/include/Nazara/Core/MemoryStream.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MEMORYSTREAM_HPP -#define NAZARA_MEMORYSTREAM_HPP +#ifndef NAZARA_CORE_MEMORYSTREAM_HPP +#define NAZARA_CORE_MEMORYSTREAM_HPP #include #include @@ -51,4 +51,4 @@ namespace Nz #include -#endif // NAZARA_MEMORYSTREAM_HPP +#endif // NAZARA_CORE_MEMORYSTREAM_HPP diff --git a/include/Nazara/Core/MemoryView.hpp b/include/Nazara/Core/MemoryView.hpp index 6cf0322b2..c854ec410 100644 --- a/include/Nazara/Core/MemoryView.hpp +++ b/include/Nazara/Core/MemoryView.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MEMORYVIEW_HPP -#define NAZARA_MEMORYVIEW_HPP +#ifndef NAZARA_CORE_MEMORYVIEW_HPP +#define NAZARA_CORE_MEMORYVIEW_HPP #include #include @@ -42,4 +42,4 @@ namespace Nz }; } -#endif // NAZARA_MEMORYVIEW_HPP +#endif // NAZARA_CORE_MEMORYVIEW_HPP diff --git a/include/Nazara/Core/ModuleBase.hpp b/include/Nazara/Core/ModuleBase.hpp index fb0a7d3f3..055b548e3 100644 --- a/include/Nazara/Core/ModuleBase.hpp +++ b/include/Nazara/Core/ModuleBase.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MODULE_HPP -#define NAZARA_MODULE_HPP +#ifndef NAZARA_CORE_MODULEBASE_HPP +#define NAZARA_CORE_MODULEBASE_HPP #include #include @@ -44,4 +44,4 @@ namespace Nz #include -#endif // NAZARA_MODULE_HPP +#endif // NAZARA_CORE_MODULEBASE_HPP diff --git a/include/Nazara/Core/Modules.hpp b/include/Nazara/Core/Modules.hpp index c1501ff76..5dbb3a7a7 100644 --- a/include/Nazara/Core/Modules.hpp +++ b/include/Nazara/Core/Modules.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MODULES_HPP -#define NAZARA_MODULES_HPP +#ifndef NAZARA_CORE_MODULES_HPP +#define NAZARA_CORE_MODULES_HPP #include @@ -51,4 +51,4 @@ namespace Nz #include -#endif +#endif // NAZARA_CORE_MODULES_HPP diff --git a/include/Nazara/Core/MovablePtr.hpp b/include/Nazara/Core/MovablePtr.hpp index d2c4abf28..d3aad584b 100644 --- a/include/Nazara/Core/MovablePtr.hpp +++ b/include/Nazara/Core/MovablePtr.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MOVABLE_PTR_HPP -#define NAZARA_MOVABLE_PTR_HPP +#ifndef NAZARA_CORE_MOVABLEPTR_HPP +#define NAZARA_CORE_MOVABLEPTR_HPP namespace Nz { @@ -35,4 +35,4 @@ namespace Nz #include -#endif // NAZARA_MOVABLE_PTR_HPP +#endif // NAZARA_CORE_MOVABLEPTR_HPP diff --git a/include/Nazara/Core/MovableValue.hpp b/include/Nazara/Core/MovableValue.hpp index 480abc57b..4f00c50ae 100644 --- a/include/Nazara/Core/MovableValue.hpp +++ b/include/Nazara/Core/MovableValue.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MOVABLE_VALUE_HPP -#define NAZARA_MOVABLE_VALUE_HPP +#ifndef NAZARA_CORE_MOVABLEVALUE_HPP +#define NAZARA_CORE_MOVABLEVALUE_HPP namespace Nz { @@ -35,4 +35,4 @@ namespace Nz #include -#endif // NAZARA_MOVABLE_VALUE_HPP +#endif // NAZARA_CORE_MOVABLEVALUE_HPP diff --git a/include/Nazara/Core/ObjectHandle.hpp b/include/Nazara/Core/ObjectHandle.hpp index e54d845bc..d2d67d8ac 100644 --- a/include/Nazara/Core/ObjectHandle.hpp +++ b/include/Nazara/Core/ObjectHandle.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OBJECTHANDLE_HPP -#define NAZARA_OBJECTHANDLE_HPP +#ifndef NAZARA_CORE_OBJECTHANDLE_HPP +#define NAZARA_CORE_OBJECTHANDLE_HPP #include #include @@ -98,4 +98,4 @@ namespace std #include -#endif // NAZARA_OBJECTHANDLE_HPP +#endif // NAZARA_CORE_OBJECTHANDLE_HPP diff --git a/include/Nazara/Core/ObjectLibrary.hpp b/include/Nazara/Core/ObjectLibrary.hpp index e74211855..0bc4475ff 100644 --- a/include/Nazara/Core/ObjectLibrary.hpp +++ b/include/Nazara/Core/ObjectLibrary.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OBJECTLIBRARY_HPP -#define NAZARA_OBJECTLIBRARY_HPP +#ifndef NAZARA_CORE_OBJECTLIBRARY_HPP +#define NAZARA_CORE_OBJECTLIBRARY_HPP #include #include @@ -38,4 +38,4 @@ namespace Nz #include -#endif // NAZARA_OBJECTLIBRARY_HPP +#endif // NAZARA_CORE_OBJECTLIBRARY_HPP diff --git a/include/Nazara/Core/ObjectRef.hpp b/include/Nazara/Core/ObjectRef.hpp index d8c2e70d4..a9051f4db 100644 --- a/include/Nazara/Core/ObjectRef.hpp +++ b/include/Nazara/Core/ObjectRef.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RESOURCEREF_HPP -#define NAZARA_RESOURCEREF_HPP +#ifndef NAZARA_CORE_OBJECTREF_HPP +#define NAZARA_CORE_OBJECTREF_HPP #include #include @@ -79,4 +79,4 @@ namespace Nz #include -#endif // NAZARA_RESOURCEREF_HPP +#endif // NAZARA_CORE_OBJECTREF_HPP diff --git a/include/Nazara/Core/OffsetOf.hpp b/include/Nazara/Core/OffsetOf.hpp index b8b406164..3ec9a264a 100644 --- a/include/Nazara/Core/OffsetOf.hpp +++ b/include/Nazara/Core/OffsetOf.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OFFSETOF_HPP -#define NAZARA_OFFSETOF_HPP +#ifndef NAZARA_CORE_OFFSETOF_HPP +#define NAZARA_CORE_OFFSETOF_HPP // By "Jesse Good" from SO: // http://stackoverflow.com/questions/12811330/c-compile-time-offsetof-inside-a-template?answertab=votes#tab-top @@ -27,4 +27,4 @@ namespace Nz #define NazaraOffsetOf(type, member) Nz::Detail::OffsetOf() -#endif // NAZARA_OFFSETOF_HPP +#endif // NAZARA_CORE_OFFSETOF_HPP diff --git a/include/Nazara/Core/ParameterList.hpp b/include/Nazara/Core/ParameterList.hpp index 1b696c3e0..df54b140c 100644 --- a/include/Nazara/Core/ParameterList.hpp +++ b/include/Nazara/Core/ParameterList.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PARAMETERLIST_HPP -#define NAZARA_PARAMETERLIST_HPP +#ifndef NAZARA_CORE_PARAMETERLIST_HPP +#define NAZARA_CORE_PARAMETERLIST_HPP #include #include @@ -109,4 +109,4 @@ std::ostream& operator<<(std::ostream& out, const Nz::ParameterList& parameterLi #include -#endif // NAZARA_PARAMETERLIST_HPP +#endif // NAZARA_CORE_PARAMETERLIST_HPP diff --git a/include/Nazara/Core/PluginManager.hpp b/include/Nazara/Core/PluginManager.hpp index 88a85da71..67fa5ae8f 100644 --- a/include/Nazara/Core/PluginManager.hpp +++ b/include/Nazara/Core/PluginManager.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PLUGINMANAGER_HPP -#define NAZARA_PLUGINMANAGER_HPP +#ifndef NAZARA_CORE_PLUGINMANAGER_HPP +#define NAZARA_CORE_PLUGINMANAGER_HPP #include #include @@ -54,4 +54,4 @@ namespace Nz }; } -#endif // NAZARA_PLUGINMANAGER_HPP +#endif // NAZARA_CORE_PLUGINMANAGER_HPP diff --git a/include/Nazara/Core/PoolByteStream.hpp b/include/Nazara/Core/PoolByteStream.hpp index 1582905b3..84c509fbc 100644 --- a/include/Nazara/Core/PoolByteStream.hpp +++ b/include/Nazara/Core/PoolByteStream.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_POOLBYTESTREAM_HPP -#define NAZARA_POOLBYTESTREAM_HPP +#ifndef NAZARA_CORE_POOLBYTESTREAM_HPP +#define NAZARA_CORE_POOLBYTESTREAM_HPP #include #include @@ -43,4 +43,4 @@ namespace Nz #include -#endif // NAZARA_POOLBYTESTREAM_HPP +#endif // NAZARA_CORE_POOLBYTESTREAM_HPP diff --git a/include/Nazara/Core/Primitive.hpp b/include/Nazara/Core/Primitive.hpp index 666f72f8b..8caed1be8 100644 --- a/include/Nazara/Core/Primitive.hpp +++ b/include/Nazara/Core/Primitive.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PRIMITIVE_HPP -#define NAZARA_PRIMITIVE_HPP +#ifndef NAZARA_CORE_PRIMITIVE_HPP +#define NAZARA_CORE_PRIMITIVE_HPP #include #include @@ -108,4 +108,4 @@ namespace Nz #include -#endif // NAZARA_PRIMITIVE_HPP +#endif // NAZARA_CORE_PRIMITIVE_HPP diff --git a/include/Nazara/Core/PrimitiveList.hpp b/include/Nazara/Core/PrimitiveList.hpp index 1d0dfcf75..358171f8a 100644 --- a/include/Nazara/Core/PrimitiveList.hpp +++ b/include/Nazara/Core/PrimitiveList.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PRIMITIVELIST_HPP -#define NAZARA_PRIMITIVELIST_HPP +#ifndef NAZARA_CORE_PRIMITIVELIST_HPP +#define NAZARA_CORE_PRIMITIVELIST_HPP #include #include @@ -51,4 +51,4 @@ namespace Nz }; } -#endif // NAZARA_PRIMITIVELIST_HPP +#endif // NAZARA_CORE_PRIMITIVELIST_HPP diff --git a/include/Nazara/Core/RefCounted.hpp b/include/Nazara/Core/RefCounted.hpp index 330d0a37f..67380de47 100644 --- a/include/Nazara/Core/RefCounted.hpp +++ b/include/Nazara/Core/RefCounted.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_REFCOUNTED_HPP -#define NAZARA_REFCOUNTED_HPP +#ifndef NAZARA_CORE_REFCOUNTED_HPP +#define NAZARA_CORE_REFCOUNTED_HPP #include #include @@ -39,4 +39,4 @@ namespace Nz }; } -#endif // NAZARA_RESOURCE_HPP +#endif // NAZARA_CORE_REFCOUNTED_HPP diff --git a/include/Nazara/Core/Resource.hpp b/include/Nazara/Core/Resource.hpp index 74664ab20..cbf3b3ed9 100644 --- a/include/Nazara/Core/Resource.hpp +++ b/include/Nazara/Core/Resource.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RESOURCE_HPP -#define NAZARA_RESOURCE_HPP +#ifndef NAZARA_CORE_RESOURCE_HPP +#define NAZARA_CORE_RESOURCE_HPP #include #include @@ -32,4 +32,4 @@ namespace Nz }; } -#endif // NAZARA_RESOURCE_HPP +#endif // NAZARA_CORE_RESOURCE_HPP diff --git a/include/Nazara/Core/ResourceLoader.hpp b/include/Nazara/Core/ResourceLoader.hpp index 86146dcaa..866322324 100644 --- a/include/Nazara/Core/ResourceLoader.hpp +++ b/include/Nazara/Core/ResourceLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RESOURCELOADER_HPP -#define NAZARA_RESOURCELOADER_HPP +#ifndef NAZARA_CORE_RESOURCELOADER_HPP +#define NAZARA_CORE_RESOURCELOADER_HPP #include #include @@ -70,4 +70,4 @@ namespace Nz #include -#endif // NAZARA_RESOURCELOADER_HPP +#endif // NAZARA_CORE_RESOURCELOADER_HPP diff --git a/include/Nazara/Core/ResourceManager.hpp b/include/Nazara/Core/ResourceManager.hpp index c2c2b9c51..5e889dcd5 100644 --- a/include/Nazara/Core/ResourceManager.hpp +++ b/include/Nazara/Core/ResourceManager.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RESOURCEMANAGER_HPP -#define NAZARA_RESOURCEMANAGER_HPP +#ifndef NAZARA_CORE_RESOURCEMANAGER_HPP +#define NAZARA_CORE_RESOURCEMANAGER_HPP #include #include @@ -55,4 +55,4 @@ namespace Nz #include -#endif // NAZARA_RESOURCEMANAGER_HPP +#endif // NAZARA_CORE_RESOURCEMANAGER_HPP diff --git a/include/Nazara/Core/ResourceParameters.hpp b/include/Nazara/Core/ResourceParameters.hpp index 20980adec..125b1624b 100644 --- a/include/Nazara/Core/ResourceParameters.hpp +++ b/include/Nazara/Core/ResourceParameters.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RESOURCEPARAMETERS_HPP -#define NAZARA_RESOURCEPARAMETERS_HPP +#ifndef NAZARA_CORE_RESOURCEPARAMETERS_HPP +#define NAZARA_CORE_RESOURCEPARAMETERS_HPP #include @@ -17,4 +17,4 @@ namespace Nz }; } -#endif // NAZARA_RESOURCEPARAMETERS_HPP +#endif // NAZARA_CORE_RESOURCEPARAMETERS_HPP diff --git a/include/Nazara/Core/ResourceSaver.hpp b/include/Nazara/Core/ResourceSaver.hpp index 3b14dee71..e03ec7228 100644 --- a/include/Nazara/Core/ResourceSaver.hpp +++ b/include/Nazara/Core/ResourceSaver.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RESOURCESAVER_HPP -#define NAZARA_RESOURCESAVER_HPP +#ifndef NAZARA_CORE_RESOURCESAVER_HPP +#define NAZARA_CORE_RESOURCESAVER_HPP #include #include @@ -65,4 +65,4 @@ namespace Nz #include -#endif // NAZARA_RESOURCESAVER_HPP +#endif // NAZARA_CORE_RESOURCESAVER_HPP diff --git a/include/Nazara/Core/SerializationContext.hpp b/include/Nazara/Core/SerializationContext.hpp index 7970fb83b..4d95adcc4 100644 --- a/include/Nazara/Core/SerializationContext.hpp +++ b/include/Nazara/Core/SerializationContext.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SERIALIZATION_HPP -#define NAZARA_SERIALIZATION_HPP +#ifndef NAZARA_CORE_SERIALIZATIONCONTEXT_HPP +#define NAZARA_CORE_SERIALIZATIONCONTEXT_HPP #include #include @@ -34,4 +34,4 @@ namespace Nz #include -#endif // NAZARA_SERIALIZATION_HPP +#endif // NAZARA_CORE_SERIALIZATIONCONTEXT_HPP diff --git a/include/Nazara/Core/Signal.hpp b/include/Nazara/Core/Signal.hpp index 0855c8b73..d64a0ef22 100644 --- a/include/Nazara/Core/Signal.hpp +++ b/include/Nazara/Core/Signal.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SIGNAL_HPP -#define NAZARA_SIGNAL_HPP +#ifndef NAZARA_CORE_SIGNAL_HPP +#define NAZARA_CORE_SIGNAL_HPP #include #include @@ -136,4 +136,4 @@ namespace Nz #include -#endif // NAZARA_SIGNAL_HPP +#endif // NAZARA_CORE_SIGNAL_HPP diff --git a/include/Nazara/Core/SparsePtr.hpp b/include/Nazara/Core/SparsePtr.hpp index 0d4cd5d93..beb6fbcbe 100644 --- a/include/Nazara/Core/SparsePtr.hpp +++ b/include/Nazara/Core/SparsePtr.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPARSEPTR_HPP -#define NAZARA_SPARSEPTR_HPP +#ifndef NAZARA_CORE_SPARSEPTR_HPP +#define NAZARA_CORE_SPARSEPTR_HPP ///FIXME: Is SparsePtr a really good name for this class ? @@ -80,4 +80,4 @@ namespace Nz #include -#endif // NAZARA_SPARSEPTR_HPP +#endif // NAZARA_CORE_SPARSEPTR_HPP diff --git a/include/Nazara/Core/StackArray.hpp b/include/Nazara/Core/StackArray.hpp index 28857ce85..e52cfd33e 100644 --- a/include/Nazara/Core/StackArray.hpp +++ b/include/Nazara/Core/StackArray.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_STACKARRAY_HPP -#define NAZARA_STACKARRAY_HPP +#ifndef NAZARA_CORE_STACKARRAY_HPP +#define NAZARA_CORE_STACKARRAY_HPP #include #include @@ -97,4 +97,4 @@ namespace Nz #include -#endif // NAZARA_STACKARRAY_HPP +#endif // NAZARA_CORE_STACKARRAY_HPP diff --git a/include/Nazara/Core/StackVector.hpp b/include/Nazara/Core/StackVector.hpp index b0c5349bb..27d77f371 100644 --- a/include/Nazara/Core/StackVector.hpp +++ b/include/Nazara/Core/StackVector.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_STACKVECTOR_HPP -#define NAZARA_STACKVECTOR_HPP +#ifndef NAZARA_CORE_STACKVECTOR_HPP +#define NAZARA_CORE_STACKVECTOR_HPP #include #include @@ -116,4 +116,4 @@ namespace Nz #include -#endif // NAZARA_STACKVECTOR_HPP +#endif // NAZARA_CORE_STACKVECTOR_HPP diff --git a/include/Nazara/Core/StdLogger.hpp b/include/Nazara/Core/StdLogger.hpp index 724cc09df..ae6919bab 100644 --- a/include/Nazara/Core/StdLogger.hpp +++ b/include/Nazara/Core/StdLogger.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_STDLOGGER_HPP -#define NAZARA_STDLOGGER_HPP +#ifndef NAZARA_CORE_STDLOGGER_HPP +#define NAZARA_CORE_STDLOGGER_HPP #include #include @@ -32,4 +32,4 @@ namespace Nz }; } -#endif // NAZARA_STDLOGGER_HPP +#endif // NAZARA_CORE_STDLOGGER_HPP diff --git a/include/Nazara/Core/Stream.hpp b/include/Nazara/Core/Stream.hpp index bd4a53f0b..c9d56bc56 100644 --- a/include/Nazara/Core/Stream.hpp +++ b/include/Nazara/Core/Stream.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_STREAM_HPP -#define NAZARA_STREAM_HPP +#ifndef NAZARA_CORE_STREAM_HPP +#define NAZARA_CORE_STREAM_HPP #include #include @@ -69,4 +69,4 @@ namespace Nz #include -#endif // NAZARA_STREAM_HPP +#endif // NAZARA_CORE_STREAM_HPP diff --git a/include/Nazara/Core/StringExt.hpp b/include/Nazara/Core/StringExt.hpp index 4cf3a922b..9b37ee773 100644 --- a/include/Nazara/Core/StringExt.hpp +++ b/include/Nazara/Core/StringExt.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CORE_STRING_EXT_HPP -#define NAZARA_CORE_STRING_EXT_HPP +#ifndef NAZARA_CORE_STRINGEXT_HPP +#define NAZARA_CORE_STRINGEXT_HPP #include #include @@ -86,4 +86,4 @@ namespace Nz #include -#endif // NAZARA_ALGORITHM_CORE_HPP +#endif // NAZARA_CORE_STRINGEXT_HPP diff --git a/include/Nazara/Core/TaskScheduler.hpp b/include/Nazara/Core/TaskScheduler.hpp index a2a4daea8..6f6cc9d39 100644 --- a/include/Nazara/Core/TaskScheduler.hpp +++ b/include/Nazara/Core/TaskScheduler.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TASKSCHEDULER_HPP -#define NAZARA_TASKSCHEDULER_HPP +#ifndef NAZARA_CORE_TASKSCHEDULER_HPP +#define NAZARA_CORE_TASKSCHEDULER_HPP #include #include @@ -35,4 +35,4 @@ namespace Nz #include -#endif // NAZARA_TASKSCHEDULER_HPP +#endif // NAZARA_CORE_TASKSCHEDULER_HPP diff --git a/include/Nazara/Core/TypeList.hpp b/include/Nazara/Core/TypeList.hpp index 2c7429c7b..68df34432 100644 --- a/include/Nazara/Core/TypeList.hpp +++ b/include/Nazara/Core/TypeList.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TYPELIST_HPP -#define NAZARA_TYPELIST_HPP +#ifndef NAZARA_CORE_TYPELIST_HPP +#define NAZARA_CORE_TYPELIST_HPP #include @@ -76,4 +76,4 @@ namespace Nz #include -#endif // NAZARA_TYPELIST_HPP +#endif // NAZARA_CORE_TYPELIST_HPP diff --git a/include/Nazara/Core/TypeTag.hpp b/include/Nazara/Core/TypeTag.hpp index 22e32a622..cc0ad2017 100644 --- a/include/Nazara/Core/TypeTag.hpp +++ b/include/Nazara/Core/TypeTag.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TYPETAG_HPP -#define NAZARA_TYPETAG_HPP +#ifndef NAZARA_CORE_TYPETAG_HPP +#define NAZARA_CORE_TYPETAG_HPP namespace Nz { @@ -16,4 +16,4 @@ namespace Nz }; } -#endif // NAZARA_TYPETAG_HPP +#endif // NAZARA_CORE_TYPETAG_HPP diff --git a/include/Nazara/Core/Unicode.hpp b/include/Nazara/Core/Unicode.hpp index 78db09a3e..f2f122a9e 100644 --- a/include/Nazara/Core/Unicode.hpp +++ b/include/Nazara/Core/Unicode.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_UNICODE_HPP -#define NAZARA_UNICODE_HPP +#ifndef NAZARA_CORE_UNICODE_HPP +#define NAZARA_CORE_UNICODE_HPP #include #include @@ -114,4 +114,4 @@ namespace Nz }; } -#endif // NAZARA_UNICODE_HPP +#endif // NAZARA_CORE_UNICODE_HPP diff --git a/include/Nazara/Core/Updatable.hpp b/include/Nazara/Core/Updatable.hpp index 11bdee8ef..e7e6f8999 100644 --- a/include/Nazara/Core/Updatable.hpp +++ b/include/Nazara/Core/Updatable.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_UPDATABLE_HPP -#define NAZARA_UPDATABLE_HPP +#ifndef NAZARA_CORE_UPDATABLE_HPP +#define NAZARA_CORE_UPDATABLE_HPP #include @@ -21,4 +21,4 @@ namespace Nz }; } -#endif // NAZARA_UPDATABLE_HPP +#endif // NAZARA_CORE_UPDATABLE_HPP diff --git a/include/Nazara/Debug.hpp b/include/Nazara/Debug.hpp index e5621d346..02acb0b8e 100644 --- a/include/Nazara/Debug.hpp +++ b/include/Nazara/Debug.hpp @@ -2,4 +2,6 @@ // This file is part of the "Nazara Engine" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include diff --git a/include/Nazara/DebugOff.hpp b/include/Nazara/DebugOff.hpp index 806548460..7e92572a6 100644 --- a/include/Nazara/DebugOff.hpp +++ b/include/Nazara/DebugOff.hpp @@ -2,5 +2,7 @@ // This file is part of the "Nazara Engine" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #undef delete #undef new diff --git a/include/Nazara/Graphics.hpp b/include/Nazara/Graphics.hpp index 81199025a..c177e9104 100644 --- a/include/Nazara/Graphics.hpp +++ b/include/Nazara/Graphics.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Graphics module - Copyright (C) 2020 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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 @@ -30,6 +30,7 @@ #define NAZARA_GLOBAL_GRAPHICS_HPP #include +#include #include #include #include diff --git a/include/Nazara/Graphics/AbstractViewer.hpp b/include/Nazara/Graphics/AbstractViewer.hpp index bf7d93033..477b42f3a 100644 --- a/include/Nazara/Graphics/AbstractViewer.hpp +++ b/include/Nazara/Graphics/AbstractViewer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ABSTRACTVIEWER_HPP -#define NAZARA_ABSTRACTVIEWER_HPP +#ifndef NAZARA_GRAPHICS_ABSTRACTVIEWER_HPP +#define NAZARA_GRAPHICS_ABSTRACTVIEWER_HPP #include #include @@ -31,4 +31,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_ABSTRACTVIEWER_HPP diff --git a/include/Nazara/Graphics/Algorithm.hpp b/include/Nazara/Graphics/Algorithm.hpp index d367a30f6..a5211f64a 100644 --- a/include/Nazara/Graphics/Algorithm.hpp +++ b/include/Nazara/Graphics/Algorithm.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ALGORITHM_GRAPHICS_HPP -#define NAZARA_ALGORITHM_GRAPHICS_HPP +#ifndef NAZARA_GRAPHICS_ALGORITHM_HPP +#define NAZARA_GRAPHICS_ALGORITHM_HPP #include @@ -16,4 +16,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_ALGORITHM_HPP diff --git a/include/Nazara/Graphics/BakedFrameGraph.hpp b/include/Nazara/Graphics/BakedFrameGraph.hpp index c546b38e0..fdd65c0b2 100644 --- a/include/Nazara/Graphics/BakedFrameGraph.hpp +++ b/include/Nazara/Graphics/BakedFrameGraph.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BAKEDFRAMEGRAPH_HPP -#define NAZARA_BAKEDFRAMEGRAPH_HPP +#ifndef NAZARA_GRAPHICS_BAKEDFRAMEGRAPH_HPP +#define NAZARA_GRAPHICS_BAKEDFRAMEGRAPH_HPP #include #include @@ -100,4 +100,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_BAKEDFRAMEGRAPH_HPP diff --git a/include/Nazara/Graphics/BasicMaterial.hpp b/include/Nazara/Graphics/BasicMaterial.hpp index 583f30698..a298bf73d 100644 --- a/include/Nazara/Graphics/BasicMaterial.hpp +++ b/include/Nazara/Graphics/BasicMaterial.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BASIC_MATERIAL_HPP -#define NAZARA_BASIC_MATERIAL_HPP +#ifndef NAZARA_GRAPHICS_BASICMATERIAL_HPP +#define NAZARA_GRAPHICS_BASICMATERIAL_HPP #include #include @@ -96,4 +96,4 @@ namespace Nz #include -#endif // NAZARA_BASIC_MATERIAL_HPP +#endif // NAZARA_GRAPHICS_BASICMATERIAL_HPP diff --git a/include/Nazara/Graphics/Camera.hpp b/include/Nazara/Graphics/Camera.hpp index e6fc218ff..9d260d5af 100644 --- a/include/Nazara/Graphics/Camera.hpp +++ b/include/Nazara/Graphics/Camera.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CAMERA_HPP -#define NAZARA_CAMERA_HPP +#ifndef NAZARA_GRAPHICS_CAMERA_HPP +#define NAZARA_GRAPHICS_CAMERA_HPP #include #include @@ -73,4 +73,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_CAMERA_HPP diff --git a/include/Nazara/Graphics/Components.hpp b/include/Nazara/Graphics/Components.hpp index d181aac51..9c5e78a37 100644 --- a/include/Nazara/Graphics/Components.hpp +++ b/include/Nazara/Graphics/Components.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Graphics module - Copyright (C) 2020 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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 @@ -26,10 +26,10 @@ #pragma once -#ifndef NAZARA_GLOBAL_GRAPHICS_COMPONENTS_HPP -#define NAZARA_GLOBAL_GRAPHICS_COMPONENTS_HPP +#ifndef NAZARA_GRAPHICS_COMPONENTS_HPP +#define NAZARA_GRAPHICS_COMPONENTS_HPP #include #include -#endif // NAZARA_GLOBAL_GRAPHICS_COMPONENTS_HPP +#endif // NAZARA_GRAPHICS_COMPONENTS_HPP diff --git a/include/Nazara/Graphics/Components/CameraComponent.hpp b/include/Nazara/Graphics/Components/CameraComponent.hpp index 196542cb0..dc2862471 100644 --- a/include/Nazara/Graphics/Components/CameraComponent.hpp +++ b/include/Nazara/Graphics/Components/CameraComponent.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CAMERACOMPONENT_HPP -#define NAZARA_CAMERACOMPONENT_HPP +#ifndef NAZARA_GRAPHICS_COMPONENTS_CAMERACOMPONENT_HPP +#define NAZARA_GRAPHICS_COMPONENTS_CAMERACOMPONENT_HPP #include #include @@ -27,4 +27,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_COMPONENTS_CAMERACOMPONENT_HPP diff --git a/include/Nazara/Graphics/Components/GraphicsComponent.hpp b/include/Nazara/Graphics/Components/GraphicsComponent.hpp index db580e683..612dae985 100644 --- a/include/Nazara/Graphics/Components/GraphicsComponent.hpp +++ b/include/Nazara/Graphics/Components/GraphicsComponent.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_GRAPHICSCOMPONENT_HPP -#define NAZARA_GRAPHICSCOMPONENT_HPP +#ifndef NAZARA_GRAPHICS_COMPONENTS_GRAPHICSCOMPONENT_HPP +#define NAZARA_GRAPHICS_COMPONENTS_GRAPHICSCOMPONENT_HPP #include #include @@ -44,4 +44,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_COMPONENTS_GRAPHICSCOMPONENT_HPP diff --git a/include/Nazara/Graphics/Config.hpp b/include/Nazara/Graphics/Config.hpp index b34dffd97..d0f780ac1 100644 --- a/include/Nazara/Graphics/Config.hpp +++ b/include/Nazara/Graphics/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_GRAPHICS_HPP -#define NAZARA_CONFIG_GRAPHICS_HPP +#ifndef NAZARA_GRAPHICS_CONFIG_HPP +#define NAZARA_GRAPHICS_CONFIG_HPP /*! * \defgroup graphics (NazaraGraphics) Graphics module @@ -53,4 +53,4 @@ #define NAZARA_GRAPHICS_API #endif -#endif // NAZARA_CONFIG_GRAPHICS_HPP +#endif // NAZARA_GRAPHICS_CONFIG_HPP diff --git a/include/Nazara/Graphics/ConfigCheck.hpp b/include/Nazara/Graphics/ConfigCheck.hpp index 3446372b6..de52fe6c4 100644 --- a/include/Nazara/Graphics/ConfigCheck.hpp +++ b/include/Nazara/Graphics/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_GRAPHICS_HPP -#define NAZARA_CONFIG_CHECK_GRAPHICS_HPP +#ifndef NAZARA_GRAPHICS_CONFIGCHECK_HPP +#define NAZARA_GRAPHICS_CONFIGCHECK_HPP /// This file is used to check the constant values defined in Config.hpp @@ -20,4 +20,4 @@ #undef NazaraCheckTypeAndVal -#endif // NAZARA_CONFIG_CHECK_GRAPHICS_HPP +#endif // NAZARA_GRAPHICS_CONFIGCHECK_HPP diff --git a/include/Nazara/Graphics/CullingList.hpp b/include/Nazara/Graphics/CullingList.hpp index a3b22dc81..86cc49e25 100644 --- a/include/Nazara/Graphics/CullingList.hpp +++ b/include/Nazara/Graphics/CullingList.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CULLINGLIST_HPP -#define NAZARA_CULLINGLIST_HPP +#ifndef NAZARA_GRAPHICS_CULLINGLIST_HPP +#define NAZARA_GRAPHICS_CULLINGLIST_HPP #include #include @@ -212,4 +212,4 @@ namespace Nz #include -#endif // NAZARA_CULLINGLIST_HPP +#endif // NAZARA_GRAPHICS_CULLINGLIST_HPP diff --git a/include/Nazara/Graphics/Debug.hpp b/include/Nazara/Graphics/Debug.hpp index a0ba0b50e..e16af147f 100644 --- a/include/Nazara/Graphics/Debug.hpp +++ b/include/Nazara/Graphics/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_GRAPHICS_MANAGE_MEMORY #include diff --git a/include/Nazara/Graphics/DebugOff.hpp b/include/Nazara/Graphics/DebugOff.hpp index 5e95587f5..556d4cf8f 100644 --- a/include/Nazara/Graphics/DebugOff.hpp +++ b/include/Nazara/Graphics/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // We assume that Debug.hpp has already been included, same thing for Config.hpp #if NAZARA_GRAPHICS_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Graphics/DepthMaterial.hpp b/include/Nazara/Graphics/DepthMaterial.hpp index d4fd21ad4..1923ab773 100644 --- a/include/Nazara/Graphics/DepthMaterial.hpp +++ b/include/Nazara/Graphics/DepthMaterial.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_DEPTH_MATERIAL_HPP -#define NAZARA_DEPTH_MATERIAL_HPP +#ifndef NAZARA_GRAPHICS_DEPTHMATERIAL_HPP +#define NAZARA_GRAPHICS_DEPTHMATERIAL_HPP #include #include @@ -35,4 +35,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_DEPTHMATERIAL_HPP diff --git a/include/Nazara/Graphics/ElementRenderer.hpp b/include/Nazara/Graphics/ElementRenderer.hpp index 810951dd6..ea6a4da96 100644 --- a/include/Nazara/Graphics/ElementRenderer.hpp +++ b/include/Nazara/Graphics/ElementRenderer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ELEMENTRENDERER_HPP -#define NAZARA_ELEMENTRENDERER_HPP +#ifndef NAZARA_GRAPHICS_ELEMENTRENDERER_HPP +#define NAZARA_GRAPHICS_ELEMENTRENDERER_HPP #include #include @@ -42,4 +42,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_ELEMENTRENDERER_HPP diff --git a/include/Nazara/Graphics/Enums.hpp b/include/Nazara/Graphics/Enums.hpp index 9f714fb06..a1b985a98 100644 --- a/include/Nazara/Graphics/Enums.hpp +++ b/include/Nazara/Graphics/Enums.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENUMS_GRAPHICS_HPP -#define NAZARA_ENUMS_GRAPHICS_HPP +#ifndef NAZARA_GRAPHICS_ENUMS_HPP +#define NAZARA_GRAPHICS_ENUMS_HPP #include #include @@ -52,4 +52,4 @@ namespace Nz }; } -#endif // NAZARA_ENUMS_GRAPHICS_HPP +#endif // NAZARA_GRAPHICS_ENUMS_HPP diff --git a/include/Nazara/Graphics/ForwardFramePipeline.hpp b/include/Nazara/Graphics/ForwardFramePipeline.hpp index 6cbc6964f..135356944 100644 --- a/include/Nazara/Graphics/ForwardFramePipeline.hpp +++ b/include/Nazara/Graphics/ForwardFramePipeline.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FORWARDFRAMEPIPELINE_HPP -#define NAZARA_FORWARDFRAMEPIPELINE_HPP +#ifndef NAZARA_GRAPHICS_FORWARDFRAMEPIPELINE_HPP +#define NAZARA_GRAPHICS_FORWARDFRAMEPIPELINE_HPP #include #include @@ -110,4 +110,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_FORWARDFRAMEPIPELINE_HPP diff --git a/include/Nazara/Graphics/FrameGraph.hpp b/include/Nazara/Graphics/FrameGraph.hpp index 344a8f14d..b250b1ffc 100644 --- a/include/Nazara/Graphics/FrameGraph.hpp +++ b/include/Nazara/Graphics/FrameGraph.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FRAMEGRAPH_HPP -#define NAZARA_FRAMEGRAPH_HPP +#ifndef NAZARA_GRAPHICS_FRAMEGRAPH_HPP +#define NAZARA_GRAPHICS_FRAMEGRAPH_HPP #include #include @@ -118,4 +118,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_FRAMEGRAPH_HPP diff --git a/include/Nazara/Graphics/FramePass.hpp b/include/Nazara/Graphics/FramePass.hpp index 705bf7216..2766d6ead 100644 --- a/include/Nazara/Graphics/FramePass.hpp +++ b/include/Nazara/Graphics/FramePass.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FRAMEPASS_HPP -#define NAZARA_FRAMEPASS_HPP +#ifndef NAZARA_GRAPHICS_FRAMEPASS_HPP +#define NAZARA_GRAPHICS_FRAMEPASS_HPP #include #include @@ -102,4 +102,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_FRAMEPASS_HPP diff --git a/include/Nazara/Graphics/FramePassAttachment.hpp b/include/Nazara/Graphics/FramePassAttachment.hpp index 4d8929e86..0bbc111b7 100644 --- a/include/Nazara/Graphics/FramePassAttachment.hpp +++ b/include/Nazara/Graphics/FramePassAttachment.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FRAMEPASSATTACHMENT_HPP -#define NAZARA_FRAMEPASSATTACHMENT_HPP +#ifndef NAZARA_GRAPHICS_FRAMEPASSATTACHMENT_HPP +#define NAZARA_GRAPHICS_FRAMEPASSATTACHMENT_HPP #include #include @@ -25,4 +25,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_FRAMEPASSATTACHMENT_HPP diff --git a/include/Nazara/Graphics/FramePipeline.hpp b/include/Nazara/Graphics/FramePipeline.hpp index 140bc4351..2967fd85c 100644 --- a/include/Nazara/Graphics/FramePipeline.hpp +++ b/include/Nazara/Graphics/FramePipeline.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FRAMEPIPELINE_HPP -#define NAZARA_FRAMEPIPELINE_HPP +#ifndef NAZARA_GRAPHICS_FRAMEPIPELINE_HPP +#define NAZARA_GRAPHICS_FRAMEPIPELINE_HPP #include #include @@ -43,4 +43,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_FRAMEPIPELINE_HPP diff --git a/include/Nazara/Graphics/GraphicalMesh.hpp b/include/Nazara/Graphics/GraphicalMesh.hpp index 501e69334..ad60c0d26 100644 --- a/include/Nazara/Graphics/GraphicalMesh.hpp +++ b/include/Nazara/Graphics/GraphicalMesh.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_GRAPHICALMESH_HPP -#define NAZARA_GRAPHICALMESH_HPP +#ifndef NAZARA_GRAPHICS_GRAPHICALMESH_HPP +#define NAZARA_GRAPHICS_GRAPHICALMESH_HPP #include #include @@ -47,4 +47,4 @@ namespace Nz #include -#endif // NAZARA_GRAPHICALMESH_HPP +#endif // NAZARA_GRAPHICS_GRAPHICALMESH_HPP diff --git a/include/Nazara/Graphics/Graphics.hpp b/include/Nazara/Graphics/Graphics.hpp index 6a7f4a2d8..90f6045fe 100644 --- a/include/Nazara/Graphics/Graphics.hpp +++ b/include/Nazara/Graphics/Graphics.hpp @@ -92,4 +92,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_HPP diff --git a/include/Nazara/Graphics/GuillotineTextureAtlas.hpp b/include/Nazara/Graphics/GuillotineTextureAtlas.hpp index 9bea01d83..94b50cdb0 100644 --- a/include/Nazara/Graphics/GuillotineTextureAtlas.hpp +++ b/include/Nazara/Graphics/GuillotineTextureAtlas.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_GUILLOTINETEXTUREATLAS_HPP -#define NAZARA_GUILLOTINETEXTUREATLAS_HPP +#ifndef NAZARA_GRAPHICS_GUILLOTINETEXTUREATLAS_HPP +#define NAZARA_GRAPHICS_GUILLOTINETEXTUREATLAS_HPP #include #include @@ -32,4 +32,4 @@ namespace Nz #include -#endif // NAZARA_GUILLOTINETEXTUREATLAS_HPP +#endif // NAZARA_GRAPHICS_GUILLOTINETEXTUREATLAS_HPP diff --git a/include/Nazara/Graphics/InstancedRenderable.hpp b/include/Nazara/Graphics/InstancedRenderable.hpp index 12fa5cdab..b3164c3c4 100644 --- a/include/Nazara/Graphics/InstancedRenderable.hpp +++ b/include/Nazara/Graphics/InstancedRenderable.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_INSTANCEDRENDERABLE_HPP -#define NAZARA_INSTANCEDRENDERABLE_HPP +#ifndef NAZARA_GRAPHICS_INSTANCEDRENDERABLE_HPP +#define NAZARA_GRAPHICS_INSTANCEDRENDERABLE_HPP #include #include @@ -46,4 +46,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_INSTANCEDRENDERABLE_HPP diff --git a/include/Nazara/Graphics/Material.hpp b/include/Nazara/Graphics/Material.hpp index 73be0c4c0..042eb201e 100644 --- a/include/Nazara/Graphics/Material.hpp +++ b/include/Nazara/Graphics/Material.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MATERIAL_HPP -#define NAZARA_MATERIAL_HPP +#ifndef NAZARA_GRAPHICS_MATERIAL_HPP +#define NAZARA_GRAPHICS_MATERIAL_HPP #include #include @@ -36,4 +36,4 @@ namespace Nz #include -#endif // NAZARA_MATERIAL_HPP +#endif // NAZARA_GRAPHICS_MATERIAL_HPP diff --git a/include/Nazara/Graphics/MaterialPass.hpp b/include/Nazara/Graphics/MaterialPass.hpp index 58885a693..d863def35 100644 --- a/include/Nazara/Graphics/MaterialPass.hpp +++ b/include/Nazara/Graphics/MaterialPass.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MATERIAL_PASS_HPP -#define NAZARA_MATERIAL_PASS_HPP +#ifndef NAZARA_GRAPHICS_MATERIALPASS_HPP +#define NAZARA_GRAPHICS_MATERIALPASS_HPP #include #include @@ -146,4 +146,4 @@ namespace Nz #include -#endif // NAZARA_MATERIAL_PASS_HPP +#endif // NAZARA_GRAPHICS_MATERIALPASS_HPP diff --git a/include/Nazara/Graphics/MaterialPassRegistry.hpp b/include/Nazara/Graphics/MaterialPassRegistry.hpp index 697126444..eb7826a3b 100644 --- a/include/Nazara/Graphics/MaterialPassRegistry.hpp +++ b/include/Nazara/Graphics/MaterialPassRegistry.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MATERIAL_PASS_REGISTRY_HPP -#define NAZARA_MATERIAL_PASS_REGISTRY_HPP +#ifndef NAZARA_GRAPHICS_MATERIALPASSREGISTRY_HPP +#define NAZARA_GRAPHICS_MATERIALPASSREGISTRY_HPP #include #include @@ -35,4 +35,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_MATERIALPASSREGISTRY_HPP diff --git a/include/Nazara/Graphics/MaterialPipeline.hpp b/include/Nazara/Graphics/MaterialPipeline.hpp index d6a330cf6..ed7ebea1d 100644 --- a/include/Nazara/Graphics/MaterialPipeline.hpp +++ b/include/Nazara/Graphics/MaterialPipeline.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MATERIALPIPELINE_HPP -#define NAZARA_MATERIALPIPELINE_HPP +#ifndef NAZARA_GRAPHICS_MATERIALPIPELINE_HPP +#define NAZARA_GRAPHICS_MATERIALPIPELINE_HPP #include #include @@ -70,4 +70,4 @@ namespace Nz #include -#endif // NAZARA_MATERIALPIPELINE_HPP +#endif // NAZARA_GRAPHICS_MATERIALPIPELINE_HPP diff --git a/include/Nazara/Graphics/MaterialSettings.hpp b/include/Nazara/Graphics/MaterialSettings.hpp index 630572f11..6df859238 100644 --- a/include/Nazara/Graphics/MaterialSettings.hpp +++ b/include/Nazara/Graphics/MaterialSettings.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MATERIALSETTINGS_HPP -#define NAZARA_MATERIALSETTINGS_HPP +#ifndef NAZARA_GRAPHICS_MATERIALSETTINGS_HPP +#define NAZARA_GRAPHICS_MATERIALSETTINGS_HPP #include #include @@ -112,4 +112,4 @@ namespace Nz #include -#endif // NAZARA_MATERIALPIPELINESETTINGS_HPP +#endif // NAZARA_GRAPHICS_MATERIALSETTINGS_HPP diff --git a/include/Nazara/Graphics/Model.hpp b/include/Nazara/Graphics/Model.hpp index a3924693a..2984c279d 100644 --- a/include/Nazara/Graphics/Model.hpp +++ b/include/Nazara/Graphics/Model.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MODEL_HPP -#define NAZARA_MODEL_HPP +#ifndef NAZARA_GRAPHICS_MODEL_HPP +#define NAZARA_GRAPHICS_MODEL_HPP #include #include @@ -57,4 +57,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_MODEL_HPP diff --git a/include/Nazara/Graphics/PhongLightingMaterial.hpp b/include/Nazara/Graphics/PhongLightingMaterial.hpp index 72b0685ed..1f92482f2 100644 --- a/include/Nazara/Graphics/PhongLightingMaterial.hpp +++ b/include/Nazara/Graphics/PhongLightingMaterial.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PHONG_LIGHTING_MATERIAL_HPP -#define NAZARA_PHONG_LIGHTING_MATERIAL_HPP +#ifndef NAZARA_GRAPHICS_PHONGLIGHTINGMATERIAL_HPP +#define NAZARA_GRAPHICS_PHONGLIGHTINGMATERIAL_HPP #include #include @@ -100,4 +100,4 @@ namespace Nz #include -#endif // NAZARA_PHONG_LIGHTING_MATERIAL_HPP +#endif // NAZARA_GRAPHICS_PHONGLIGHTINGMATERIAL_HPP diff --git a/include/Nazara/Graphics/PredefinedShaderStructs.hpp b/include/Nazara/Graphics/PredefinedShaderStructs.hpp index 0e4ac79ae..03be0e3f7 100644 --- a/include/Nazara/Graphics/PredefinedShaderStructs.hpp +++ b/include/Nazara/Graphics/PredefinedShaderStructs.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PREDEFINEDSHADERSTRUCTS_HPP -#define NAZARA_PREDEFINEDSHADERSTRUCTS_HPP +#ifndef NAZARA_GRAPHICS_PREDEFINEDSHADERSTRUCTS_HPP +#define NAZARA_GRAPHICS_PREDEFINEDSHADERSTRUCTS_HPP #include #include @@ -63,4 +63,4 @@ namespace Nz #include -#endif // NAZARA_PREDEFINEDSHADERSTRUCTS_HPP +#endif // NAZARA_GRAPHICS_PREDEFINEDSHADERSTRUCTS_HPP diff --git a/include/Nazara/Graphics/RenderElement.hpp b/include/Nazara/Graphics/RenderElement.hpp index f5b563c3f..57dff6876 100644 --- a/include/Nazara/Graphics/RenderElement.hpp +++ b/include/Nazara/Graphics/RenderElement.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERELEMENT_HPP -#define NAZARA_RENDERELEMENT_HPP +#ifndef NAZARA_GRAPHICS_RENDERELEMENT_HPP +#define NAZARA_GRAPHICS_RENDERELEMENT_HPP #include #include @@ -38,4 +38,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_RENDERELEMENT_HPP diff --git a/include/Nazara/Graphics/RenderQueue.hpp b/include/Nazara/Graphics/RenderQueue.hpp index 57bcd1a1c..2637e8b91 100644 --- a/include/Nazara/Graphics/RenderQueue.hpp +++ b/include/Nazara/Graphics/RenderQueue.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERQUEUE_HPP -#define NAZARA_RENDERQUEUE_HPP +#ifndef NAZARA_GRAPHICS_RENDERQUEUE_HPP +#define NAZARA_GRAPHICS_RENDERQUEUE_HPP #include #include @@ -46,4 +46,4 @@ namespace Nz #include -#endif // NAZARA_RENDERQUEUE_HPP +#endif // NAZARA_GRAPHICS_RENDERQUEUE_HPP diff --git a/include/Nazara/Graphics/RenderQueueRegistry.hpp b/include/Nazara/Graphics/RenderQueueRegistry.hpp index 9a9c87044..2f2e230f5 100644 --- a/include/Nazara/Graphics/RenderQueueRegistry.hpp +++ b/include/Nazara/Graphics/RenderQueueRegistry.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERQUEUEREGISTRY_HPP -#define NAZARA_RENDERQUEUEREGISTRY_HPP +#ifndef NAZARA_GRAPHICS_RENDERQUEUEREGISTRY_HPP +#define NAZARA_GRAPHICS_RENDERQUEUEREGISTRY_HPP #include #include @@ -44,4 +44,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_RENDERQUEUEREGISTRY_HPP diff --git a/include/Nazara/Graphics/RenderSpriteChain.hpp b/include/Nazara/Graphics/RenderSpriteChain.hpp index 54577e425..3609c6fec 100644 --- a/include/Nazara/Graphics/RenderSpriteChain.hpp +++ b/include/Nazara/Graphics/RenderSpriteChain.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERSUBMESH_HPP -#define NAZARA_RENDERSUBMESH_HPP +#ifndef NAZARA_GRAPHICS_RENDERSPRITECHAIN_HPP +#define NAZARA_GRAPHICS_RENDERSPRITECHAIN_HPP #include #include @@ -54,4 +54,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_RENDERSPRITECHAIN_HPP diff --git a/include/Nazara/Graphics/RenderSubmesh.hpp b/include/Nazara/Graphics/RenderSubmesh.hpp index a95d4e72f..39a2d5b67 100644 --- a/include/Nazara/Graphics/RenderSubmesh.hpp +++ b/include/Nazara/Graphics/RenderSubmesh.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERSUBMESH_HPP -#define NAZARA_RENDERSUBMESH_HPP +#ifndef NAZARA_GRAPHICS_RENDERSUBMESH_HPP +#define NAZARA_GRAPHICS_RENDERSUBMESH_HPP #include #include @@ -51,4 +51,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_RENDERSUBMESH_HPP diff --git a/include/Nazara/Graphics/Sprite.hpp b/include/Nazara/Graphics/Sprite.hpp index 0a806f98c..3491b8f7a 100644 --- a/include/Nazara/Graphics/Sprite.hpp +++ b/include/Nazara/Graphics/Sprite.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPRITE_HPP -#define NAZARA_SPRITE_HPP +#ifndef NAZARA_GRAPHICS_SPRITE_HPP +#define NAZARA_GRAPHICS_SPRITE_HPP #include #include @@ -54,4 +54,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_SPRITE_HPP diff --git a/include/Nazara/Graphics/SpriteChainRenderer.hpp b/include/Nazara/Graphics/SpriteChainRenderer.hpp index 4d25a2de2..ff50fbd23 100644 --- a/include/Nazara/Graphics/SpriteChainRenderer.hpp +++ b/include/Nazara/Graphics/SpriteChainRenderer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPRITECHAINRENDERER_HPP -#define NAZARA_SPRITECHAINRENDERER_HPP +#ifndef NAZARA_GRAPHICS_SPRITECHAINRENDERER_HPP +#define NAZARA_GRAPHICS_SPRITECHAINRENDERER_HPP #include #include @@ -83,4 +83,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_SPRITECHAINRENDERER_HPP diff --git a/include/Nazara/Graphics/SubmeshRenderer.hpp b/include/Nazara/Graphics/SubmeshRenderer.hpp index 6ce32f3fe..880e2e0ac 100644 --- a/include/Nazara/Graphics/SubmeshRenderer.hpp +++ b/include/Nazara/Graphics/SubmeshRenderer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SUBMESHRENDERER_HPP -#define NAZARA_SUBMESHRENDERER_HPP +#ifndef NAZARA_GRAPHICS_SUBMESHRENDERER_HPP +#define NAZARA_GRAPHICS_SUBMESHRENDERER_HPP #include #include @@ -29,4 +29,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_SUBMESHRENDERER_HPP diff --git a/include/Nazara/Graphics/Systems.hpp b/include/Nazara/Graphics/Systems.hpp index 24869dc68..939baf883 100644 --- a/include/Nazara/Graphics/Systems.hpp +++ b/include/Nazara/Graphics/Systems.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Graphics module - Copyright (C) 2020 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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 @@ -26,9 +26,9 @@ #pragma once -#ifndef NAZARA_GLOBAL_GRAPHICS_SYSTEMS_HPP -#define NAZARA_GLOBAL_GRAPHICS_SYSTEMS_HPP +#ifndef NAZARA_GRAPHICS_SYSTEMS_HPP +#define NAZARA_GRAPHICS_SYSTEMS_HPP #include -#endif // NAZARA_GLOBAL_GRAPHICS_SYSTEMS_HPP +#endif // NAZARA_GRAPHICS_SYSTEMS_HPP diff --git a/include/Nazara/Graphics/Systems/RenderSystem.hpp b/include/Nazara/Graphics/Systems/RenderSystem.hpp index 5166b15af..14b3d8a2d 100644 --- a/include/Nazara/Graphics/Systems/RenderSystem.hpp +++ b/include/Nazara/Graphics/Systems/RenderSystem.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERSYSTEM_HPP -#define NAZARA_RENDERSYSTEM_HPP +#ifndef NAZARA_GRAPHICS_SYSTEMS_RENDERSYSTEM_HPP +#define NAZARA_GRAPHICS_SYSTEMS_RENDERSYSTEM_HPP #include #include @@ -69,4 +69,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_SYSTEMS_RENDERSYSTEM_HPP diff --git a/include/Nazara/Graphics/TextSprite.hpp b/include/Nazara/Graphics/TextSprite.hpp index 72ce19d00..e24b155e0 100644 --- a/include/Nazara/Graphics/TextSprite.hpp +++ b/include/Nazara/Graphics/TextSprite.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TEXTSPRITE_HPP -#define NAZARA_TEXTSPRITE_HPP +#ifndef NAZARA_GRAPHICS_TEXTSPRITE_HPP +#define NAZARA_GRAPHICS_TEXTSPRITE_HPP #include #include @@ -100,4 +100,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_TEXTSPRITE_HPP diff --git a/include/Nazara/Graphics/TextureSamplerCache.hpp b/include/Nazara/Graphics/TextureSamplerCache.hpp index 0a10a9a29..0250a6d6f 100644 --- a/include/Nazara/Graphics/TextureSamplerCache.hpp +++ b/include/Nazara/Graphics/TextureSamplerCache.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TEXTURESAMPLERCACHE_HPP -#define NAZARA_TEXTURESAMPLERCACHE_HPP +#ifndef NAZARA_GRAPHICS_TEXTURESAMPLERCACHE_HPP +#define NAZARA_GRAPHICS_TEXTURESAMPLERCACHE_HPP #include #include @@ -37,4 +37,4 @@ namespace Nz #include -#endif +#endif // NAZARA_GRAPHICS_TEXTURESAMPLERCACHE_HPP diff --git a/include/Nazara/Graphics/UberShader.hpp b/include/Nazara/Graphics/UberShader.hpp index f442bfab0..05c140e06 100644 --- a/include/Nazara/Graphics/UberShader.hpp +++ b/include/Nazara/Graphics/UberShader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_UBER_SHADER_HPP -#define NAZARA_UBER_SHADER_HPP +#ifndef NAZARA_GRAPHICS_UBERSHADER_HPP +#define NAZARA_GRAPHICS_UBERSHADER_HPP #include #include @@ -72,4 +72,4 @@ namespace Nz #include -#endif // NAZARA_UBER_SHADER_HPP +#endif // NAZARA_GRAPHICS_UBERSHADER_HPP diff --git a/include/Nazara/Graphics/ViewerInstance.hpp b/include/Nazara/Graphics/ViewerInstance.hpp index 549194df6..07a60c7e4 100644 --- a/include/Nazara/Graphics/ViewerInstance.hpp +++ b/include/Nazara/Graphics/ViewerInstance.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VIEWERINSTANCE_HPP -#define NAZARA_VIEWERINSTANCE_HPP +#ifndef NAZARA_GRAPHICS_VIEWERINSTANCE_HPP +#define NAZARA_GRAPHICS_VIEWERINSTANCE_HPP #include #include @@ -67,4 +67,4 @@ namespace Nz #include -#endif // NAZARA_VIEWERINSTANCE_HPP +#endif // NAZARA_GRAPHICS_VIEWERINSTANCE_HPP diff --git a/include/Nazara/Graphics/WorldInstance.hpp b/include/Nazara/Graphics/WorldInstance.hpp index a71038f63..dc1901625 100644 --- a/include/Nazara/Graphics/WorldInstance.hpp +++ b/include/Nazara/Graphics/WorldInstance.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MODELINSTANCE_HPP -#define NAZARA_MODELINSTANCE_HPP +#ifndef NAZARA_GRAPHICS_WORLDINSTANCE_HPP +#define NAZARA_GRAPHICS_WORLDINSTANCE_HPP #include #include @@ -56,4 +56,4 @@ namespace Nz #include -#endif // NAZARA_MODELINSTANCE_HPP +#endif // NAZARA_GRAPHICS_WORLDINSTANCE_HPP diff --git a/include/Nazara/Math.hpp b/include/Nazara/Math.hpp index b4b965e07..6559d60cf 100644 --- a/include/Nazara/Math.hpp +++ b/include/Nazara/Math.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* - Nazara Engine - Mathematics module + Nazara Engine - Math module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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 diff --git a/include/Nazara/Math/Algorithm.hpp b/include/Nazara/Math/Algorithm.hpp index 42ef3dcb7..f5ba7ba29 100644 --- a/include/Nazara/Math/Algorithm.hpp +++ b/include/Nazara/Math/Algorithm.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ALGORITHM_MATH_HPP -#define NAZARA_ALGORITHM_MATH_HPP +#ifndef NAZARA_MATH_ALGORITHM_HPP +#define NAZARA_MATH_ALGORITHM_HPP #include #include @@ -56,4 +56,4 @@ namespace Nz #include -#endif // NAZARA_ALGORITHM_MATH_HPP +#endif // NAZARA_MATH_ALGORITHM_HPP diff --git a/include/Nazara/Math/Angle.hpp b/include/Nazara/Math/Angle.hpp index 7f78df740..89463dc0a 100644 --- a/include/Nazara/Math/Angle.hpp +++ b/include/Nazara/Math/Angle.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ANGLE_HPP -#define NAZARA_ANGLE_HPP +#ifndef NAZARA_MATH_ANGLE_HPP +#define NAZARA_MATH_ANGLE_HPP #include #include @@ -102,4 +102,4 @@ std::ostream& operator<<(std::ostream& out, const Nz::Angle& angle); #include -#endif // NAZARA_ANGLE_HPP +#endif // NAZARA_MATH_ANGLE_HPP diff --git a/include/Nazara/Math/BoundingVolume.hpp b/include/Nazara/Math/BoundingVolume.hpp index 39e95b480..479714ffa 100644 --- a/include/Nazara/Math/BoundingVolume.hpp +++ b/include/Nazara/Math/BoundingVolume.hpp @@ -2,8 +2,10 @@ // This file is part of the "Nazara Engine - Math module" // For conditions of distribution and use, see copyright notice in Config.hpp -#ifndef NAZARA_BOUNDINGVOLUME_HPP -#define NAZARA_BOUNDINGVOLUME_HPP +#pragma once + +#ifndef NAZARA_MATH_BOUNDINGVOLUME_HPP +#define NAZARA_MATH_BOUNDINGVOLUME_HPP #include #include @@ -81,4 +83,4 @@ std::ostream& operator<<(std::ostream& out, const Nz::BoundingVolume& volume) #include -#endif // NAZARA_BOUNDINGVOLUME_HPP +#endif // NAZARA_MATH_BOUNDINGVOLUME_HPP diff --git a/include/Nazara/Math/Box.hpp b/include/Nazara/Math/Box.hpp index 7c3042279..1c79ca8e7 100644 --- a/include/Nazara/Math/Box.hpp +++ b/include/Nazara/Math/Box.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BOX_HPP -#define NAZARA_BOX_HPP +#ifndef NAZARA_MATH_BOX_HPP +#define NAZARA_MATH_BOX_HPP #include #include @@ -109,4 +109,4 @@ std::ostream& operator<<(std::ostream& out, const Nz::Box& box); #include -#endif // NAZARA_BOX_HPP +#endif // NAZARA_MATH_BOX_HPP diff --git a/include/Nazara/Math/Config.hpp b/include/Nazara/Math/Config.hpp index 5b3c4afbb..2ecb643c3 100644 --- a/include/Nazara/Math/Config.hpp +++ b/include/Nazara/Math/Config.hpp @@ -25,8 +25,8 @@ #pragma once -#ifndef NAZARA_CONFIG_MATH_HPP -#define NAZARA_CONFIG_MATH_HPP +#ifndef NAZARA_MATH_CONFIG_HPP +#define NAZARA_MATH_CONFIG_HPP /*! * \defgroup math (NazaraMath) Mathematics module @@ -41,4 +41,4 @@ // Enable tests of security based on the code (Advised for the developpement) #define NAZARA_MATH_SAFE 1 -#endif // NAZARA_CONFIG_MATH_HPP +#endif // NAZARA_MATH_CONFIG_HPP diff --git a/include/Nazara/Math/Enums.hpp b/include/Nazara/Math/Enums.hpp index 71d5dc0a9..571dbd335 100644 --- a/include/Nazara/Math/Enums.hpp +++ b/include/Nazara/Math/Enums.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENUMS_MATH_HPP -#define NAZARA_ENUMS_MATH_HPP +#ifndef NAZARA_MATH_ENUMS_HPP +#define NAZARA_MATH_ENUMS_HPP #include @@ -78,4 +78,4 @@ namespace Nz constexpr std::size_t RectCornerCount = UnderlyingCast(RectCorner::Max) + 1; } -#endif // NAZARA_ENUMS_MATH_HPP +#endif // NAZARA_MATH_ENUMS_HPP diff --git a/include/Nazara/Math/EulerAngles.hpp b/include/Nazara/Math/EulerAngles.hpp index 1fa7927e2..e9515e53f 100644 --- a/include/Nazara/Math/EulerAngles.hpp +++ b/include/Nazara/Math/EulerAngles.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_EULERANGLES_HPP -#define NAZARA_EULERANGLES_HPP +#ifndef NAZARA_MATH_EULERANGLES_HPP +#define NAZARA_MATH_EULERANGLES_HPP #include #include @@ -76,4 +76,4 @@ template std::ostream& operator<<(std::ostream& out, const Nz::Euler #include -#endif // NAZARA_EULERANGLES_HPP +#endif // NAZARA_MATH_EULERANGLES_HPP diff --git a/include/Nazara/Math/Frustum.hpp b/include/Nazara/Math/Frustum.hpp index f99008e97..126efc7cc 100644 --- a/include/Nazara/Math/Frustum.hpp +++ b/include/Nazara/Math/Frustum.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FRUSTUM_HPP -#define NAZARA_FRUSTUM_HPP +#ifndef NAZARA_MATH_FRUSTUM_HPP +#define NAZARA_MATH_FRUSTUM_HPP #include #include @@ -75,4 +75,4 @@ std::ostream& operator<<(std::ostream& out, const Nz::Frustum& frustum); #include -#endif // NAZARA_FRUSTUM_HPP +#endif // NAZARA_MATH_FRUSTUM_HPP diff --git a/include/Nazara/Math/Matrix4.hpp b/include/Nazara/Math/Matrix4.hpp index 20fa37ecb..88923cb55 100644 --- a/include/Nazara/Math/Matrix4.hpp +++ b/include/Nazara/Math/Matrix4.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MATRIX4_HPP -#define NAZARA_MATRIX4_HPP +#ifndef NAZARA_MATH_MATRIX4_HPP +#define NAZARA_MATH_MATRIX4_HPP ///FIXME: Matrices column-major, difficile de bosser avec (Tout passer en row-major et transposer dans les shaders ?) @@ -155,4 +155,4 @@ template Nz::Matrix4 operator*(T scale, const Nz::Matrix4& mat #include -#endif // NAZARA_MATRIX4_HPP +#endif // NAZARA_MATH_MATRIX4_HPP diff --git a/include/Nazara/Math/OrientedBox.hpp b/include/Nazara/Math/OrientedBox.hpp index 01a8dadd9..b77380f19 100644 --- a/include/Nazara/Math/OrientedBox.hpp +++ b/include/Nazara/Math/OrientedBox.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ORIENTEDBOX_HPP -#define NAZARA_ORIENTEDBOX_HPP +#ifndef NAZARA_MATH_ORIENTEDBOX_HPP +#define NAZARA_MATH_ORIENTEDBOX_HPP #include #include @@ -78,4 +78,4 @@ std::ostream& operator<<(std::ostream& out, const Nz::OrientedBox& orientedBo #include -#endif // NAZARA_ORIENTEDBOX_HPP +#endif // NAZARA_MATH_ORIENTEDBOX_HPP diff --git a/include/Nazara/Math/PidController.hpp b/include/Nazara/Math/PidController.hpp index 0ec056f08..c0480e432 100644 --- a/include/Nazara/Math/PidController.hpp +++ b/include/Nazara/Math/PidController.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PIDCONTROLLER_HPP -#define NAZARA_PIDCONTROLLER_HPP +#ifndef NAZARA_MATH_PIDCONTROLLER_HPP +#define NAZARA_MATH_PIDCONTROLLER_HPP namespace Nz { @@ -28,4 +28,4 @@ namespace Nz #include -#endif +#endif // NAZARA_MATH_PIDCONTROLLER_HPP diff --git a/include/Nazara/Math/Plane.hpp b/include/Nazara/Math/Plane.hpp index 6867c9913..4ad3f07a9 100644 --- a/include/Nazara/Math/Plane.hpp +++ b/include/Nazara/Math/Plane.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PLANE_HPP -#define NAZARA_PLANE_HPP +#ifndef NAZARA_MATH_PLANE_HPP +#define NAZARA_MATH_PLANE_HPP #include #include @@ -70,4 +70,4 @@ std::ostream& operator<<(std::ostream& out, const Nz::Plane& plane); #include -#endif // NAZARA_PLANE_HPP +#endif // NAZARA_MATH_PLANE_HPP diff --git a/include/Nazara/Math/Quaternion.hpp b/include/Nazara/Math/Quaternion.hpp index 1a4dfa3d5..eeb05ca1d 100644 --- a/include/Nazara/Math/Quaternion.hpp +++ b/include/Nazara/Math/Quaternion.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_QUATERNION_HPP -#define NAZARA_QUATERNION_HPP +#ifndef NAZARA_MATH_QUATERNION_HPP +#define NAZARA_MATH_QUATERNION_HPP #include #include @@ -102,4 +102,4 @@ template std::ostream& operator<<(std::ostream& out, const Nz::Quate #include -#endif // NAZARA_QUATERNION_HPP +#endif // NAZARA_MATH_QUATERNION_HPP diff --git a/include/Nazara/Math/Ray.hpp b/include/Nazara/Math/Ray.hpp index 9df415fbd..66794631a 100644 --- a/include/Nazara/Math/Ray.hpp +++ b/include/Nazara/Math/Ray.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RAY_HPP -#define NAZARA_RAY_HPP +#ifndef NAZARA_MATH_RAY_HPP +#define NAZARA_MATH_RAY_HPP #include #include @@ -84,4 +84,4 @@ template std::ostream& operator<<(std::ostream& out, const Nz::Ray -#endif // NAZARA_RAY_HPP +#endif // NAZARA_MATH_RAY_HPP diff --git a/include/Nazara/Math/Rect.hpp b/include/Nazara/Math/Rect.hpp index fbd801abd..dd9436752 100644 --- a/include/Nazara/Math/Rect.hpp +++ b/include/Nazara/Math/Rect.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RECT_HPP -#define NAZARA_RECT_HPP +#ifndef NAZARA_MATH_RECT_HPP +#define NAZARA_MATH_RECT_HPP #include #include @@ -104,4 +104,4 @@ std::ostream& operator<<(std::ostream& out, const Nz::Rect& rect); #include -#endif // NAZARA_RECT_HPP +#endif // NAZARA_MATH_RECT_HPP diff --git a/include/Nazara/Math/Sphere.hpp b/include/Nazara/Math/Sphere.hpp index 1e235a28d..082c4229d 100644 --- a/include/Nazara/Math/Sphere.hpp +++ b/include/Nazara/Math/Sphere.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPHERE_HPP -#define NAZARA_SPHERE_HPP +#ifndef NAZARA_MATH_SPHERE_HPP +#define NAZARA_MATH_SPHERE_HPP #include #include @@ -89,4 +89,4 @@ std::ostream& operator<<(std::ostream& out, const Nz::Sphere& sphere); #include -#endif // NAZARA_SPHERE_HPP +#endif // NAZARA_MATH_SPHERE_HPP diff --git a/include/Nazara/Math/Vector2.hpp b/include/Nazara/Math/Vector2.hpp index bcf23deca..708a32197 100644 --- a/include/Nazara/Math/Vector2.hpp +++ b/include/Nazara/Math/Vector2.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VECTOR2_HPP -#define NAZARA_VECTOR2_HPP +#ifndef NAZARA_MATH_VECTOR2_HPP +#define NAZARA_MATH_VECTOR2_HPP #include #include @@ -131,4 +131,4 @@ namespace std #include -#endif // NAZARA_VECTOR2_HPP +#endif // NAZARA_MATH_VECTOR2_HPP diff --git a/include/Nazara/Math/Vector3.hpp b/include/Nazara/Math/Vector3.hpp index 875bba76d..508ce7e8f 100644 --- a/include/Nazara/Math/Vector3.hpp +++ b/include/Nazara/Math/Vector3.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VECTOR3_HPP -#define NAZARA_VECTOR3_HPP +#ifndef NAZARA_MATH_VECTOR3_HPP +#define NAZARA_MATH_VECTOR3_HPP #include #include @@ -151,4 +151,4 @@ namespace std #include -#endif // NAZARA_VECTOR3_HPP +#endif // NAZARA_MATH_VECTOR3_HPP diff --git a/include/Nazara/Math/Vector4.hpp b/include/Nazara/Math/Vector4.hpp index 5b1559885..9b7bf6c16 100644 --- a/include/Nazara/Math/Vector4.hpp +++ b/include/Nazara/Math/Vector4.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VECTOR4_HPP -#define NAZARA_VECTOR4_HPP +#ifndef NAZARA_MATH_VECTOR4_HPP +#define NAZARA_MATH_VECTOR4_HPP #include #include @@ -127,4 +127,4 @@ namespace std #include -#endif // NAZARA_VECTOR4_HPP +#endif // NAZARA_MATH_VECTOR4_HPP diff --git a/include/Nazara/Network.hpp b/include/Nazara/Network.hpp index 97a337364..e4c9ba31c 100644 --- a/include/Nazara/Network.hpp +++ b/include/Nazara/Network.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Network module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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/Network/AbstractSocket.hpp b/include/Nazara/Network/AbstractSocket.hpp index ca9274487..8f0baf9cb 100644 --- a/include/Nazara/Network/AbstractSocket.hpp +++ b/include/Nazara/Network/AbstractSocket.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ABSTRACTSOCKET_HPP -#define NAZARA_ABSTRACTSOCKET_HPP +#ifndef NAZARA_NETWORK_ABSTRACTSOCKET_HPP +#define NAZARA_NETWORK_ABSTRACTSOCKET_HPP #include #include @@ -68,4 +68,4 @@ namespace Nz #include -#endif // NAZARA_ABSTRACTSOCKET_HPP +#endif // NAZARA_NETWORK_ABSTRACTSOCKET_HPP diff --git a/include/Nazara/Network/Algorithm.hpp b/include/Nazara/Network/Algorithm.hpp index f3baec7ee..fa45cdf01 100644 --- a/include/Nazara/Network/Algorithm.hpp +++ b/include/Nazara/Network/Algorithm.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ALGORITHM_NETWORK_HPP -#define NAZARA_ALGORITHM_NETWORK_HPP +#ifndef NAZARA_NETWORK_ALGORITHM_HPP +#define NAZARA_NETWORK_ALGORITHM_HPP #include #include @@ -30,4 +30,4 @@ namespace Nz #include -#endif // NAZARA_ALGORITHM_NETWORK_HPP +#endif // NAZARA_NETWORK_ALGORITHM_HPP diff --git a/include/Nazara/Network/Config.hpp b/include/Nazara/Network/Config.hpp index b77b7c671..3fd90a5a7 100644 --- a/include/Nazara/Network/Config.hpp +++ b/include/Nazara/Network/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_NETWORK_HPP -#define NAZARA_CONFIG_NETWORK_HPP +#ifndef NAZARA_NETWORK_CONFIG_HPP +#define NAZARA_NETWORK_CONFIG_HPP /*! * \defgroup network (NazaraNetwork) Network module @@ -55,4 +55,4 @@ #endif #endif -#endif // NAZARA_CONFIG_NETWORK_HPP +#endif // NAZARA_NETWORK_CONFIG_HPP diff --git a/include/Nazara/Network/ConfigCheck.hpp b/include/Nazara/Network/ConfigCheck.hpp index 6d9379fba..db26c4252 100644 --- a/include/Nazara/Network/ConfigCheck.hpp +++ b/include/Nazara/Network/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_NETWORK_HPP -#define NAZARA_CONFIG_CHECK_NETWORK_HPP +#ifndef NAZARA_NETWORK_CONFIGCHECK_HPP +#define NAZARA_NETWORK_CONFIGCHECK_HPP /// This file is used to check the constant values defined in Config.hpp @@ -17,4 +17,4 @@ #define NAZARA_NETWORK_MANAGE_MEMORY 0 #endif -#endif // NAZARA_CONFIG_CHECK_NETWORK_HPP +#endif // NAZARA_NETWORK_CONFIGCHECK_HPP diff --git a/include/Nazara/Network/Debug.hpp b/include/Nazara/Network/Debug.hpp index 3f3be4aaa..e07991640 100644 --- a/include/Nazara/Network/Debug.hpp +++ b/include/Nazara/Network/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Network module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_NETWORK_MANAGE_MEMORY #include diff --git a/include/Nazara/Network/DebugOff.hpp b/include/Nazara/Network/DebugOff.hpp index 4e3f2bf14..256eb4674 100644 --- a/include/Nazara/Network/DebugOff.hpp +++ b/include/Nazara/Network/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Network module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // We suppose that Debug.hpp is already included, same goes for Config.hpp #if NAZARA_NETWORK_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Network/ENetCompressor.hpp b/include/Nazara/Network/ENetCompressor.hpp index bd47adad0..07f957eb5 100644 --- a/include/Nazara/Network/ENetCompressor.hpp +++ b/include/Nazara/Network/ENetCompressor.hpp @@ -18,8 +18,8 @@ #pragma once -#ifndef NAZARA_ENETCOMPRESSOR_HPP -#define NAZARA_ENETCOMPRESSOR_HPP +#ifndef NAZARA_NETWORK_ENETCOMPRESSOR_HPP +#define NAZARA_NETWORK_ENETCOMPRESSOR_HPP #include #include @@ -40,4 +40,4 @@ namespace Nz }; } -#endif // NAZARA_ENETCOMPRESSOR_HPP +#endif // NAZARA_NETWORK_ENETCOMPRESSOR_HPP diff --git a/include/Nazara/Network/ENetHost.hpp b/include/Nazara/Network/ENetHost.hpp index 8269668bc..fc4c67fe5 100644 --- a/include/Nazara/Network/ENetHost.hpp +++ b/include/Nazara/Network/ENetHost.hpp @@ -14,8 +14,8 @@ #pragma once -#ifndef NAZARA_ENETHOST_HPP -#define NAZARA_ENETHOST_HPP +#ifndef NAZARA_NETWORK_ENETHOST_HPP +#define NAZARA_NETWORK_ENETHOST_HPP #include #include @@ -175,4 +175,4 @@ namespace Nz #include -#endif // NAZARA_ENETHOST_HPP +#endif // NAZARA_NETWORK_ENETHOST_HPP diff --git a/include/Nazara/Network/ENetPacket.hpp b/include/Nazara/Network/ENetPacket.hpp index d28658408..03c6a8fb4 100644 --- a/include/Nazara/Network/ENetPacket.hpp +++ b/include/Nazara/Network/ENetPacket.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENETPACKET_HPP -#define NAZARA_ENETPACKET_HPP +#ifndef NAZARA_NETWORK_ENETPACKET_HPP +#define NAZARA_NETWORK_ENETPACKET_HPP #include #include @@ -103,4 +103,4 @@ namespace Nz }; } -#endif // NAZARA_ENETPACKET_HPP +#endif // NAZARA_NETWORK_ENETPACKET_HPP diff --git a/include/Nazara/Network/ENetPeer.hpp b/include/Nazara/Network/ENetPeer.hpp index 5a9912d05..66906622e 100644 --- a/include/Nazara/Network/ENetPeer.hpp +++ b/include/Nazara/Network/ENetPeer.hpp @@ -14,8 +14,8 @@ #pragma once -#ifndef NAZARA_ENETPEER_HPP -#define NAZARA_ENETPEER_HPP +#ifndef NAZARA_NETWORK_ENETPEER_HPP +#define NAZARA_NETWORK_ENETPEER_HPP #include #include @@ -251,4 +251,4 @@ namespace Nz #include -#endif // NAZARA_ENETPEER_HPP +#endif // NAZARA_NETWORK_ENETPEER_HPP diff --git a/include/Nazara/Network/ENetProtocol.hpp b/include/Nazara/Network/ENetProtocol.hpp index 379412c97..45ae550a3 100644 --- a/include/Nazara/Network/ENetProtocol.hpp +++ b/include/Nazara/Network/ENetProtocol.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENETPROTOCOL_HPP -#define NAZARA_ENETPROTOCOL_HPP +#ifndef NAZARA_NETWORK_ENETPROTOCOL_HPP +#define NAZARA_NETWORK_ENETPROTOCOL_HPP #include #include @@ -308,4 +308,4 @@ namespace Nz #include -#endif // NAZARA_ENETPROTOCOL_HPP +#endif // NAZARA_NETWORK_ENETPROTOCOL_HPP diff --git a/include/Nazara/Network/Enums.hpp b/include/Nazara/Network/Enums.hpp index 3e95872c7..e1a5efa5c 100644 --- a/include/Nazara/Network/Enums.hpp +++ b/include/Nazara/Network/Enums.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENUMS_NETWORK_HPP -#define NAZARA_ENUMS_NETWORK_HPP +#ifndef NAZARA_NETWORK_ENUMS_HPP +#define NAZARA_NETWORK_ENUMS_HPP #include @@ -121,4 +121,4 @@ namespace Nz constexpr std::size_t SocketTypeCount = static_cast(SocketType::Max) + 1; } -#endif // NAZARA_ENUMS_NETWORK_HPP +#endif // NAZARA_NETWORK_ENUMS_HPP diff --git a/include/Nazara/Network/IpAddress.hpp b/include/Nazara/Network/IpAddress.hpp index 42ef0418d..229bdfa31 100644 --- a/include/Nazara/Network/IpAddress.hpp +++ b/include/Nazara/Network/IpAddress.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_IPADDRESS_HPP -#define NAZARA_IPADDRESS_HPP +#ifndef NAZARA_NETWORK_IPADDRESS_HPP +#define NAZARA_NETWORK_IPADDRESS_HPP #include #include @@ -100,4 +100,4 @@ namespace Nz #include -#endif // NAZARA_IPADDRESS_HPP +#endif // NAZARA_NETWORK_IPADDRESS_HPP diff --git a/include/Nazara/Network/NetBuffer.hpp b/include/Nazara/Network/NetBuffer.hpp index 56c1d18b9..8eb8883e6 100644 --- a/include/Nazara/Network/NetBuffer.hpp +++ b/include/Nazara/Network/NetBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_NETBUFFER_HPP -#define NAZARA_NETBUFFER_HPP +#ifndef NAZARA_NETWORK_NETBUFFER_HPP +#define NAZARA_NETWORK_NETBUFFER_HPP #include @@ -18,4 +18,4 @@ namespace Nz }; } -#endif // NAZARA_NETBUFFER_HPP +#endif // NAZARA_NETWORK_NETBUFFER_HPP diff --git a/include/Nazara/Network/NetPacket.hpp b/include/Nazara/Network/NetPacket.hpp index bf96ccc13..ff078cb21 100644 --- a/include/Nazara/Network/NetPacket.hpp +++ b/include/Nazara/Network/NetPacket.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_NETPACKET_HPP -#define NAZARA_NETPACKET_HPP +#ifndef NAZARA_NETWORK_NETPACKET_HPP +#define NAZARA_NETWORK_NETPACKET_HPP #include #include @@ -71,4 +71,4 @@ namespace Nz #include -#endif // NAZARA_NETPACKET_HPP +#endif // NAZARA_NETWORK_NETPACKET_HPP diff --git a/include/Nazara/Network/Network.hpp b/include/Nazara/Network/Network.hpp index f1df023d2..823e4ac3b 100644 --- a/include/Nazara/Network/Network.hpp +++ b/include/Nazara/Network/Network.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MODULENAME_HPP -#define NAZARA_MODULENAME_HPP +#ifndef NAZARA_NETWORK_HPP +#define NAZARA_NETWORK_HPP #include #include @@ -30,4 +30,4 @@ namespace Nz }; } -#endif // NAZARA_MODULENAME_HPP +#endif // NAZARA_NETWORK_HPP diff --git a/include/Nazara/Network/SocketHandle.hpp b/include/Nazara/Network/SocketHandle.hpp index 5d33810b9..30b93db0e 100644 --- a/include/Nazara/Network/SocketHandle.hpp +++ b/include/Nazara/Network/SocketHandle.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOCKETHANDLE_HPP -#define NAZARA_SOCKETHANDLE_HPP +#ifndef NAZARA_NETWORK_SOCKETHANDLE_HPP +#define NAZARA_NETWORK_SOCKETHANDLE_HPP #include @@ -24,4 +24,4 @@ namespace Nz #endif } -#endif // NAZARA_SOCKETHANDLE_HPP +#endif // NAZARA_NETWORK_SOCKETHANDLE_HPP diff --git a/include/Nazara/Network/SocketPoller.hpp b/include/Nazara/Network/SocketPoller.hpp index 2719e2f83..f2882000c 100644 --- a/include/Nazara/Network/SocketPoller.hpp +++ b/include/Nazara/Network/SocketPoller.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOCKETPOLLER_HPP -#define NAZARA_SOCKETPOLLER_HPP +#ifndef NAZARA_NETWORK_SOCKETPOLLER_HPP +#define NAZARA_NETWORK_SOCKETPOLLER_HPP #include #include @@ -42,4 +42,4 @@ namespace Nz #include -#endif // NAZARA_SOCKETPOLLER_HPP +#endif // NAZARA_NETWORK_SOCKETPOLLER_HPP diff --git a/include/Nazara/Network/TcpClient.hpp b/include/Nazara/Network/TcpClient.hpp index b63810c77..038edce39 100644 --- a/include/Nazara/Network/TcpClient.hpp +++ b/include/Nazara/Network/TcpClient.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TCPCLIENT_HPP -#define NAZARA_TCPCLIENT_HPP +#ifndef NAZARA_NETWORK_TCPCLIENT_HPP +#define NAZARA_NETWORK_TCPCLIENT_HPP #include #include @@ -90,4 +90,4 @@ namespace Nz #include -#endif // NAZARA_TCPCLIENT_HPP +#endif // NAZARA_NETWORK_TCPCLIENT_HPP diff --git a/include/Nazara/Network/TcpServer.hpp b/include/Nazara/Network/TcpServer.hpp index 955a72bcd..eb891b7de 100644 --- a/include/Nazara/Network/TcpServer.hpp +++ b/include/Nazara/Network/TcpServer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TCPSERVER_HPP -#define NAZARA_TCPSERVER_HPP +#ifndef NAZARA_NETWORK_TCPSERVER_HPP +#define NAZARA_NETWORK_TCPSERVER_HPP #include #include @@ -40,4 +40,4 @@ namespace Nz #include -#endif // NAZARA_TCPSERVER_HPP +#endif // NAZARA_NETWORK_TCPSERVER_HPP diff --git a/include/Nazara/Network/UdpSocket.hpp b/include/Nazara/Network/UdpSocket.hpp index 308bde333..cd17d8396 100644 --- a/include/Nazara/Network/UdpSocket.hpp +++ b/include/Nazara/Network/UdpSocket.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_UDPSOCKET_HPP -#define NAZARA_UDPSOCKET_HPP +#ifndef NAZARA_NETWORK_UDPSOCKET_HPP +#define NAZARA_NETWORK_UDPSOCKET_HPP #include #include @@ -60,4 +60,4 @@ namespace Nz #include -#endif // NAZARA_UDPSOCKET_HPP +#endif // NAZARA_NETWORK_UDPSOCKET_HPP diff --git a/include/Nazara/OpenGLRenderer.hpp b/include/Nazara/OpenGLRenderer.hpp index da8bf0c08..090fad80c 100644 --- a/include/Nazara/OpenGLRenderer.hpp +++ b/include/Nazara/OpenGLRenderer.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* - Nazara Engine - OpenGL + Nazara Engine - OpenGL renderer - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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/OpenGLRenderer/Config.hpp b/include/Nazara/OpenGLRenderer/Config.hpp index dfb158cc5..4d000b04c 100644 --- a/include/Nazara/OpenGLRenderer/Config.hpp +++ b/include/Nazara/OpenGLRenderer/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_OPENGLRENDERER_HPP -#define NAZARA_CONFIG_OPENGLRENDERER_HPP +#ifndef NAZARA_OPENGLRENDERER_CONFIG_HPP +#define NAZARA_OPENGLRENDERER_CONFIG_HPP /// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci @@ -50,4 +50,4 @@ #define NAZARA_OPENGLRENDERER_API #endif -#endif // NAZARA_CONFIG_OPENGLRENDERER_HPP +#endif // NAZARA_OPENGLRENDERER_CONFIG_HPP diff --git a/include/Nazara/OpenGLRenderer/ConfigCheck.hpp b/include/Nazara/OpenGLRenderer/ConfigCheck.hpp index e898a0531..a982044ae 100644 --- a/include/Nazara/OpenGLRenderer/ConfigCheck.hpp +++ b/include/Nazara/OpenGLRenderer/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_OPENGLRENDERER_HPP -#define NAZARA_CONFIG_CHECK_OPENGLRENDERER_HPP +#ifndef NAZARA_OPENGLRENDERER_CONFIGCHECK_HPP +#define NAZARA_OPENGLRENDERER_CONFIGCHECK_HPP /// Ce fichier sert à vérifier la valeur des constantes du fichier Config.hpp @@ -19,4 +19,4 @@ #define NAZARA_OPENGLRENDERER_MANAGE_MEMORY 0 #endif -#endif // NAZARA_CONFIG_CHECK_OPENGLRENDERER_HPP +#endif // NAZARA_OPENGLRENDERER_CONFIGCHECK_HPP diff --git a/include/Nazara/OpenGLRenderer/Debug.hpp b/include/Nazara/OpenGLRenderer/Debug.hpp index 737e00fe2..ca6366ff4 100644 --- a/include/Nazara/OpenGLRenderer/Debug.hpp +++ b/include/Nazara/OpenGLRenderer/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - OpenGL renderer" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_OPENGLRENDERER_MANAGE_MEMORY #include diff --git a/include/Nazara/OpenGLRenderer/DebugOff.hpp b/include/Nazara/OpenGLRenderer/DebugOff.hpp index 42fbe78f4..affead368 100644 --- a/include/Nazara/OpenGLRenderer/DebugOff.hpp +++ b/include/Nazara/OpenGLRenderer/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - OpenGL renderer" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // On suppose que Debug.hpp a déjà été inclus, tout comme Config.hpp #if NAZARA_OPENGLRENDERER_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/OpenGLRenderer/DummySurface.hpp b/include/Nazara/OpenGLRenderer/DummySurface.hpp index 5d09126ac..e4c96aa21 100644 --- a/include/Nazara/OpenGLRenderer/DummySurface.hpp +++ b/include/Nazara/OpenGLRenderer/DummySurface.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_SURFACE_HPP -#define NAZARA_OPENGLRENDERER_SURFACE_HPP +#ifndef NAZARA_OPENGLRENDERER_DUMMYSURFACE_HPP +#define NAZARA_OPENGLRENDERER_DUMMYSURFACE_HPP #include #include @@ -31,4 +31,4 @@ namespace Nz #include -#endif // NAZARA_OPENGLRENDERER_SURFACE_HPP +#endif // NAZARA_OPENGLRENDERER_DUMMYSURFACE_HPP diff --git a/include/Nazara/OpenGLRenderer/OpenGLBuffer.hpp b/include/Nazara/OpenGLRenderer/OpenGLBuffer.hpp index 84b82962e..ded9beb0f 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLBuffer.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_BUFFER_HPP -#define NAZARA_OPENGLRENDERER_BUFFER_HPP +#ifndef NAZARA_OPENGLRENDERER_OPENGLBUFFER_HPP +#define NAZARA_OPENGLRENDERER_OPENGLBUFFER_HPP #include #include @@ -50,4 +50,4 @@ namespace Nz #include -#endif // NAZARA_OPENGLRENDERER_BUFFER_HPP +#endif // NAZARA_OPENGLRENDERER_OPENGLBUFFER_HPP diff --git a/include/Nazara/OpenGLRenderer/OpenGLRenderWindow.hpp b/include/Nazara/OpenGLRenderer/OpenGLRenderWindow.hpp index 777a1c04f..06be74774 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLRenderWindow.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLRenderWindow.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_RENDERWINDOW_HPP -#define NAZARA_OPENGLRENDERER_RENDERWINDOW_HPP +#ifndef NAZARA_OPENGLRENDERER_OPENGLRENDERWINDOW_HPP +#define NAZARA_OPENGLRENDERER_OPENGLRENDERWINDOW_HPP #include #include @@ -54,4 +54,4 @@ namespace Nz #include -#endif // NAZARA_OPENGLRENDERER_RENDERWINDOW_HPP +#endif // NAZARA_OPENGLRENDERER_OPENGLRENDERWINDOW_HPP diff --git a/include/Nazara/OpenGLRenderer/Utils.hpp b/include/Nazara/OpenGLRenderer/Utils.hpp index 95031fa8b..39772372e 100644 --- a/include/Nazara/OpenGLRenderer/Utils.hpp +++ b/include/Nazara/OpenGLRenderer/Utils.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_UTILS_OPENGL_HPP -#define NAZARA_UTILS_OPENGL_HPP +#ifndef NAZARA_OPENGLRENDERER_UTILS_HPP +#define NAZARA_OPENGLRENDERER_UTILS_HPP #include #include @@ -48,4 +48,4 @@ namespace Nz #include -#endif // NAZARA_UTILS_OPENGL_HPP +#endif // NAZARA_OPENGLRENDERER_UTILS_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper.hpp b/include/Nazara/OpenGLRenderer/Wrapper.hpp index 77133a5e4..47a0246ff 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* - Nazara Engine - OpenGL + Nazara Engine - OpenGL renderer - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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 @@ -26,8 +26,8 @@ #pragma once -#ifndef NAZARA_GLOBAL_OPENGLRENDERER_WRAPPER_HPP -#define NAZARA_GLOBAL_OPENGLRENDERER_WRAPPER_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_HPP #include #include @@ -42,4 +42,4 @@ #include #include -#endif // NAZARA_GLOBAL_OPENGLRENDERER_WRAPPER_HPP +#endif // NAZARA_OPENGLRENDERER_WRAPPER_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Buffer.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Buffer.hpp index a77bf677d..afaa01b7c 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Buffer.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Buffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_GLBUFFER_HPP -#define NAZARA_OPENGLRENDERER_GLBUFFER_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_BUFFER_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_BUFFER_HPP #include #include @@ -45,4 +45,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_BUFFER_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Context.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Context.hpp index 7e5568424..6966fc0a6 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Context.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Context.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_CONTEXTIMPL_HPP -#define NAZARA_OPENGLRENDERER_CONTEXTIMPL_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_CONTEXT_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_CONTEXT_HPP #include #include @@ -251,4 +251,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_CONTEXT_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/ContextObject.hpp b/include/Nazara/OpenGLRenderer/Wrapper/ContextObject.hpp index 5ff9c025b..bc43f5f36 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/ContextObject.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/ContextObject.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_GLCONTEXTOBJECT_HPP -#define NAZARA_OPENGLRENDERER_GLCONTEXTOBJECT_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_CONTEXTOBJECT_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_CONTEXTOBJECT_HPP #include #include @@ -49,4 +49,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_CONTEXTOBJECT_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/CoreFunctions.hpp b/include/Nazara/OpenGLRenderer/Wrapper/CoreFunctions.hpp index 604d010a7..0c23ac2f8 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/CoreFunctions.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/CoreFunctions.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_COREFUNCTIONS_HPP -#define NAZARA_OPENGLRENDERER_COREFUNCTIONS_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_COREFUNCTIONS_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_COREFUNCTIONS_HPP #define GL_GLES_PROTOTYPES 0 #include @@ -182,4 +182,4 @@ typedef void (GL_APIENTRYP PFNGLSPECIALIZESHADERARBPROC) (GLuint shader, const G \ extCb(glSpecializeShaderARB, PFNGLSPECIALIZESHADERARBPROC) \ -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_COREFUNCTIONS_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/DeviceObject.hpp b/include/Nazara/OpenGLRenderer/Wrapper/DeviceObject.hpp index eba2c9ba5..c3848fd36 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/DeviceObject.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/DeviceObject.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_GLDEVICEOBJECT_HPP -#define NAZARA_OPENGLRENDERER_GLDEVICEOBJECT_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_DEVICEOBJECT_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_DEVICEOBJECT_HPP #include #include @@ -50,4 +50,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_DEVICEOBJECT_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.hpp b/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.hpp index fbcf76d03..3cfb331f7 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_EGLCONTEXT_HPP -#define NAZARA_OPENGLRENDERER_EGLCONTEXT_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_EGL_EGLCONTEXTBASE_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_EGL_EGLCONTEXTBASE_HPP #include #include @@ -78,4 +78,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_EGL_EGLCONTEXTBASE_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLFunctions.hpp b/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLFunctions.hpp index a00ee7954..f79f4c2ca 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLFunctions.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLFunctions.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - OpenGL renderer" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #if !defined(NAZARA_OPENGLRENDERER_EGL_FUNC) || !defined(NAZARA_OPENGLRENDERER_EGL_FUNC_OPT) #error You must define NAZARA_OPENGLRENDERER_EGL_FUNC and NAZARA_OPENGLRENDERER_EGL_FUNC_OPT before including this file #endif diff --git a/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.hpp b/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.hpp index 40d29d4e1..d815008d6 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_EGLLOADER_HPP -#define NAZARA_OPENGLRENDERER_EGLLOADER_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_EGL_EGLLOADER_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_EGL_EGLLOADER_HPP #include #include @@ -48,4 +48,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_EGL_EGLLOADER_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Framebuffer.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Framebuffer.hpp index 563972946..9c2625829 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Framebuffer.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Framebuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_GLFRAMEBUFFER_HPP -#define NAZARA_OPENGLRENDERER_GLFRAMEBUFFER_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_FRAMEBUFFER_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_FRAMEBUFFER_HPP #include #include @@ -38,4 +38,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_FRAMEBUFFER_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextWayland.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextWayland.hpp index e04d41de1..a85a6d461 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextWayland.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextWayland.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_EGLCONTEXTWAYLAND_HPP -#define NAZARA_OPENGLRENDERER_EGLCONTEXTWAYLAND_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_LINUX_EGLCONTEXTWAYLAND_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_LINUX_EGLCONTEXTWAYLAND_HPP #include #include @@ -30,4 +30,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_LINUX_EGLCONTEXTWAYLAND_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.hpp index 506a4f1b4..dd4da4cc2 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_EGLCONTEXTWIN32_HPP -#define NAZARA_OPENGLRENDERER_EGLCONTEXTWIN32_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_LINUX_EGLCONTEXTX11_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_LINUX_EGLCONTEXTX11_HPP #include #include @@ -29,4 +29,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_LINUX_EGLCONTEXTX11_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Loader.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Loader.hpp index a20a5839a..218afe43e 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Loader.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Loader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_LOADER_HPP -#define NAZARA_OPENGLRENDERER_LOADER_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_LOADER_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_LOADER_HPP #include #include @@ -39,4 +39,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_LOADER_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Program.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Program.hpp index e29934c32..62a150dcf 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Program.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Program.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_GLPROGRAM_HPP -#define NAZARA_OPENGLRENDERER_GLPROGRAM_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_PROGRAM_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_PROGRAM_HPP #include #include @@ -56,4 +56,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_PROGRAM_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Sampler.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Sampler.hpp index ec34b9398..e5fbe7d77 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Sampler.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Sampler.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_GLSAMPLER_HPP -#define NAZARA_OPENGLRENDERER_GLSAMPLER_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_SAMPLER_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_SAMPLER_HPP #include #include @@ -40,4 +40,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_SAMPLER_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Shader.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Shader.hpp index 862e8a4b3..b428c139e 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Shader.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Shader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_GLSHADER_HPP -#define NAZARA_OPENGLRENDERER_GLSHADER_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_SHADER_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_SHADER_HPP #include #include @@ -46,4 +46,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_SHADER_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Texture.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Texture.hpp index df51bc9e9..527c35b45 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Texture.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Texture.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_GLTEXTURE_HPP -#define NAZARA_OPENGLRENDERER_GLTEXTURE_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_TEXTURE_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_TEXTURE_HPP #include #include @@ -53,4 +53,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_TEXTURE_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/VertexArray.hpp b/include/Nazara/OpenGLRenderer/Wrapper/VertexArray.hpp index 676279350..6398de40d 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/VertexArray.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/VertexArray.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_GLVERTEXARRAY_HPP -#define NAZARA_OPENGLRENDERER_GLVERTEXARRAY_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_VERTEXARRAY_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_VERTEXARRAY_HPP #include #include @@ -36,4 +36,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_VERTEXARRAY_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp index a75c40f01..68ebfa1ac 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_WGLCONTEXT_HPP -#define NAZARA_OPENGLRENDERER_WGLCONTEXT_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_WGL_WGLCONTEXT_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_WGL_WGLCONTEXT_HPP #include #include @@ -81,4 +81,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_WGL_WGLCONTEXT_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp index 0b7c09bc5..33ef418b0 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_WGLFUNCTIONS_HPP -#define NAZARA_OPENGLRENDERER_WGLFUNCTIONS_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_WGL_WGLFUNCTIONS_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_WGL_WGLFUNCTIONS_HPP #undef WIN32_LEAN_AND_MEAN //< Redefined by wgl.h header (ty Khronos) @@ -51,4 +51,4 @@ func(SetPixelFormat, PFNSETPIXELFORMATPROC) \ func(SwapBuffers, PFNSWAPBUFFERSPROC) \ -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_WGL_WGLFUNCTIONS_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp index fb8046451..fc614110c 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_WGLLOADER_HPP -#define NAZARA_OPENGLRENDERER_WGLLOADER_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_WGL_WGLLOADER_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_WGL_WGLLOADER_HPP #include #include @@ -48,4 +48,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_WGL_WGLLOADER_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Win32/EGLContextWin32.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Win32/EGLContextWin32.hpp index db9382bfb..39de96e6f 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Win32/EGLContextWin32.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Win32/EGLContextWin32.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_EGLCONTEXTWIN32_HPP -#define NAZARA_OPENGLRENDERER_EGLCONTEXTWIN32_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_WIN32_EGLCONTEXTWIN32_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_WIN32_EGLCONTEXTWIN32_HPP #include #include @@ -35,4 +35,4 @@ namespace Nz::GL #include -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_WIN32_EGLCONTEXTWIN32_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Win32/Gdi32Functions.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Win32/Gdi32Functions.hpp index 0b7c09bc5..6d19c68cf 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Win32/Gdi32Functions.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Win32/Gdi32Functions.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_WGLFUNCTIONS_HPP -#define NAZARA_OPENGLRENDERER_WGLFUNCTIONS_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_WIN32_GDI32FUNCTIONS_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_WIN32_GDI32FUNCTIONS_HPP #undef WIN32_LEAN_AND_MEAN //< Redefined by wgl.h header (ty Khronos) @@ -51,4 +51,4 @@ func(SetPixelFormat, PFNSETPIXELFORMATPROC) \ func(SwapBuffers, PFNSWAPBUFFERSPROC) \ -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_WIN32_GDI32FUNCTIONS_HPP diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp index 028369f4d..6424ab59d 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_OPENGLRENDERER_WIN32HELPER_HPP -#define NAZARA_OPENGLRENDERER_WIN32HELPER_HPP +#ifndef NAZARA_OPENGLRENDERER_WRAPPER_WIN32_WIN32HELPER_HPP +#define NAZARA_OPENGLRENDERER_WRAPPER_WIN32_WIN32HELPER_HPP #include #include @@ -25,4 +25,4 @@ namespace Nz::GL using HWNDHandle = std::unique_ptr, WindowDeleter>; } -#endif +#endif // NAZARA_OPENGLRENDERER_WRAPPER_WIN32_WIN32HELPER_HPP diff --git a/include/Nazara/Physics2D.hpp b/include/Nazara/Physics2D.hpp index 1aa97796f..a8487d539 100644 --- a/include/Nazara/Physics2D.hpp +++ b/include/Nazara/Physics2D.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* - Nazara Engine - Physics 2D module + Nazara Engine - Physics2D module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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/Physics2D/Arbiter2D.hpp b/include/Nazara/Physics2D/Arbiter2D.hpp index e718349e3..de638450e 100644 --- a/include/Nazara/Physics2D/Arbiter2D.hpp +++ b/include/Nazara/Physics2D/Arbiter2D.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ARBITER2D_HPP -#define NAZARA_ARBITER2D_HPP +#ifndef NAZARA_PHYSICS2D_ARBITER2D_HPP +#define NAZARA_PHYSICS2D_ARBITER2D_HPP #include #include @@ -58,4 +58,4 @@ namespace Nz #include -#endif // NAZARA_ARBITER2D_HPP +#endif // NAZARA_PHYSICS2D_ARBITER2D_HPP diff --git a/include/Nazara/Physics2D/Collider2D.hpp b/include/Nazara/Physics2D/Collider2D.hpp index 704267e44..78bad0437 100644 --- a/include/Nazara/Physics2D/Collider2D.hpp +++ b/include/Nazara/Physics2D/Collider2D.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_COLLIDER2D_HPP -#define NAZARA_COLLIDER2D_HPP +#ifndef NAZARA_PHYSICS2D_COLLIDER2D_HPP +#define NAZARA_PHYSICS2D_COLLIDER2D_HPP #include #include @@ -208,4 +208,4 @@ namespace Nz #include -#endif // NAZARA_COLLIDER2D_HPP +#endif // NAZARA_PHYSICS2D_COLLIDER2D_HPP diff --git a/include/Nazara/Physics2D/Config.hpp b/include/Nazara/Physics2D/Config.hpp index 9c9f21a50..b477f78f5 100644 --- a/include/Nazara/Physics2D/Config.hpp +++ b/include/Nazara/Physics2D/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_PHYSICS2D_HPP -#define NAZARA_CONFIG_PHYSICS2D_HPP +#ifndef NAZARA_PHYSICS2D_CONFIG_HPP +#define NAZARA_PHYSICS2D_CONFIG_HPP /// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci @@ -48,4 +48,4 @@ #endif #endif -#endif // NAZARA_CONFIG_PHYSICS3D_HPP +#endif // NAZARA_PHYSICS2D_CONFIG_HPP diff --git a/include/Nazara/Physics2D/ConfigCheck.hpp b/include/Nazara/Physics2D/ConfigCheck.hpp index c2eaaaf3d..289232f80 100644 --- a/include/Nazara/Physics2D/ConfigCheck.hpp +++ b/include/Nazara/Physics2D/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_PHYSICS_HPP -#define NAZARA_CONFIG_CHECK_PHYSICS_HPP +#ifndef NAZARA_PHYSICS2D_CONFIGCHECK_HPP +#define NAZARA_PHYSICS2D_CONFIGCHECK_HPP /// Ce fichier sert à vérifier la valeur des constantes du fichier Config.hpp @@ -15,4 +15,4 @@ #define NAZARA_PHYSICS2D_MANAGE_MEMORY 0 #endif -#endif // NAZARA_CONFIG_CHECK_PHYSICS_HPP +#endif // NAZARA_PHYSICS2D_CONFIGCHECK_HPP diff --git a/include/Nazara/Physics2D/Constraint2D.hpp b/include/Nazara/Physics2D/Constraint2D.hpp index c9117f888..ecfd6a21b 100644 --- a/include/Nazara/Physics2D/Constraint2D.hpp +++ b/include/Nazara/Physics2D/Constraint2D.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONSTRAINT2D_HPP -#define NAZARA_CONSTRAINT2D_HPP +#ifndef NAZARA_PHYSICS2D_CONSTRAINT2D_HPP +#define NAZARA_PHYSICS2D_CONSTRAINT2D_HPP #include #include @@ -229,4 +229,4 @@ namespace Nz #include -#endif // NAZARA_CONSTRAINT2D_HPP +#endif // NAZARA_PHYSICS2D_CONSTRAINT2D_HPP diff --git a/include/Nazara/Physics2D/Debug.hpp b/include/Nazara/Physics2D/Debug.hpp index cc3e7ddda..d0360510e 100644 --- a/include/Nazara/Physics2D/Debug.hpp +++ b/include/Nazara/Physics2D/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Physics2D module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_PHYSICS2D_MANAGE_MEMORY #include diff --git a/include/Nazara/Physics2D/DebugOff.hpp b/include/Nazara/Physics2D/DebugOff.hpp index 4ea73eea6..bb322b874 100644 --- a/include/Nazara/Physics2D/DebugOff.hpp +++ b/include/Nazara/Physics2D/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Physics2D module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // On suppose que Debug.hpp a déjà été inclus, tout comme Config.hpp #if NAZARA_PHYSICS2D_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Physics2D/Enums.hpp b/include/Nazara/Physics2D/Enums.hpp index e6b3fe7ca..7ccfb22a3 100644 --- a/include/Nazara/Physics2D/Enums.hpp +++ b/include/Nazara/Physics2D/Enums.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENUMS_PHYSICS2D_HPP -#define NAZARA_ENUMS_PHYSICS2D_HPP +#ifndef NAZARA_PHYSICS2D_ENUMS_HPP +#define NAZARA_PHYSICS2D_ENUMS_HPP namespace Nz { @@ -22,4 +22,4 @@ namespace Nz }; } -#endif // NAZARA_ENUMS_PHYSICS2D_HPP +#endif // NAZARA_PHYSICS2D_ENUMS_HPP diff --git a/include/Nazara/Physics2D/PhysWorld2D.hpp b/include/Nazara/Physics2D/PhysWorld2D.hpp index e697427a4..10c0160e9 100644 --- a/include/Nazara/Physics2D/PhysWorld2D.hpp +++ b/include/Nazara/Physics2D/PhysWorld2D.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PHYSWORLD2D_HPP -#define NAZARA_PHYSWORLD2D_HPP +#ifndef NAZARA_PHYSICS2D_PHYSWORLD2D_HPP +#define NAZARA_PHYSICS2D_PHYSWORLD2D_HPP #include #include @@ -161,4 +161,4 @@ namespace Nz }; } -#endif // NAZARA_PHYSWORLD2D_HPP +#endif // NAZARA_PHYSICS2D_PHYSWORLD2D_HPP diff --git a/include/Nazara/Physics2D/RigidBody2D.hpp b/include/Nazara/Physics2D/RigidBody2D.hpp index c02b5336e..a45897f70 100644 --- a/include/Nazara/Physics2D/RigidBody2D.hpp +++ b/include/Nazara/Physics2D/RigidBody2D.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RIGIDBODY2D_HPP -#define NAZARA_RIGIDBODY2D_HPP +#ifndef NAZARA_PHYSICS2D_RIGIDBODY2D_HPP +#define NAZARA_PHYSICS2D_RIGIDBODY2D_HPP #include #include @@ -136,4 +136,4 @@ namespace Nz #include -#endif // NAZARA_RIGIDBODY2D_HPP +#endif // NAZARA_PHYSICS2D_RIGIDBODY2D_HPP diff --git a/include/Nazara/Physics3D.hpp b/include/Nazara/Physics3D.hpp index a40c40b9c..dda1b20f7 100644 --- a/include/Nazara/Physics3D.hpp +++ b/include/Nazara/Physics3D.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* - Nazara Engine - Physics 3D module + Nazara Engine - Physics3D module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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/Physics3D/Collider3D.hpp b/include/Nazara/Physics3D/Collider3D.hpp index 6694f8a98..6fc752479 100644 --- a/include/Nazara/Physics3D/Collider3D.hpp +++ b/include/Nazara/Physics3D/Collider3D.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_COLLIDER3D_HPP -#define NAZARA_COLLIDER3D_HPP +#ifndef NAZARA_PHYSICS3D_COLLIDER3D_HPP +#define NAZARA_PHYSICS3D_COLLIDER3D_HPP #include #include @@ -206,4 +206,4 @@ namespace Nz #include -#endif // NAZARA_COLLIDER3D_HPP +#endif // NAZARA_PHYSICS3D_COLLIDER3D_HPP diff --git a/include/Nazara/Physics3D/Components.hpp b/include/Nazara/Physics3D/Components.hpp index 73936ed86..4eb9a844a 100644 --- a/include/Nazara/Physics3D/Components.hpp +++ b/include/Nazara/Physics3D/Components.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* - Nazara Engine - Physics 3D module + Nazara Engine - Physics3D module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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 @@ -26,9 +26,9 @@ #pragma once -#ifndef NAZARA_GLOBAL_PHYSICS3D_COMPONENTS_HPP -#define NAZARA_GLOBAL_PHYSICS3D_COMPONENTS_HPP +#ifndef NAZARA_PHYSICS3D_COMPONENTS_HPP +#define NAZARA_PHYSICS3D_COMPONENTS_HPP #include -#endif // NAZARA_GLOBAL_PHYSICS3D_COMPONENTS_HPP +#endif // NAZARA_PHYSICS3D_COMPONENTS_HPP diff --git a/include/Nazara/Physics3D/Components/RigidBody3DComponent.hpp b/include/Nazara/Physics3D/Components/RigidBody3DComponent.hpp index 8f83923b4..a510bed44 100644 --- a/include/Nazara/Physics3D/Components/RigidBody3DComponent.hpp +++ b/include/Nazara/Physics3D/Components/RigidBody3DComponent.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RIGIDBODYCOMPONENT_HPP -#define NAZARA_RIGIDBODYCOMPONENT_HPP +#ifndef NAZARA_PHYSICS3D_COMPONENTS_RIGIDBODY3DCOMPONENT_HPP +#define NAZARA_PHYSICS3D_COMPONENTS_RIGIDBODY3DCOMPONENT_HPP #include #include @@ -27,4 +27,4 @@ namespace Nz #include -#endif +#endif // NAZARA_PHYSICS3D_COMPONENTS_RIGIDBODY3DCOMPONENT_HPP diff --git a/include/Nazara/Physics3D/Config.hpp b/include/Nazara/Physics3D/Config.hpp index 95132a905..7e2596f13 100644 --- a/include/Nazara/Physics3D/Config.hpp +++ b/include/Nazara/Physics3D/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_PHYSICS3D_HPP -#define NAZARA_CONFIG_PHYSICS3D_HPP +#ifndef NAZARA_PHYSICS3D_CONFIG_HPP +#define NAZARA_PHYSICS3D_CONFIG_HPP /// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci @@ -48,4 +48,4 @@ #endif #endif -#endif // NAZARA_CONFIG_PHYSICS3D_HPP +#endif // NAZARA_PHYSICS3D_CONFIG_HPP diff --git a/include/Nazara/Physics3D/ConfigCheck.hpp b/include/Nazara/Physics3D/ConfigCheck.hpp index b67aaea07..288c4650f 100644 --- a/include/Nazara/Physics3D/ConfigCheck.hpp +++ b/include/Nazara/Physics3D/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_PHYSICS_HPP -#define NAZARA_CONFIG_CHECK_PHYSICS_HPP +#ifndef NAZARA_PHYSICS3D_CONFIGCHECK_HPP +#define NAZARA_PHYSICS3D_CONFIGCHECK_HPP /// Ce fichier sert à vérifier la valeur des constantes du fichier Config.hpp @@ -15,4 +15,4 @@ #define NAZARA_PHYSICS3D_MANAGE_MEMORY 0 #endif -#endif // NAZARA_CONFIG_CHECK_PHYSICS_HPP +#endif // NAZARA_PHYSICS3D_CONFIGCHECK_HPP diff --git a/include/Nazara/Physics3D/Debug.hpp b/include/Nazara/Physics3D/Debug.hpp index 6830227ee..cc4b8aa90 100644 --- a/include/Nazara/Physics3D/Debug.hpp +++ b/include/Nazara/Physics3D/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Physics3D module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_PHYSICS3D_MANAGE_MEMORY #include diff --git a/include/Nazara/Physics3D/DebugOff.hpp b/include/Nazara/Physics3D/DebugOff.hpp index ba28b9dba..e347dcf37 100644 --- a/include/Nazara/Physics3D/DebugOff.hpp +++ b/include/Nazara/Physics3D/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Physics3D module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // On suppose que Debug.hpp a déjà été inclus, tout comme Config.hpp #if NAZARA_PHYSICS3D_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Physics3D/Enums.hpp b/include/Nazara/Physics3D/Enums.hpp index 495dafd2d..939bec2b0 100644 --- a/include/Nazara/Physics3D/Enums.hpp +++ b/include/Nazara/Physics3D/Enums.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENUMS_PHYSICS3D_HPP -#define NAZARA_ENUMS_PHYSICS3D_HPP +#ifndef NAZARA_PHYSICS3D_ENUMS_HPP +#define NAZARA_PHYSICS3D_ENUMS_HPP namespace Nz { @@ -27,4 +27,4 @@ namespace Nz }; } -#endif // NAZARA_ENUMS_PHYSICS3D_HPP +#endif // NAZARA_PHYSICS3D_ENUMS_HPP diff --git a/include/Nazara/Physics3D/PhysWorld3D.hpp b/include/Nazara/Physics3D/PhysWorld3D.hpp index eba687672..d37c2a23e 100644 --- a/include/Nazara/Physics3D/PhysWorld3D.hpp +++ b/include/Nazara/Physics3D/PhysWorld3D.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PHYSWORLD_HPP -#define NAZARA_PHYSWORLD_HPP +#ifndef NAZARA_PHYSICS3D_PHYSWORLD3D_HPP +#define NAZARA_PHYSICS3D_PHYSWORLD3D_HPP #include #include @@ -84,4 +84,4 @@ namespace Nz }; } -#endif // NAZARA_PHYSWORLD_HPP +#endif // NAZARA_PHYSICS3D_PHYSWORLD3D_HPP diff --git a/include/Nazara/Physics3D/RigidBody3D.hpp b/include/Nazara/Physics3D/RigidBody3D.hpp index a05a5a0ed..65516f01e 100644 --- a/include/Nazara/Physics3D/RigidBody3D.hpp +++ b/include/Nazara/Physics3D/RigidBody3D.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RIGIDBODY3D_HPP -#define NAZARA_RIGIDBODY3D_HPP +#ifndef NAZARA_PHYSICS3D_RIGIDBODY3D_HPP +#define NAZARA_PHYSICS3D_RIGIDBODY3D_HPP #include #include @@ -92,4 +92,4 @@ namespace Nz }; } -#endif // NAZARA_RIGIDBODY3D_HPP +#endif // NAZARA_PHYSICS3D_RIGIDBODY3D_HPP diff --git a/include/Nazara/Physics3D/Systems.hpp b/include/Nazara/Physics3D/Systems.hpp index cf1e7745a..12eb216ea 100644 --- a/include/Nazara/Physics3D/Systems.hpp +++ b/include/Nazara/Physics3D/Systems.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* - Nazara Engine - Physics 3D module + Nazara Engine - Physics3D module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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 @@ -26,9 +26,9 @@ #pragma once -#ifndef NAZARA_GLOBAL_PHYSICS3D_SYSTEMS_HPP -#define NAZARA_GLOBAL_PHYSICS3D_SYSTEMS_HPP +#ifndef NAZARA_PHYSICS3D_SYSTEMS_HPP +#define NAZARA_PHYSICS3D_SYSTEMS_HPP #include -#endif // NAZARA_GLOBAL_PHYSICS3D_SYSTEMS_HPP +#endif // NAZARA_PHYSICS3D_SYSTEMS_HPP diff --git a/include/Nazara/Physics3D/Systems/Physics3DSystem.hpp b/include/Nazara/Physics3D/Systems/Physics3DSystem.hpp index 1308a5d63..97240b3f9 100644 --- a/include/Nazara/Physics3D/Systems/Physics3DSystem.hpp +++ b/include/Nazara/Physics3D/Systems/Physics3DSystem.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PHYSICS3DSYSTEM_HPP -#define NAZARA_PHYSICS3DSYSTEM_HPP +#ifndef NAZARA_PHYSICS3D_SYSTEMS_PHYSICS3DSYSTEM_HPP +#define NAZARA_PHYSICS3D_SYSTEMS_PHYSICS3DSYSTEM_HPP #include #include @@ -42,4 +42,4 @@ namespace Nz #include -#endif +#endif // NAZARA_PHYSICS3D_SYSTEMS_PHYSICS3DSYSTEM_HPP diff --git a/include/Nazara/Platform.hpp b/include/Nazara/Platform.hpp index 51d4e0a32..392e475a7 100644 --- a/include/Nazara/Platform.hpp +++ b/include/Nazara/Platform.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Platform module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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/Platform/Config.hpp b/include/Nazara/Platform/Config.hpp index 01bf241d1..8cb8909da 100644 --- a/include/Nazara/Platform/Config.hpp +++ b/include/Nazara/Platform/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_PLATFORM_HPP -#define NAZARA_CONFIG_PLATFORM_HPP +#ifndef NAZARA_PLATFORM_CONFIG_HPP +#define NAZARA_PLATFORM_CONFIG_HPP /// Each modification of a parameter needs a recompilation of the module @@ -51,4 +51,4 @@ #endif #endif -#endif // NAZARA_CONFIG_PLATFORM_HPP +#endif // NAZARA_PLATFORM_CONFIG_HPP diff --git a/include/Nazara/Platform/ConfigCheck.hpp b/include/Nazara/Platform/ConfigCheck.hpp index b844ac58a..fedd95b73 100644 --- a/include/Nazara/Platform/ConfigCheck.hpp +++ b/include/Nazara/Platform/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_PLATFORM_HPP -#define NAZARA_CONFIG_CHECK_PLATFORM_HPP +#ifndef NAZARA_PLATFORM_CONFIGCHECK_HPP +#define NAZARA_PLATFORM_CONFIGCHECK_HPP /// This file is used to check the constant values defined in Config.hpp @@ -20,4 +20,4 @@ #undef NazaraCheckTypeAndVal -#endif // NAZARA_CONFIG_CHECK_PLATFORM_HPP +#endif // NAZARA_PLATFORM_CONFIGCHECK_HPP diff --git a/include/Nazara/Platform/Cursor.hpp b/include/Nazara/Platform/Cursor.hpp index a639329fa..1c27ccbea 100644 --- a/include/Nazara/Platform/Cursor.hpp +++ b/include/Nazara/Platform/Cursor.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CURSOR_HPP -#define NAZARA_CURSOR_HPP +#ifndef NAZARA_PLATFORM_CURSOR_HPP +#define NAZARA_PLATFORM_CURSOR_HPP #include #include @@ -59,4 +59,4 @@ namespace Nz #include -#endif // NAZARA_CURSOR_HPP +#endif // NAZARA_PLATFORM_CURSOR_HPP diff --git a/include/Nazara/Platform/CursorController.hpp b/include/Nazara/Platform/CursorController.hpp index a6a7b2867..9cdc3c2e3 100644 --- a/include/Nazara/Platform/CursorController.hpp +++ b/include/Nazara/Platform/CursorController.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CURSORCONTROLLER_HPP -#define NAZARA_CURSORCONTROLLER_HPP +#ifndef NAZARA_PLATFORM_CURSORCONTROLLER_HPP +#define NAZARA_PLATFORM_CURSORCONTROLLER_HPP #include #include @@ -39,4 +39,4 @@ namespace Nz #include -#endif // NAZARA_CURSORCONTROLLER_HPP +#endif // NAZARA_PLATFORM_CURSORCONTROLLER_HPP diff --git a/include/Nazara/Platform/Debug.hpp b/include/Nazara/Platform/Debug.hpp index 2a883475b..84fbf933d 100644 --- a/include/Nazara/Platform/Debug.hpp +++ b/include/Nazara/Platform/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Platform module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_PLATFORM_MANAGE_MEMORY #include diff --git a/include/Nazara/Platform/DebugOff.hpp b/include/Nazara/Platform/DebugOff.hpp index f110798f7..033a011f7 100644 --- a/include/Nazara/Platform/DebugOff.hpp +++ b/include/Nazara/Platform/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Platform module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // We suppose that Debug.hpp is already included, same goes for Config.hpp #if NAZARA_PLATFORM_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Platform/Enums.hpp b/include/Nazara/Platform/Enums.hpp index 785739859..e74de6602 100644 --- a/include/Nazara/Platform/Enums.hpp +++ b/include/Nazara/Platform/Enums.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENUMS_PLATFORM_HPP -#define NAZARA_ENUMS_PLATFORM_HPP +#ifndef NAZARA_PLATFORM_ENUMS_HPP +#define NAZARA_PLATFORM_ENUMS_HPP #include @@ -88,4 +88,4 @@ namespace Nz constexpr WindowStyleFlags WindowStyle_Default = WindowStyle::Closable | WindowStyle::Resizable | WindowStyle::Titlebar; } -#endif // NAZARA_ENUMS_PLATFORM_HPP +#endif // NAZARA_PLATFORM_ENUMS_HPP diff --git a/include/Nazara/Platform/Event.hpp b/include/Nazara/Platform/Event.hpp index aa3291d2e..22b86c239 100644 --- a/include/Nazara/Platform/Event.hpp +++ b/include/Nazara/Platform/Event.hpp @@ -6,8 +6,8 @@ #pragma once -#ifndef NAZARA_EVENT_HPP -#define NAZARA_EVENT_HPP +#ifndef NAZARA_PLATFORM_EVENT_HPP +#define NAZARA_PLATFORM_EVENT_HPP #include @@ -135,4 +135,4 @@ namespace Nz }; } -#endif // NAZARA_EVENT_HPP +#endif // NAZARA_PLATFORM_EVENT_HPP diff --git a/include/Nazara/Platform/EventHandler.hpp b/include/Nazara/Platform/EventHandler.hpp index 1fe3ea3e8..9dbce9f50 100644 --- a/include/Nazara/Platform/EventHandler.hpp +++ b/include/Nazara/Platform/EventHandler.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_EVENTHANDLER_HPP -#define NAZARA_EVENTHANDLER_HPP +#ifndef NAZARA_PLATFORM_EVENTHANDLER_HPP +#define NAZARA_PLATFORM_EVENTHANDLER_HPP #include #include @@ -55,4 +55,4 @@ namespace Nz #include -#endif // NAZARA_EVENTHANDLER_HPP +#endif // NAZARA_PLATFORM_EVENTHANDLER_HPP diff --git a/include/Nazara/Platform/Icon.hpp b/include/Nazara/Platform/Icon.hpp index 54498f2c0..fbc2eb51a 100644 --- a/include/Nazara/Platform/Icon.hpp +++ b/include/Nazara/Platform/Icon.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ICON_HPP -#define NAZARA_ICON_HPP +#ifndef NAZARA_PLATFORM_ICON_HPP +#define NAZARA_PLATFORM_ICON_HPP #include #include @@ -42,4 +42,4 @@ namespace Nz #include -#endif // NAZARA_ICON_HPP +#endif // NAZARA_PLATFORM_ICON_HPP diff --git a/include/Nazara/Platform/Joystick.hpp b/include/Nazara/Platform/Joystick.hpp index 4d297057f..5302545ad 100644 --- a/include/Nazara/Platform/Joystick.hpp +++ b/include/Nazara/Platform/Joystick.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_JOYSTICK_HPP -#define NAZARA_JOYSTICK_HPP +#ifndef NAZARA_PLATFORM_JOYSTICK_HPP +#define NAZARA_PLATFORM_JOYSTICK_HPP #include #include @@ -24,4 +24,4 @@ namespace Nz }; } -#endif // NAZARA_JOYSTICK_HPP +#endif // NAZARA_PLATFORM_JOYSTICK_HPP diff --git a/include/Nazara/Platform/Keyboard.hpp b/include/Nazara/Platform/Keyboard.hpp index 8f7061412..a6dbadf1f 100644 --- a/include/Nazara/Platform/Keyboard.hpp +++ b/include/Nazara/Platform/Keyboard.hpp @@ -6,8 +6,8 @@ #pragma once -#ifndef NAZARA_KEYBOARD_HPP -#define NAZARA_KEYBOARD_HPP +#ifndef NAZARA_PLATFORM_KEYBOARD_HPP +#define NAZARA_PLATFORM_KEYBOARD_HPP #include #include @@ -330,4 +330,4 @@ namespace Nz }; } -#endif // NAZARA_KEYBOARD_HPP +#endif // NAZARA_PLATFORM_KEYBOARD_HPP diff --git a/include/Nazara/Platform/Mouse.hpp b/include/Nazara/Platform/Mouse.hpp index af08113f1..35b5f3d35 100644 --- a/include/Nazara/Platform/Mouse.hpp +++ b/include/Nazara/Platform/Mouse.hpp @@ -6,8 +6,8 @@ #pragma once -#ifndef NAZARA_MOUSE_HPP -#define NAZARA_MOUSE_HPP +#ifndef NAZARA_PLATFORM_MOUSE_HPP +#define NAZARA_PLATFORM_MOUSE_HPP #include #include @@ -45,4 +45,4 @@ namespace Nz }; } -#endif // NAZARA_MOUSE_HPP +#endif // NAZARA_PLATFORM_MOUSE_HPP diff --git a/include/Nazara/Platform/VideoMode.hpp b/include/Nazara/Platform/VideoMode.hpp index f92acdf41..8e5fbb83b 100644 --- a/include/Nazara/Platform/VideoMode.hpp +++ b/include/Nazara/Platform/VideoMode.hpp @@ -6,8 +6,8 @@ #pragma once -#ifndef NAZARA_VIDEOMODE_HPP -#define NAZARA_VIDEOMODE_HPP +#ifndef NAZARA_PLATFORM_VIDEOMODE_HPP +#define NAZARA_PLATFORM_VIDEOMODE_HPP #include #include @@ -40,4 +40,4 @@ namespace Nz bool NAZARA_PLATFORM_API operator>=(const VideoMode& left, const VideoMode& right); } -#endif // NAZARA_VIDEOMODE_HPP +#endif // NAZARA_PLATFORM_VIDEOMODE_HPP diff --git a/include/Nazara/Platform/Window.hpp b/include/Nazara/Platform/Window.hpp index 8a4968cdd..7e01bbe12 100644 --- a/include/Nazara/Platform/Window.hpp +++ b/include/Nazara/Platform/Window.hpp @@ -6,8 +6,8 @@ #pragma once -#ifndef NAZARA_WINDOW_HPP -#define NAZARA_WINDOW_HPP +#ifndef NAZARA_PLATFORM_WINDOW_HPP +#define NAZARA_PLATFORM_WINDOW_HPP #include #include @@ -149,4 +149,4 @@ namespace Nz #include -#endif // NAZARA_WINDOW_HPP +#endif // NAZARA_PLATFORM_WINDOW_HPP diff --git a/include/Nazara/Platform/WindowHandle.hpp b/include/Nazara/Platform/WindowHandle.hpp index b9e2a90cd..d27e33273 100644 --- a/include/Nazara/Platform/WindowHandle.hpp +++ b/include/Nazara/Platform/WindowHandle.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_WINDOWHANDLE_HPP -#define NAZARA_WINDOWHANDLE_HPP +#ifndef NAZARA_PLATFORM_WINDOWHANDLE_HPP +#define NAZARA_PLATFORM_WINDOWHANDLE_HPP #include #include @@ -48,4 +48,4 @@ namespace Nz }; } -#endif // NAZARA_WINDOWHANDLE_HPP +#endif // NAZARA_PLATFORM_WINDOWHANDLE_HPP diff --git a/include/Nazara/Renderer.hpp b/include/Nazara/Renderer.hpp index c021338f7..c8824d3e2 100644 --- a/include/Nazara/Renderer.hpp +++ b/include/Nazara/Renderer.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Renderer module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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/CommandBuffer.hpp b/include/Nazara/Renderer/CommandBuffer.hpp index 5c401dacf..13a8a00e8 100644 --- a/include/Nazara/Renderer/CommandBuffer.hpp +++ b/include/Nazara/Renderer/CommandBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_COMMANDBUFFER_HPP -#define NAZARA_COMMANDBUFFER_HPP +#ifndef NAZARA_RENDERER_COMMANDBUFFER_HPP +#define NAZARA_RENDERER_COMMANDBUFFER_HPP #include #include @@ -44,4 +44,4 @@ namespace Nz #include -#endif // NAZARA_COMMANDBUFFER_HPP +#endif // NAZARA_RENDERER_COMMANDBUFFER_HPP diff --git a/include/Nazara/Renderer/CommandBufferBuilder.hpp b/include/Nazara/Renderer/CommandBufferBuilder.hpp index 3e0eeeca0..6ffc724c1 100644 --- a/include/Nazara/Renderer/CommandBufferBuilder.hpp +++ b/include/Nazara/Renderer/CommandBufferBuilder.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_COMMANDBUFFERBUILDER_HPP -#define NAZARA_COMMANDBUFFERBUILDER_HPP +#ifndef NAZARA_RENDERER_COMMANDBUFFERBUILDER_HPP +#define NAZARA_RENDERER_COMMANDBUFFERBUILDER_HPP #include #include @@ -81,4 +81,4 @@ namespace Nz #include -#endif // NAZARA_COMMANDBUFFERBUILDER_HPP +#endif // NAZARA_RENDERER_COMMANDBUFFERBUILDER_HPP diff --git a/include/Nazara/Renderer/CommandPool.hpp b/include/Nazara/Renderer/CommandPool.hpp index 1fb01b967..530503694 100644 --- a/include/Nazara/Renderer/CommandPool.hpp +++ b/include/Nazara/Renderer/CommandPool.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_COMMANDPOOL_HPP -#define NAZARA_COMMANDPOOL_HPP +#ifndef NAZARA_RENDERER_COMMANDPOOL_HPP +#define NAZARA_RENDERER_COMMANDPOOL_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz #include -#endif // NAZARA_COMMANDPOOL_HPP +#endif // NAZARA_RENDERER_COMMANDPOOL_HPP diff --git a/include/Nazara/Renderer/Config.hpp b/include/Nazara/Renderer/Config.hpp index d7ec416e7..6bae5afd6 100644 --- a/include/Nazara/Renderer/Config.hpp +++ b/include/Nazara/Renderer/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_RENDERER_HPP -#define NAZARA_CONFIG_RENDERER_HPP +#ifndef NAZARA_RENDERER_CONFIG_HPP +#define NAZARA_RENDERER_CONFIG_HPP /// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci @@ -54,4 +54,4 @@ #endif #endif -#endif // NAZARA_CONFIG_MODULENAME_HPP +#endif // NAZARA_RENDERER_CONFIG_HPP diff --git a/include/Nazara/Renderer/ConfigCheck.hpp b/include/Nazara/Renderer/ConfigCheck.hpp index d5bdfae3b..d41ef0b31 100644 --- a/include/Nazara/Renderer/ConfigCheck.hpp +++ b/include/Nazara/Renderer/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_RENDERER_HPP -#define NAZARA_CONFIG_CHECK_RENDERER_HPP +#ifndef NAZARA_RENDERER_CONFIGCHECK_HPP +#define NAZARA_RENDERER_CONFIGCHECK_HPP /// Ce fichier sert à vérifier la valeur des constantes du fichier Config.hpp @@ -22,4 +22,4 @@ NazaraCheckTypeAndVal(NAZARA_RENDERER_INSTANCE_BUFFER_SIZE, integral, >, 0, " sh #undef NazaraCheckTypeAndVal -#endif // NAZARA_CONFIG_CHECK_RENDERER_HPP +#endif // NAZARA_RENDERER_CONFIGCHECK_HPP diff --git a/include/Nazara/Renderer/Debug.hpp b/include/Nazara/Renderer/Debug.hpp index 2458d3866..d7e140b32 100644 --- a/include/Nazara/Renderer/Debug.hpp +++ b/include/Nazara/Renderer/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_RENDERER_MANAGE_MEMORY #include diff --git a/include/Nazara/Renderer/DebugDrawer.hpp b/include/Nazara/Renderer/DebugDrawer.hpp index 14a5c5cb9..b8724efee 100644 --- a/include/Nazara/Renderer/DebugDrawer.hpp +++ b/include/Nazara/Renderer/DebugDrawer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_DEBUGDRAWER_HPP -#define NAZARA_DEBUGDRAWER_HPP +#ifndef NAZARA_RENDERER_DEBUGDRAWER_HPP +#define NAZARA_RENDERER_DEBUGDRAWER_HPP #include #include @@ -58,4 +58,4 @@ namespace Nz }; } -#endif // NAZARA_DEBUG_DRAWER_HPP +#endif // NAZARA_RENDERER_DEBUGDRAWER_HPP diff --git a/include/Nazara/Renderer/DebugOff.hpp b/include/Nazara/Renderer/DebugOff.hpp index da6d19e89..59afcbece 100644 --- a/include/Nazara/Renderer/DebugOff.hpp +++ b/include/Nazara/Renderer/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // On suppose que Debug.hpp a déjà été inclus, tout comme Config.hpp #if NAZARA_RENDERER_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Renderer/Enums.hpp b/include/Nazara/Renderer/Enums.hpp index 9de031f5d..bf6de3ebe 100644 --- a/include/Nazara/Renderer/Enums.hpp +++ b/include/Nazara/Renderer/Enums.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENUMS_RENDERER_HPP -#define NAZARA_ENUMS_RENDERER_HPP +#ifndef NAZARA_RENDERER_ENUMS_HPP +#define NAZARA_RENDERER_ENUMS_HPP #include @@ -185,4 +185,4 @@ namespace Nz using TextureUsageFlags = Flags; } -#endif // NAZARA_ENUMS_RENDERER_HPP +#endif // NAZARA_RENDERER_ENUMS_HPP diff --git a/include/Nazara/Renderer/Framebuffer.hpp b/include/Nazara/Renderer/Framebuffer.hpp index 8e702bb74..91a4c7e69 100644 --- a/include/Nazara/Renderer/Framebuffer.hpp +++ b/include/Nazara/Renderer/Framebuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FRAMEBUFFER_HPP -#define NAZARA_FRAMEBUFFER_HPP +#ifndef NAZARA_RENDERER_FRAMEBUFFER_HPP +#define NAZARA_RENDERER_FRAMEBUFFER_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz #include -#endif // NAZARA_FRAMEBUFFER_HPP +#endif // NAZARA_RENDERER_FRAMEBUFFER_HPP diff --git a/include/Nazara/Renderer/GpuSwitch.hpp b/include/Nazara/Renderer/GpuSwitch.hpp index 03097b448..cb2ede6ee 100644 --- a/include/Nazara/Renderer/GpuSwitch.hpp +++ b/include/Nazara/Renderer/GpuSwitch.hpp @@ -4,6 +4,11 @@ #include +#pragma once + +#ifndef NAZARA_RENDERER_GPUSWITCH_HPP +#define NAZARA_RENDERER_GPUSWITCH_HPP + #ifdef NAZARA_PLATFORM_WINDOWS #define NAZARA_REQUEST_DEDICATED_GPU() \ @@ -18,3 +23,5 @@ extern "C" \ #define NAZARA_REQUEST_DEDICATED_GPU() #endif + +#endif // NAZARA_RENDERER_GPUSWITCH_HPP diff --git a/include/Nazara/Renderer/RenderBuffer.hpp b/include/Nazara/Renderer/RenderBuffer.hpp index da0ae631a..0468c0feb 100644 --- a/include/Nazara/Renderer/RenderBuffer.hpp +++ b/include/Nazara/Renderer/RenderBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERBUFFER_HPP -#define NAZARA_RENDERBUFFER_HPP +#ifndef NAZARA_RENDERER_RENDERBUFFER_HPP +#define NAZARA_RENDERER_RENDERBUFFER_HPP #include #include @@ -66,4 +66,4 @@ namespace Nz #include -#endif // NAZARA_RENDERBUFFER_HPP +#endif // NAZARA_RENDERER_RENDERBUFFER_HPP diff --git a/include/Nazara/Renderer/RenderBufferView.hpp b/include/Nazara/Renderer/RenderBufferView.hpp index d57ab97c0..d674e4817 100644 --- a/include/Nazara/Renderer/RenderBufferView.hpp +++ b/include/Nazara/Renderer/RenderBufferView.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERBUFFERVIEW_HPP -#define NAZARA_RENDERBUFFERVIEW_HPP +#ifndef NAZARA_RENDERER_RENDERBUFFERVIEW_HPP +#define NAZARA_RENDERER_RENDERBUFFERVIEW_HPP #include #include @@ -38,4 +38,4 @@ namespace Nz #include -#endif // NAZARA_RENDERBUFFERVIEW_HPP +#endif // NAZARA_RENDERER_RENDERBUFFERVIEW_HPP diff --git a/include/Nazara/Renderer/RenderDevice.hpp b/include/Nazara/Renderer/RenderDevice.hpp index 995874243..0186f97e0 100644 --- a/include/Nazara/Renderer/RenderDevice.hpp +++ b/include/Nazara/Renderer/RenderDevice.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERDEVICEINSTANCE_HPP -#define NAZARA_RENDERDEVICEINSTANCE_HPP +#ifndef NAZARA_RENDERER_RENDERDEVICE_HPP +#define NAZARA_RENDERER_RENDERDEVICE_HPP #include #include @@ -58,4 +58,4 @@ namespace Nz #include -#endif // NAZARA_RENDERDEVICEINSTANCE_HPP +#endif // NAZARA_RENDERER_RENDERDEVICE_HPP diff --git a/include/Nazara/Renderer/RenderDeviceInfo.hpp b/include/Nazara/Renderer/RenderDeviceInfo.hpp index 3641ec9eb..b1ba81f73 100644 --- a/include/Nazara/Renderer/RenderDeviceInfo.hpp +++ b/include/Nazara/Renderer/RenderDeviceInfo.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERDEVICE_HPP -#define NAZARA_RENDERDEVICE_HPP +#ifndef NAZARA_RENDERER_RENDERDEVICEINFO_HPP +#define NAZARA_RENDERER_RENDERDEVICEINFO_HPP #include #include @@ -34,4 +34,4 @@ namespace Nz }; } -#endif // NAZARA_RENDERER_HPP +#endif // NAZARA_RENDERER_RENDERDEVICEINFO_HPP diff --git a/include/Nazara/Renderer/RenderFrame.hpp b/include/Nazara/Renderer/RenderFrame.hpp index 5637fd734..777d20f3c 100644 --- a/include/Nazara/Renderer/RenderFrame.hpp +++ b/include/Nazara/Renderer/RenderFrame.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERFRAME_HPP -#define NAZARA_RENDERFRAME_HPP +#ifndef NAZARA_RENDERER_RENDERFRAME_HPP +#define NAZARA_RENDERER_RENDERFRAME_HPP #include #include @@ -59,4 +59,4 @@ namespace Nz #include -#endif +#endif // NAZARA_RENDERER_RENDERFRAME_HPP diff --git a/include/Nazara/Renderer/RenderImage.hpp b/include/Nazara/Renderer/RenderImage.hpp index 405df4911..de5071230 100644 --- a/include/Nazara/Renderer/RenderImage.hpp +++ b/include/Nazara/Renderer/RenderImage.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERIMAGE_HPP -#define NAZARA_RENDERIMAGE_HPP +#ifndef NAZARA_RENDERER_RENDERIMAGE_HPP +#define NAZARA_RENDERER_RENDERIMAGE_HPP #include #include @@ -81,4 +81,4 @@ namespace Nz #include -#endif // NAZARA_RENDERIMAGE_HPP +#endif // NAZARA_RENDERER_RENDERIMAGE_HPP diff --git a/include/Nazara/Renderer/RenderPass.hpp b/include/Nazara/Renderer/RenderPass.hpp index acd6cc6e6..c35693787 100644 --- a/include/Nazara/Renderer/RenderPass.hpp +++ b/include/Nazara/Renderer/RenderPass.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERPASS_HPP -#define NAZARA_RENDERPASS_HPP +#ifndef NAZARA_RENDERER_RENDERPASS_HPP +#define NAZARA_RENDERER_RENDERPASS_HPP #include #include @@ -86,4 +86,4 @@ namespace Nz #include -#endif // NAZARA_RENDERPASS_HPP +#endif // NAZARA_RENDERER_RENDERPASS_HPP diff --git a/include/Nazara/Renderer/RenderPassCache.hpp b/include/Nazara/Renderer/RenderPassCache.hpp index dc6f2efd6..7a8cdbb36 100644 --- a/include/Nazara/Renderer/RenderPassCache.hpp +++ b/include/Nazara/Renderer/RenderPassCache.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERPASSCACHE_HPP -#define NAZARA_RENDERPASSCACHE_HPP +#ifndef NAZARA_RENDERER_RENDERPASSCACHE_HPP +#define NAZARA_RENDERER_RENDERPASSCACHE_HPP #include #include @@ -67,4 +67,4 @@ namespace Nz #include -#endif // NAZARA_RENDERPASS_HPP +#endif // NAZARA_RENDERER_RENDERPASSCACHE_HPP diff --git a/include/Nazara/Renderer/RenderPipeline.hpp b/include/Nazara/Renderer/RenderPipeline.hpp index c4f5103b2..bf83eff89 100644 --- a/include/Nazara/Renderer/RenderPipeline.hpp +++ b/include/Nazara/Renderer/RenderPipeline.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERPIPELINE_HPP -#define NAZARA_RENDERPIPELINE_HPP +#ifndef NAZARA_RENDERER_RENDERPIPELINE_HPP +#define NAZARA_RENDERER_RENDERPIPELINE_HPP #include #include @@ -43,4 +43,4 @@ namespace Nz #include -#endif // NAZARA_RENDERPIPELINE_HPP +#endif // NAZARA_RENDERER_RENDERPIPELINE_HPP diff --git a/include/Nazara/Renderer/RenderPipelineLayout.hpp b/include/Nazara/Renderer/RenderPipelineLayout.hpp index a026488eb..c8d9d814c 100644 --- a/include/Nazara/Renderer/RenderPipelineLayout.hpp +++ b/include/Nazara/Renderer/RenderPipelineLayout.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERPIPELINELAYOUT_HPP -#define NAZARA_RENDERPIPELINELAYOUT_HPP +#ifndef NAZARA_RENDERER_RENDERPIPELINELAYOUT_HPP +#define NAZARA_RENDERER_RENDERPIPELINELAYOUT_HPP #include #include @@ -42,4 +42,4 @@ namespace Nz #include -#endif // NAZARA_RENDERPIPELINELAYOUT_HPP +#endif // NAZARA_RENDERER_RENDERPIPELINELAYOUT_HPP diff --git a/include/Nazara/Renderer/RenderStates.hpp b/include/Nazara/Renderer/RenderStates.hpp index 1ce506254..95e5cba8d 100644 --- a/include/Nazara/Renderer/RenderStates.hpp +++ b/include/Nazara/Renderer/RenderStates.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERSTATES_HPP -#define NAZARA_RENDERSTATES_HPP +#ifndef NAZARA_RENDERER_RENDERSTATES_HPP +#define NAZARA_RENDERER_RENDERSTATES_HPP #include #include @@ -64,4 +64,4 @@ namespace Nz #include -#endif // NAZARA_RENDERSTATES_HPP +#endif // NAZARA_RENDERER_RENDERSTATES_HPP diff --git a/include/Nazara/Renderer/RenderSurface.hpp b/include/Nazara/Renderer/RenderSurface.hpp index f11325ed5..480abb7c5 100644 --- a/include/Nazara/Renderer/RenderSurface.hpp +++ b/include/Nazara/Renderer/RenderSurface.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERSURFACE_HPP -#define NAZARA_RENDERSURFACE_HPP +#ifndef NAZARA_RENDERER_RENDERSURFACE_HPP +#define NAZARA_RENDERER_RENDERSURFACE_HPP #include #include @@ -27,4 +27,4 @@ namespace Nz #include -#endif // NAZARA_RENDERSURFACE_HPP +#endif // NAZARA_RENDERER_RENDERSURFACE_HPP diff --git a/include/Nazara/Renderer/RenderTarget.hpp b/include/Nazara/Renderer/RenderTarget.hpp index 8da8d2a16..7da20d93f 100644 --- a/include/Nazara/Renderer/RenderTarget.hpp +++ b/include/Nazara/Renderer/RenderTarget.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERTARGET_HPP -#define NAZARA_RENDERTARGET_HPP +#ifndef NAZARA_RENDERER_RENDERTARGET_HPP +#define NAZARA_RENDERER_RENDERTARGET_HPP #include #include @@ -35,4 +35,4 @@ namespace Nz #include -#endif +#endif // NAZARA_RENDERER_RENDERTARGET_HPP diff --git a/include/Nazara/Renderer/RenderWindow.hpp b/include/Nazara/Renderer/RenderWindow.hpp index 893060ee8..80cbdf483 100644 --- a/include/Nazara/Renderer/RenderWindow.hpp +++ b/include/Nazara/Renderer/RenderWindow.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERWINDOW_HPP -#define NAZARA_RENDERWINDOW_HPP +#ifndef NAZARA_RENDERER_RENDERWINDOW_HPP +#define NAZARA_RENDERER_RENDERWINDOW_HPP #include #include @@ -64,4 +64,4 @@ namespace Nz #include -#endif // NAZARA_RENDERWINDOW_HPP +#endif // NAZARA_RENDERER_RENDERWINDOW_HPP diff --git a/include/Nazara/Renderer/RenderWindowImpl.hpp b/include/Nazara/Renderer/RenderWindowImpl.hpp index ddc284ce6..ccfa578a1 100644 --- a/include/Nazara/Renderer/RenderWindowImpl.hpp +++ b/include/Nazara/Renderer/RenderWindowImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERWINDOWIMPL_HPP -#define NAZARA_RENDERWINDOWIMPL_HPP +#ifndef NAZARA_RENDERER_RENDERWINDOWIMPL_HPP +#define NAZARA_RENDERER_RENDERWINDOWIMPL_HPP #include #include @@ -41,4 +41,4 @@ namespace Nz }; } -#endif // NAZARA_RENDERWINDOWIMPL_HPP +#endif // NAZARA_RENDERER_RENDERWINDOWIMPL_HPP diff --git a/include/Nazara/Renderer/RenderWindowParameters.hpp b/include/Nazara/Renderer/RenderWindowParameters.hpp index 1c0ec3d00..914169124 100644 --- a/include/Nazara/Renderer/RenderWindowParameters.hpp +++ b/include/Nazara/Renderer/RenderWindowParameters.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RENDERWINDOWPARAMETERS_HPP -#define NAZARA_RENDERWINDOWPARAMETERS_HPP +#ifndef NAZARA_RENDERER_RENDERWINDOWPARAMETERS_HPP +#define NAZARA_RENDERER_RENDERWINDOWPARAMETERS_HPP #include #include @@ -20,4 +20,4 @@ namespace Nz }; } -#endif // NAZARA_RENDERWINDOWPARAMETERS_HPP +#endif // NAZARA_RENDERER_RENDERWINDOWPARAMETERS_HPP diff --git a/include/Nazara/Renderer/ShaderBinding.hpp b/include/Nazara/Renderer/ShaderBinding.hpp index 19b844a43..fbee3a97d 100644 --- a/include/Nazara/Renderer/ShaderBinding.hpp +++ b/include/Nazara/Renderer/ShaderBinding.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADERBINDING_HPP -#define NAZARA_SHADERBINDING_HPP +#ifndef NAZARA_RENDERER_SHADERBINDING_HPP +#define NAZARA_RENDERER_SHADERBINDING_HPP #include #include @@ -72,4 +72,4 @@ namespace Nz #include -#endif // NAZARA_SHADERBINDING_HPP +#endif // NAZARA_RENDERER_SHADERBINDING_HPP diff --git a/include/Nazara/Renderer/Texture.hpp b/include/Nazara/Renderer/Texture.hpp index 08b803e89..cf5004a8d 100644 --- a/include/Nazara/Renderer/Texture.hpp +++ b/include/Nazara/Renderer/Texture.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TEXTURE_HPP -#define NAZARA_TEXTURE_HPP +#ifndef NAZARA_RENDERER_TEXTURE_HPP +#define NAZARA_RENDERER_TEXTURE_HPP #include #include @@ -87,4 +87,4 @@ namespace Nz #include -#endif // NAZARA_TEXTURE_HPP +#endif // NAZARA_RENDERER_TEXTURE_HPP diff --git a/include/Nazara/Renderer/TextureSampler.hpp b/include/Nazara/Renderer/TextureSampler.hpp index 10546de8d..9d06b9ff0 100644 --- a/include/Nazara/Renderer/TextureSampler.hpp +++ b/include/Nazara/Renderer/TextureSampler.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TEXTURE_SAMPLER_HPP -#define NAZARA_TEXTURE_SAMPLER_HPP +#ifndef NAZARA_RENDERER_TEXTURESAMPLER_HPP +#define NAZARA_RENDERER_TEXTURESAMPLER_HPP #include #include @@ -51,4 +51,4 @@ struct std::hash; #include -#endif // NAZARA_TEXTURE_HPP +#endif // NAZARA_RENDERER_TEXTURESAMPLER_HPP diff --git a/include/Nazara/Shader.hpp b/include/Nazara/Shader.hpp index 1bac8589f..555c413f1 100644 --- a/include/Nazara/Shader.hpp +++ b/include/Nazara/Shader.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* - Nazara Engine - Shader generator + Nazara Engine - Shader module - Copyright (C) 2020 Jérôme "Lynix" Leclercq (lynix680@gmail.com) + Copyright (C) 2021 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/Shader/Ast/AstCloner.hpp b/include/Nazara/Shader/Ast/AstCloner.hpp index 91e0361cc..2c5a775ea 100644 --- a/include/Nazara/Shader/Ast/AstCloner.hpp +++ b/include/Nazara/Shader/Ast/AstCloner.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADERASTCLONER_HPP -#define NAZARA_SHADERASTCLONER_HPP +#ifndef NAZARA_SHADER_AST_ASTCLONER_HPP +#define NAZARA_SHADER_AST_ASTCLONER_HPP #include #include @@ -88,4 +88,4 @@ namespace Nz::ShaderAst #include -#endif +#endif // NAZARA_SHADER_AST_ASTCLONER_HPP diff --git a/include/Nazara/Shader/Ast/AstExpressionVisitor.hpp b/include/Nazara/Shader/Ast/AstExpressionVisitor.hpp index cbf21ace7..c42dc84a4 100644 --- a/include/Nazara/Shader/Ast/AstExpressionVisitor.hpp +++ b/include/Nazara/Shader/Ast/AstExpressionVisitor.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADER_AST_EXPRESSIONVISITOR_HPP -#define NAZARA_SHADER_AST_EXPRESSIONVISITOR_HPP +#ifndef NAZARA_SHADER_AST_ASTEXPRESSIONVISITOR_HPP +#define NAZARA_SHADER_AST_ASTEXPRESSIONVISITOR_HPP #include #include @@ -29,4 +29,4 @@ namespace Nz::ShaderAst }; } -#endif +#endif // NAZARA_SHADER_AST_ASTEXPRESSIONVISITOR_HPP diff --git a/include/Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp b/include/Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp index 808662e90..a95a195ff 100644 --- a/include/Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp +++ b/include/Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADERASTEXPRESSIONVISITOREXCEPT_HPP -#define NAZARA_SHADERASTEXPRESSIONVISITOREXCEPT_HPP +#ifndef NAZARA_SHADER_AST_ASTEXPRESSIONVISITOREXCEPT_HPP +#define NAZARA_SHADER_AST_ASTEXPRESSIONVISITOREXCEPT_HPP #include #include @@ -23,4 +23,4 @@ namespace Nz::ShaderAst }; } -#endif +#endif // NAZARA_SHADER_AST_ASTEXPRESSIONVISITOREXCEPT_HPP diff --git a/include/Nazara/Shader/Ast/AstNodeList.hpp b/include/Nazara/Shader/Ast/AstNodeList.hpp index 8acf3670c..927f36eb7 100644 --- a/include/Nazara/Shader/Ast/AstNodeList.hpp +++ b/include/Nazara/Shader/Ast/AstNodeList.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Shader module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #if !defined(NAZARA_SHADERAST_NODE) && !defined(NAZARA_SHADERAST_EXPRESSION) && !defined(NAZARA_SHADERAST_STATEMENT) #error You must define NAZARA_SHADERAST_NODE or NAZARA_SHADERAST_EXPRESSION or NAZARA_SHADERAST_STATEMENT before including this file #endif diff --git a/include/Nazara/Shader/Ast/AstOptimizer.hpp b/include/Nazara/Shader/Ast/AstOptimizer.hpp index 4fd1821ca..32b9cd821 100644 --- a/include/Nazara/Shader/Ast/AstOptimizer.hpp +++ b/include/Nazara/Shader/Ast/AstOptimizer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADERASTOPTIMISER_HPP -#define NAZARA_SHADERASTOPTIMISER_HPP +#ifndef NAZARA_SHADER_AST_ASTOPTIMIZER_HPP +#define NAZARA_SHADER_AST_ASTOPTIMIZER_HPP #include #include @@ -67,4 +67,4 @@ namespace Nz::ShaderAst #include -#endif +#endif // NAZARA_SHADER_AST_ASTOPTIMIZER_HPP diff --git a/include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp b/include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp index efdca2ac4..765ac0d89 100644 --- a/include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp +++ b/include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADER_RECURSIVE_VISITOR_HPP -#define NAZARA_SHADER_RECURSIVE_VISITOR_HPP +#ifndef NAZARA_SHADER_AST_ASTRECURSIVEVISITOR_HPP +#define NAZARA_SHADER_AST_ASTRECURSIVEVISITOR_HPP #include #include @@ -54,4 +54,4 @@ namespace Nz::ShaderAst #include -#endif +#endif // NAZARA_SHADER_AST_ASTRECURSIVEVISITOR_HPP diff --git a/include/Nazara/Shader/Ast/AstReflect.hpp b/include/Nazara/Shader/Ast/AstReflect.hpp index eae49a68f..a928a38d5 100644 --- a/include/Nazara/Shader/Ast/AstReflect.hpp +++ b/include/Nazara/Shader/Ast/AstReflect.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADER_AST_REFLECT_HPP -#define NAZARA_SHADER_AST_REFLECT_HPP +#ifndef NAZARA_SHADER_AST_ASTREFLECT_HPP +#define NAZARA_SHADER_AST_ASTREFLECT_HPP #include #include @@ -45,4 +45,4 @@ namespace Nz::ShaderAst #include -#endif +#endif // NAZARA_SHADER_AST_ASTREFLECT_HPP diff --git a/include/Nazara/Shader/Ast/AstSerializer.hpp b/include/Nazara/Shader/Ast/AstSerializer.hpp index 461e8ebc8..6e4ae5cf4 100644 --- a/include/Nazara/Shader/Ast/AstSerializer.hpp +++ b/include/Nazara/Shader/Ast/AstSerializer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADERSERIALIZER_HPP -#define NAZARA_SHADERSERIALIZER_HPP +#ifndef NAZARA_SHADER_AST_ASTSERIALIZER_HPP +#define NAZARA_SHADER_AST_ASTSERIALIZER_HPP #include #include @@ -153,4 +153,4 @@ namespace Nz::ShaderAst #include -#endif +#endif // NAZARA_SHADER_AST_ASTSERIALIZER_HPP diff --git a/include/Nazara/Shader/Ast/AstStatementVisitor.hpp b/include/Nazara/Shader/Ast/AstStatementVisitor.hpp index b3bedc01a..19b8f4101 100644 --- a/include/Nazara/Shader/Ast/AstStatementVisitor.hpp +++ b/include/Nazara/Shader/Ast/AstStatementVisitor.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADERASTSTATEMENTVISITOR_HPP -#define NAZARA_SHADERASTSTATEMENTVISITOR_HPP +#ifndef NAZARA_SHADER_AST_ASTSTATEMENTVISITOR_HPP +#define NAZARA_SHADER_AST_ASTSTATEMENTVISITOR_HPP #include #include @@ -29,4 +29,4 @@ namespace Nz::ShaderAst }; } -#endif +#endif // NAZARA_SHADER_AST_ASTSTATEMENTVISITOR_HPP diff --git a/include/Nazara/Shader/Ast/AstStatementVisitorExcept.hpp b/include/Nazara/Shader/Ast/AstStatementVisitorExcept.hpp index 763e02265..fabd20b2c 100644 --- a/include/Nazara/Shader/Ast/AstStatementVisitorExcept.hpp +++ b/include/Nazara/Shader/Ast/AstStatementVisitorExcept.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADERASTSTATEMENTVISITOREXCEPT_HPP -#define NAZARA_SHADERASTSTATEMENTVISITOREXCEPT_HPP +#ifndef NAZARA_SHADER_AST_ASTSTATEMENTVISITOREXCEPT_HPP +#define NAZARA_SHADER_AST_ASTSTATEMENTVISITOREXCEPT_HPP #include #include @@ -23,4 +23,4 @@ namespace Nz::ShaderAst }; } -#endif +#endif // NAZARA_SHADER_AST_ASTSTATEMENTVISITOREXCEPT_HPP diff --git a/include/Nazara/Shader/Ast/AstUtils.hpp b/include/Nazara/Shader/Ast/AstUtils.hpp index 42bd41015..e9ea838d1 100644 --- a/include/Nazara/Shader/Ast/AstUtils.hpp +++ b/include/Nazara/Shader/Ast/AstUtils.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADER_AST_UTILS_HPP -#define NAZARA_SHADER_AST_UTILS_HPP +#ifndef NAZARA_SHADER_AST_ASTUTILS_HPP +#define NAZARA_SHADER_AST_ASTUTILS_HPP #include #include @@ -55,4 +55,4 @@ namespace Nz::ShaderAst #include -#endif +#endif // NAZARA_SHADER_AST_ASTUTILS_HPP diff --git a/include/Nazara/Shader/Ast/Attribute.hpp b/include/Nazara/Shader/Ast/Attribute.hpp index 455356bb9..0460c5add 100644 --- a/include/Nazara/Shader/Ast/Attribute.hpp +++ b/include/Nazara/Shader/Ast/Attribute.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADERAST_ATTRIBUTES_HPP -#define NAZARA_SHADERAST_ATTRIBUTES_HPP +#ifndef NAZARA_SHADER_AST_ATTRIBUTE_HPP +#define NAZARA_SHADER_AST_ATTRIBUTE_HPP #include #include @@ -57,4 +57,4 @@ namespace Nz::ShaderAst #include -#endif +#endif // NAZARA_SHADER_AST_ATTRIBUTE_HPP diff --git a/include/Nazara/Shader/Ast/ConstantValue.hpp b/include/Nazara/Shader/Ast/ConstantValue.hpp index 4b52189db..f0ad89e3d 100644 --- a/include/Nazara/Shader/Ast/ConstantValue.hpp +++ b/include/Nazara/Shader/Ast/ConstantValue.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADER_CONSTANTVALUE_HPP -#define NAZARA_SHADER_CONSTANTVALUE_HPP +#ifndef NAZARA_SHADER_AST_CONSTANTVALUE_HPP +#define NAZARA_SHADER_AST_CONSTANTVALUE_HPP #include #include @@ -39,4 +39,4 @@ namespace Nz::ShaderAst NAZARA_SHADER_API ExpressionType GetExpressionType(const ConstantValue& constant); } -#endif +#endif // NAZARA_SHADER_AST_CONSTANTVALUE_HPP diff --git a/include/Nazara/Shader/Ast/SanitizeVisitor.hpp b/include/Nazara/Shader/Ast/SanitizeVisitor.hpp index a7e48a346..22922b461 100644 --- a/include/Nazara/Shader/Ast/SanitizeVisitor.hpp +++ b/include/Nazara/Shader/Ast/SanitizeVisitor.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADERAST_TRANSFORMVISITOR_HPP -#define NAZARA_SHADERAST_TRANSFORMVISITOR_HPP +#ifndef NAZARA_SHADER_AST_SANITIZEVISITOR_HPP +#define NAZARA_SHADER_AST_SANITIZEVISITOR_HPP #include #include @@ -149,4 +149,4 @@ namespace Nz::ShaderAst #include -#endif +#endif // NAZARA_SHADER_AST_SANITIZEVISITOR_HPP diff --git a/include/Nazara/Shader/Config.hpp b/include/Nazara/Shader/Config.hpp index dfc0c10d2..ea25fc818 100644 --- a/include/Nazara/Shader/Config.hpp +++ b/include/Nazara/Shader/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_SHADER_HPP -#define NAZARA_CONFIG_SHADER_HPP +#ifndef NAZARA_SHADER_CONFIG_HPP +#define NAZARA_SHADER_CONFIG_HPP /// Each modification of a parameter needs a recompilation of the module @@ -50,4 +50,4 @@ #define NAZARA_SHADER_API #endif -#endif // NAZARA_CONFIG_SHADER_HPP +#endif // NAZARA_SHADER_CONFIG_HPP diff --git a/include/Nazara/Shader/ConfigCheck.hpp b/include/Nazara/Shader/ConfigCheck.hpp index 01b123dbb..4047c8bf0 100644 --- a/include/Nazara/Shader/ConfigCheck.hpp +++ b/include/Nazara/Shader/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_SHADER_HPP -#define NAZARA_CONFIG_CHECK_SHADER_HPP +#ifndef NAZARA_SHADER_CONFIGCHECK_HPP +#define NAZARA_SHADER_CONFIGCHECK_HPP /// This file is used to check the constant values defined in Config.hpp @@ -19,4 +19,4 @@ #define NAZARA_SHADER_MANAGE_MEMORY 0 #endif -#endif // NAZARA_CONFIG_CHECK_SHADER_HPP +#endif // NAZARA_SHADER_CONFIGCHECK_HPP diff --git a/include/Nazara/Shader/Debug.hpp b/include/Nazara/Shader/Debug.hpp index 1d8203c46..7f757f5c9 100644 --- a/include/Nazara/Shader/Debug.hpp +++ b/include/Nazara/Shader/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Shader module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_SHADER_MANAGE_MEMORY #include diff --git a/include/Nazara/Shader/DebugOff.hpp b/include/Nazara/Shader/DebugOff.hpp index 2cf585f83..23c75002f 100644 --- a/include/Nazara/Shader/DebugOff.hpp +++ b/include/Nazara/Shader/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Shader module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // We suppose that Debug.hpp is already included, same goes for Config.hpp #if NAZARA_SHADER_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Shader/GlslWriter.hpp b/include/Nazara/Shader/GlslWriter.hpp index 956d7fa62..bd2c6c7fb 100644 --- a/include/Nazara/Shader/GlslWriter.hpp +++ b/include/Nazara/Shader/GlslWriter.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_GLSLWRITER_HPP -#define NAZARA_GLSLWRITER_HPP +#ifndef NAZARA_SHADER_GLSLWRITER_HPP +#define NAZARA_SHADER_GLSLWRITER_HPP #include #include @@ -117,4 +117,4 @@ namespace Nz #include -#endif // NAZARA_GLSLWRITER_HPP +#endif // NAZARA_SHADER_GLSLWRITER_HPP diff --git a/include/Nazara/Shader/LangWriter.hpp b/include/Nazara/Shader/LangWriter.hpp index 6360849cc..a1446d3a9 100644 --- a/include/Nazara/Shader/LangWriter.hpp +++ b/include/Nazara/Shader/LangWriter.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LANGWRITER_HPP -#define NAZARA_LANGWRITER_HPP +#ifndef NAZARA_SHADER_LANGWRITER_HPP +#define NAZARA_SHADER_LANGWRITER_HPP #include #include @@ -118,4 +118,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_LANGWRITER_HPP diff --git a/include/Nazara/Shader/ShaderBuilder.hpp b/include/Nazara/Shader/ShaderBuilder.hpp index dfd84c059..12b8f0dfc 100644 --- a/include/Nazara/Shader/ShaderBuilder.hpp +++ b/include/Nazara/Shader/ShaderBuilder.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADER_BUILDER_HPP -#define NAZARA_SHADER_BUILDER_HPP +#ifndef NAZARA_SHADER_SHADERBUILDER_HPP +#define NAZARA_SHADER_SHADERBUILDER_HPP #include #include @@ -171,4 +171,4 @@ namespace Nz::ShaderBuilder #include -#endif // NAZARA_SHADER_BUILDER_HPP +#endif // NAZARA_SHADER_SHADERBUILDER_HPP diff --git a/include/Nazara/Shader/ShaderLangLexer.hpp b/include/Nazara/Shader/ShaderLangLexer.hpp index fa4d2313f..b47ec0f78 100644 --- a/include/Nazara/Shader/ShaderLangLexer.hpp +++ b/include/Nazara/Shader/ShaderLangLexer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADER_LANGLEXER_HPP -#define NAZARA_SHADER_LANGLEXER_HPP +#ifndef NAZARA_SHADER_SHADERLANGLEXER_HPP +#define NAZARA_SHADER_SHADERLANGLEXER_HPP #include #include @@ -53,4 +53,4 @@ namespace Nz::ShaderLang #include -#endif +#endif // NAZARA_SHADER_SHADERLANGLEXER_HPP diff --git a/include/Nazara/Shader/ShaderLangParser.hpp b/include/Nazara/Shader/ShaderLangParser.hpp index 9619013ca..ff40a5e84 100644 --- a/include/Nazara/Shader/ShaderLangParser.hpp +++ b/include/Nazara/Shader/ShaderLangParser.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADER_LANGPARSER_HPP -#define NAZARA_SHADER_LANGPARSER_HPP +#ifndef NAZARA_SHADER_SHADERLANGPARSER_HPP +#define NAZARA_SHADER_SHADERLANGPARSER_HPP #include #include @@ -138,4 +138,4 @@ namespace Nz::ShaderLang #include -#endif +#endif // NAZARA_SHADER_SHADERLANGPARSER_HPP diff --git a/include/Nazara/Shader/ShaderLangTokenList.hpp b/include/Nazara/Shader/ShaderLangTokenList.hpp index 301ef7511..e9a2ad288 100644 --- a/include/Nazara/Shader/ShaderLangTokenList.hpp +++ b/include/Nazara/Shader/ShaderLangTokenList.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Shader module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #if !defined(NAZARA_SHADERLANG_TOKEN) #error You must define NAZARA_SHADERLANG_TOKEN before including this file #endif diff --git a/include/Nazara/Shader/ShaderWriter.hpp b/include/Nazara/Shader/ShaderWriter.hpp index 1a39dc4b6..15a3436a8 100644 --- a/include/Nazara/Shader/ShaderWriter.hpp +++ b/include/Nazara/Shader/ShaderWriter.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SHADERWRITER_HPP -#define NAZARA_SHADERWRITER_HPP +#ifndef NAZARA_SHADER_SHADERWRITER_HPP +#define NAZARA_SHADER_SHADERWRITER_HPP #include #include @@ -34,4 +34,4 @@ namespace Nz }; } -#endif // NAZARA_SHADERWRITER_HPP +#endif // NAZARA_SHADER_SHADERWRITER_HPP diff --git a/include/Nazara/Shader/SpirvAstVisitor.hpp b/include/Nazara/Shader/SpirvAstVisitor.hpp index 60d467d82..c208db3af 100644 --- a/include/Nazara/Shader/SpirvAstVisitor.hpp +++ b/include/Nazara/Shader/SpirvAstVisitor.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPIRVASTVISITOR_HPP -#define NAZARA_SPIRVASTVISITOR_HPP +#ifndef NAZARA_SHADER_SPIRVASTVISITOR_HPP +#define NAZARA_SHADER_SPIRVASTVISITOR_HPP #include #include @@ -161,4 +161,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_SPIRVASTVISITOR_HPP diff --git a/include/Nazara/Shader/SpirvBlock.hpp b/include/Nazara/Shader/SpirvBlock.hpp index 1ac47b458..bce079c82 100644 --- a/include/Nazara/Shader/SpirvBlock.hpp +++ b/include/Nazara/Shader/SpirvBlock.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPIRVBLOCK_HPP -#define NAZARA_SPIRVBLOCK_HPP +#ifndef NAZARA_SHADER_SPIRVBLOCK_HPP +#define NAZARA_SHADER_SPIRVBLOCK_HPP #include #include @@ -46,4 +46,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_SPIRVBLOCK_HPP diff --git a/include/Nazara/Shader/SpirvConstantCache.hpp b/include/Nazara/Shader/SpirvConstantCache.hpp index 3b7b757e7..4a9304aac 100644 --- a/include/Nazara/Shader/SpirvConstantCache.hpp +++ b/include/Nazara/Shader/SpirvConstantCache.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPIRVCONSTANTCACHE_HPP -#define NAZARA_SPIRVCONSTANTCACHE_HPP +#ifndef NAZARA_SHADER_SPIRVCONSTANTCACHE_HPP +#define NAZARA_SHADER_SPIRVCONSTANTCACHE_HPP #include #include @@ -208,4 +208,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_SPIRVCONSTANTCACHE_HPP diff --git a/include/Nazara/Shader/SpirvData.hpp b/include/Nazara/Shader/SpirvData.hpp index f1fe9d956..f057331d1 100644 --- a/include/Nazara/Shader/SpirvData.hpp +++ b/include/Nazara/Shader/SpirvData.hpp @@ -2,12 +2,12 @@ // This file is part of the "Nazara Engine - Shader module" // For conditions of distribution and use, see copyright notice in Config.hpp -// This file was generated automatically, please do not edit +// this file was automatically generated and should not be edited #pragma once -#ifndef NAZARA_SPIRVDATA_HPP -#define NAZARA_SPIRVDATA_HPP +#ifndef NAZARA_SHADER_SPIRVDATA_HPP +#define NAZARA_SHADER_SPIRVDATA_HPP #include #include @@ -1812,4 +1812,4 @@ namespace Nz NAZARA_SHADER_API const SpirvInstruction* GetInstructionData(UInt16 op); } -#endif +#endif // NAZARA_SHADER_SPIRVDATA_HPP diff --git a/include/Nazara/Shader/SpirvDecoder.hpp b/include/Nazara/Shader/SpirvDecoder.hpp index 65ab05482..ca7340d3e 100644 --- a/include/Nazara/Shader/SpirvDecoder.hpp +++ b/include/Nazara/Shader/SpirvDecoder.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPIRVDECODER_HPP -#define NAZARA_SPIRVDECODER_HPP +#ifndef NAZARA_SHADER_SPIRVDECODER_HPP +#define NAZARA_SHADER_SPIRVDECODER_HPP #include #include @@ -56,4 +56,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_SPIRVDECODER_HPP diff --git a/include/Nazara/Shader/SpirvExpressionLoad.hpp b/include/Nazara/Shader/SpirvExpressionLoad.hpp index 3662f022a..cf8febb17 100644 --- a/include/Nazara/Shader/SpirvExpressionLoad.hpp +++ b/include/Nazara/Shader/SpirvExpressionLoad.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPIRVEXPRESSIONLOAD_HPP -#define NAZARA_SPIRVEXPRESSIONLOAD_HPP +#ifndef NAZARA_SHADER_SPIRVEXPRESSIONLOAD_HPP +#define NAZARA_SHADER_SPIRVEXPRESSIONLOAD_HPP #include #include @@ -58,4 +58,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_SPIRVEXPRESSIONLOAD_HPP diff --git a/include/Nazara/Shader/SpirvExpressionStore.hpp b/include/Nazara/Shader/SpirvExpressionStore.hpp index 3ebed46d6..8d3ea3884 100644 --- a/include/Nazara/Shader/SpirvExpressionStore.hpp +++ b/include/Nazara/Shader/SpirvExpressionStore.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPIRVEXPRESSIONSTORE_HPP -#define NAZARA_SPIRVEXPRESSIONSTORE_HPP +#ifndef NAZARA_SHADER_SPIRVEXPRESSIONSTORE_HPP +#define NAZARA_SHADER_SPIRVEXPRESSIONSTORE_HPP #include #include @@ -57,4 +57,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_SPIRVEXPRESSIONSTORE_HPP diff --git a/include/Nazara/Shader/SpirvPrinter.hpp b/include/Nazara/Shader/SpirvPrinter.hpp index 70358a23f..e08c16aab 100644 --- a/include/Nazara/Shader/SpirvPrinter.hpp +++ b/include/Nazara/Shader/SpirvPrinter.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPIRVPRINTER_HPP -#define NAZARA_SPIRVPRINTER_HPP +#ifndef NAZARA_SHADER_SPIRVPRINTER_HPP +#define NAZARA_SHADER_SPIRVPRINTER_HPP #include #include @@ -51,4 +51,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_SPIRVPRINTER_HPP diff --git a/include/Nazara/Shader/SpirvSection.hpp b/include/Nazara/Shader/SpirvSection.hpp index 38a838ba4..9f3de6435 100644 --- a/include/Nazara/Shader/SpirvSection.hpp +++ b/include/Nazara/Shader/SpirvSection.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPIRVSECTION_HPP -#define NAZARA_SPIRVSECTION_HPP +#ifndef NAZARA_SHADER_SPIRVSECTION_HPP +#define NAZARA_SHADER_SPIRVSECTION_HPP #include #include @@ -32,4 +32,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_SPIRVSECTION_HPP diff --git a/include/Nazara/Shader/SpirvSectionBase.hpp b/include/Nazara/Shader/SpirvSectionBase.hpp index 9a4384545..118325f37 100644 --- a/include/Nazara/Shader/SpirvSectionBase.hpp +++ b/include/Nazara/Shader/SpirvSectionBase.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPIRVSECTIONBASE_HPP -#define NAZARA_SPIRVSECTIONBASE_HPP +#ifndef NAZARA_SHADER_SPIRVSECTIONBASE_HPP +#define NAZARA_SHADER_SPIRVSECTIONBASE_HPP #include #include @@ -72,4 +72,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_SPIRVSECTIONBASE_HPP diff --git a/include/Nazara/Shader/SpirvWriter.hpp b/include/Nazara/Shader/SpirvWriter.hpp index 9adac3359..0c82895ab 100644 --- a/include/Nazara/Shader/SpirvWriter.hpp +++ b/include/Nazara/Shader/SpirvWriter.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SPIRVWRITER_HPP -#define NAZARA_SPIRVWRITER_HPP +#ifndef NAZARA_SHADER_SPIRVWRITER_HPP +#define NAZARA_SHADER_SPIRVWRITER_HPP #include #include @@ -85,4 +85,4 @@ namespace Nz #include -#endif +#endif // NAZARA_SHADER_SPIRVWRITER_HPP diff --git a/include/Nazara/Utility.hpp b/include/Nazara/Utility.hpp index 29acfe8b9..c18a395e1 100644 --- a/include/Nazara/Utility.hpp +++ b/include/Nazara/Utility.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Utility module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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/AbstractAtlas.hpp b/include/Nazara/Utility/AbstractAtlas.hpp index eb13d9bc4..7b7f8cb4a 100644 --- a/include/Nazara/Utility/AbstractAtlas.hpp +++ b/include/Nazara/Utility/AbstractAtlas.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ABSTRACTATLAS_HPP -#define NAZARA_ABSTRACTATLAS_HPP +#ifndef NAZARA_UTILITY_ABSTRACTATLAS_HPP +#define NAZARA_UTILITY_ABSTRACTATLAS_HPP #include #include @@ -44,4 +44,4 @@ namespace Nz }; } -#endif // NAZARA_ABSTRACTATLAS_HPP +#endif // NAZARA_UTILITY_ABSTRACTATLAS_HPP diff --git a/include/Nazara/Utility/AbstractBuffer.hpp b/include/Nazara/Utility/AbstractBuffer.hpp index 84b6f0713..031d254bf 100644 --- a/include/Nazara/Utility/AbstractBuffer.hpp +++ b/include/Nazara/Utility/AbstractBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ABSTRACTBUFFER_HPP -#define NAZARA_ABSTRACTBUFFER_HPP +#ifndef NAZARA_UTILITY_ABSTRACTBUFFER_HPP +#define NAZARA_UTILITY_ABSTRACTBUFFER_HPP #include #include @@ -30,4 +30,4 @@ namespace Nz }; } -#endif // NAZARA_ABSTRACTBUFFER_HPP +#endif // NAZARA_UTILITY_ABSTRACTBUFFER_HPP diff --git a/include/Nazara/Utility/AbstractImage.hpp b/include/Nazara/Utility/AbstractImage.hpp index 19b5d96aa..9d326f08a 100644 --- a/include/Nazara/Utility/AbstractImage.hpp +++ b/include/Nazara/Utility/AbstractImage.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ABSTRACTIMAGE_HPP -#define NAZARA_ABSTRACTIMAGE_HPP +#ifndef NAZARA_UTILITY_ABSTRACTIMAGE_HPP +#define NAZARA_UTILITY_ABSTRACTIMAGE_HPP #include #include @@ -46,4 +46,4 @@ namespace Nz #include -#endif // NAZARA_IMAGE_HPP +#endif // NAZARA_UTILITY_ABSTRACTIMAGE_HPP diff --git a/include/Nazara/Utility/AbstractTextDrawer.hpp b/include/Nazara/Utility/AbstractTextDrawer.hpp index 3b47b31f1..cfe997db5 100644 --- a/include/Nazara/Utility/AbstractTextDrawer.hpp +++ b/include/Nazara/Utility/AbstractTextDrawer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ABSTRACTTEXTDRAWER_HPP -#define NAZARA_ABSTRACTTEXTDRAWER_HPP +#ifndef NAZARA_UTILITY_ABSTRACTTEXTDRAWER_HPP +#define NAZARA_UTILITY_ABSTRACTTEXTDRAWER_HPP #include #include @@ -63,4 +63,4 @@ namespace Nz #include -#endif // NAZARA_ABSTRACTTEXTDRAWER_HPP +#endif // NAZARA_UTILITY_ABSTRACTTEXTDRAWER_HPP diff --git a/include/Nazara/Utility/Algorithm.hpp b/include/Nazara/Utility/Algorithm.hpp index 58ff5b633..415c64d3c 100644 --- a/include/Nazara/Utility/Algorithm.hpp +++ b/include/Nazara/Utility/Algorithm.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ALGORITHM_UTILITY_HPP -#define NAZARA_ALGORITHM_UTILITY_HPP +#ifndef NAZARA_UTILITY_ALGORITHM_HPP +#define NAZARA_UTILITY_ALGORITHM_HPP #include #include @@ -71,4 +71,4 @@ namespace Nz } #include -#endif // NAZARA_ALGORITHM_UTILITY_HPP +#endif // NAZARA_UTILITY_ALGORITHM_HPP diff --git a/include/Nazara/Utility/Animation.hpp b/include/Nazara/Utility/Animation.hpp index 1b59629c5..ee9830f08 100644 --- a/include/Nazara/Utility/Animation.hpp +++ b/include/Nazara/Utility/Animation.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ANIMATION_HPP -#define NAZARA_ANIMATION_HPP +#ifndef NAZARA_UTILITY_ANIMATION_HPP +#define NAZARA_UTILITY_ANIMATION_HPP #include #include @@ -93,4 +93,4 @@ namespace Nz #include -#endif // NAZARA_ANIMATION_HPP +#endif // NAZARA_UTILITY_ANIMATION_HPP diff --git a/include/Nazara/Utility/Buffer.hpp b/include/Nazara/Utility/Buffer.hpp index ee788a523..d5d3acf64 100644 --- a/include/Nazara/Utility/Buffer.hpp +++ b/include/Nazara/Utility/Buffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BUFFER_HPP -#define NAZARA_BUFFER_HPP +#ifndef NAZARA_UTILITY_BUFFER_HPP +#define NAZARA_UTILITY_BUFFER_HPP #include #include @@ -75,4 +75,4 @@ namespace Nz #include -#endif // NAZARA_BUFFER_HPP +#endif // NAZARA_UTILITY_BUFFER_HPP diff --git a/include/Nazara/Utility/BufferMapper.hpp b/include/Nazara/Utility/BufferMapper.hpp index 94e578a2c..5c467df24 100644 --- a/include/Nazara/Utility/BufferMapper.hpp +++ b/include/Nazara/Utility/BufferMapper.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BUFFERMAPPER_HPP -#define NAZARA_BUFFERMAPPER_HPP +#ifndef NAZARA_UTILITY_BUFFERMAPPER_HPP +#define NAZARA_UTILITY_BUFFERMAPPER_HPP #include @@ -40,4 +40,4 @@ namespace Nz #include -#endif // NAZARA_BUFFERMAPPER_HPP +#endif // NAZARA_UTILITY_BUFFERMAPPER_HPP diff --git a/include/Nazara/Utility/Components.hpp b/include/Nazara/Utility/Components.hpp index a7ef8eaa4..0f3535310 100644 --- a/include/Nazara/Utility/Components.hpp +++ b/include/Nazara/Utility/Components.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Utility module - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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 @@ -26,9 +26,9 @@ #pragma once -#ifndef NAZARA_GLOBAL_UTILITY_COMPONENTS_HPP -#define NAZARA_GLOBAL_UTILITY_COMPONENTS_HPP +#ifndef NAZARA_UTILITY_COMPONENTS_HPP +#define NAZARA_UTILITY_COMPONENTS_HPP #include -#endif // NAZARA_GLOBAL_UTILITY_COMPONENTS_HPP +#endif // NAZARA_UTILITY_COMPONENTS_HPP diff --git a/include/Nazara/Utility/Components/NodeComponent.hpp b/include/Nazara/Utility/Components/NodeComponent.hpp index d1461cef0..13a0bac3b 100644 --- a/include/Nazara/Utility/Components/NodeComponent.hpp +++ b/include/Nazara/Utility/Components/NodeComponent.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_NODECOMPONENT_HPP -#define NAZARA_NODECOMPONENT_HPP +#ifndef NAZARA_UTILITY_COMPONENTS_NODECOMPONENT_HPP +#define NAZARA_UTILITY_COMPONENTS_NODECOMPONENT_HPP #include #include @@ -31,4 +31,4 @@ namespace Nz #include -#endif +#endif // NAZARA_UTILITY_COMPONENTS_NODECOMPONENT_HPP diff --git a/include/Nazara/Utility/Config.hpp b/include/Nazara/Utility/Config.hpp index 79634c2d4..72ec6ec30 100644 --- a/include/Nazara/Utility/Config.hpp +++ b/include/Nazara/Utility/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_UTILITY_HPP -#define NAZARA_CONFIG_UTILITY_HPP +#ifndef NAZARA_UTILITY_CONFIG_HPP +#define NAZARA_UTILITY_CONFIG_HPP /// Each modification of a parameter needs a recompilation of the module @@ -62,4 +62,4 @@ #endif #endif -#endif // NAZARA_CONFIG_UTILITY_HPP +#endif // NAZARA_UTILITY_CONFIG_HPP diff --git a/include/Nazara/Utility/ConfigCheck.hpp b/include/Nazara/Utility/ConfigCheck.hpp index 4ad0eb6e2..2e9e42e25 100644 --- a/include/Nazara/Utility/ConfigCheck.hpp +++ b/include/Nazara/Utility/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_UTILITY_HPP -#define NAZARA_CONFIG_CHECK_UTILITY_HPP +#ifndef NAZARA_UTILITY_CONFIGCHECK_HPP +#define NAZARA_UTILITY_CONFIGCHECK_HPP /// This file is used to check the constant values defined in Config.hpp @@ -22,4 +22,4 @@ NazaraCheckTypeAndVal(NAZARA_UTILITY_SKINNING_MAX_WEIGHTS, integral, >, 0, " sha #undef NazaraCheckTypeAndVal -#endif // NAZARA_CONFIG_CHECK_UTILITY_HPP +#endif // NAZARA_UTILITY_CONFIGCHECK_HPP diff --git a/include/Nazara/Utility/CubemapParams.hpp b/include/Nazara/Utility/CubemapParams.hpp index a24ba50e8..c8842d320 100644 --- a/include/Nazara/Utility/CubemapParams.hpp +++ b/include/Nazara/Utility/CubemapParams.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CUBEMAPPARAMS_HPP -#define NAZARA_CUBEMAPPARAMS_HPP +#ifndef NAZARA_UTILITY_CUBEMAPPARAMS_HPP +#define NAZARA_UTILITY_CUBEMAPPARAMS_HPP #include @@ -35,4 +35,4 @@ namespace Nz }; } -#endif // NAZARA_CUBEMAPPARAMS_HPP +#endif // NAZARA_UTILITY_CUBEMAPPARAMS_HPP diff --git a/include/Nazara/Utility/Debug.hpp b/include/Nazara/Utility/Debug.hpp index abe0d7499..fe9362aa9 100644 --- a/include/Nazara/Utility/Debug.hpp +++ b/include/Nazara/Utility/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_UTILITY_MANAGE_MEMORY #include diff --git a/include/Nazara/Utility/DebugOff.hpp b/include/Nazara/Utility/DebugOff.hpp index 4f6bb6eca..a583d0946 100644 --- a/include/Nazara/Utility/DebugOff.hpp +++ b/include/Nazara/Utility/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // On suppose que Debug.hpp a déjà été inclus, tout comme Config.hpp #if NAZARA_UTILITY_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Utility/Enums.hpp b/include/Nazara/Utility/Enums.hpp index f67412fdf..8b73fd805 100644 --- a/include/Nazara/Utility/Enums.hpp +++ b/include/Nazara/Utility/Enums.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ENUMS_UTILITY_HPP -#define NAZARA_ENUMS_UTILITY_HPP +#ifndef NAZARA_UTILITY_ENUMS_HPP +#define NAZARA_UTILITY_ENUMS_HPP #include @@ -481,4 +481,4 @@ namespace Nz constexpr std::size_t VertexLayoutCount = static_cast(VertexLayout::Max) + 1; } -#endif // NAZARA_ENUMS_UTILITY_HPP +#endif // NAZARA_UTILITY_ENUMS_HPP diff --git a/include/Nazara/Utility/FieldOffsets.hpp b/include/Nazara/Utility/FieldOffsets.hpp index bbd744786..ffe41c007 100644 --- a/include/Nazara/Utility/FieldOffsets.hpp +++ b/include/Nazara/Utility/FieldOffsets.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FIELDOFFSETS_HPP -#define NAZARA_FIELDOFFSETS_HPP +#ifndef NAZARA_UTILITY_FIELDOFFSETS_HPP +#define NAZARA_UTILITY_FIELDOFFSETS_HPP #include #include @@ -48,4 +48,4 @@ namespace Nz #include -#endif // NAZARA_FIELDOFFSETS_HPP +#endif // NAZARA_UTILITY_FIELDOFFSETS_HPP diff --git a/include/Nazara/Utility/Font.hpp b/include/Nazara/Utility/Font.hpp index 5ed9ae2ef..2cf978084 100644 --- a/include/Nazara/Utility/Font.hpp +++ b/include/Nazara/Utility/Font.hpp @@ -6,8 +6,8 @@ #pragma once -#ifndef NAZARA_FONT_HPP -#define NAZARA_FONT_HPP +#ifndef NAZARA_UTILITY_FONT_HPP +#define NAZARA_UTILITY_FONT_HPP #include #include @@ -157,4 +157,4 @@ namespace Nz #include -#endif // NAZARA_FONT_HPP +#endif // NAZARA_UTILITY_FONT_HPP diff --git a/include/Nazara/Utility/FontData.hpp b/include/Nazara/Utility/FontData.hpp index aa1190d21..e0d31b0fe 100644 --- a/include/Nazara/Utility/FontData.hpp +++ b/include/Nazara/Utility/FontData.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FONTDATA_HPP -#define NAZARA_FONTDATA_HPP +#ifndef NAZARA_UTILITY_FONTDATA_HPP +#define NAZARA_UTILITY_FONTDATA_HPP #include #include @@ -41,4 +41,4 @@ namespace Nz }; } -#endif // NAZARA_FONTDATA_HPP +#endif // NAZARA_UTILITY_FONTDATA_HPP diff --git a/include/Nazara/Utility/FontGlyph.hpp b/include/Nazara/Utility/FontGlyph.hpp index 5ddfebd8c..8994cf294 100644 --- a/include/Nazara/Utility/FontGlyph.hpp +++ b/include/Nazara/Utility/FontGlyph.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FONTGLYPH_HPP -#define NAZARA_FONTGLYPH_HPP +#ifndef NAZARA_UTILITY_FONTGLYPH_HPP +#define NAZARA_UTILITY_FONTGLYPH_HPP #include @@ -19,4 +19,4 @@ namespace Nz }; } -#endif // NAZARA_FONTGLYPH_HPP +#endif // NAZARA_UTILITY_FONTGLYPH_HPP diff --git a/include/Nazara/Utility/Formats/MD5AnimParser.hpp b/include/Nazara/Utility/Formats/MD5AnimParser.hpp index 62d48535b..02db3a33b 100644 --- a/include/Nazara/Utility/Formats/MD5AnimParser.hpp +++ b/include/Nazara/Utility/Formats/MD5AnimParser.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FORMATS_MD5ANIMPARSER_HPP -#define NAZARA_FORMATS_MD5ANIMPARSER_HPP +#ifndef NAZARA_UTILITY_FORMATS_MD5ANIMPARSER_HPP +#define NAZARA_UTILITY_FORMATS_MD5ANIMPARSER_HPP #include #include @@ -78,4 +78,4 @@ namespace Nz }; } -#endif // NAZARA_FORMATS_MD5ANIMPARSER_HPP +#endif // NAZARA_UTILITY_FORMATS_MD5ANIMPARSER_HPP diff --git a/include/Nazara/Utility/Formats/MD5MeshParser.hpp b/include/Nazara/Utility/Formats/MD5MeshParser.hpp index 5efbe7288..405035981 100644 --- a/include/Nazara/Utility/Formats/MD5MeshParser.hpp +++ b/include/Nazara/Utility/Formats/MD5MeshParser.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FORMATS_MD5MESHPARSER_HPP -#define NAZARA_FORMATS_MD5MESHPARSER_HPP +#ifndef NAZARA_UTILITY_FORMATS_MD5MESHPARSER_HPP +#define NAZARA_UTILITY_FORMATS_MD5MESHPARSER_HPP #include #include @@ -83,4 +83,4 @@ namespace Nz }; } -#endif // NAZARA_FORMATS_MD5MESHPARSER_HPP +#endif // NAZARA_UTILITY_FORMATS_MD5MESHPARSER_HPP diff --git a/include/Nazara/Utility/Formats/MTLParser.hpp b/include/Nazara/Utility/Formats/MTLParser.hpp index bbd4f24f7..cb0dff1dd 100644 --- a/include/Nazara/Utility/Formats/MTLParser.hpp +++ b/include/Nazara/Utility/Formats/MTLParser.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FORMATS_MTLPARSER_HPP -#define NAZARA_FORMATS_MTLPARSER_HPP +#ifndef NAZARA_UTILITY_FORMATS_MTLPARSER_HPP +#define NAZARA_UTILITY_FORMATS_MTLPARSER_HPP #include #include @@ -76,4 +76,4 @@ namespace Nz #include -#endif // NAZARA_FORMATS_MTLPARSER_HPP +#endif // NAZARA_UTILITY_FORMATS_MTLPARSER_HPP diff --git a/include/Nazara/Utility/Formats/OBJParser.hpp b/include/Nazara/Utility/Formats/OBJParser.hpp index f95ba67c9..6563b10f1 100644 --- a/include/Nazara/Utility/Formats/OBJParser.hpp +++ b/include/Nazara/Utility/Formats/OBJParser.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FORMATS_OBJPARSER_HPP -#define NAZARA_FORMATS_OBJPARSER_HPP +#ifndef NAZARA_UTILITY_FORMATS_OBJPARSER_HPP +#define NAZARA_UTILITY_FORMATS_OBJPARSER_HPP #include #include @@ -103,4 +103,4 @@ namespace Nz #include -#endif // NAZARA_FORMATS_OBJPARSER_HPP +#endif // NAZARA_UTILITY_FORMATS_OBJPARSER_HPP diff --git a/include/Nazara/Utility/GuillotineImageAtlas.hpp b/include/Nazara/Utility/GuillotineImageAtlas.hpp index 09e0b3f81..67cd9f6b1 100644 --- a/include/Nazara/Utility/GuillotineImageAtlas.hpp +++ b/include/Nazara/Utility/GuillotineImageAtlas.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_GUILLOTINEIMAGEATLAS_HPP -#define NAZARA_GUILLOTINEIMAGEATLAS_HPP +#ifndef NAZARA_UTILITY_GUILLOTINEIMAGEATLAS_HPP +#define NAZARA_UTILITY_GUILLOTINEIMAGEATLAS_HPP #include #include @@ -73,4 +73,4 @@ namespace Nz }; } -#endif // NAZARA_GUILLOTINEIMAGEATLAS_HPP +#endif // NAZARA_UTILITY_GUILLOTINEIMAGEATLAS_HPP diff --git a/include/Nazara/Utility/Image.hpp b/include/Nazara/Utility/Image.hpp index c97232dc6..a80326c86 100644 --- a/include/Nazara/Utility/Image.hpp +++ b/include/Nazara/Utility/Image.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_IMAGE_HPP -#define NAZARA_IMAGE_HPP +#ifndef NAZARA_UTILITY_IMAGE_HPP +#define NAZARA_UTILITY_IMAGE_HPP #include #include @@ -165,4 +165,4 @@ namespace Nz #include -#endif // NAZARA_IMAGE_HPP +#endif // NAZARA_UTILITY_IMAGE_HPP diff --git a/include/Nazara/Utility/IndexBuffer.hpp b/include/Nazara/Utility/IndexBuffer.hpp index ce30ec716..6caff8577 100644 --- a/include/Nazara/Utility/IndexBuffer.hpp +++ b/include/Nazara/Utility/IndexBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_INDEXBUFFER_HPP -#define NAZARA_INDEXBUFFER_HPP +#ifndef NAZARA_UTILITY_INDEXBUFFER_HPP +#define NAZARA_UTILITY_INDEXBUFFER_HPP #include #include @@ -67,4 +67,4 @@ namespace Nz #include -#endif // NAZARA_INDEXBUFFER_HPP +#endif // NAZARA_UTILITY_INDEXBUFFER_HPP diff --git a/include/Nazara/Utility/IndexIterator.hpp b/include/Nazara/Utility/IndexIterator.hpp index 43decc602..76dd19080 100644 --- a/include/Nazara/Utility/IndexIterator.hpp +++ b/include/Nazara/Utility/IndexIterator.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_INDEXITERATOR_HPP -#define NAZARA_INDEXITERATOR_HPP +#ifndef NAZARA_UTILITY_INDEXITERATOR_HPP +#define NAZARA_UTILITY_INDEXITERATOR_HPP #include @@ -79,4 +79,4 @@ namespace Nz #include -#endif // NAZARA_INDEXITERATOR_HPP +#endif // NAZARA_UTILITY_INDEXITERATOR_HPP diff --git a/include/Nazara/Utility/IndexMapper.hpp b/include/Nazara/Utility/IndexMapper.hpp index 48deb4fe8..9deab3b80 100644 --- a/include/Nazara/Utility/IndexMapper.hpp +++ b/include/Nazara/Utility/IndexMapper.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_INDEXMAPPER_HPP -#define NAZARA_INDEXMAPPER_HPP +#ifndef NAZARA_UTILITY_INDEXMAPPER_HPP +#define NAZARA_UTILITY_INDEXMAPPER_HPP #include #include @@ -51,4 +51,4 @@ namespace Nz }; } -#endif // NAZARA_INDEXMAPPER_HPP +#endif // NAZARA_UTILITY_INDEXMAPPER_HPP diff --git a/include/Nazara/Utility/Joint.hpp b/include/Nazara/Utility/Joint.hpp index 2296486ab..358576a29 100644 --- a/include/Nazara/Utility/Joint.hpp +++ b/include/Nazara/Utility/Joint.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_JOINT_HPP -#define NAZARA_JOINT_HPP +#ifndef NAZARA_UTILITY_JOINT_HPP +#define NAZARA_UTILITY_JOINT_HPP #include #include @@ -46,4 +46,4 @@ namespace Nz }; } -#endif // NAZARA_JOINT_HPP +#endif // NAZARA_UTILITY_JOINT_HPP diff --git a/include/Nazara/Utility/MaterialData.hpp b/include/Nazara/Utility/MaterialData.hpp index c6143e09d..1d8d0d296 100644 --- a/include/Nazara/Utility/MaterialData.hpp +++ b/include/Nazara/Utility/MaterialData.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MATERIALDATA_HPP -#define NAZARA_MATERIALDATA_HPP +#ifndef NAZARA_UTILITY_MATERIALDATA_HPP +#define NAZARA_UTILITY_MATERIALDATA_HPP namespace Nz { @@ -68,4 +68,4 @@ namespace Nz }; } -#endif // NAZARA_MATERIALDATA_HPP +#endif // NAZARA_UTILITY_MATERIALDATA_HPP diff --git a/include/Nazara/Utility/Mesh.hpp b/include/Nazara/Utility/Mesh.hpp index 54cd8b81f..4343a845e 100644 --- a/include/Nazara/Utility/Mesh.hpp +++ b/include/Nazara/Utility/Mesh.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MESH_HPP -#define NAZARA_MESH_HPP +#ifndef NAZARA_UTILITY_MESH_HPP +#define NAZARA_UTILITY_MESH_HPP #include #include @@ -165,4 +165,4 @@ namespace Nz #include -#endif // NAZARA_MESH_HPP +#endif // NAZARA_UTILITY_MESH_HPP diff --git a/include/Nazara/Utility/MeshData.hpp b/include/Nazara/Utility/MeshData.hpp index 96db4eefc..11cb2baa2 100644 --- a/include/Nazara/Utility/MeshData.hpp +++ b/include/Nazara/Utility/MeshData.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_MESHDATA_HPP -#define NAZARA_MESHDATA_HPP +#ifndef NAZARA_UTILITY_MESHDATA_HPP +#define NAZARA_UTILITY_MESHDATA_HPP #include @@ -22,4 +22,4 @@ namespace Nz }; } -#endif // NAZARA_MESHDATA_HPP +#endif // NAZARA_UTILITY_MESHDATA_HPP diff --git a/include/Nazara/Utility/Node.hpp b/include/Nazara/Utility/Node.hpp index 00a899891..0e10345b0 100644 --- a/include/Nazara/Utility/Node.hpp +++ b/include/Nazara/Utility/Node.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_NODE_HPP -#define NAZARA_NODE_HPP +#ifndef NAZARA_UTILITY_NODE_HPP +#define NAZARA_UTILITY_NODE_HPP #include #include @@ -130,4 +130,4 @@ namespace Nz }; } -#endif // NAZARA_NODE_HPP +#endif // NAZARA_UTILITY_NODE_HPP diff --git a/include/Nazara/Utility/PixelFormat.hpp b/include/Nazara/Utility/PixelFormat.hpp index 83c77bdca..6235782cc 100644 --- a/include/Nazara/Utility/PixelFormat.hpp +++ b/include/Nazara/Utility/PixelFormat.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_PIXELFORMAT_HPP -#define NAZARA_PIXELFORMAT_HPP +#ifndef NAZARA_UTILITY_PIXELFORMAT_HPP +#define NAZARA_UTILITY_PIXELFORMAT_HPP #include #include @@ -95,4 +95,4 @@ namespace Nz #include -#endif // NAZARA_PIXELFORMAT_HPP +#endif // NAZARA_UTILITY_PIXELFORMAT_HPP diff --git a/include/Nazara/Utility/RichTextDrawer.hpp b/include/Nazara/Utility/RichTextDrawer.hpp index de7ff3ee7..64aae02c4 100644 --- a/include/Nazara/Utility/RichTextDrawer.hpp +++ b/include/Nazara/Utility/RichTextDrawer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_RICHTEXTDRAWER_HPP -#define NAZARA_RICHTEXTDRAWER_HPP +#ifndef NAZARA_UTILITY_RICHTEXTDRAWER_HPP +#define NAZARA_UTILITY_RICHTEXTDRAWER_HPP #include #include @@ -209,4 +209,4 @@ namespace Nz #include -#endif // NAZARA_RICHTEXTDRAWER_HPP +#endif // NAZARA_UTILITY_RICHTEXTDRAWER_HPP diff --git a/include/Nazara/Utility/Sequence.hpp b/include/Nazara/Utility/Sequence.hpp index 4f05b3191..224520b33 100644 --- a/include/Nazara/Utility/Sequence.hpp +++ b/include/Nazara/Utility/Sequence.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SEQUENCE_HPP -#define NAZARA_SEQUENCE_HPP +#ifndef NAZARA_UTILITY_SEQUENCE_HPP +#define NAZARA_UTILITY_SEQUENCE_HPP #include #include @@ -29,4 +29,4 @@ namespace Nz }; } -#endif // NAZARA_SEQUENCE_HPP +#endif // NAZARA_UTILITY_SEQUENCE_HPP diff --git a/include/Nazara/Utility/SimpleTextDrawer.hpp b/include/Nazara/Utility/SimpleTextDrawer.hpp index 60035dc79..904ab9ce5 100644 --- a/include/Nazara/Utility/SimpleTextDrawer.hpp +++ b/include/Nazara/Utility/SimpleTextDrawer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SIMPLETEXTDRAWER_HPP -#define NAZARA_SIMPLETEXTDRAWER_HPP +#ifndef NAZARA_UTILITY_SIMPLETEXTDRAWER_HPP +#define NAZARA_UTILITY_SIMPLETEXTDRAWER_HPP #include #include @@ -122,4 +122,4 @@ namespace Nz #include -#endif // NAZARA_SIMPLETEXTDRAWER_HPP +#endif // NAZARA_UTILITY_SIMPLETEXTDRAWER_HPP diff --git a/include/Nazara/Utility/SkeletalMesh.hpp b/include/Nazara/Utility/SkeletalMesh.hpp index 869d10753..24b8f290d 100644 --- a/include/Nazara/Utility/SkeletalMesh.hpp +++ b/include/Nazara/Utility/SkeletalMesh.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SKELETALMESH_HPP -#define NAZARA_SKELETALMESH_HPP +#ifndef NAZARA_UTILITY_SKELETALMESH_HPP +#define NAZARA_UTILITY_SKELETALMESH_HPP #include #include @@ -41,4 +41,4 @@ namespace Nz #include -#endif // NAZARA_SKELETALMESH_HPP +#endif // NAZARA_UTILITY_SKELETALMESH_HPP diff --git a/include/Nazara/Utility/Skeleton.hpp b/include/Nazara/Utility/Skeleton.hpp index d524689fa..d26cce4ba 100644 --- a/include/Nazara/Utility/Skeleton.hpp +++ b/include/Nazara/Utility/Skeleton.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SKELETON_HPP -#define NAZARA_SKELETON_HPP +#ifndef NAZARA_UTILITY_SKELETON_HPP +#define NAZARA_UTILITY_SKELETON_HPP #include #include @@ -68,4 +68,4 @@ namespace Nz #include -#endif // NAZARA_SKELETON_HPP +#endif // NAZARA_UTILITY_SKELETON_HPP diff --git a/include/Nazara/Utility/SoftwareBuffer.hpp b/include/Nazara/Utility/SoftwareBuffer.hpp index ebf1bec1a..379512438 100644 --- a/include/Nazara/Utility/SoftwareBuffer.hpp +++ b/include/Nazara/Utility/SoftwareBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOFTWAREBUFFER_HPP -#define NAZARA_SOFTWAREBUFFER_HPP +#ifndef NAZARA_UTILITY_SOFTWAREBUFFER_HPP +#define NAZARA_UTILITY_SOFTWAREBUFFER_HPP #include #include @@ -38,4 +38,4 @@ namespace Nz }; } -#endif // NAZARA_SOFTWAREBUFFER_HPP +#endif // NAZARA_UTILITY_SOFTWAREBUFFER_HPP diff --git a/include/Nazara/Utility/StaticMesh.hpp b/include/Nazara/Utility/StaticMesh.hpp index 23cf893c9..0a4334fe2 100644 --- a/include/Nazara/Utility/StaticMesh.hpp +++ b/include/Nazara/Utility/StaticMesh.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_STATICMESH_HPP -#define NAZARA_STATICMESH_HPP +#ifndef NAZARA_UTILITY_STATICMESH_HPP +#define NAZARA_UTILITY_STATICMESH_HPP #include #include @@ -43,4 +43,4 @@ namespace Nz #include -#endif // NAZARA_STATICMESH_HPP +#endif // NAZARA_UTILITY_STATICMESH_HPP diff --git a/include/Nazara/Utility/SubMesh.hpp b/include/Nazara/Utility/SubMesh.hpp index a16507025..d52f7aba2 100644 --- a/include/Nazara/Utility/SubMesh.hpp +++ b/include/Nazara/Utility/SubMesh.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SUBMESH_HPP -#define NAZARA_SUBMESH_HPP +#ifndef NAZARA_UTILITY_SUBMESH_HPP +#define NAZARA_UTILITY_SUBMESH_HPP #include #include @@ -57,4 +57,4 @@ namespace Nz }; } -#endif // NAZARA_SUBMESH_HPP +#endif // NAZARA_UTILITY_SUBMESH_HPP diff --git a/include/Nazara/Utility/TriangleIterator.hpp b/include/Nazara/Utility/TriangleIterator.hpp index 39cca969c..9303ff8a9 100644 --- a/include/Nazara/Utility/TriangleIterator.hpp +++ b/include/Nazara/Utility/TriangleIterator.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TRIANGLEITERATOR_HPP -#define NAZARA_TRIANGLEITERATOR_HPP +#ifndef NAZARA_UTILITY_TRIANGLEITERATOR_HPP +#define NAZARA_UTILITY_TRIANGLEITERATOR_HPP #include #include @@ -37,4 +37,4 @@ namespace Nz }; } -#endif // NAZARA_TRIANGLEITERATOR_HPP +#endif // NAZARA_UTILITY_TRIANGLEITERATOR_HPP diff --git a/include/Nazara/Utility/UniformBuffer.hpp b/include/Nazara/Utility/UniformBuffer.hpp index 34d51f2ae..b92ed672e 100644 --- a/include/Nazara/Utility/UniformBuffer.hpp +++ b/include/Nazara/Utility/UniformBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_UNIFORMBUFFER_HPP -#define NAZARA_UNIFORMBUFFER_HPP +#ifndef NAZARA_UTILITY_UNIFORMBUFFER_HPP +#define NAZARA_UTILITY_UNIFORMBUFFER_HPP #include #include @@ -54,4 +54,4 @@ namespace Nz #include -#endif // NAZARA_UNIFORMBUFFER_HPP +#endif // NAZARA_UTILITY_UNIFORMBUFFER_HPP diff --git a/include/Nazara/Utility/VertexBuffer.hpp b/include/Nazara/Utility/VertexBuffer.hpp index 280acb7c4..1daa902f2 100644 --- a/include/Nazara/Utility/VertexBuffer.hpp +++ b/include/Nazara/Utility/VertexBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VERTEXBUFFER_HPP -#define NAZARA_VERTEXBUFFER_HPP +#ifndef NAZARA_UTILITY_VERTEXBUFFER_HPP +#define NAZARA_UTILITY_VERTEXBUFFER_HPP #include #include @@ -65,4 +65,4 @@ namespace Nz #include -#endif // NAZARA_VERTEXBUFFER_HPP +#endif // NAZARA_UTILITY_VERTEXBUFFER_HPP diff --git a/include/Nazara/Utility/VertexDeclaration.hpp b/include/Nazara/Utility/VertexDeclaration.hpp index dcda8c7d6..19a5c5195 100644 --- a/include/Nazara/Utility/VertexDeclaration.hpp +++ b/include/Nazara/Utility/VertexDeclaration.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VERTEXDECLARATION_HPP -#define NAZARA_VERTEXDECLARATION_HPP +#ifndef NAZARA_UTILITY_VERTEXDECLARATION_HPP +#define NAZARA_UTILITY_VERTEXDECLARATION_HPP #include #include @@ -83,4 +83,4 @@ namespace Nz #include -#endif // NAZARA_VERTEXDECLARATION_HPP +#endif // NAZARA_UTILITY_VERTEXDECLARATION_HPP diff --git a/include/Nazara/Utility/VertexMapper.hpp b/include/Nazara/Utility/VertexMapper.hpp index 9bc9fa43f..bb8c70b1e 100644 --- a/include/Nazara/Utility/VertexMapper.hpp +++ b/include/Nazara/Utility/VertexMapper.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VERTEXMAPPER_HPP -#define NAZARA_VERTEXMAPPER_HPP +#ifndef NAZARA_UTILITY_VERTEXMAPPER_HPP +#define NAZARA_UTILITY_VERTEXMAPPER_HPP #include #include @@ -41,4 +41,4 @@ namespace Nz #include -#endif // NAZARA_VERTEXMAPPER_HPP +#endif // NAZARA_UTILITY_VERTEXMAPPER_HPP diff --git a/include/Nazara/Utility/VertexStruct.hpp b/include/Nazara/Utility/VertexStruct.hpp index c14948088..ce217e022 100644 --- a/include/Nazara/Utility/VertexStruct.hpp +++ b/include/Nazara/Utility/VertexStruct.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VERTEXSTRUCT_HPP -#define NAZARA_VERTEXSTRUCT_HPP +#ifndef NAZARA_UTILITY_VERTEXSTRUCT_HPP +#define NAZARA_UTILITY_VERTEXSTRUCT_HPP #include #include @@ -83,4 +83,4 @@ namespace Nz }; } -#endif // NAZARA_VERTEXSTRUCT_HPP +#endif // NAZARA_UTILITY_VERTEXSTRUCT_HPP diff --git a/include/Nazara/VulkanRenderer.hpp b/include/Nazara/VulkanRenderer.hpp index 4b91672ff..469777424 100644 --- a/include/Nazara/VulkanRenderer.hpp +++ b/include/Nazara/VulkanRenderer.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* - Nazara Engine - Vulkan + Nazara Engine - Vulkan renderer - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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/VulkanRenderer/Config.hpp b/include/Nazara/VulkanRenderer/Config.hpp index 39a7f5b4f..82cfb81ed 100644 --- a/include/Nazara/VulkanRenderer/Config.hpp +++ b/include/Nazara/VulkanRenderer/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_VULKANRENDERER_HPP -#define NAZARA_CONFIG_VULKANRENDERER_HPP +#ifndef NAZARA_VULKANRENDERER_CONFIG_HPP +#define NAZARA_VULKANRENDERER_CONFIG_HPP /// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci @@ -50,4 +50,4 @@ #define NAZARA_VULKANRENDERER_API #endif -#endif // NAZARA_CONFIG_VULKANRENDERER_HPP +#endif // NAZARA_VULKANRENDERER_CONFIG_HPP diff --git a/include/Nazara/VulkanRenderer/ConfigCheck.hpp b/include/Nazara/VulkanRenderer/ConfigCheck.hpp index 6592eb252..465bb067a 100644 --- a/include/Nazara/VulkanRenderer/ConfigCheck.hpp +++ b/include/Nazara/VulkanRenderer/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_VULKANRENDERER_HPP -#define NAZARA_CONFIG_CHECK_VULKANRENDERER_HPP +#ifndef NAZARA_VULKANRENDERER_CONFIGCHECK_HPP +#define NAZARA_VULKANRENDERER_CONFIGCHECK_HPP /// Ce fichier sert à vérifier la valeur des constantes du fichier Config.hpp @@ -19,4 +19,4 @@ #define NAZARA_VULKANRENDERER_MANAGE_MEMORY 0 #endif -#endif // NAZARA_CONFIG_CHECK_VULKANRENDERER_HPP +#endif // NAZARA_VULKANRENDERER_CONFIGCHECK_HPP diff --git a/include/Nazara/VulkanRenderer/Debug.hpp b/include/Nazara/VulkanRenderer/Debug.hpp index 281889766..c8aad51a4 100644 --- a/include/Nazara/VulkanRenderer/Debug.hpp +++ b/include/Nazara/VulkanRenderer/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Vulkan renderer" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_VULKANRENDERER_MANAGE_MEMORY #include diff --git a/include/Nazara/VulkanRenderer/DebugOff.hpp b/include/Nazara/VulkanRenderer/DebugOff.hpp index 22eb5898b..7acd2edf6 100644 --- a/include/Nazara/VulkanRenderer/DebugOff.hpp +++ b/include/Nazara/VulkanRenderer/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Vulkan renderer" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // On suppose que Debug.hpp a déjà été inclus, tout comme Config.hpp #if NAZARA_VULKANRENDERER_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/VulkanRenderer/Utils.hpp b/include/Nazara/VulkanRenderer/Utils.hpp index 5782c4857..67910e179 100644 --- a/include/Nazara/VulkanRenderer/Utils.hpp +++ b/include/Nazara/VulkanRenderer/Utils.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_UTILS_VULKAN_HPP -#define NAZARA_UTILS_VULKAN_HPP +#ifndef NAZARA_VULKANRENDERER_UTILS_HPP +#define NAZARA_VULKANRENDERER_UTILS_HPP #include #include @@ -49,4 +49,4 @@ namespace Nz #include -#endif // NAZARA_UTILS_VULKAN_HPP +#endif // NAZARA_VULKANRENDERER_UTILS_HPP diff --git a/include/Nazara/VulkanRenderer/Vulkan.hpp b/include/Nazara/VulkanRenderer/Vulkan.hpp index e6b72e01a..981a5f983 100644 --- a/include/Nazara/VulkanRenderer/Vulkan.hpp +++ b/include/Nazara/VulkanRenderer/Vulkan.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKAN_HPP -#define NAZARA_VULKAN_HPP +#ifndef NAZARA_VULKANRENDERER_VULKAN_HPP +#define NAZARA_VULKANRENDERER_VULKAN_HPP #include #include @@ -60,4 +60,4 @@ namespace Nz }; } -#endif // NAZARA_VULKAN_HPP +#endif // NAZARA_VULKANRENDERER_VULKAN_HPP diff --git a/include/Nazara/VulkanRenderer/VulkanBuffer.hpp b/include/Nazara/VulkanRenderer/VulkanBuffer.hpp index 43c588038..b19f95d2e 100644 --- a/include/Nazara/VulkanRenderer/VulkanBuffer.hpp +++ b/include/Nazara/VulkanRenderer/VulkanBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_BUFFER_HPP -#define NAZARA_VULKANRENDERER_BUFFER_HPP +#ifndef NAZARA_VULKANRENDERER_VULKANBUFFER_HPP +#define NAZARA_VULKANRENDERER_VULKANBUFFER_HPP #include #include @@ -54,4 +54,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_BUFFER_HPP +#endif // NAZARA_VULKANRENDERER_VULKANBUFFER_HPP diff --git a/include/Nazara/VulkanRenderer/VulkanRenderWindow.hpp b/include/Nazara/VulkanRenderer/VulkanRenderWindow.hpp index 206c318d7..3897210a1 100644 --- a/include/Nazara/VulkanRenderer/VulkanRenderWindow.hpp +++ b/include/Nazara/VulkanRenderer/VulkanRenderWindow.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_RENDERWINDOW_HPP -#define NAZARA_VULKANRENDERER_RENDERWINDOW_HPP +#ifndef NAZARA_VULKANRENDERER_VULKANRENDERWINDOW_HPP +#define NAZARA_VULKANRENDERER_VULKANRENDERWINDOW_HPP #include #include @@ -92,4 +92,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_RENDERWINDOW_HPP +#endif // NAZARA_VULKANRENDERER_VULKANRENDERWINDOW_HPP diff --git a/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp b/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp index fcc46c132..2e32f17a4 100644 --- a/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp +++ b/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VULKANSHADERSTAGE_HPP -#define NAZARA_VULKANRENDERER_VULKANSHADERSTAGE_HPP +#ifndef NAZARA_VULKANRENDERER_VULKANSHADERMODULE_HPP +#define NAZARA_VULKANRENDERER_VULKANSHADERMODULE_HPP #include #include @@ -50,4 +50,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VULKANSHADERSTAGE_HPP +#endif // NAZARA_VULKANRENDERER_VULKANSHADERMODULE_HPP diff --git a/include/Nazara/VulkanRenderer/VulkanSurface.hpp b/include/Nazara/VulkanRenderer/VulkanSurface.hpp index 712febdaf..072468ea1 100644 --- a/include/Nazara/VulkanRenderer/VulkanSurface.hpp +++ b/include/Nazara/VulkanRenderer/VulkanSurface.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_SURFACE_HPP -#define NAZARA_VULKANRENDERER_SURFACE_HPP +#ifndef NAZARA_VULKANRENDERER_VULKANSURFACE_HPP +#define NAZARA_VULKANRENDERER_VULKANSURFACE_HPP #include #include @@ -37,4 +37,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_SURFACE_HPP +#endif // NAZARA_VULKANRENDERER_VULKANSURFACE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper.hpp b/include/Nazara/VulkanRenderer/Wrapper.hpp index 94c80b9c5..abb1ce519 100644 --- a/include/Nazara/VulkanRenderer/Wrapper.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* - Nazara Engine - Vulkan + Nazara Engine - Vulkan renderer - Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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 @@ -26,8 +26,8 @@ #pragma once -#ifndef NAZARA_GLOBAL_VULKANRENDERER_WRAPPER_HPP -#define NAZARA_GLOBAL_VULKANRENDERER_WRAPPER_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_HPP #include #include @@ -59,4 +59,4 @@ #include #include -#endif // NAZARA_GLOBAL_VULKANRENDERER_WRAPPER_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/AutoFree.hpp b/include/Nazara/VulkanRenderer/Wrapper/AutoFree.hpp index 839c423b6..39d34b3f7 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/AutoFree.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/AutoFree.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKAUTOFREE_HPP -#define NAZARA_VULKANRENDERER_VKAUTOFREE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_AUTOFREE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_AUTOFREE_HPP #include @@ -39,4 +39,4 @@ namespace Nz::Vk #include -#endif // NAZARA_VULKANRENDERER_VKAUTOFREE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_AUTOFREE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp index 803fa3df1..449bda575 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKBUFFER_HPP -#define NAZARA_VULKANRENDERER_VKBUFFER_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_BUFFER_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_BUFFER_HPP #include #include @@ -43,4 +43,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKBUFFER_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_BUFFER_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp index 18ad866e0..10db6a57a 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKCOMMANDBUFFER_HPP -#define NAZARA_VULKANRENDERER_VKCOMMANDBUFFER_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_COMMANDBUFFER_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_COMMANDBUFFER_HPP #include #include @@ -128,4 +128,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKCOMMANDBUFFER_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_COMMANDBUFFER_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp b/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp index 279365375..f1bd9458a 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKCOMMANDPOOL_HPP -#define NAZARA_VULKANRENDERER_VKCOMMANDPOOL_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_COMMANDPOOL_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_COMMANDPOOL_HPP #include #include @@ -46,4 +46,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKCOMMANDPOOL_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_COMMANDPOOL_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/DebugUtilsMessengerEXT.hpp b/include/Nazara/VulkanRenderer/Wrapper/DebugUtilsMessengerEXT.hpp index 0f31548aa..2c390ce40 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DebugUtilsMessengerEXT.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DebugUtilsMessengerEXT.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKDEBUGUTILSMESSENGEREXT_HPP -#define NAZARA_VULKANRENDERER_VKDEBUGUTILSMESSENGEREXT_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_DEBUGUTILSMESSENGEREXT_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_DEBUGUTILSMESSENGEREXT_HPP #include #include @@ -38,4 +38,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKDEBUGUTILSMESSENGEREXT_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_DEBUGUTILSMESSENGEREXT_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp index ddf2473a3..8c7cb31b5 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKDESCRIPTORPOOL_HPP -#define NAZARA_VULKANRENDERER_VKDESCRIPTORPOOL_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_DESCRIPTORPOOL_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_DESCRIPTORPOOL_HPP #include #include @@ -45,4 +45,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKDESCRIPTORPOOL_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_DESCRIPTORPOOL_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp index f4f2bb237..1bcc923c9 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKDESCRIPTORSET_HPP -#define NAZARA_VULKANRENDERER_VKDESCRIPTORSET_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_DESCRIPTORSET_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_DESCRIPTORSET_HPP #include #include @@ -71,4 +71,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKDESCRIPTORSET_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_DESCRIPTORSET_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp index ad93ee903..228e6b7b1 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKDESCRIPTORSETLAYOUT_HPP -#define NAZARA_VULKANRENDERER_VKDESCRIPTORSETLAYOUT_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_DESCRIPTORSETLAYOUT_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_DESCRIPTORSETLAYOUT_HPP #include #include @@ -40,4 +40,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKDESCRIPTORSETLAYOUT_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_DESCRIPTORSETLAYOUT_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Device.hpp b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp index 33834fd67..b8bd111b1 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Device.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKDEVICE_HPP -#define NAZARA_VULKANRENDERER_VKDEVICE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_DEVICE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_DEVICE_HPP #include #include @@ -122,4 +122,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKDEVICE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_DEVICE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/DeviceFunctions.hpp b/include/Nazara/VulkanRenderer/Wrapper/DeviceFunctions.hpp index e1ae71299..3f4600af6 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DeviceFunctions.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceFunctions.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Vulkan renderer" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #if !defined(NAZARA_VULKANRENDERER_DEVICE_FUNCTION) || !defined(NAZARA_VULKANRENDERER_DEVICE_CORE_EXT_FUNCTION) #error You must define NAZARA_VULKANRENDERER_DEVICE_FUNCTION and NAZARA_VULKANRENDERER_DEVICE_CORE_EXT_FUNCTION before including this file #endif diff --git a/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp index f45752df1..99c125a8e 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKDEVICEMEMORY_HPP -#define NAZARA_VULKANRENDERER_VKDEVICEMEMORY_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_DEVICEMEMORY_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_DEVICEMEMORY_HPP #include #include @@ -53,4 +53,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKDEVICEMEMORY_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_DEVICEMEMORY_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp index 7c4d01d3b..216b90932 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKDEVICEOBJECT_HPP -#define NAZARA_VULKANRENDERER_VKDEVICEOBJECT_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_DEVICEOBJECT_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_DEVICEOBJECT_HPP #include #include @@ -50,4 +50,4 @@ namespace Nz::Vk #include -#endif // NAZARA_VULKANRENDERER_VKDEVICEOBJECT_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_DEVICEOBJECT_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Fence.hpp b/include/Nazara/VulkanRenderer/Wrapper/Fence.hpp index 34ec3ca88..1ac90ed3b 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Fence.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Fence.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKFENCE_HPP -#define NAZARA_VULKANRENDERER_VKFENCE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_FENCE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_FENCE_HPP #include #include @@ -44,4 +44,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKFENCE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_FENCE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp index 06fd6becd..b9e0075fc 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKFRAMEBUFFER_HPP -#define NAZARA_VULKANRENDERER_VKFRAMEBUFFER_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_FRAMEBUFFER_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_FRAMEBUFFER_HPP #include #include @@ -36,4 +36,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKFRAMEBUFFER_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_FRAMEBUFFER_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/GlobalFunctions.hpp b/include/Nazara/VulkanRenderer/Wrapper/GlobalFunctions.hpp index 341b79542..9e6ad4ac1 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/GlobalFunctions.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/GlobalFunctions.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Vulkan renderer" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #if !defined(NAZARA_VULKANRENDERER_GLOBAL_FUNCTION) || !defined(NAZARA_VULKANRENDERER_GLOBAL_FUNCTION_OPT) #error You must define NAZARA_VULKANRENDERER_GLOBAL_FUNCTION and NAZARA_VULKANRENDERER_GLOBAL_FUNCTION_OPT before including this file #endif diff --git a/include/Nazara/VulkanRenderer/Wrapper/Image.hpp b/include/Nazara/VulkanRenderer/Wrapper/Image.hpp index 6fb07b4b5..4f6bfdf4c 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Image.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Image.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKIMAGE_HPP -#define NAZARA_VULKANRENDERER_VKIMAGE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_IMAGE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_IMAGE_HPP #include #include @@ -40,4 +40,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKIMAGE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_IMAGE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp b/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp index 5527d9181..5c80b6810 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKIMAGEVIEW_HPP -#define NAZARA_VULKANRENDERER_VKIMAGEVIEW_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_IMAGEVIEW_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_IMAGEVIEW_HPP #include #include @@ -36,4 +36,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKIMAGEVIEW_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_IMAGEVIEW_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp b/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp index 78eda846f..e47f0ca61 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKINSTANCE_HPP -#define NAZARA_VULKANRENDERER_VKINSTANCE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_INSTANCE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_INSTANCE_HPP #include #include @@ -112,4 +112,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKINSTANCE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_INSTANCE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/InstanceFunctions.hpp b/include/Nazara/VulkanRenderer/Wrapper/InstanceFunctions.hpp index 0a1224290..f67fa9905 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/InstanceFunctions.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/InstanceFunctions.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Vulkan renderer" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #if !defined(NAZARA_VULKANRENDERER_INSTANCE_FUNCTION) || !defined(NAZARA_VULKANRENDERER_INSTANCE_CORE_EXT_FUNCTION) #error You must define NAZARA_VULKANRENDERER_INSTANCE_FUNCTION and NAZARA_VULKANRENDERER_INSTANCE_CORE_EXT_FUNCTION before including this file #endif diff --git a/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp b/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp index 090681fa9..8b2b38517 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKINSTANCEOBJECT_HPP -#define NAZARA_VULKANRENDERER_VKINSTANCEOBJECT_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_INSTANCEOBJECT_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_INSTANCEOBJECT_HPP #include #include @@ -50,4 +50,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKINSTANCEOBJECT_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_INSTANCEOBJECT_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp b/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp index 8e3e0ca04..839aa34fe 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKLOADER_HPP -#define NAZARA_VULKANRENDERER_VKLOADER_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_LOADER_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_LOADER_HPP #include #include @@ -48,4 +48,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKLOADER_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_LOADER_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp b/include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp index 34c0cf043..301bcb38f 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKPHYSICALDEVICE_HPP -#define NAZARA_VULKANRENDERER_VKPHYSICALDEVICE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_PHYSICALDEVICE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_PHYSICALDEVICE_HPP #include #include @@ -24,4 +24,4 @@ namespace Nz::Vk }; } -#endif // NAZARA_VULKANRENDERER_VKPHYSICALDEVICE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_PHYSICALDEVICE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp b/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp index a8a87bf6d..e49aab05c 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKPIPELINE_HPP -#define NAZARA_VULKANRENDERER_VKPIPELINE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_PIPELINE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_PIPELINE_HPP #include #include @@ -47,4 +47,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKPIPELINE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_PIPELINE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp b/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp index ad4d6dc0f..120cfc2cc 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKPIPELINECACHE_HPP -#define NAZARA_VULKANRENDERER_VKPIPELINECACHE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_PIPELINECACHE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_PIPELINECACHE_HPP #include #include @@ -36,4 +36,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKPIPELINECACHE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_PIPELINECACHE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp b/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp index 8b251503c..65c053e27 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKPIPELINELAYOUT_HPP -#define NAZARA_VULKANRENDERER_VKPIPELINELAYOUT_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_PIPELINELAYOUT_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_PIPELINELAYOUT_HPP #include #include @@ -40,4 +40,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKPIPELINELAYOUT_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_PIPELINELAYOUT_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp b/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp index 5d9d12ea2..6db9cc6f7 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKQUEUE_HPP -#define NAZARA_VULKANRENDERER_VKQUEUE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_QUEUEHANDLE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_QUEUEHANDLE_HPP #include #include @@ -59,4 +59,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKQUEUE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_QUEUEHANDLE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp b/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp index 6dfab3e0e..99ae173a4 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKRENDERPASS_HPP -#define NAZARA_VULKANRENDERER_VKRENDERPASS_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_RENDERPASS_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_RENDERPASS_HPP #include #include @@ -36,4 +36,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKRENDERPASS_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_RENDERPASS_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Sampler.hpp b/include/Nazara/VulkanRenderer/Wrapper/Sampler.hpp index b495f717b..f074b3f42 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Sampler.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Sampler.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKSAMPLER_HPP -#define NAZARA_VULKANRENDERER_VKSAMPLER_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_SAMPLER_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_SAMPLER_HPP #include #include @@ -36,4 +36,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKSAMPLER_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_SAMPLER_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp b/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp index 32f395e07..c01f64859 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKSEMAPHORE_HPP -#define NAZARA_VULKANRENDERER_VKSEMAPHORE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_SEMAPHORE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_SEMAPHORE_HPP #include #include @@ -39,4 +39,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKSEMAPHORE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_SEMAPHORE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp b/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp index 306228e11..d7ebf10c9 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKSHADERMODULE_HPP -#define NAZARA_VULKANRENDERER_VKSHADERMODULE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_SHADERMODULE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_SHADERMODULE_HPP #include #include @@ -39,4 +39,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKSHADERMODULE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_SHADERMODULE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp b/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp index 3d3d97524..35680d225 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKSURFACE_HPP -#define NAZARA_VULKANRENDERER_VKSURFACE_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_SURFACE_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_SURFACE_HPP #include #include @@ -83,4 +83,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKSURFACE_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_SURFACE_HPP diff --git a/include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp b/include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp index 30b4ca9c1..488d7c512 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VULKANRENDERER_VKSWAPCHAIN_HPP -#define NAZARA_VULKANRENDERER_VKSWAPCHAIN_HPP +#ifndef NAZARA_VULKANRENDERER_WRAPPER_SWAPCHAIN_HPP +#define NAZARA_VULKANRENDERER_WRAPPER_SWAPCHAIN_HPP #include #include @@ -57,4 +57,4 @@ namespace Nz #include -#endif // NAZARA_VULKANRENDERER_VKSWAPCHAIN_HPP +#endif // NAZARA_VULKANRENDERER_WRAPPER_SWAPCHAIN_HPP diff --git a/include/Nazara/Widgets.hpp b/include/Nazara/Widgets.hpp index 40789c49a..2df183ce7 100644 --- a/include/Nazara/Widgets.hpp +++ b/include/Nazara/Widgets.hpp @@ -1,9 +1,9 @@ -// This file was automatically generated +// this file was automatically generated and should not be edited /* Nazara Engine - Widgets module - Copyright (C) 2020 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + Copyright (C) 2021 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 @@ -30,6 +30,7 @@ #define NAZARA_GLOBAL_WIDGETS_HPP #include +#include #include #include #include diff --git a/include/Nazara/Widgets/BaseWidget.hpp b/include/Nazara/Widgets/BaseWidget.hpp index 646f17b78..96256b03d 100644 --- a/include/Nazara/Widgets/BaseWidget.hpp +++ b/include/Nazara/Widgets/BaseWidget.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BASEWIDGET_HPP -#define NAZARA_BASEWIDGET_HPP +#ifndef NAZARA_WIDGETS_BASEWIDGET_HPP +#define NAZARA_WIDGETS_BASEWIDGET_HPP #include #include @@ -178,4 +178,4 @@ namespace Nz #include -#endif // NAZARA_BASEWIDGET_HPP +#endif // NAZARA_WIDGETS_BASEWIDGET_HPP diff --git a/include/Nazara/Widgets/ButtonWidget.hpp b/include/Nazara/Widgets/ButtonWidget.hpp index 7d4f4d65b..2030b9875 100644 --- a/include/Nazara/Widgets/ButtonWidget.hpp +++ b/include/Nazara/Widgets/ButtonWidget.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_BUTTONWIDGET_HPP -#define NAZARA_BUTTONWIDGET_HPP +#ifndef NAZARA_WIDGETS_BUTTONWIDGET_HPP +#define NAZARA_WIDGETS_BUTTONWIDGET_HPP #include #include @@ -69,4 +69,4 @@ namespace Nz #include -#endif // NDK_WIDGETS_BUTTONWIDGET_HPP +#endif // NAZARA_WIDGETS_BUTTONWIDGET_HPP diff --git a/include/Nazara/Widgets/Canvas.hpp b/include/Nazara/Widgets/Canvas.hpp index 6f2ae15cd..12091e63e 100644 --- a/include/Nazara/Widgets/Canvas.hpp +++ b/include/Nazara/Widgets/Canvas.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CANVAS_HPP -#define NAZARA_CANVAS_HPP +#ifndef NAZARA_WIDGETS_CANVAS_HPP +#define NAZARA_WIDGETS_CANVAS_HPP #include #include @@ -85,4 +85,4 @@ namespace Nz #include -#endif // NDK_CANVAS_HPP +#endif // NAZARA_WIDGETS_CANVAS_HPP diff --git a/include/Nazara/Widgets/Config.hpp b/include/Nazara/Widgets/Config.hpp index 2b17470db..f725987ee 100644 --- a/include/Nazara/Widgets/Config.hpp +++ b/include/Nazara/Widgets/Config.hpp @@ -24,8 +24,8 @@ #pragma once -#ifndef NAZARA_CONFIG_WIDGETS_HPP -#define NAZARA_CONFIG_WIDGETS_HPP +#ifndef NAZARA_WIDGETS_CONFIG_HPP +#define NAZARA_WIDGETS_CONFIG_HPP /*! * \defgroup widgets (NazaraWidgets) Widgets module @@ -50,4 +50,4 @@ #define NAZARA_WIDGETS_API #endif -#endif // NAZARA_CONFIG_WIDGETS_HPP +#endif // NAZARA_WIDGETS_CONFIG_HPP diff --git a/include/Nazara/Widgets/ConfigCheck.hpp b/include/Nazara/Widgets/ConfigCheck.hpp index 8f31e9d74..cfffeec1c 100644 --- a/include/Nazara/Widgets/ConfigCheck.hpp +++ b/include/Nazara/Widgets/ConfigCheck.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CONFIG_CHECK_WIDGETS_HPP -#define NAZARA_CONFIG_CHECK_WIDGETS_HPP +#ifndef NAZARA_WIDGETS_CONFIGCHECK_HPP +#define NAZARA_WIDGETS_CONFIGCHECK_HPP /// This file is used to check the constant values defined in Config.hpp @@ -20,4 +20,4 @@ #undef NazaraCheckTypeAndVal -#endif // NAZARA_CONFIG_CHECK_WIDGETS_HPP +#endif // NAZARA_WIDGETS_CONFIGCHECK_HPP diff --git a/include/Nazara/Widgets/Debug.hpp b/include/Nazara/Widgets/Debug.hpp index 8882fa69d..c91076aa7 100644 --- a/include/Nazara/Widgets/Debug.hpp +++ b/include/Nazara/Widgets/Debug.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Widgets module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #include #if NAZARA_WIDGETS_MANAGE_MEMORY #include diff --git a/include/Nazara/Widgets/DebugOff.hpp b/include/Nazara/Widgets/DebugOff.hpp index 0239dc1c1..bbcce1812 100644 --- a/include/Nazara/Widgets/DebugOff.hpp +++ b/include/Nazara/Widgets/DebugOff.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Widgets module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + // We assume that Debug.hpp has already been included, same thing for Config.hpp #if NAZARA_WIDGETS_MANAGE_MEMORY #undef delete diff --git a/include/Nazara/Widgets/LabelWidget.hpp b/include/Nazara/Widgets/LabelWidget.hpp index 4680571ea..f39e6eed1 100644 --- a/include/Nazara/Widgets/LabelWidget.hpp +++ b/include/Nazara/Widgets/LabelWidget.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LABELWIDGET_HPP -#define NAZARA_LABELWIDGET_HPP +#ifndef NAZARA_WIDGETS_LABELWIDGET_HPP +#define NAZARA_WIDGETS_LABELWIDGET_HPP #include #include @@ -36,4 +36,4 @@ namespace Nz #include -#endif +#endif // NAZARA_WIDGETS_LABELWIDGET_HPP diff --git a/include/Nazara/Widgets/Widgets.hpp b/include/Nazara/Widgets/Widgets.hpp index f9118f882..0609e6e25 100644 --- a/include/Nazara/Widgets/Widgets.hpp +++ b/include/Nazara/Widgets/Widgets.hpp @@ -36,4 +36,4 @@ namespace Nz #include -#endif +#endif // NAZARA_WIDGETS_HPP diff --git a/src/Nazara/Audio/Formats/drwavLoader.hpp b/src/Nazara/Audio/Formats/drwavLoader.hpp index f6a5f81b0..5c617c6f8 100644 --- a/src/Nazara/Audio/Formats/drwavLoader.hpp +++ b/src/Nazara/Audio/Formats/drwavLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_DRWAV_HPP -#define NAZARA_LOADERS_DRWAV_HPP +#ifndef NAZARA_AUDIO_FORMATS_DRWAVLOADER_HPP +#define NAZARA_AUDIO_FORMATS_DRWAVLOADER_HPP #include #include @@ -17,4 +17,4 @@ namespace Nz::Loaders SoundStreamLoader::Entry GetSoundStreamLoader_drwav(); } -#endif +#endif // NAZARA_AUDIO_FORMATS_DRWAVLOADER_HPP diff --git a/src/Nazara/Audio/Formats/libflacLoader.hpp b/src/Nazara/Audio/Formats/libflacLoader.hpp index 32b85bfa4..845582716 100644 --- a/src/Nazara/Audio/Formats/libflacLoader.hpp +++ b/src/Nazara/Audio/Formats/libflacLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_LIBFLAC_HPP -#define NAZARA_LOADERS_LIBFLAC_HPP +#ifndef NAZARA_AUDIO_FORMATS_LIBFLACLOADER_HPP +#define NAZARA_AUDIO_FORMATS_LIBFLACLOADER_HPP #include #include @@ -17,4 +17,4 @@ namespace Nz::Loaders SoundStreamLoader::Entry GetSoundStreamLoader_libflac(); } -#endif +#endif // NAZARA_AUDIO_FORMATS_LIBFLACLOADER_HPP diff --git a/src/Nazara/Audio/Formats/libvorbisLoader.hpp b/src/Nazara/Audio/Formats/libvorbisLoader.hpp index c58c48a9e..094ffb663 100644 --- a/src/Nazara/Audio/Formats/libvorbisLoader.hpp +++ b/src/Nazara/Audio/Formats/libvorbisLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_LIBVORBIS_HPP -#define NAZARA_LOADERS_LIBVORBIS_HPP +#ifndef NAZARA_AUDIO_FORMATS_LIBVORBISLOADER_HPP +#define NAZARA_AUDIO_FORMATS_LIBVORBISLOADER_HPP #include #include @@ -17,4 +17,4 @@ namespace Nz::Loaders SoundStreamLoader::Entry GetSoundStreamLoader_libvorbis(); } -#endif +#endif // NAZARA_AUDIO_FORMATS_LIBVORBISLOADER_HPP diff --git a/src/Nazara/Audio/Formats/minimp3Loader.hpp b/src/Nazara/Audio/Formats/minimp3Loader.hpp index 6da7cbbb9..2558eae1b 100644 --- a/src/Nazara/Audio/Formats/minimp3Loader.hpp +++ b/src/Nazara/Audio/Formats/minimp3Loader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_MINIMP3_HPP -#define NAZARA_LOADERS_MINIMP3_HPP +#ifndef NAZARA_AUDIO_FORMATS_MINIMP3LOADER_HPP +#define NAZARA_AUDIO_FORMATS_MINIMP3LOADER_HPP #include #include @@ -17,4 +17,4 @@ namespace Nz::Loaders SoundStreamLoader::Entry GetSoundStreamLoader_minimp3(); } -#endif +#endif // NAZARA_AUDIO_FORMATS_MINIMP3LOADER_HPP diff --git a/src/Nazara/Core/Hash/SHA/Internal.hpp b/src/Nazara/Core/Hash/SHA/Internal.hpp index a10fe6f38..75a2c30f9 100644 --- a/src/Nazara/Core/Hash/SHA/Internal.hpp +++ b/src/Nazara/Core/Hash/SHA/Internal.hpp @@ -39,8 +39,8 @@ #pragma once -#ifndef NAZARA_HASH_SHA2_INTERNAL_HPP -#define NAZARA_HASH_SHA2_INTERNAL_HPP +#ifndef NAZARA_CORE_HASH_SHA_INTERNAL_HPP +#define NAZARA_CORE_HASH_SHA_INTERNAL_HPP #include @@ -106,4 +106,4 @@ namespace Nz void SHA512_End(SHA_CTX*, UInt8*); } -#endif /* NAZARA_HASH_SHA2_INTERNAL_HPP */ +#endif // NAZARA_CORE_HASH_SHA_INTERNAL_HPP diff --git a/src/Nazara/Core/Posix/ClockImpl.hpp b/src/Nazara/Core/Posix/ClockImpl.hpp index ce4a4af15..d37017b99 100644 --- a/src/Nazara/Core/Posix/ClockImpl.hpp +++ b/src/Nazara/Core/Posix/ClockImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CLOCKIMPL_POSIX_HPP -#define NAZARA_CLOCKIMPL_POSIX_HPP +#ifndef NAZARA_CORE_POSIX_CLOCKIMPL_HPP +#define NAZARA_CORE_POSIX_CLOCKIMPL_HPP #include @@ -16,4 +16,4 @@ namespace Nz UInt64 ClockImplGetElapsedMilliseconds(); } -#endif // NAZARA_CLOCKIMPL_POSIX_HPP +#endif // NAZARA_CORE_POSIX_CLOCKIMPL_HPP diff --git a/src/Nazara/Core/Posix/DynLibImpl.hpp b/src/Nazara/Core/Posix/DynLibImpl.hpp index 6e2ffa53a..0f4c54f5d 100644 --- a/src/Nazara/Core/Posix/DynLibImpl.hpp +++ b/src/Nazara/Core/Posix/DynLibImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_DYNLIBIMPL_HPP -#define NAZARA_DYNLIBIMPL_HPP +#ifndef NAZARA_CORE_POSIX_DYNLIBIMPL_HPP +#define NAZARA_CORE_POSIX_DYNLIBIMPL_HPP #include #include @@ -29,4 +29,4 @@ namespace Nz }; } -#endif // NAZARA_DYNLIBIMPL_HPP +#endif // NAZARA_CORE_POSIX_DYNLIBIMPL_HPP diff --git a/src/Nazara/Core/Posix/FileImpl.hpp b/src/Nazara/Core/Posix/FileImpl.hpp index 68a829696..f7b44ff5a 100644 --- a/src/Nazara/Core/Posix/FileImpl.hpp +++ b/src/Nazara/Core/Posix/FileImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FILEIMPL_HPP -#define NAZARA_FILEIMPL_HPP +#ifndef NAZARA_CORE_POSIX_FILEIMPL_HPP +#define NAZARA_CORE_POSIX_FILEIMPL_HPP #ifndef _LARGEFILE64_SOURCE #define _LARGEFILE64_SOURCE @@ -66,4 +66,4 @@ namespace Nz }; } -#endif // NAZARA_FILEIMPL_HPP +#endif // NAZARA_CORE_POSIX_FILEIMPL_HPP diff --git a/src/Nazara/Core/Posix/HardwareInfoImpl.hpp b/src/Nazara/Core/Posix/HardwareInfoImpl.hpp index 12cab3f7a..43daf8623 100644 --- a/src/Nazara/Core/Posix/HardwareInfoImpl.hpp +++ b/src/Nazara/Core/Posix/HardwareInfoImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HARDWAREINFOIMPL_POSIX_HPP -#define NAZARA_HARDWAREINFOIMPL_POSIX_HPP +#ifndef NAZARA_CORE_POSIX_HARDWAREINFOIMPL_HPP +#define NAZARA_CORE_POSIX_HARDWAREINFOIMPL_HPP #include @@ -21,4 +21,4 @@ namespace Nz }; } -#endif // NAZARA_HARDWAREINFOIMPL_POSIX_HPP +#endif // NAZARA_CORE_POSIX_HARDWAREINFOIMPL_HPP diff --git a/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp b/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp index a5d272dfc..190fa464a 100644 --- a/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp +++ b/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TASKSCHEDULERIMPL_HPP -#define NAZARA_TASKSCHEDULERIMPL_HPP +#ifndef NAZARA_CORE_POSIX_TASKSCHEDULERIMPL_HPP +#define NAZARA_CORE_POSIX_TASKSCHEDULERIMPL_HPP #include #include @@ -65,4 +65,4 @@ namespace Nz }; } -#endif // NAZARA_TASKSCHEDULERIMPL_HPP +#endif // NAZARA_CORE_POSIX_TASKSCHEDULERIMPL_HPP diff --git a/src/Nazara/Core/UnicodeData.hpp b/src/Nazara/Core/UnicodeData.hpp index f60e35a45..b1dbb520a 100644 --- a/src/Nazara/Core/UnicodeData.hpp +++ b/src/Nazara/Core/UnicodeData.hpp @@ -1,8 +1,9 @@ // this file was automatically generated and should not be edited +// no header guards // Copyright (C) 2021 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" +// For conditions of distribution and use, see copyright notice in Config.hpp UnicodeCharacter unicodeCharacters[34592] = { {0, Unicode::Category_Other_Control, Unicode::Direction_Boundary_Neutral}, diff --git a/src/Nazara/Core/Win32/ClockImpl.hpp b/src/Nazara/Core/Win32/ClockImpl.hpp index b2af58d0d..1e1756b21 100644 --- a/src/Nazara/Core/Win32/ClockImpl.hpp +++ b/src/Nazara/Core/Win32/ClockImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CLOCKIMPL_WINDOWS_HPP -#define NAZARA_CLOCKIMPL_WINDOWS_HPP +#ifndef NAZARA_CORE_WIN32_CLOCKIMPL_HPP +#define NAZARA_CORE_WIN32_CLOCKIMPL_HPP #include @@ -16,4 +16,4 @@ namespace Nz UInt64 ClockImplGetElapsedMilliseconds(); } -#endif // NAZARA_CLOCKIMPL_WINDOWS_HPP +#endif // NAZARA_CORE_WIN32_CLOCKIMPL_HPP diff --git a/src/Nazara/Core/Win32/DynLibImpl.hpp b/src/Nazara/Core/Win32/DynLibImpl.hpp index f7cfa5638..9b3111990 100644 --- a/src/Nazara/Core/Win32/DynLibImpl.hpp +++ b/src/Nazara/Core/Win32/DynLibImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_DYNLIBIMPL_HPP -#define NAZARA_DYNLIBIMPL_HPP +#ifndef NAZARA_CORE_WIN32_DYNLIBIMPL_HPP +#define NAZARA_CORE_WIN32_DYNLIBIMPL_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_DYNLIBIMPL_HPP +#endif // NAZARA_CORE_WIN32_DYNLIBIMPL_HPP diff --git a/src/Nazara/Core/Win32/FileImpl.hpp b/src/Nazara/Core/Win32/FileImpl.hpp index 8bdd715a3..a62485ee7 100644 --- a/src/Nazara/Core/Win32/FileImpl.hpp +++ b/src/Nazara/Core/Win32/FileImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FILEIMPL_HPP -#define NAZARA_FILEIMPL_HPP +#ifndef NAZARA_CORE_WIN32_FILEIMPL_HPP +#define NAZARA_CORE_WIN32_FILEIMPL_HPP #include #include @@ -44,4 +44,4 @@ namespace Nz }; } -#endif // NAZARA_FILEIMPL_HPP +#endif // NAZARA_CORE_WIN32_FILEIMPL_HPP diff --git a/src/Nazara/Core/Win32/HardwareInfoImpl.hpp b/src/Nazara/Core/Win32/HardwareInfoImpl.hpp index 4e26d0dde..da5cadd8b 100644 --- a/src/Nazara/Core/Win32/HardwareInfoImpl.hpp +++ b/src/Nazara/Core/Win32/HardwareInfoImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_HARDWAREINFOIMPL_WINDOWS_HPP -#define NAZARA_HARDWAREINFOIMPL_WINDOWS_HPP +#ifndef NAZARA_CORE_WIN32_HARDWAREINFOIMPL_HPP +#define NAZARA_CORE_WIN32_HARDWAREINFOIMPL_HPP #include @@ -21,4 +21,4 @@ namespace Nz }; } -#endif // NAZARA_HARDWAREINFOIMPL_WINDOWS_HPP +#endif // NAZARA_CORE_WIN32_HARDWAREINFOIMPL_HPP diff --git a/src/Nazara/Core/Win32/TaskSchedulerImpl.hpp b/src/Nazara/Core/Win32/TaskSchedulerImpl.hpp index 360d471a2..12d6f0360 100644 --- a/src/Nazara/Core/Win32/TaskSchedulerImpl.hpp +++ b/src/Nazara/Core/Win32/TaskSchedulerImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_TASKSCHEDULERIMPL_HPP -#define NAZARA_TASKSCHEDULERIMPL_HPP +#ifndef NAZARA_CORE_WIN32_TASKSCHEDULERIMPL_HPP +#define NAZARA_CORE_WIN32_TASKSCHEDULERIMPL_HPP #include #include @@ -48,4 +48,4 @@ namespace Nz }; } -#endif // NAZARA_TASKSCHEDULERIMPL_HPP +#endif // NAZARA_CORE_WIN32_TASKSCHEDULERIMPL_HPP diff --git a/src/Nazara/Core/Win32/Time.hpp b/src/Nazara/Core/Win32/Time.hpp index 44b7c84a8..59e0b15aa 100644 --- a/src/Nazara/Core/Win32/Time.hpp +++ b/src/Nazara/Core/Win32/Time.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_WINDOWS_TIME_HPP -#define NAZARA_WINDOWS_TIME_HPP +#ifndef NAZARA_CORE_WIN32_TIME_HPP +#define NAZARA_CORE_WIN32_TIME_HPP #include #include @@ -16,4 +16,4 @@ namespace Nz time_t FileTimeToTime(FILETIME* time); } -#endif // NAZARA_WINDOWS_TIME_HPP +#endif // NAZARA_CORE_WIN32_TIME_HPP diff --git a/src/Nazara/Network/Linux/SocketPollerImpl.hpp b/src/Nazara/Network/Linux/SocketPollerImpl.hpp index 74af5e3c2..2dcedca2c 100644 --- a/src/Nazara/Network/Linux/SocketPollerImpl.hpp +++ b/src/Nazara/Network/Linux/SocketPollerImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOCKETPOLLERIMPL_HPP -#define NAZARA_SOCKETPOLLERIMPL_HPP +#ifndef NAZARA_NETWORK_LINUX_SOCKETPOLLERIMPL_HPP +#define NAZARA_NETWORK_LINUX_SOCKETPOLLERIMPL_HPP #include #include @@ -41,4 +41,4 @@ namespace Nz }; } -#endif // NAZARA_SOCKETPOLLERIMPL_HPP +#endif // NAZARA_NETWORK_LINUX_SOCKETPOLLERIMPL_HPP diff --git a/src/Nazara/Network/Posix/IpAddressImpl.hpp b/src/Nazara/Network/Posix/IpAddressImpl.hpp index 188cf05db..1589c4089 100644 --- a/src/Nazara/Network/Posix/IpAddressImpl.hpp +++ b/src/Nazara/Network/Posix/IpAddressImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_IPADDRESSIMPL_HPP -#define NAZARA_IPADDRESSIMPL_HPP +#ifndef NAZARA_NETWORK_POSIX_IPADDRESSIMPL_HPP +#define NAZARA_NETWORK_POSIX_IPADDRESSIMPL_HPP #include #include @@ -37,4 +37,4 @@ namespace Nz }; } -#endif // NAZARA_IPADDRESSIMPL_HPP +#endif // NAZARA_NETWORK_POSIX_IPADDRESSIMPL_HPP diff --git a/src/Nazara/Network/Posix/SocketImpl.hpp b/src/Nazara/Network/Posix/SocketImpl.hpp index 9f6ac9d19..62e3be3d1 100644 --- a/src/Nazara/Network/Posix/SocketImpl.hpp +++ b/src/Nazara/Network/Posix/SocketImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOCKETIMPL_HPP -#define NAZARA_SOCKETIMPL_HPP +#ifndef NAZARA_NETWORK_POSIX_SOCKETIMPL_HPP +#define NAZARA_NETWORK_POSIX_SOCKETIMPL_HPP #include #include @@ -92,4 +92,4 @@ namespace Nz }; } -#endif // NAZARA_SOCKETIMPL_HPP +#endif // NAZARA_NETWORK_POSIX_SOCKETIMPL_HPP diff --git a/src/Nazara/Network/Posix/SocketPollerImpl.hpp b/src/Nazara/Network/Posix/SocketPollerImpl.hpp index 4cab73db3..00e4843b5 100644 --- a/src/Nazara/Network/Posix/SocketPollerImpl.hpp +++ b/src/Nazara/Network/Posix/SocketPollerImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOCKETPOLLERIMPL_HPP -#define NAZARA_SOCKETPOLLERIMPL_HPP +#ifndef NAZARA_NETWORK_POSIX_SOCKETPOLLERIMPL_HPP +#define NAZARA_NETWORK_POSIX_SOCKETPOLLERIMPL_HPP #include #include @@ -40,4 +40,4 @@ namespace Nz }; } -#endif // NAZARA_SOCKETPOLLERIMPL_HPP +#endif // NAZARA_NETWORK_POSIX_SOCKETPOLLERIMPL_HPP diff --git a/src/Nazara/Network/SystemSocket.hpp b/src/Nazara/Network/SystemSocket.hpp index f606ba1e6..52eae834b 100644 --- a/src/Nazara/Network/SystemSocket.hpp +++ b/src/Nazara/Network/SystemSocket.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Network module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #ifdef NAZARA_PLATFORM_WINDOWS #include #include diff --git a/src/Nazara/Network/Win32/IpAddressImpl.hpp b/src/Nazara/Network/Win32/IpAddressImpl.hpp index 092b201fb..5f836733b 100644 --- a/src/Nazara/Network/Win32/IpAddressImpl.hpp +++ b/src/Nazara/Network/Win32/IpAddressImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_IPADDRESSIMPL_HPP -#define NAZARA_IPADDRESSIMPL_HPP +#ifndef NAZARA_NETWORK_WIN32_IPADDRESSIMPL_HPP +#define NAZARA_NETWORK_WIN32_IPADDRESSIMPL_HPP #include #include @@ -40,4 +40,4 @@ namespace Nz }; } -#endif // NAZARA_IPADDRESSIMPL_HPP +#endif // NAZARA_NETWORK_WIN32_IPADDRESSIMPL_HPP diff --git a/src/Nazara/Network/Win32/SocketImpl.hpp b/src/Nazara/Network/Win32/SocketImpl.hpp index e3320bbce..fa74d0832 100644 --- a/src/Nazara/Network/Win32/SocketImpl.hpp +++ b/src/Nazara/Network/Win32/SocketImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOCKETIMPL_HPP -#define NAZARA_SOCKETIMPL_HPP +#ifndef NAZARA_NETWORK_WIN32_SOCKETIMPL_HPP +#define NAZARA_NETWORK_WIN32_SOCKETIMPL_HPP #include #include @@ -91,4 +91,4 @@ namespace Nz }; } -#endif // NAZARA_SOCKETIMPL_HPP +#endif // NAZARA_NETWORK_WIN32_SOCKETIMPL_HPP diff --git a/src/Nazara/Network/Win32/SocketPollerImpl.hpp b/src/Nazara/Network/Win32/SocketPollerImpl.hpp index 5633ad683..41782c16c 100644 --- a/src/Nazara/Network/Win32/SocketPollerImpl.hpp +++ b/src/Nazara/Network/Win32/SocketPollerImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SOCKETPOLLERIMPL_HPP -#define NAZARA_SOCKETPOLLERIMPL_HPP +#ifndef NAZARA_NETWORK_WIN32_SOCKETPOLLERIMPL_HPP +#define NAZARA_NETWORK_WIN32_SOCKETPOLLERIMPL_HPP #include #include @@ -49,4 +49,4 @@ namespace Nz }; } -#endif // NAZARA_SOCKETPOLLERIMPL_HPP +#endif // NAZARA_NETWORK_WIN32_SOCKETPOLLERIMPL_HPP diff --git a/src/Nazara/Platform/SDL2/CursorImpl.hpp b/src/Nazara/Platform/SDL2/CursorImpl.hpp index 40933383d..ad1b60005 100644 --- a/src/Nazara/Platform/SDL2/CursorImpl.hpp +++ b/src/Nazara/Platform/SDL2/CursorImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_CURSORIMPL_HPP -#define NAZARA_CURSORIMPL_HPP +#ifndef NAZARA_PLATFORM_SDL2_CURSORIMPL_HPP +#define NAZARA_PLATFORM_SDL2_CURSORIMPL_HPP #include #include @@ -37,4 +37,4 @@ namespace Nz }; } -#endif // NAZARA_CURSORIMPL_HPP +#endif // NAZARA_PLATFORM_SDL2_CURSORIMPL_HPP diff --git a/src/Nazara/Platform/SDL2/IconImpl.hpp b/src/Nazara/Platform/SDL2/IconImpl.hpp index 1d58e495c..f46cdfd9d 100644 --- a/src/Nazara/Platform/SDL2/IconImpl.hpp +++ b/src/Nazara/Platform/SDL2/IconImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_ICONIMPL_HPP -#define NAZARA_ICONIMPL_HPP +#ifndef NAZARA_PLATFORM_SDL2_ICONIMPL_HPP +#define NAZARA_PLATFORM_SDL2_ICONIMPL_HPP #include #include @@ -33,4 +33,4 @@ namespace Nz }; } -#endif // NAZARA_ICONIMPL_HPP +#endif // NAZARA_PLATFORM_SDL2_ICONIMPL_HPP diff --git a/src/Nazara/Platform/SDL2/InputImpl.hpp b/src/Nazara/Platform/SDL2/InputImpl.hpp index e5537b8f5..a4381a867 100644 --- a/src/Nazara/Platform/SDL2/InputImpl.hpp +++ b/src/Nazara/Platform/SDL2/InputImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_INPUTIMPL_HPP -#define NAZARA_INPUTIMPL_HPP +#ifndef NAZARA_PLATFORM_SDL2_INPUTIMPL_HPP +#define NAZARA_PLATFORM_SDL2_INPUTIMPL_HPP #include #include @@ -34,4 +34,4 @@ namespace Nz }; } -#endif // NAZARA_INPUTIMPL_HPP +#endif // NAZARA_PLATFORM_SDL2_INPUTIMPL_HPP diff --git a/src/Nazara/Platform/SDL2/SDLHelper.hpp b/src/Nazara/Platform/SDL2/SDLHelper.hpp index b0fd3515b..93fffd73d 100644 --- a/src/Nazara/Platform/SDL2/SDLHelper.hpp +++ b/src/Nazara/Platform/SDL2/SDLHelper.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_SDL2_HELPER_HPP -#define NAZARA_SDL2_HELPER_HPP +#ifndef NAZARA_PLATFORM_SDL2_SDLHELPER_HPP +#define NAZARA_PLATFORM_SDL2_SDLHELPER_HPP #include #include @@ -23,4 +23,4 @@ namespace Nz }; } -#endif // NAZARA_SDL2_HELPER_HPP +#endif // NAZARA_PLATFORM_SDL2_SDLHELPER_HPP diff --git a/src/Nazara/Platform/SDL2/VideoModeImpl.hpp b/src/Nazara/Platform/SDL2/VideoModeImpl.hpp index 3e3b3bd8e..712bfee4b 100644 --- a/src/Nazara/Platform/SDL2/VideoModeImpl.hpp +++ b/src/Nazara/Platform/SDL2/VideoModeImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VIDEOMODEIMPL_HPP -#define NAZARA_VIDEOMODEIMPL_HPP +#ifndef NAZARA_PLATFORM_SDL2_VIDEOMODEIMPL_HPP +#define NAZARA_PLATFORM_SDL2_VIDEOMODEIMPL_HPP #include @@ -19,4 +19,4 @@ namespace Nz }; } -#endif // NNAZARA_VIDEOMODEIMPL_HPP +#endif // NAZARA_PLATFORM_SDL2_VIDEOMODEIMPL_HPP diff --git a/src/Nazara/Platform/SDL2/WindowImpl.hpp b/src/Nazara/Platform/SDL2/WindowImpl.hpp index 111a24192..59123213d 100644 --- a/src/Nazara/Platform/SDL2/WindowImpl.hpp +++ b/src/Nazara/Platform/SDL2/WindowImpl.hpp @@ -6,8 +6,8 @@ #pragma once -#ifndef NAZARA_WINDOWIMPL_HPP -#define NAZARA_WINDOWIMPL_HPP +#ifndef NAZARA_PLATFORM_SDL2_WINDOWIMPL_HPP +#define NAZARA_PLATFORM_SDL2_WINDOWIMPL_HPP #include #include @@ -105,4 +105,4 @@ namespace Nz }; } -#endif // NAZARA_WINDOWIMPL_HPP +#endif // NAZARA_PLATFORM_SDL2_WINDOWIMPL_HPP diff --git a/src/Nazara/Platform/VideoModeImpl.hpp b/src/Nazara/Platform/VideoModeImpl.hpp index 256848165..7326eee3a 100644 --- a/src/Nazara/Platform/VideoModeImpl.hpp +++ b/src/Nazara/Platform/VideoModeImpl.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_VIDEOMODEIMPL_HPP -#define NAZARA_VIDEOMODEIMPL_HPP +#ifndef NAZARA_PLATFORM_VIDEOMODEIMPL_HPP +#define NAZARA_PLATFORM_VIDEOMODEIMPL_HPP #include @@ -18,4 +18,4 @@ class VideoModeImpl static void GetFullscreenModes(std::vector& modes); }; -#endif // NAZARA_VIDEOMODEIMPL_HPP +#endif // NAZARA_PLATFORM_VIDEOMODEIMPL_HPP diff --git a/src/Nazara/Shader/SpirvData.cpp b/src/Nazara/Shader/SpirvData.cpp index 661c4d7ed..71fb78225 100644 --- a/src/Nazara/Shader/SpirvData.cpp +++ b/src/Nazara/Shader/SpirvData.cpp @@ -1,8 +1,8 @@ -// this file was automatically generated and should not be edited - -// Copyright (C) 2021 Jérôme Leclercq +// Copyright (C) 2021 Jérôme "Lynix" Leclercq (lynix680@gmail.com) // This file is part of the "Nazara Engine - Shader module" -// For conditions of distribution and use, see copyright notice in Config.hpp" +// For conditions of distribution and use, see copyright notice in Config.hpp + +// this file was automatically generated and should not be edited #include #include diff --git a/src/Nazara/Utility/Formats/DDSConstants.hpp b/src/Nazara/Utility/Formats/DDSConstants.hpp index 160611785..cdece4202 100644 --- a/src/Nazara/Utility/Formats/DDSConstants.hpp +++ b/src/Nazara/Utility/Formats/DDSConstants.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_DDS_CONSTANTS_HPP -#define NAZARA_LOADERS_DDS_CONSTANTS_HPP +#ifndef NAZARA_UTILITY_FORMATS_DDSCONSTANTS_HPP +#define NAZARA_UTILITY_FORMATS_DDSCONSTANTS_HPP #include #include @@ -374,4 +374,4 @@ namespace Nz NAZARA_UTILITY_API bool Unserialize(SerializationContext& context, DDSPixelFormat* pixelFormat); } -#endif // NAZARA_LOADERS_DDS_CONSTANTS_HPP +#endif // NAZARA_UTILITY_FORMATS_DDSCONSTANTS_HPP diff --git a/src/Nazara/Utility/Formats/DDSLoader.hpp b/src/Nazara/Utility/Formats/DDSLoader.hpp index 8a63ba6f0..080889115 100644 --- a/src/Nazara/Utility/Formats/DDSLoader.hpp +++ b/src/Nazara/Utility/Formats/DDSLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_DDS_HPP -#define NAZARA_LOADERS_DDS_HPP +#ifndef NAZARA_UTILITY_FORMATS_DDSLOADER_HPP +#define NAZARA_UTILITY_FORMATS_DDSLOADER_HPP #include #include @@ -15,4 +15,4 @@ namespace Nz::Loaders ImageLoader::Entry GetImageLoader_DDS(); } -#endif // NAZARA_LOADERS_DDS_HPP +#endif // NAZARA_UTILITY_FORMATS_DDSLOADER_HPP diff --git a/src/Nazara/Utility/Formats/FreeTypeLoader.hpp b/src/Nazara/Utility/Formats/FreeTypeLoader.hpp index dc8b23531..0d51c5ca4 100644 --- a/src/Nazara/Utility/Formats/FreeTypeLoader.hpp +++ b/src/Nazara/Utility/Formats/FreeTypeLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_FREETYPE_HPP -#define NAZARA_LOADERS_FREETYPE_HPP +#ifndef NAZARA_UTILITY_FORMATS_FREETYPELOADER_HPP +#define NAZARA_UTILITY_FORMATS_FREETYPELOADER_HPP #include #include @@ -17,4 +17,4 @@ namespace Nz::Loaders void UninitializeFreeType(); } -#endif // NAZARA_LOADERS_FREETYPE_HPP +#endif // NAZARA_UTILITY_FORMATS_FREETYPELOADER_HPP diff --git a/src/Nazara/Utility/Formats/MD2Constants.hpp b/src/Nazara/Utility/Formats/MD2Constants.hpp index e97fc53a6..c383b988d 100644 --- a/src/Nazara/Utility/Formats/MD2Constants.hpp +++ b/src/Nazara/Utility/Formats/MD2Constants.hpp @@ -2,8 +2,10 @@ // 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 +#pragma once + +#ifndef NAZARA_UTILITY_FORMATS_MD2CONSTANTS_HPP +#define NAZARA_UTILITY_FORMATS_MD2CONSTANTS_HPP #include #include @@ -64,4 +66,4 @@ namespace Nz extern const Vector3f md2Normals[162]; } -#endif // NAZARA_LOADERS_MD2_CONSTANTS_HPP +#endif // NAZARA_UTILITY_FORMATS_MD2CONSTANTS_HPP diff --git a/src/Nazara/Utility/Formats/MD2Loader.hpp b/src/Nazara/Utility/Formats/MD2Loader.hpp index b68dbbf38..bcaae8672 100644 --- a/src/Nazara/Utility/Formats/MD2Loader.hpp +++ b/src/Nazara/Utility/Formats/MD2Loader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_MD2_HPP -#define NAZARA_LOADERS_MD2_HPP +#ifndef NAZARA_UTILITY_FORMATS_MD2LOADER_HPP +#define NAZARA_UTILITY_FORMATS_MD2LOADER_HPP #include #include @@ -15,4 +15,4 @@ namespace Nz::Loaders MeshLoader::Entry GetMeshLoader_MD2(); } -#endif // NAZARA_LOADERS_MD2_HPP +#endif // NAZARA_UTILITY_FORMATS_MD2LOADER_HPP diff --git a/src/Nazara/Utility/Formats/MD5AnimLoader.hpp b/src/Nazara/Utility/Formats/MD5AnimLoader.hpp index 977405b1e..3e0c8faac 100644 --- a/src/Nazara/Utility/Formats/MD5AnimLoader.hpp +++ b/src/Nazara/Utility/Formats/MD5AnimLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_MD5ANIM_HPP -#define NAZARA_LOADERS_MD5ANIM_HPP +#ifndef NAZARA_UTILITY_FORMATS_MD5ANIMLOADER_HPP +#define NAZARA_UTILITY_FORMATS_MD5ANIMLOADER_HPP #include #include @@ -15,4 +15,4 @@ namespace Nz::Loaders AnimationLoader::Entry GetAnimationLoader_MD5Anim(); } -#endif // NAZARA_LOADERS_MD5ANIM_HPP +#endif // NAZARA_UTILITY_FORMATS_MD5ANIMLOADER_HPP diff --git a/src/Nazara/Utility/Formats/MD5MeshLoader.hpp b/src/Nazara/Utility/Formats/MD5MeshLoader.hpp index ece87fe83..31319f090 100644 --- a/src/Nazara/Utility/Formats/MD5MeshLoader.hpp +++ b/src/Nazara/Utility/Formats/MD5MeshLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_MD5MESH_HPP -#define NAZARA_LOADERS_MD5MESH_HPP +#ifndef NAZARA_UTILITY_FORMATS_MD5MESHLOADER_HPP +#define NAZARA_UTILITY_FORMATS_MD5MESHLOADER_HPP #include #include @@ -15,4 +15,4 @@ namespace Nz::Loaders MeshLoader::Entry GetMeshLoader_MD5Mesh(); } -#endif // NAZARA_LOADERS_MD5MESH_HPP +#endif // NAZARA_UTILITY_FORMATS_MD5MESHLOADER_HPP diff --git a/src/Nazara/Utility/Formats/OBJLoader.hpp b/src/Nazara/Utility/Formats/OBJLoader.hpp index e373f5411..fdbed02c1 100644 --- a/src/Nazara/Utility/Formats/OBJLoader.hpp +++ b/src/Nazara/Utility/Formats/OBJLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_OBJ_HPP -#define NAZARA_LOADERS_OBJ_HPP +#ifndef NAZARA_UTILITY_FORMATS_OBJLOADER_HPP +#define NAZARA_UTILITY_FORMATS_OBJLOADER_HPP #include #include @@ -15,4 +15,4 @@ namespace Nz::Loaders MeshLoader::Entry GetMeshLoader_OBJ(); } -#endif // NAZARA_LOADERS_OBJ_HPP +#endif // NAZARA_UTILITY_FORMATS_OBJLOADER_HPP diff --git a/src/Nazara/Utility/Formats/OBJSaver.hpp b/src/Nazara/Utility/Formats/OBJSaver.hpp index c874a7371..7026f228b 100644 --- a/src/Nazara/Utility/Formats/OBJSaver.hpp +++ b/src/Nazara/Utility/Formats/OBJSaver.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FORMATS_OBJSAVER_HPP -#define NAZARA_FORMATS_OBJSAVER_HPP +#ifndef NAZARA_UTILITY_FORMATS_OBJSAVER_HPP +#define NAZARA_UTILITY_FORMATS_OBJSAVER_HPP #include #include @@ -15,4 +15,4 @@ namespace Nz::Loaders MeshSaver::Entry GetMeshSaver_OBJ(); } -#endif // NAZARA_FORMATS_OBJSAVER_HPP +#endif // NAZARA_UTILITY_FORMATS_OBJSAVER_HPP diff --git a/src/Nazara/Utility/Formats/PCXLoader.hpp b/src/Nazara/Utility/Formats/PCXLoader.hpp index bb0be2c78..d05cd3d39 100644 --- a/src/Nazara/Utility/Formats/PCXLoader.hpp +++ b/src/Nazara/Utility/Formats/PCXLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_LOADERS_PCX_HPP -#define NAZARA_LOADERS_PCX_HPP +#ifndef NAZARA_UTILITY_FORMATS_PCXLOADER_HPP +#define NAZARA_UTILITY_FORMATS_PCXLOADER_HPP #include #include @@ -15,4 +15,4 @@ namespace Nz::Loaders ImageLoader::Entry GetImageLoader_PCX(); } -#endif // NAZARA_LOADERS_PCX_HPP +#endif // NAZARA_UTILITY_FORMATS_PCXLOADER_HPP diff --git a/src/Nazara/Utility/Formats/STBLoader.hpp b/src/Nazara/Utility/Formats/STBLoader.hpp index b09c04722..1a2896149 100644 --- a/src/Nazara/Utility/Formats/STBLoader.hpp +++ b/src/Nazara/Utility/Formats/STBLoader.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FORMATS_STBLOADER_HPP -#define NAZARA_FORMATS_STBLOADER_HPP +#ifndef NAZARA_UTILITY_FORMATS_STBLOADER_HPP +#define NAZARA_UTILITY_FORMATS_STBLOADER_HPP #include #include @@ -15,4 +15,4 @@ namespace Nz::Loaders ImageLoader::Entry GetImageLoader_STB(); } -#endif // NAZARA_FORMATS_STBLOADER_HPP +#endif // NAZARA_UTILITY_FORMATS_STBLOADER_HPP diff --git a/src/Nazara/Utility/Formats/STBSaver.hpp b/src/Nazara/Utility/Formats/STBSaver.hpp index 7dc3f1369..fa58067a3 100644 --- a/src/Nazara/Utility/Formats/STBSaver.hpp +++ b/src/Nazara/Utility/Formats/STBSaver.hpp @@ -4,8 +4,8 @@ #pragma once -#ifndef NAZARA_FORMATS_STBSAVER_HPP -#define NAZARA_FORMATS_STBSAVER_HPP +#ifndef NAZARA_UTILITY_FORMATS_STBSAVER_HPP +#define NAZARA_UTILITY_FORMATS_STBSAVER_HPP #include #include @@ -15,4 +15,4 @@ namespace Nz::Loaders ImageSaver::Entry GetImageSaver_STB(); } -#endif // NAZARA_FORMATS_STBSAVER_HPP +#endif // NAZARA_UTILITY_FORMATS_STBSAVER_HPP