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

Fixed 3D module 

Former-commit-id: 91b5980f101ab55ce9313e80cbf3ece8c0da9b0f
This commit is contained in:
Lynix 2012-11-25 16:12:30 +01:00
parent ebd4512614
commit 7f6003085f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ class Nz3D
static void Uninitialize(); static void Uninitialize();
private: private:
static unsigned int s_moduleReferenceCouter; static unsigned int s_moduleReferenceCounter;
}; };
#endif // NAZARA_3D_HPP #endif // NAZARA_3D_HPP

22
src/Nazara/3D/3D.cpp
View File

@ -2,48 +2,48 @@
// This file is part of the "Nazara Engine - 3D Module" // This file is part of the "Nazara Engine - 3D Module"
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/3D/ModuleName.hpp> #include <Nazara/3D/3D.hpp>
#include <Nazara/3D/Config.hpp> #include <Nazara/3D/Config.hpp>
#include <Nazara/3D/Debug.hpp> #include <Nazara/3D/Debug.hpp>
#include <Nazara/Core/Core.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp> #include <Nazara/Core/Log.hpp>
#include <Nazara/Renderer/Renderer.hpp>
bool Nz3D::Initialize() bool Nz3D::Initialize()
{ {
if (s_moduleReferenceCouter++ != 0) if (s_moduleReferenceCounter++ != 0)
return true; // Déjà initialisé return true; // Déjà initialisé
// Initialisation des dépendances // Initialisation des dépendances
if (!NzCore::Initialize()) if (!NzRenderer::Initialize())
{ {
NazaraError("Failed to initialize core module"); NazaraError("Failed to initialize renderer module");
return false; return false;
} }
// Initialisation du module // Initialisation du module
NazaraNotice("Initialized: ModuleName module"); NazaraNotice("Initialized: 3D module");
return true; return true;
} }
bool Nz3D::IsInitialized() bool Nz3D::IsInitialized()
{ {
return s_moduleReferenceCouter != 0; return s_moduleReferenceCounter != 0;
} }
void Nz3D::Uninitialize() void Nz3D::Uninitialize()
{ {
if (--s_moduleReferenceCouter != 0) if (--s_moduleReferenceCounter != 0)
return; // Encore utilisé return; // Encore utilisé
// Libération du module // Libération du module
NazaraNotice("Uninitialized: ModuleName module"); NazaraNotice("Uninitialized: 3D module");
// Libération des dépendances // Libération des dépendances
NzCore::Uninitialize(); NzRenderer::Uninitialize();
} }
unsigned int Nz3D::s_moduleReferenceCouter = 0; unsigned int Nz3D::s_moduleReferenceCounter = 0;