From 34dbd193850d8c99968556b3d285d8af0e8566f9 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 3 Apr 2013 01:14:55 +0200 Subject: [PATCH] Merged 2D and 3D modules into Graphics module Former-commit-id: 33bf0fbe727e50e864bc52680c95a106ada508e9 --- build/scripts/module/3d.lua | 45 -------------- build/scripts/module/{2d.lua => graphics.lua} | 16 ++--- examples/16bitsRendering/build.lua | 12 ++-- examples/FirstScene/build.lua | 12 ++-- include/Nazara/2D.hpp | 36 ------------ include/Nazara/2D/2D.hpp | 29 ---------- include/Nazara/2D/Enums.hpp | 20 ------- include/Nazara/3D/Debug.hpp | 11 ---- include/Nazara/3D/DebugOff.hpp | 8 --- include/Nazara/Core.hpp | 3 +- .../Nazara/{2D/Config.hpp => Graphics.hpp} | 31 ++++++---- include/Nazara/{3D => Graphics}/3D.hpp | 14 ++--- .../Nazara/{2D => Graphics}/Background.hpp | 4 +- include/Nazara/{3D => Graphics}/Camera.hpp | 2 +- .../{2D => Graphics}/ColorBackground.hpp | 4 +- include/Nazara/{3D => Graphics}/Config.hpp | 12 ++-- include/Nazara/{2D => Graphics}/Debug.hpp | 6 +- include/Nazara/{2D => Graphics}/DebugOff.hpp | 4 +- include/Nazara/{2D => Graphics}/Drawable.hpp | 2 +- include/Nazara/{3D => Graphics}/Enums.hpp | 18 ++++-- include/Nazara/{3D => Graphics}/Light.hpp | 6 +- include/Nazara/{3D => Graphics}/Model.hpp | 4 +- .../Nazara/{3D => Graphics}/RenderQueue.hpp | 4 +- include/Nazara/{3D => Graphics}/Scene.hpp | 4 +- include/Nazara/{3D => Graphics}/SceneNode.hpp | 8 +-- include/Nazara/{3D => Graphics}/SceneRoot.hpp | 4 +- .../{2D => Graphics}/TextureBackground.hpp | 4 +- src/Nazara/2D/2D.cpp | 58 ------------------- src/Nazara/2D/Debug/Leaks.cpp | 29 ---------- src/Nazara/{2D => Graphics}/Background.cpp | 6 +- src/Nazara/{3D => Graphics}/Camera.cpp | 8 +-- .../{2D => Graphics}/ColorBackground.cpp | 6 +- src/Nazara/{3D => Graphics}/Debug/Leaks.cpp | 6 +- src/Nazara/{2D => Graphics}/Drawable.cpp | 6 +- .../{3D/3D.cpp => Graphics/Graphics.cpp} | 21 ++++--- src/Nazara/{3D => Graphics}/Light.cpp | 6 +- src/Nazara/{3D => Graphics}/Loaders/Mesh.hpp | 2 +- .../{3D => Graphics}/Loaders/Mesh/Loader.cpp | 8 +-- src/Nazara/{3D => Graphics}/Loaders/OBJ.hpp | 2 +- .../{3D => Graphics}/Loaders/OBJ/Loader.cpp | 12 ++-- .../Loaders/OBJ/MTLParser.cpp | 6 +- .../Loaders/OBJ/MTLParser.hpp | 2 +- .../Loaders/OBJ/OBJParser.cpp | 6 +- .../Loaders/OBJ/OBJParser.hpp | 2 +- src/Nazara/{3D => Graphics}/Model.cpp | 8 +-- src/Nazara/{3D => Graphics}/RenderQueue.cpp | 6 +- src/Nazara/{3D => Graphics}/Scene.cpp | 18 +++--- src/Nazara/{3D => Graphics}/SceneNode.cpp | 8 +-- src/Nazara/{3D => Graphics}/SceneRoot.cpp | 6 +- .../{2D => Graphics}/TextureBackground.cpp | 6 +- 50 files changed, 168 insertions(+), 393 deletions(-) delete mode 100644 build/scripts/module/3d.lua rename build/scripts/module/{2d.lua => graphics.lua} (57%) delete mode 100644 include/Nazara/2D.hpp delete mode 100644 include/Nazara/2D/2D.hpp delete mode 100644 include/Nazara/2D/Enums.hpp delete mode 100644 include/Nazara/3D/Debug.hpp delete mode 100644 include/Nazara/3D/DebugOff.hpp rename include/Nazara/{2D/Config.hpp => Graphics.hpp} (59%) rename include/Nazara/{3D => Graphics}/3D.hpp (62%) rename include/Nazara/{2D => Graphics}/Background.hpp (81%) rename include/Nazara/{3D => Graphics}/Camera.hpp (97%) rename include/Nazara/{2D => Graphics}/ColorBackground.hpp (85%) rename include/Nazara/{3D => Graphics}/Config.hpp (86%) rename include/Nazara/{2D => Graphics}/Debug.hpp (63%) rename include/Nazara/{2D => Graphics}/DebugOff.hpp (55%) rename include/Nazara/{2D => Graphics}/Drawable.hpp (85%) rename include/Nazara/{3D => Graphics}/Enums.hpp (54%) rename include/Nazara/{3D => Graphics}/Light.hpp (92%) rename include/Nazara/{3D => Graphics}/Model.hpp (96%) rename include/Nazara/{3D => Graphics}/RenderQueue.hpp (94%) rename include/Nazara/{3D => Graphics}/Scene.hpp (92%) rename include/Nazara/{3D => Graphics}/SceneNode.hpp (87%) rename include/Nazara/{3D => Graphics}/SceneRoot.hpp (87%) rename include/Nazara/{2D => Graphics}/TextureBackground.hpp (85%) delete mode 100644 src/Nazara/2D/2D.cpp delete mode 100644 src/Nazara/2D/Debug/Leaks.cpp rename src/Nazara/{2D => Graphics}/Background.cpp (53%) rename src/Nazara/{3D => Graphics}/Camera.cpp (96%) rename src/Nazara/{2D => Graphics}/ColorBackground.cpp (80%) rename src/Nazara/{3D => Graphics}/Debug/Leaks.cpp (77%) rename src/Nazara/{2D => Graphics}/Drawable.cpp (53%) rename src/Nazara/{3D/3D.cpp => Graphics/Graphics.cpp} (70%) rename src/Nazara/{3D => Graphics}/Light.cpp (98%) rename src/Nazara/{3D => Graphics}/Loaders/Mesh.hpp (84%) rename src/Nazara/{3D => Graphics}/Loaders/Mesh/Loader.cpp (92%) rename src/Nazara/{3D => Graphics}/Loaders/OBJ.hpp (84%) rename src/Nazara/{3D => Graphics}/Loaders/OBJ/Loader.cpp (96%) rename src/Nazara/{3D => Graphics}/Loaders/OBJ/MTLParser.cpp (98%) rename src/Nazara/{3D => Graphics}/Loaders/OBJ/MTLParser.hpp (95%) rename src/Nazara/{3D => Graphics}/Loaders/OBJ/OBJParser.cpp (98%) rename src/Nazara/{3D => Graphics}/Loaders/OBJ/OBJParser.hpp (96%) rename src/Nazara/{3D => Graphics}/Model.cpp (98%) rename src/Nazara/{3D => Graphics}/RenderQueue.cpp (94%) rename src/Nazara/{3D => Graphics}/Scene.cpp (96%) rename src/Nazara/{3D => Graphics}/SceneNode.cpp (90%) rename src/Nazara/{3D => Graphics}/SceneRoot.cpp (87%) rename src/Nazara/{2D => Graphics}/TextureBackground.cpp (88%) diff --git a/build/scripts/module/3d.lua b/build/scripts/module/3d.lua deleted file mode 100644 index 98245612b..000000000 --- a/build/scripts/module/3d.lua +++ /dev/null @@ -1,45 +0,0 @@ -if (not _OPTIONS["united"]) then - project "Nazara3D" -end - -files -{ - "../include/Nazara/3D/**.hpp", - "../include/Nazara/3D/**.inl", - "../src/Nazara/3D/**.hpp", - "../src/Nazara/3D/**.cpp" -} - -if (os.is("windows")) then - excludes { "../src/Nazara/3D/Posix/*.hpp", "../src/Nazara/3D/Posix/*.cpp" } -else - excludes { "../src/Nazara/3D/Win32/*.hpp", "../src/Nazara/3D/Win32/*.cpp" } -end - -if (_OPTIONS["united"]) then - excludes "../src/Nazara/3D/Debug/Leaks.cpp" -else - configuration "DebugStatic" - links "NazaraCore-s-d" - links "NazaraUtility-s-d" - links "NazaraRenderer-s-d" - links "Nazara2D-s-d" - - configuration "ReleaseStatic" - links "NazaraCore-s" - links "NazaraUtility-s" - links "NazaraRenderer-s" - links "Nazara2D-s" - - configuration "DebugDLL" - links "NazaraCore-d" - links "NazaraUtility-d" - links "NazaraRenderer-d" - links "Nazara2D-d" - - configuration "ReleaseDLL" - links "NazaraCore" - links "NazaraUtility" - links "NazaraRenderer" - links "Nazara2D" -end \ No newline at end of file diff --git a/build/scripts/module/2d.lua b/build/scripts/module/graphics.lua similarity index 57% rename from build/scripts/module/2d.lua rename to build/scripts/module/graphics.lua index fd419970b..d873912b2 100644 --- a/build/scripts/module/2d.lua +++ b/build/scripts/module/graphics.lua @@ -1,23 +1,23 @@ if (not _OPTIONS["united"]) then - project "Nazara2D" + project "NazaraGraphics" end files { - "../include/Nazara/2D/**.hpp", - "../include/Nazara/2D/**.inl", - "../src/Nazara/2D/**.hpp", - "../src/Nazara/2D/**.cpp" + "../include/Nazara/Graphics/**.hpp", + "../include/Nazara/Graphics/**.inl", + "../src/Nazara/Graphics/**.hpp", + "../src/Nazara/Graphics/**.cpp" } if (os.is("windows")) then - excludes { "../src/Nazara/2D/Posix/*.hpp", "../src/Nazara/2D/Posix/*.cpp" } + excludes { "../src/Nazara/Graphics/Posix/*.hpp", "../src/Nazara/Graphics/Posix/*.cpp" } else - excludes { "../src/Nazara/2D/Win32/*.hpp", "../src/Nazara/2D/Win32/*.cpp" } + excludes { "../src/Nazara/Graphics/Win32/*.hpp", "../src/Nazara/Graphics/Win32/*.cpp" } end if (_OPTIONS["united"]) then - excludes "../src/Nazara/2D/Debug/Leaks.cpp" + excludes "../src/Nazara/Graphics/Debug/Leaks.cpp" else configuration "DebugStatic" links "NazaraCore-s-d" diff --git a/examples/16bitsRendering/build.lua b/examples/16bitsRendering/build.lua index 5ad2d7c4d..a9b899ad1 100644 --- a/examples/16bitsRendering/build.lua +++ b/examples/16bitsRendering/build.lua @@ -16,29 +16,25 @@ if (_OPTIONS["united"]) then links "NazaraEngine" else configuration "DebugStatic" - links "Nazara3D-s-d" - links "Nazara2D-s-d" + links "NazaraGraphics-s-d" links "NazaraRenderer-s-d" links "NazaraUtility-s-d" links "NazaraCore-s-d" configuration "ReleaseStatic" - links "Nazara3D-s" - links "Nazara2D-s" + links "NazaraGraphics-s" links "NazaraRenderer-s" links "NazaraUtility-s" links "NazaraCore-s" configuration "DebugDLL" - links "Nazara3D-d" - links "Nazara2D-d" + links "NazaraGraphics-d" links "NazaraRenderer-d" links "NazaraUtility-d" links "NazaraCore-d" configuration "ReleaseDLL" - links "Nazara3D" - links "Nazara2D" + links "NazaraGraphics" links "NazaraRenderer" links "NazaraUtility" links "NazaraCore" diff --git a/examples/FirstScene/build.lua b/examples/FirstScene/build.lua index 5ad2d7c4d..a9b899ad1 100644 --- a/examples/FirstScene/build.lua +++ b/examples/FirstScene/build.lua @@ -16,29 +16,25 @@ if (_OPTIONS["united"]) then links "NazaraEngine" else configuration "DebugStatic" - links "Nazara3D-s-d" - links "Nazara2D-s-d" + links "NazaraGraphics-s-d" links "NazaraRenderer-s-d" links "NazaraUtility-s-d" links "NazaraCore-s-d" configuration "ReleaseStatic" - links "Nazara3D-s" - links "Nazara2D-s" + links "NazaraGraphics-s" links "NazaraRenderer-s" links "NazaraUtility-s" links "NazaraCore-s" configuration "DebugDLL" - links "Nazara3D-d" - links "Nazara2D-d" + links "NazaraGraphics-d" links "NazaraRenderer-d" links "NazaraUtility-d" links "NazaraCore-d" configuration "ReleaseDLL" - links "Nazara3D" - links "Nazara2D" + links "NazaraGraphics" links "NazaraRenderer" links "NazaraUtility" links "NazaraCore" diff --git a/include/Nazara/2D.hpp b/include/Nazara/2D.hpp deleted file mode 100644 index 9deda5150..000000000 --- a/include/Nazara/2D.hpp +++ /dev/null @@ -1,36 +0,0 @@ -// This file was automatically generated on 13 Mar 2013 at 23:20:31 - -/* - Nazara Engine - 2D module - - Copyright (C) 2013 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) - - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -#pragma once - -#ifndef NAZARA_GLOBAL_2D_HPP -#define NAZARA_GLOBAL_2D_HPP - -#include -#include -#include - -#endif // NAZARA_GLOBAL_2D_HPP diff --git a/include/Nazara/2D/2D.hpp b/include/Nazara/2D/2D.hpp deleted file mode 100644 index 3c2e4674f..000000000 --- a/include/Nazara/2D/2D.hpp +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" -// For conditions of distribution and use, see copyright notice in Config.hpp - -#pragma once - -#ifndef NAZARA_2D_HPP -#define NAZARA_2D_HPP - -#include -#include - -class NAZARA_API Nz2D -{ - public: - Nz2D() = delete; - ~Nz2D() = delete; - - static bool Initialize(); - - static bool IsInitialized(); - - static void Uninitialize(); - - private: - static unsigned int s_moduleReferenceCounter; -}; - -#endif // NAZARA_2D_HPP diff --git a/include/Nazara/2D/Enums.hpp b/include/Nazara/2D/Enums.hpp deleted file mode 100644 index 9f0ebde5b..000000000 --- a/include/Nazara/2D/Enums.hpp +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D module" -// For conditions of distribution and use, see copyright notice in Config.hpp - -#pragma once - -#ifndef NAZARA_ENUMS_2D_HPP -#define NAZARA_ENUMS_2D_HPP - -enum nzBackgroundType -{ - nzBackgroundType_Color, // NzColorBackground - nzBackgroundType_Skybox, // NzSkyboxBackground - nzBackgroundType_Texture, // NzTextureBackground - nzBackgroundType_User, - - nzBackgroundType_Max = nzBackgroundType_User -}; - -#endif // NAZARA_ENUMS_2D_HPP diff --git a/include/Nazara/3D/Debug.hpp b/include/Nazara/3D/Debug.hpp deleted file mode 100644 index 90bc86b27..000000000 --- a/include/Nazara/3D/Debug.hpp +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" -// For conditions of distribution and use, see copyright notice in Config.hpp - -#include -#if NAZARA_3D_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) - #include - - #define delete NzMemoryManager::NextFree(__FILE__, __LINE__), delete - #define new new(__FILE__, __LINE__) -#endif diff --git a/include/Nazara/3D/DebugOff.hpp b/include/Nazara/3D/DebugOff.hpp deleted file mode 100644 index 6c7613ac4..000000000 --- a/include/Nazara/3D/DebugOff.hpp +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" -// For conditions of distribution and use, see copyright notice in Config.hpp - -#if NAZARA_3D_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) - #undef delete - #undef new -#endif diff --git a/include/Nazara/Core.hpp b/include/Nazara/Core.hpp index 0f6f98d17..d2cdbc6f6 100644 --- a/include/Nazara/Core.hpp +++ b/include/Nazara/Core.hpp @@ -1,4 +1,4 @@ -// This file was automatically generated on 13 Mar 2013 at 23:20:31 +// This file was automatically generated on 03 Apr 2013 at 01:09:47 /* Nazara Engine - Core module @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include diff --git a/include/Nazara/2D/Config.hpp b/include/Nazara/Graphics.hpp similarity index 59% rename from include/Nazara/2D/Config.hpp rename to include/Nazara/Graphics.hpp index 391f43103..767019033 100644 --- a/include/Nazara/2D/Config.hpp +++ b/include/Nazara/Graphics.hpp @@ -1,5 +1,7 @@ +// This file was automatically generated on 03 Apr 2013 at 01:09:47 + /* - Nazara Engine - 2D module + Nazara Engine - Graphics module Copyright (C) 2013 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) @@ -24,15 +26,22 @@ #pragma once -#ifndef NAZARA_CONFIG_2D_HPP -#define NAZARA_CONFIG_2D_HPP +#ifndef NAZARA_GLOBAL_GRAPHICS_HPP +#define NAZARA_GLOBAL_GRAPHICS_HPP -/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) -#define NAZARA_2D_MEMORYLEAKTRACKER 0 - -// Active les tests de sécurité basés sur le code (Conseillé pour le développement) -#define NAZARA_2D_SAFE 1 - -#endif // NAZARA_CONFIG_2D_HPP +#endif // NAZARA_GLOBAL_GRAPHICS_HPP diff --git a/include/Nazara/3D/3D.hpp b/include/Nazara/Graphics/3D.hpp similarity index 62% rename from include/Nazara/3D/3D.hpp rename to include/Nazara/Graphics/3D.hpp index 7b4f1c529..56e2adf7d 100644 --- a/include/Nazara/3D/3D.hpp +++ b/include/Nazara/Graphics/3D.hpp @@ -1,20 +1,20 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once -#ifndef NAZARA_3D_HPP -#define NAZARA_3D_HPP +#ifndef NAZARA_GRAPHICS_HPP +#define NAZARA_GRAPHICS_HPP #include #include -class NAZARA_API Nz3D +class NAZARA_API NzGraphics { public: - Nz3D() = delete; - ~Nz3D() = delete; + NzGraphics() = delete; + ~NzGraphics() = delete; static bool Initialize(); @@ -26,4 +26,4 @@ class NAZARA_API Nz3D static unsigned int s_moduleReferenceCounter; }; -#endif // NAZARA_3D_HPP +#endif // NAZARA_GRAPHICS_HPP diff --git a/include/Nazara/2D/Background.hpp b/include/Nazara/Graphics/Background.hpp similarity index 81% rename from include/Nazara/2D/Background.hpp rename to include/Nazara/Graphics/Background.hpp index 5831c0d50..f8ba7d58a 100644 --- a/include/Nazara/2D/Background.hpp +++ b/include/Nazara/Graphics/Background.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -8,7 +8,7 @@ #define NAZARA_BACKGROUND_HPP #include -#include +#include class NAZARA_API NzBackground { diff --git a/include/Nazara/3D/Camera.hpp b/include/Nazara/Graphics/Camera.hpp similarity index 97% rename from include/Nazara/3D/Camera.hpp rename to include/Nazara/Graphics/Camera.hpp index 4b7bdb9f2..038b12e33 100644 --- a/include/Nazara/3D/Camera.hpp +++ b/include/Nazara/Graphics/Camera.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/2D/ColorBackground.hpp b/include/Nazara/Graphics/ColorBackground.hpp similarity index 85% rename from include/Nazara/2D/ColorBackground.hpp rename to include/Nazara/Graphics/ColorBackground.hpp index 92e3b4d0a..c51a158eb 100644 --- a/include/Nazara/2D/ColorBackground.hpp +++ b/include/Nazara/Graphics/ColorBackground.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -8,8 +8,8 @@ #define NAZARA_COLORBACKGROUND_HPP #include -#include #include +#include class NAZARA_API NzColorBackground : public NzBackground { diff --git a/include/Nazara/3D/Config.hpp b/include/Nazara/Graphics/Config.hpp similarity index 86% rename from include/Nazara/3D/Config.hpp rename to include/Nazara/Graphics/Config.hpp index 147e061af..36a7ce6d4 100644 --- a/include/Nazara/3D/Config.hpp +++ b/include/Nazara/Graphics/Config.hpp @@ -1,5 +1,5 @@ /* - Nazara Engine - 3D module + Nazara Engine - Graphics module Copyright (C) 2013 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) @@ -24,15 +24,15 @@ #pragma once -#ifndef NAZARA_CONFIG_3D_HPP -#define NAZARA_CONFIG_3D_HPP +#ifndef NAZARA_CONFIG_GRAPHICS_HPP +#define NAZARA_CONFIG_GRAPHICS_HPP /// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci // Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) -#define NAZARA_3D_MEMORYLEAKTRACKER 0 +#define NAZARA_GRAPHICS_MEMORYLEAKTRACKER 0 // Active les tests de sécurité basés sur le code (Conseillé pour le développement) -#define NAZARA_3D_SAFE 1 +#define NAZARA_GRAPHICS_SAFE 1 -#endif // NAZARA_CONFIG_3D_HPP +#endif // NAZARA_CONFIG_GRAPHICS_HPP diff --git a/include/Nazara/2D/Debug.hpp b/include/Nazara/Graphics/Debug.hpp similarity index 63% rename from include/Nazara/2D/Debug.hpp rename to include/Nazara/Graphics/Debug.hpp index 28719e541..ba3612ad4 100644 --- a/include/Nazara/2D/Debug.hpp +++ b/include/Nazara/Graphics/Debug.hpp @@ -1,9 +1,9 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#if NAZARA_2D_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) +#include +#if NAZARA_GRAPHICS_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) #include #define delete NzMemoryManager::NextFree(__FILE__, __LINE__), delete diff --git a/include/Nazara/2D/DebugOff.hpp b/include/Nazara/Graphics/DebugOff.hpp similarity index 55% rename from include/Nazara/2D/DebugOff.hpp rename to include/Nazara/Graphics/DebugOff.hpp index 5cc37d15d..e0ea204b9 100644 --- a/include/Nazara/2D/DebugOff.hpp +++ b/include/Nazara/Graphics/DebugOff.hpp @@ -1,8 +1,8 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#if NAZARA_2D_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) +#if NAZARA_GRAPHICS_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) #undef delete #undef new #endif diff --git a/include/Nazara/2D/Drawable.hpp b/include/Nazara/Graphics/Drawable.hpp similarity index 85% rename from include/Nazara/2D/Drawable.hpp rename to include/Nazara/Graphics/Drawable.hpp index 790df3428..636901b8d 100644 --- a/include/Nazara/2D/Drawable.hpp +++ b/include/Nazara/Graphics/Drawable.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/3D/Enums.hpp b/include/Nazara/Graphics/Enums.hpp similarity index 54% rename from include/Nazara/3D/Enums.hpp rename to include/Nazara/Graphics/Enums.hpp index 404922589..74718e800 100644 --- a/include/Nazara/3D/Enums.hpp +++ b/include/Nazara/Graphics/Enums.hpp @@ -1,11 +1,21 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once -#ifndef NAZARA_ENUMS_3D_HPP -#define NAZARA_ENUMS_3D_HPP +#ifndef NAZARA_ENUMS_GRAPHICS_HPP +#define NAZARA_ENUMS_GRAPHICS_HPP + +enum nzBackgroundType +{ + nzBackgroundType_Color, // NzColorBackground + nzBackgroundType_Skybox, // NzSkyboxBackground + nzBackgroundType_Texture, // NzTextureBackground + nzBackgroundType_User, + + nzBackgroundType_Max = nzBackgroundType_User +}; enum nzLightType { @@ -27,4 +37,4 @@ enum nzSceneNodeType nzSceneNodeType_Max = nzSceneNodeType_User }; -#endif // NAZARA_ENUMS_3D_HPP +#endif // NAZARA_ENUMS_GRAPHICS_HPP diff --git a/include/Nazara/3D/Light.hpp b/include/Nazara/Graphics/Light.hpp similarity index 92% rename from include/Nazara/3D/Light.hpp rename to include/Nazara/Graphics/Light.hpp index 561eedacf..048a5d210 100644 --- a/include/Nazara/3D/Light.hpp +++ b/include/Nazara/Graphics/Light.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -8,9 +8,9 @@ #define NAZARA_LIGHT_HPP #include -#include -#include #include +#include +#include class NzShader; diff --git a/include/Nazara/3D/Model.hpp b/include/Nazara/Graphics/Model.hpp similarity index 96% rename from include/Nazara/3D/Model.hpp rename to include/Nazara/Graphics/Model.hpp index 9130018b8..505aca95d 100644 --- a/include/Nazara/3D/Model.hpp +++ b/include/Nazara/Graphics/Model.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -8,9 +8,9 @@ #define NAZARA_MODEL_HPP #include -#include #include #include +#include #include #include #include diff --git a/include/Nazara/3D/RenderQueue.hpp b/include/Nazara/Graphics/RenderQueue.hpp similarity index 94% rename from include/Nazara/3D/RenderQueue.hpp rename to include/Nazara/Graphics/RenderQueue.hpp index f15bac791..44c9370ff 100644 --- a/include/Nazara/3D/RenderQueue.hpp +++ b/include/Nazara/Graphics/RenderQueue.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #ifndef NAZARA_RENDERQUEUE_HPP @@ -59,4 +59,4 @@ class NAZARA_API NzRenderQueue std::vector visibleLights; }; - #endif // NAZARA_RENDERQUEUE_HPP +#endif // NAZARA_RENDERQUEUE_HPP diff --git a/include/Nazara/3D/Scene.hpp b/include/Nazara/Graphics/Scene.hpp similarity index 92% rename from include/Nazara/3D/Scene.hpp rename to include/Nazara/Graphics/Scene.hpp index c7dff02b0..beaa10cd7 100644 --- a/include/Nazara/3D/Scene.hpp +++ b/include/Nazara/Graphics/Scene.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -8,9 +8,9 @@ #define NAZARA_SCENE_HPP #include -#include #include #include +#include #include class NzCamera; diff --git a/include/Nazara/3D/SceneNode.hpp b/include/Nazara/Graphics/SceneNode.hpp similarity index 87% rename from include/Nazara/3D/SceneNode.hpp rename to include/Nazara/Graphics/SceneNode.hpp index bb977cfab..ba2b010a3 100644 --- a/include/Nazara/3D/SceneNode.hpp +++ b/include/Nazara/Graphics/SceneNode.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -8,9 +8,9 @@ #define NAZARA_SCENENODE_HPP #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/Nazara/3D/SceneRoot.hpp b/include/Nazara/Graphics/SceneRoot.hpp similarity index 87% rename from include/Nazara/3D/SceneRoot.hpp rename to include/Nazara/Graphics/SceneRoot.hpp index 6f258120c..c28651b70 100644 --- a/include/Nazara/3D/SceneRoot.hpp +++ b/include/Nazara/Graphics/SceneRoot.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -8,7 +8,7 @@ #define NAZARA_SCENEROOT_HPP #include -#include +#include struct NzSceneImpl; diff --git a/include/Nazara/2D/TextureBackground.hpp b/include/Nazara/Graphics/TextureBackground.hpp similarity index 85% rename from include/Nazara/2D/TextureBackground.hpp rename to include/Nazara/Graphics/TextureBackground.hpp index dbfa4b65f..008abca36 100644 --- a/include/Nazara/2D/TextureBackground.hpp +++ b/include/Nazara/Graphics/TextureBackground.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -8,7 +8,7 @@ #define NAZARA_TEXTUREBACKGROUND_HPP #include -#include +#include #include class NAZARA_API NzTextureBackground : public NzBackground diff --git a/src/Nazara/2D/2D.cpp b/src/Nazara/2D/2D.cpp deleted file mode 100644 index e1a7a03b9..000000000 --- a/src/Nazara/2D/2D.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" -// For conditions of distribution and use, see copyright notice in Config.hpp - -#include -#include -#include -#include -#include -#include - -bool Nz2D::Initialize() -{ - if (s_moduleReferenceCounter++ != 0) - return true; // Déjà initialisé - - // Initialisation des dépendances - if (!NzRenderer::Initialize()) - { - NazaraError("Failed to initialize renderer module"); - Uninitialize(); - - return false; - } - - // Initialisation du module - - NazaraNotice("Initialized: 2D module"); - - return true; -} - -bool Nz2D::IsInitialized() -{ - return s_moduleReferenceCounter != 0; -} - -void Nz2D::Uninitialize() -{ - if (s_moduleReferenceCounter != 1) - { - // Le module est soit encore utilisé, soit pas initialisé - if (s_moduleReferenceCounter > 1) - s_moduleReferenceCounter--; - - return; - } - - // Libération du module - s_moduleReferenceCounter = 0; - - NazaraNotice("Uninitialized: 2D module"); - - // Libération des dépendances - NzRenderer::Uninitialize(); -} - -unsigned int Nz2D::s_moduleReferenceCounter = 0; diff --git a/src/Nazara/2D/Debug/Leaks.cpp b/src/Nazara/2D/Debug/Leaks.cpp deleted file mode 100644 index d4f9bcf7a..000000000 --- a/src/Nazara/2D/Debug/Leaks.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" -// For conditions of distribution and use, see copyright notice in Config.hpp - -#include -#if NAZARA_2D_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) -#include -#include - -void* operator new(std::size_t size) -{ - return NzMemoryManager::Allocate(size, false); -} - -void* operator new[](std::size_t size) -{ - return NzMemoryManager::Allocate(size, true); -} - -void operator delete(void* pointer) noexcept -{ - NzMemoryManager::Free(pointer, false); -} - -void operator delete[](void* pointer) noexcept -{ - NzMemoryManager::Free(pointer, true); -} -#endif diff --git a/src/Nazara/2D/Background.cpp b/src/Nazara/Graphics/Background.cpp similarity index 53% rename from src/Nazara/2D/Background.cpp rename to src/Nazara/Graphics/Background.cpp index fd2d37c97..2ae7e90e7 100644 --- a/src/Nazara/2D/Background.cpp +++ b/src/Nazara/Graphics/Background.cpp @@ -1,8 +1,8 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#include +#include +#include NzBackground::~NzBackground() = default; diff --git a/src/Nazara/3D/Camera.cpp b/src/Nazara/Graphics/Camera.cpp similarity index 96% rename from src/Nazara/3D/Camera.cpp rename to src/Nazara/Graphics/Camera.cpp index 275e651c4..a03a94a6c 100644 --- a/src/Nazara/3D/Camera.cpp +++ b/src/Nazara/Graphics/Camera.cpp @@ -1,12 +1,12 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#include +#include +#include #include #include -#include +#include NzCamera::NzCamera() : m_viewport(0.f, 0.f, 1.f, 1.f), diff --git a/src/Nazara/2D/ColorBackground.cpp b/src/Nazara/Graphics/ColorBackground.cpp similarity index 80% rename from src/Nazara/2D/ColorBackground.cpp rename to src/Nazara/Graphics/ColorBackground.cpp index e4b968233..eda8eb2ce 100644 --- a/src/Nazara/2D/ColorBackground.cpp +++ b/src/Nazara/Graphics/ColorBackground.cpp @@ -1,10 +1,10 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include -#include +#include NzColorBackground::NzColorBackground(const NzColor& color) : m_color(color) diff --git a/src/Nazara/3D/Debug/Leaks.cpp b/src/Nazara/Graphics/Debug/Leaks.cpp similarity index 77% rename from src/Nazara/3D/Debug/Leaks.cpp rename to src/Nazara/Graphics/Debug/Leaks.cpp index d4af3d2b2..703945665 100644 --- a/src/Nazara/3D/Debug/Leaks.cpp +++ b/src/Nazara/Graphics/Debug/Leaks.cpp @@ -1,9 +1,9 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#if NAZARA_3D_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) +#include +#if NAZARA_GRAPHICS_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG) #include #include diff --git a/src/Nazara/2D/Drawable.cpp b/src/Nazara/Graphics/Drawable.cpp similarity index 53% rename from src/Nazara/2D/Drawable.cpp rename to src/Nazara/Graphics/Drawable.cpp index e4c1a7bf6..59df5be71 100644 --- a/src/Nazara/2D/Drawable.cpp +++ b/src/Nazara/Graphics/Drawable.cpp @@ -1,8 +1,8 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#include +#include +#include NzDrawable::~NzDrawable() = default; diff --git a/src/Nazara/3D/3D.cpp b/src/Nazara/Graphics/Graphics.cpp similarity index 70% rename from src/Nazara/3D/3D.cpp rename to src/Nazara/Graphics/Graphics.cpp index a0d40064a..d0ebe7967 100644 --- a/src/Nazara/3D/3D.cpp +++ b/src/Nazara/Graphics/Graphics.cpp @@ -1,16 +1,15 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include bool Nz3D::Initialize() { @@ -18,9 +17,9 @@ bool Nz3D::Initialize() return true; // Déjà initialisé // Initialisation des dépendances - if (!Nz2D::Initialize()) + if (!NzRenderer::Initialize()) { - NazaraError("Failed to initialize 2D module"); + NazaraError("Failed to initialize Renderer module"); Uninitialize(); return false; @@ -34,7 +33,7 @@ bool Nz3D::Initialize() // Loader générique NzLoaders_Mesh_Register(); - NazaraNotice("Initialized: 3D module"); + NazaraNotice("Initialized: Graphics module"); return true; } @@ -62,7 +61,7 @@ void Nz3D::Uninitialize() NzLoaders_Mesh_Unregister(); NzLoaders_OBJ_Unregister(); - NazaraNotice("Uninitialized: 3D module"); + NazaraNotice("Uninitialized: Graphics module"); // Libération des dépendances Nz2D::Uninitialize(); diff --git a/src/Nazara/3D/Light.cpp b/src/Nazara/Graphics/Light.cpp similarity index 98% rename from src/Nazara/3D/Light.cpp rename to src/Nazara/Graphics/Light.cpp index 2bd5f2bd4..3fdb7ed87 100644 --- a/src/Nazara/3D/Light.cpp +++ b/src/Nazara/Graphics/Light.cpp @@ -1,15 +1,15 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include #include #include #include #include -#include +#include ///TODO: Utilisation des UBOs diff --git a/src/Nazara/3D/Loaders/Mesh.hpp b/src/Nazara/Graphics/Loaders/Mesh.hpp similarity index 84% rename from src/Nazara/3D/Loaders/Mesh.hpp rename to src/Nazara/Graphics/Loaders/Mesh.hpp index 47c03ad18..f1be05181 100644 --- a/src/Nazara/3D/Loaders/Mesh.hpp +++ b/src/Nazara/Graphics/Loaders/Mesh.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/3D/Loaders/Mesh/Loader.cpp b/src/Nazara/Graphics/Loaders/Mesh/Loader.cpp similarity index 92% rename from src/Nazara/3D/Loaders/Mesh/Loader.cpp rename to src/Nazara/Graphics/Loaders/Mesh/Loader.cpp index 0e9458205..078757632 100644 --- a/src/Nazara/3D/Loaders/Mesh/Loader.cpp +++ b/src/Nazara/Graphics/Loaders/Mesh/Loader.cpp @@ -1,13 +1,13 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#include +#include +#include #include #include #include -#include +#include namespace { diff --git a/src/Nazara/3D/Loaders/OBJ.hpp b/src/Nazara/Graphics/Loaders/OBJ.hpp similarity index 84% rename from src/Nazara/3D/Loaders/OBJ.hpp rename to src/Nazara/Graphics/Loaders/OBJ.hpp index 3e442c5bd..e1c3346c6 100644 --- a/src/Nazara/3D/Loaders/OBJ.hpp +++ b/src/Nazara/Graphics/Loaders/OBJ.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/3D/Loaders/OBJ/Loader.cpp b/src/Nazara/Graphics/Loaders/OBJ/Loader.cpp similarity index 96% rename from src/Nazara/3D/Loaders/OBJ/Loader.cpp rename to src/Nazara/Graphics/Loaders/OBJ/Loader.cpp index b112d7350..16fba1a15 100644 --- a/src/Nazara/3D/Loaders/OBJ/Loader.cpp +++ b/src/Nazara/Graphics/Loaders/OBJ/Loader.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -14,7 +14,7 @@ #include #include #include -#include +#include namespace { diff --git a/src/Nazara/3D/Loaders/OBJ/MTLParser.cpp b/src/Nazara/Graphics/Loaders/OBJ/MTLParser.cpp similarity index 98% rename from src/Nazara/3D/Loaders/OBJ/MTLParser.cpp rename to src/Nazara/Graphics/Loaders/OBJ/MTLParser.cpp index d2c5f3f69..57b057e96 100644 --- a/src/Nazara/3D/Loaders/OBJ/MTLParser.cpp +++ b/src/Nazara/Graphics/Loaders/OBJ/MTLParser.cpp @@ -1,14 +1,14 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include #include #include #include -#include +#include NzMTLParser::NzMTLParser(NzInputStream& stream) : m_stream(stream), diff --git a/src/Nazara/3D/Loaders/OBJ/MTLParser.hpp b/src/Nazara/Graphics/Loaders/OBJ/MTLParser.hpp similarity index 95% rename from src/Nazara/3D/Loaders/OBJ/MTLParser.hpp rename to src/Nazara/Graphics/Loaders/OBJ/MTLParser.hpp index b8701a0b8..09ca9ab30 100644 --- a/src/Nazara/3D/Loaders/OBJ/MTLParser.hpp +++ b/src/Nazara/Graphics/Loaders/OBJ/MTLParser.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/3D/Loaders/OBJ/OBJParser.cpp b/src/Nazara/Graphics/Loaders/OBJ/OBJParser.cpp similarity index 98% rename from src/Nazara/3D/Loaders/OBJ/OBJParser.cpp rename to src/Nazara/Graphics/Loaders/OBJ/OBJParser.cpp index 4183f3914..1305809d7 100644 --- a/src/Nazara/3D/Loaders/OBJ/OBJParser.cpp +++ b/src/Nazara/Graphics/Loaders/OBJ/OBJParser.cpp @@ -1,15 +1,15 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include #include #include #include #include -#include +#include NzOBJParser::NzOBJParser(NzInputStream& stream) : m_stream(stream), diff --git a/src/Nazara/3D/Loaders/OBJ/OBJParser.hpp b/src/Nazara/Graphics/Loaders/OBJ/OBJParser.hpp similarity index 96% rename from src/Nazara/3D/Loaders/OBJ/OBJParser.hpp rename to src/Nazara/Graphics/Loaders/OBJ/OBJParser.hpp index 03594571b..ff7c91daa 100644 --- a/src/Nazara/3D/Loaders/OBJ/OBJParser.hpp +++ b/src/Nazara/Graphics/Loaders/OBJ/OBJParser.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/3D/Model.cpp b/src/Nazara/Graphics/Model.cpp similarity index 98% rename from src/Nazara/3D/Model.cpp rename to src/Nazara/Graphics/Model.cpp index 33d9a991b..8226bfad5 100644 --- a/src/Nazara/3D/Model.cpp +++ b/src/Nazara/Graphics/Model.cpp @@ -1,14 +1,14 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#include +#include +#include #include #include #include #include -#include +#include bool NzModelParameters::IsValid() const { diff --git a/src/Nazara/3D/RenderQueue.cpp b/src/Nazara/Graphics/RenderQueue.cpp similarity index 94% rename from src/Nazara/3D/RenderQueue.cpp rename to src/Nazara/Graphics/RenderQueue.cpp index a390890c9..59a6c5921 100644 --- a/src/Nazara/3D/RenderQueue.cpp +++ b/src/Nazara/Graphics/RenderQueue.cpp @@ -1,12 +1,12 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include #include -#include +#include bool NzRenderQueue::MaterialComparator::operator()(const NzMaterial* mat1, const NzMaterial* mat2) { diff --git a/src/Nazara/3D/Scene.cpp b/src/Nazara/Graphics/Scene.cpp similarity index 96% rename from src/Nazara/3D/Scene.cpp rename to src/Nazara/Graphics/Scene.cpp index 2a2c05755..98ae7905e 100644 --- a/src/Nazara/3D/Scene.cpp +++ b/src/Nazara/Graphics/Scene.cpp @@ -1,17 +1,17 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/Nazara/3D/SceneNode.cpp b/src/Nazara/Graphics/SceneNode.cpp similarity index 90% rename from src/Nazara/3D/SceneNode.cpp rename to src/Nazara/Graphics/SceneNode.cpp index ef487454d..481bd67ff 100644 --- a/src/Nazara/3D/SceneNode.cpp +++ b/src/Nazara/Graphics/SceneNode.cpp @@ -1,10 +1,10 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include -#include -#include +#include +#include +#include NzSceneNode::NzSceneNode() : m_scene(nullptr), diff --git a/src/Nazara/3D/SceneRoot.cpp b/src/Nazara/Graphics/SceneRoot.cpp similarity index 87% rename from src/Nazara/3D/SceneRoot.cpp rename to src/Nazara/Graphics/SceneRoot.cpp index 15fa27324..44cbb15c6 100644 --- a/src/Nazara/3D/SceneRoot.cpp +++ b/src/Nazara/Graphics/SceneRoot.cpp @@ -1,10 +1,10 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 3D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include -#include +#include NzSceneRoot::NzSceneRoot(NzScene* scene) { diff --git a/src/Nazara/2D/TextureBackground.cpp b/src/Nazara/Graphics/TextureBackground.cpp similarity index 88% rename from src/Nazara/2D/TextureBackground.cpp rename to src/Nazara/Graphics/TextureBackground.cpp index c41cbd866..ef8ad7141 100644 --- a/src/Nazara/2D/TextureBackground.cpp +++ b/src/Nazara/Graphics/TextureBackground.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - 2D Module" +// This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include -#include +#include NzTextureBackground::NzTextureBackground(NzTexture* texture) : m_texture(texture)