Update module template

Former-commit-id: 49040d563978c2b565f55cab38c92cf7d0a8496a
This commit is contained in:
Lynix
2015-09-27 18:28:43 +02:00
parent 24e5141cbe
commit 20e8ef1436
7 changed files with 102 additions and 104 deletions

View File

@@ -5,17 +5,21 @@
#include <Nazara/ModuleName/ClassName.hpp>
#include <Nazara/ModuleName/Debug.hpp>
NzClassName::NzClassName() :
m_attribute(42)
namespace Nz
{
ClassName::ClassName() :
m_attribute(42)
{
}
int ClassName::GetAttribute() const
{
return m_attribute;
}
void ClassName::SetAttribute(int attribute)
{
m_attribute = attribute;
}
}
int NzClassName::GetAttribute() const
{
return m_attribute;
}
void NzClassName::SetAttribute(int attribute)
{
m_attribute = attribute;
}

View File

@@ -10,22 +10,22 @@
void* operator new(std::size_t size)
{
return NzMemoryManager::Allocate(size, false);
return Nz::MemoryManager::Allocate(size, false);
}
void* operator new[](std::size_t size)
{
return NzMemoryManager::Allocate(size, true);
return Nz::MemoryManager::Allocate(size, true);
}
void operator delete(void* pointer) noexcept
{
NzMemoryManager::Free(pointer, false);
Nz::MemoryManager::Free(pointer, false);
}
void operator delete[](void* pointer) noexcept
{
NzMemoryManager::Free(pointer, true);
Nz::MemoryManager::Free(pointer, true);
}
#endif // NAZARA_MODULENAME_MANAGE_MEMORY

View File

@@ -10,55 +10,61 @@
#include <Nazara/ModuleName/Config.hpp>
#include <Nazara/ModuleName/Debug.hpp>
bool NzModuleName::Initialize()
namespace Nz
{
if (s_moduleReferenceCounter > 0)
bool ModuleName::Initialize()
{
if (s_moduleReferenceCounter > 0)
{
s_moduleReferenceCounter++;
return true; // Already initialized
}
// Initialize module dependencies
if (!NzCore::Initialize())
{
NazaraError("Failed to initialize core module");
return false;
}
s_moduleReferenceCounter++;
return true; // Déjà initialisé
CallOnExit onExit(ModuleName::Uninitialize);
// Initialize module here
onExit.Reset();
NazaraNotice("Initialized: ModuleName module");
return true;
}
// Initialisation des dépendances
if (!NzCore::Initialize())
bool ModuleName::IsInitialized()
{
NazaraError("Failed to initialize core module");
return false;
return s_moduleReferenceCounter != 0;
}
s_moduleReferenceCounter++;
// Initialisation du module
NzCallOnExit onExit(NzModuleName::Uninitialize);
onExit.Reset();
NazaraNotice("Initialized: ModuleName module");
return true;
}
bool NzModuleName::IsInitialized()
{
return s_moduleReferenceCounter != 0;
}
void NzModuleName::Uninitialize()
{
if (s_moduleReferenceCounter != 1)
void ModuleName::Uninitialize()
{
// Le module est soit encore utilisé, soit pas initialisé
if (s_moduleReferenceCounter > 1)
s_moduleReferenceCounter--;
if (s_moduleReferenceCounter != 1)
{
// Le module est soit encore utilisé, soit pas initialisé
if (s_moduleReferenceCounter > 1)
s_moduleReferenceCounter--;
return;
return;
}
s_moduleReferenceCounter = 0;
// Uninitialize module here
NazaraNotice("Uninitialized: ModuleName module");
// Free module dependencies
Core::Uninitialize();
}
// Libération du module
s_moduleReferenceCounter = 0;
NazaraNotice("Uninitialized: ModuleName module");
// Libération des dépendances
NzCore::Uninitialize();
unsigned int ModuleName::s_moduleReferenceCounter = 0;
}
unsigned int NzModuleName::s_moduleReferenceCounter = 0;