Update for EnTT 3.9

This commit is contained in:
Jérôme Leclercq
2022-02-08 20:05:14 +01:00
parent 6c35b0be57
commit f466a7494b
16 changed files with 11 additions and 124 deletions

View File

@@ -1,11 +0,0 @@
// Copyright (C) 2022 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
// This file is part of the "Nazara Engine - Core module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/ECS.hpp>
#include <Nazara/Core/Debug.hpp>
namespace Nz
{
NAZARA_CORE_API ECS* ECS::s_instance = nullptr;
}

View File

@@ -3,7 +3,6 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Graphics/Graphics.hpp>
#include <Nazara/Core/ECS.hpp>
#include <Nazara/Graphics/GuillotineTextureAtlas.hpp>
#include <Nazara/Graphics/MaterialPipeline.hpp>
#include <Nazara/Graphics/PredefinedShaderStructs.hpp>
@@ -29,8 +28,6 @@ namespace Nz
ModuleBase("Graphics", this),
m_preferredDepthStencilFormat(PixelFormat::Undefined)
{
ECS::RegisterComponents();
Renderer* renderer = Renderer::Instance();
const std::vector<RenderDeviceInfo>& renderDeviceInfo = renderer->QueryRenderDevices();

View File

@@ -4,7 +4,6 @@
#include <Nazara/Physics3D/Physics3D.hpp>
#include <Nazara/Core/Core.hpp>
#include <Nazara/Core/ECS.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Physics3D/Collider3D.hpp>
@@ -17,7 +16,6 @@ namespace Nz
Physics3D::Physics3D(Config /*config*/) :
ModuleBase("Physics3D", this)
{
ECS::RegisterComponents();
}
unsigned int Physics3D::GetMemoryUsed()

View File

@@ -5,7 +5,6 @@
#include <Nazara/Utility/Utility.hpp>
#include <Nazara/Core/CallOnExit.hpp>
#include <Nazara/Core/Core.hpp>
#include <Nazara/Core/ECS.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Utility/Animation.hpp>
#include <Nazara/Utility/Buffer.hpp>
@@ -40,8 +39,6 @@ namespace Nz
Utility::Utility(Config /*config*/) :
ModuleBase("Utility", this)
{
ECS::RegisterComponents();
if (!Font::Initialize())
throw std::runtime_error("failed to initialize fonts");

View File

@@ -15,11 +15,9 @@ namespace Nz
* \class Nz::Widgets
* \brief Widgets class that represents the module initializer of Widgets
*/
Widgets::Widgets(Config config) :
Widgets::Widgets(Config /*config*/) :
ModuleBase("Widgets", this)
{
ECS::RegisterComponents();
CreateDefaultMaterials();
}