sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged 2D and 3D modules into Graphics module 

Former-commit-id: 33bf0fbe727e50e864bc52680c95a106ada508e9
This commit is contained in:
Lynix 2013-04-03 01:14:55 +02:00
parent e52412577b
commit 34dbd19385
50 changed files with 168 additions and 393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
build/scripts/module/3d.lua
View File

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

16
build/scripts/module/2d.lua → build/scripts/module/graphics.lua
View File

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

12
examples/16bitsRendering/build.lua
View File

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

12
examples/FirstScene/build.lua
View File

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

36
include/Nazara/2D.hpp
View File

@ -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 <Nazara/2D/2D.hpp>
#include <Nazara/2D/Config.hpp>
#include <Nazara/2D/Drawable.hpp>
#endif // NAZARA_GLOBAL_2D_HPP

29
include/Nazara/2D/2D.hpp
View File

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

20
include/Nazara/2D/Enums.hpp
View File

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

11
include/Nazara/3D/Debug.hpp
View File

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

8
include/Nazara/3D/DebugOff.hpp
View File

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

3
include/Nazara/Core.hpp
View File

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

31
include/Nazara/2D/Config.hpp → include/Nazara/Graphics.hpp
View File

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

14
include/Nazara/3D/3D.hpp → include/Nazara/Graphics/3D.hpp
View File

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

4
include/Nazara/2D/Background.hpp → include/Nazara/Graphics/Background.hpp
View File

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

2
include/Nazara/3D/Camera.hpp → include/Nazara/Graphics/Camera.hpp
View File

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

4
include/Nazara/2D/ColorBackground.hpp → include/Nazara/Graphics/ColorBackground.hpp
View File

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

12
include/Nazara/3D/Config.hpp → include/Nazara/Graphics/Config.hpp
View File

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

6
include/Nazara/2D/Debug.hpp → include/Nazara/Graphics/Debug.hpp
View File

@ -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 <Nazara/2D/Config.hpp>
#if NAZARA_2D_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

4
include/Nazara/2D/DebugOff.hpp → include/Nazara/Graphics/DebugOff.hpp
View File

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

2
include/Nazara/2D/Drawable.hpp → include/Nazara/Graphics/Drawable.hpp
View File

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

18
include/Nazara/3D/Enums.hpp → include/Nazara/Graphics/Enums.hpp
View File

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

6
include/Nazara/3D/Light.hpp → include/Nazara/Graphics/Light.hpp
View File

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

4
include/Nazara/3D/Model.hpp → include/Nazara/Graphics/Model.hpp
View File

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

4
include/Nazara/3D/RenderQueue.hpp → include/Nazara/Graphics/RenderQueue.hpp
View File

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

4
include/Nazara/3D/Scene.hpp → include/Nazara/Graphics/Scene.hpp
View File

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

8
include/Nazara/3D/SceneNode.hpp → include/Nazara/Graphics/SceneNode.hpp
View File

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

4
include/Nazara/3D/SceneRoot.hpp → include/Nazara/Graphics/SceneRoot.hpp
View File

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

4
include/Nazara/2D/TextureBackground.hpp → include/Nazara/Graphics/TextureBackground.hpp
View File

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

58
src/Nazara/2D/2D.cpp
View File

@ -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 <Nazara/2D/2D.hpp>
#include <Nazara/2D/Config.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/2D/Debug.hpp>
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;

29
src/Nazara/2D/Debug/Leaks.cpp
View File

@ -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 <Nazara/2D/Config.hpp>
#if NAZARA_2D_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
#include <new>
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

6
src/Nazara/2D/Background.cpp → src/Nazara/Graphics/Background.cpp
View File

@ -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 <Nazara/2D/Background.hpp>
#include <Nazara/2D/Debug.hpp>
#include <Nazara/Graphics/Background.hpp>
#include <Nazara/Graphics/Debug.hpp>
NzBackground::~NzBackground() = default;

8
src/Nazara/3D/Camera.cpp → src/Nazara/Graphics/Camera.cpp
View File

@ -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 <Nazara/3D/Camera.hpp>
#include <Nazara/3D/Scene.hpp>
#include <Nazara/Graphics/Camera.hpp>
#include <Nazara/Graphics/Scene.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/RenderTarget.hpp>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
NzCamera::NzCamera() :
m_viewport(0.f, 0.f, 1.f, 1.f),

