Fix compilation for gcc/clang + tests for serialization

Former-commit-id: db9c93a1db3c57f268fc17e411402e071fc8675a
This commit is contained in:
Gawaboumga
2016-04-04 10:17:05 +02:00
parent 85c2cd43e7
commit 265e1c0fbd
20 changed files with 747 additions and 22 deletions

View File

@@ -11,6 +11,7 @@
#include <NDK/World.hpp>
#include <Nazara/Core/Clock.hpp>
#include <Nazara/Utility/Window.hpp>
#include <list>
#include <vector>
namespace Ndk

View File

@@ -38,6 +38,7 @@ namespace Ndk
s_application = nullptr;
}
#ifndef NDK_SERVER
template<typename T, typename... Args>
T& Application::AddWindow(Args&&... args)
{
@@ -46,6 +47,7 @@ namespace Ndk
m_windows.emplace_back(new T(std::forward<Args>(args)...));
return static_cast<T&>(*m_windows.back().get());
}
#endif
template<typename... Args>
World& Application::AddWorld(Args&&... args)

View File

@@ -2,7 +2,7 @@
// This file is part of the "Nazara Development Kit"
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
#include <Ndk/BaseComponent.hpp>
#include <NDK/BaseComponent.hpp>
#include <Nazara/Core/Error.hpp>
namespace Ndk

View File

@@ -59,6 +59,7 @@ namespace Ndk
application.SetMethod("Quit", &Application::Quit);
/*********************************** Ndk::Console **********************************/
#ifndef NDK_SERVER
consoleClass.Inherit<Nz::Node>(nodeClass, [] (ConsoleHandle* handle) -> Nz::Node*
{
return handle->GetObject();
@@ -84,6 +85,7 @@ namespace Ndk
//consoleClass.SetMethod("SetTextFont", &Console::SetTextFont);
consoleClass.SetMethod("Show", &Console::Show, true);
#endif
/*********************************** Ndk::Entity **********************************/
entityClass.SetMethod("Enable", &Entity::Enable);
@@ -248,4 +250,4 @@ namespace Ndk
}
instance.SetGlobal("ComponentType");
}
}
}

View File

@@ -14,7 +14,7 @@
namespace Ndk
{
World::~World()
World::~World() noexcept
{
// La destruction doit se faire dans un ordre précis
Clear();