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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
NazaraModuleTemplate/build/scripts/module/modulename.lua
View File

@ -1,33 +0,0 @@
if (not _OPTIONS["united"]) then
project "NazaraModuleName"
end
files
{
"../include/Nazara/ModuleName/**.hpp",
"../include/Nazara/ModuleName/**.inl",
"../src/Nazara/ModuleName/**.hpp",
"../src/Nazara/ModuleName/**.cpp"
}
if (os.is("windows")) then
excludes { "../src/Nazara/ModuleName/Posix/*.hpp", "../src/Nazara/ModuleName/Posix/*.cpp" }
else
excludes { "../src/Nazara/ModuleName/Win32/*.hpp", "../src/Nazara/ModuleName/Win32/*.cpp" }
end
if (_OPTIONS["united"]) then
excludes "../src/Nazara/ModuleName/Debug/NewOverload.cpp"
else
configuration "DebugStatic"
links "NazaraCore-s-d"
configuration "ReleaseStatic"
links "NazaraCore-s"
configuration "DebugDLL"
links "NazaraCore-d"
configuration "ReleaseDLL"
links "NazaraCore"
end

15
NazaraModuleTemplate/build/scripts/modules/modulename.lua Normal file
View File

@ -0,0 +1,15 @@
MODULE.Name = "ModuleName"
MODULE.Libraries = {
"NazaraCore"
}
MODULE.OsFiles.Windows = {
"../src/Nazara/ModuleName/Win32/**.hpp",
"../src/Nazara/ModuleName/Win32/**.cpp"
}
MODULE.OsFiles.Posix = {
"../src/Nazara/ModuleName/Posix/**.hpp",
"../src/Nazara/ModuleName/Posix/**.cpp"
}

7
NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp
View File

@ -9,10 +9,12 @@
#include <Nazara/Prerequesites.hpp>
class NAZARA_API NzClassName
namespace Nz
{
class NAZARA_MODULENAME_API API ClassName
{
public:
NzClassName();
ClassName();
int GetAttribute() const;
@ -21,5 +23,6 @@ class NAZARA_API NzClassName
private:
int m_attribute;
};
}
#endif // NAZARA_CLASSNAME_HPP

9
NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp
View File

@ -10,11 +10,13 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Initializer.hpp>
class NAZARA_API NzModuleName
namespace Nz
{
class NAZARA_MODULENAME_API ModuleName
{
public:
NzModuleName() = delete;
~NzModuleName() = delete;
ModuleName() = delete;
~ModuleName() = delete;
static bool Initialize();
@ -25,5 +27,6 @@ class NAZARA_API NzModuleName
private:
static unsigned int s_moduleReferenceCounter;
};
}
#endif // NAZARA_MODULENAME_HPP

10
NazaraModuleTemplate/src/Nazara/ModuleName/ClassName.cpp
View File

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

8
NazaraModuleTemplate/src/Nazara/ModuleName/Debug/NewOverload.cpp
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

28
NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp
View File

@ -10,15 +10,17 @@
#include <Nazara/ModuleName/Config.hpp>
#include <Nazara/ModuleName/Debug.hpp>
bool NzModuleName::Initialize()
namespace Nz
{
bool ModuleName::Initialize()
{
if (s_moduleReferenceCounter > 0)
{
s_moduleReferenceCounter++;
return true; // Déjà initialisé
return true; // Already initialized
}
// Initialisation des dépendances
// Initialize module dependencies
if (!NzCore::Initialize())
{
NazaraError("Failed to initialize core module");
@ -27,8 +29,9 @@ bool NzModuleName::Initialize()
s_moduleReferenceCounter++;
// Initialisation du module
NzCallOnExit onExit(NzModuleName::Uninitialize);
CallOnExit onExit(ModuleName::Uninitialize);
// Initialize module here
onExit.Reset();
@ -36,12 +39,12 @@ bool NzModuleName::Initialize()
return true;
}
bool NzModuleName::IsInitialized()
bool ModuleName::IsInitialized()
{
return s_moduleReferenceCounter != 0;
}
void NzModuleName::Uninitialize()
void ModuleName::Uninitialize()
{
if (s_moduleReferenceCounter != 1)
{
@ -52,13 +55,16 @@ void NzModuleName::Uninitialize()
return;
}
// Libération du module
s_moduleReferenceCounter = 0;
// Uninitialize module here
NazaraNotice("Uninitialized: ModuleName module");
// Libération des dépendances
NzCore::Uninitialize();
// Free module dependencies
Core::Uninitialize();
}
unsigned int ModuleName::s_moduleReferenceCounter = 0;
}
unsigned int NzModuleName::s_moduleReferenceCounter = 0;