6
src/Nazara/2D/ColorBackground.cpp → src/Nazara/Graphics/ColorBackground.cpp
View File

@ -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 <Nazara/2D/ColorBackground.hpp>
#include <Nazara/Graphics/ColorBackground.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/2D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
NzColorBackground::NzColorBackground(const NzColor& color) :
m_color(color)

6
src/Nazara/3D/Debug/Leaks.cpp → src/Nazara/Graphics/Debug/Leaks.cpp
View File

@ -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>
#include <new>

6
src/Nazara/2D/Drawable.cpp → src/Nazara/Graphics/Drawable.cpp
View File

@ -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 <Nazara/2D/Drawable.hpp>
#include <Nazara/2D/Debug.hpp>
#include <Nazara/Graphics/Drawable.hpp>
#include <Nazara/Graphics/Debug.hpp>
NzDrawable::~NzDrawable() = default;

21
src/Nazara/3D/3D.cpp → src/Nazara/Graphics/Graphics.cpp
View File

@ -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 <Nazara/3D/3D.hpp>
#include <Nazara/2D/2D.hpp>
#include <Nazara/3D/Config.hpp>
#include <Nazara/3D/Loaders/Mesh.hpp>
#include <Nazara/3D/Loaders/OBJ.hpp>
#include <Nazara/Graphics/Graphics.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/Loaders/Mesh.hpp>
#include <Nazara/Graphics/Loaders/OBJ.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
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();

6
src/Nazara/3D/Light.cpp → src/Nazara/Graphics/Light.cpp
View File

@ -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 <Nazara/3D/Light.hpp>
#include <Nazara/Graphics/Light.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Math/Basic.hpp>
#include <Nazara/Math/Sphere.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/Shader.hpp>
#include <cstring>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
///TODO: Utilisation des UBOs

2
src/Nazara/3D/Loaders/Mesh.hpp → src/Nazara/Graphics/Loaders/Mesh.hpp
View File

@ -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
src/Nazara/3D/Loaders/Mesh/Loader.cpp → src/Nazara/Graphics/Loaders/Mesh/Loader.cpp
View File

