Merged 2D and 3D modules into Graphics module

Former-commit-id: 33bf0fbe727e50e864bc52680c95a106ada508e9

include/Nazara/2D/2D.hpp

@@ -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 <Nazara/Prerequesites.hpp>
-#include <Nazara/Core/Initializer.hpp>
-
-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

include/Nazara/2D/Config.hpp

@@ -1,38 +0,0 @@
-/*
-	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_CONFIG_2D_HPP
-#define NAZARA_CONFIG_2D_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_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

include/Nazara/2D/Debug.hpp

@@ -1,11 +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 <Nazara/2D/Config.hpp>
-#if NAZARA_2D_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
-	#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
-
-	#define delete NzMemoryManager::NextFree(__FILE__, __LINE__), delete
-	#define new new(__FILE__, __LINE__)
-#endif

include/Nazara/2D/Enums.hpp

@@ -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

include/Nazara/3D/DebugOff.hpp

@@ -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

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 <Nazara/Core/Resource.hpp>
 #include <Nazara/Core/ResourceListener.hpp>
 #include <Nazara/Core/ResourceLoader.hpp>
+#include <Nazara/Core/ResourceRef.hpp>
 #include <Nazara/Core/Semaphore.hpp>
 #include <Nazara/Core/Stream.hpp>
 #include <Nazara/Core/String.hpp>

include/Nazara/Graphics.hpp

@@ -1,7 +1,7 @@
-// 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 - 2D module
+	Nazara Engine - Graphics module
 
 	Copyright (C) 2013 Jérôme "Lynix" Leclercq (Lynix680@gmail.com)
 
@@ -26,11 +26,22 @@
 
 #pragma once
 
-#ifndef NAZARA_GLOBAL_2D_HPP
-#define NAZARA_GLOBAL_2D_HPP
+#ifndef NAZARA_GLOBAL_GRAPHICS_HPP
+#define NAZARA_GLOBAL_GRAPHICS_HPP
 
-#include <Nazara/2D/2D.hpp>
-#include <Nazara/2D/Config.hpp>
-#include <Nazara/2D/Drawable.hpp>
+#include <Nazara/Graphics/3D.hpp>
+#include <Nazara/Graphics/Background.hpp>
+#include <Nazara/Graphics/Camera.hpp>
+#include <Nazara/Graphics/ColorBackground.hpp>
+#include <Nazara/Graphics/Config.hpp>
+#include <Nazara/Graphics/Drawable.hpp>
+#include <Nazara/Graphics/Enums.hpp>
+#include <Nazara/Graphics/Light.hpp>
+#include <Nazara/Graphics/Model.hpp>
+#include <Nazara/Graphics/RenderQueue.hpp>
+#include <Nazara/Graphics/Scene.hpp>
+#include <Nazara/Graphics/SceneNode.hpp>
+#include <Nazara/Graphics/SceneRoot.hpp>
+#include <Nazara/Graphics/TextureBackground.hpp>
 
-#endif // NAZARA_GLOBAL_2D_HPP
+#endif // NAZARA_GLOBAL_GRAPHICS_HPP

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 <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/Initializer.hpp>
 
-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

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 <Nazara/Prerequesites.hpp>
-#include <Nazara/2D/Enums.hpp>
+#include <Nazara/Graphics/Enums.hpp>
 
 class NAZARA_API NzBackground
 {

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

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 <Nazara/Prerequesites.hpp>
-#include <Nazara/2D/Background.hpp>
 #include <Nazara/Core/Color.hpp>
+#include <Nazara/Graphics/Background.hpp>
 
 class NAZARA_API NzColorBackground : public NzBackground
 {

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

include/Nazara/Graphics/Debug.hpp

@@ -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 <Nazara/3D/Config.hpp>
-#if NAZARA_3D_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
+#include <Nazara/Graphics/Config.hpp>
+#if NAZARA_GRAPHICS_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
 	#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
 
 	#define delete NzMemoryManager::NextFree(__FILE__, __LINE__), delete

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

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

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

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 <Nazara/Prerequesites.hpp>
-#include <Nazara/3D/Enums.hpp>
-#include <Nazara/3D/SceneNode.hpp>
 #include <Nazara/Core/Color.hpp>
+#include <Nazara/Graphics/Enums.hpp>
+#include <Nazara/Graphics/SceneNode.hpp>
 
 class NzShader;
 

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 <Nazara/Prerequesites.hpp>
-#include <Nazara/3D/SceneNode.hpp>
 #include <Nazara/Core/ResourceLoader.hpp>
 #include <Nazara/Core/Updatable.hpp>
+#include <Nazara/Graphics/SceneNode.hpp>
 #include <Nazara/Renderer/Material.hpp>
 #include <Nazara/Utility/Animation.hpp>
 #include <Nazara/Utility/Mesh.hpp>

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<const NzLight*> visibleLights;
 };
 
-					#endif // NAZARA_RENDERQUEUE_HPP
+#endif // NAZARA_RENDERQUEUE_HPP

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 <Nazara/Prerequesites.hpp>
-#include <Nazara/2D/Background.hpp>
 #include <Nazara/Core/Color.hpp>
 #include <Nazara/Core/Updatable.hpp>
+#include <Nazara/Graphics/Background.hpp>
 #include <Nazara/Math/Frustum.hpp>
 
 class NzCamera;

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 <Nazara/Prerequesites.hpp>
-#include <Nazara/3D/Enums.hpp>
-#include <Nazara/3D/RenderQueue.hpp>
-#include <Nazara/3D/Scene.hpp>
+#include <Nazara/Graphics/Enums.hpp>
+#include <Nazara/Graphics/RenderQueue.hpp>
+#include <Nazara/Graphics/Scene.hpp>
 #include <Nazara/Math/BoundingBox.hpp>
 #include <Nazara/Math/Frustum.hpp>
 #include <Nazara/Utility/Node.hpp>

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 <Nazara/Prerequesites.hpp>
-#include <Nazara/3D/SceneNode.hpp>
+#include <Nazara/Graphics/SceneNode.hpp>
 
 struct NzSceneImpl;
 

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 <Nazara/Prerequesites.hpp>
-#include <Nazara/2D/Background.hpp>
+#include <Nazara/Graphics/Background.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 
 class NAZARA_API NzTextureBackground : public NzBackground