@ -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 <Nazara/3D/Loaders/Mesh.hpp>
#include <Nazara/3D/Model.hpp>
#include <Nazara/Graphics/Loaders/Mesh.hpp>
#include <Nazara/Graphics/Model.hpp>
#include <Nazara/Renderer/Material.hpp>
#include <Nazara/Utility/Mesh.hpp>
#include <memory>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
namespace
{

2
src/Nazara/3D/Loaders/OBJ.hpp → src/Nazara/Graphics/Loaders/OBJ.hpp
View File

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

12
src/Nazara/3D/Loaders/OBJ/Loader.cpp → src/Nazara/Graphics/Loaders/OBJ/Loader.cpp
View File

@ -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 <Nazara/3D/Loaders/OBJ.hpp>
#include <Nazara/3D/Loaders/OBJ/MTLParser.hpp>
#include <Nazara/3D/Loaders/OBJ/OBJParser.hpp>
#include <Nazara/3D/Model.hpp>
#include <Nazara/Graphics/Loaders/OBJ.hpp>
#include <Nazara/Graphics/Loaders/OBJ/MTLParser.hpp>
#include <Nazara/Graphics/Loaders/OBJ/OBJParser.hpp>
#include <Nazara/Graphics/Model.hpp>
#include <Nazara/Renderer/Material.hpp>
#include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/IndexMapper.hpp>
@ -14,7 +14,7 @@
#include <limits>
#include <memory>
#include <unordered_map>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
namespace
{

6
src/Nazara/3D/Loaders/OBJ/MTLParser.cpp → src/Nazara/Graphics/Loaders/OBJ/MTLParser.cpp
View File

@ -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 <Nazara/3D/Loaders/OBJ/MTLParser.hpp>
#include <Nazara/Graphics/Loaders/OBJ/MTLParser.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Utility/Config.hpp>
#include <cstdio>
#include <memory>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
NzMTLParser::NzMTLParser(NzInputStream& stream) :
m_stream(stream),

2
src/Nazara/3D/Loaders/OBJ/MTLParser.hpp → src/Nazara/Graphics/Loaders/OBJ/MTLParser.hpp
View File

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

6
src/Nazara/3D/Loaders/OBJ/OBJParser.cpp → src/Nazara/Graphics/Loaders/OBJ/OBJParser.cpp
View File

@ -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 <Nazara/3D/Loaders/OBJ/OBJParser.hpp>
#include <Nazara/Graphics/Loaders/OBJ/OBJParser.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Utility/Config.hpp>
#include <cstdio>
#include <map>
#include <memory>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
NzOBJParser::NzOBJParser(NzInputStream& stream) :
m_stream(stream),

2
src/Nazara/3D/Loaders/OBJ/OBJParser.hpp → src/Nazara/Graphics/Loaders/OBJ/OBJParser.hpp
View File

@ -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
src/Nazara/3D/Model.cpp → src/Nazara/Graphics/Model.cpp
View File

@ -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 <Nazara/3D/Model.hpp>
#include <Nazara/3D/Config.hpp>
#include <Nazara/Graphics/Model.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Utility/SkeletalMesh.hpp>
#include <Nazara/Utility/StaticMesh.hpp>
#include <memory>
#include <tuple>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
bool NzModelParameters::IsValid() const
{

6
src/Nazara/3D/RenderQueue.cpp → src/Nazara/Graphics/RenderQueue.cpp
View File

@ -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 <Nazara/3D/RenderQueue.hpp>
#include <Nazara/Graphics/RenderQueue.hpp>
#include <Nazara/Renderer/Material.hpp>
#include <Nazara/Utility/SkeletalMesh.hpp>
#include <Nazara/Utility/StaticMesh.hpp>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
bool NzRenderQueue::MaterialComparator::operator()(const NzMaterial* mat1, const NzMaterial* mat2)
{

18
src/Nazara/3D/Scene.cpp → src/Nazara/Graphics/Scene.cpp
View File

@ -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 <Nazara/3D/Scene.hpp>
#include <Nazara/2D/ColorBackground.hpp>
#include <Nazara/2D/Drawable.hpp>
#include <Nazara/3D/Camera.hpp>
#include <Nazara/3D/Light.hpp>
#include <Nazara/3D/Model.hpp>
#include <Nazara/3D/RenderQueue.hpp>
#include <Nazara/3D/SceneRoot.hpp>
#include <Nazara/Graphics/Scene.hpp>
#include <Nazara/Core/Clock.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Graphics/ColorBackground.hpp>
#include <Nazara/Graphics/Drawable.hpp>
#include <Nazara/Graphics/Camera.hpp>
#include <Nazara/Graphics/Light.hpp>
#include <Nazara/Graphics/Model.hpp>
#include <Nazara/Graphics/RenderQueue.hpp>
#include <Nazara/Graphics/SceneRoot.hpp>
#include <Nazara/Renderer/Config.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/Shader.hpp>

8
src/Nazara/3D/SceneNode.cpp → src/Nazara/Graphics/SceneNode.cpp
View File

@ -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 <Nazara/3D/SceneNode.hpp>
#include <Nazara/3D/Scene.hpp>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/SceneNode.hpp>
#include <Nazara/Graphics/Scene.hpp>
#include <Nazara/Graphics/Debug.hpp>
NzSceneNode::NzSceneNode() :
m_scene(nullptr),

6
src/Nazara/3D/SceneRoot.cpp → src/Nazara/Graphics/SceneRoot.cpp
View File

@ -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 <Nazara/3D/SceneRoot.hpp>
#include <Nazara/Graphics/SceneRoot.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/3D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
NzSceneRoot::NzSceneRoot(NzScene* scene)
{

6
src/Nazara/2D/TextureBackground.cpp → src/Nazara/Graphics/TextureBackground.cpp
View File

@ -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 <Nazara/2D/TextureBackground.hpp>
#include <Nazara/Graphics/TextureBackground.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/RenderTarget.hpp>
#include <Nazara/2D/Debug.hpp>
#include <Nazara/Graphics/Debug.hpp>
NzTextureBackground::NzTextureBackground(NzTexture* texture) :
m_texture(texture)