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

Improved declarations

Browse Source 
Former-commit-id: 19169e7acc6fd5d7ea7399ec9b2614c028a1dfd2 [formerly c383d9fbf62f8868d0834dcdd08a1f7b7f3ff81a] [formerly 4633f0bfb8c049bc2ce10ea2aa47684c7ae7a030 [formerly 4a92fd2e96b20daedf2d04006053e7600c60cd79]]
Former-commit-id: fcb2bfac13cdc0d6cf5d7b9c19a5cf11b04874c1 [formerly b631d69d2d2795c3bd60bc89085579087df6b73b]
Former-commit-id: 105a4d1bb3e05266c8c5cde7f87e14444a5de49c
This commit is contained in:
Lynix
2016-08-02 13:31:09 +02:00
parent 76818335ff
commit 5b83ac044b
6 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Graphics/ParticleDeclaration.hpp
View File

@@ -15,6 +15,7 @@
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/Enums.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <array>
namespace Nz
{
@@ -46,6 +47,7 @@ namespace Nz
static ParticleDeclaration* Get(ParticleLayout layout);
static bool IsTypeSupported(ComponentType type);
template<typename... Args> static ParticleDeclarationRef New(Args&&... args);
// Signals:
NazaraSignal(OnParticleDeclarationRelease, const ParticleDeclaration* /*particleDeclaration*/);
@@ -68,12 +70,14 @@ namespace Nz
*/
};
Component m_components[ParticleComponent_Max + 1];
std::array<Component, ParticleComponent_Max + 1> m_components;
unsigned int m_stride;
static ParticleDeclaration s_declarations[ParticleLayout_Max + 1];
static std::array<ParticleDeclaration, ParticleLayout_Max + 1> s_declarations;
static ParticleDeclarationLibrary::LibraryMap s_library;
};
}
#include <Nazara/Graphics/ParticleDeclaration.inl>
#endif // NAZARA_PARTICLEDECLARATION_HPP

18
include/Nazara/Graphics/ParticleDeclaration.inl Normal file
View File

@@ -0,0 +1,18 @@
// Copyright (C) 2016 Jérôme Leclercq
// This file is part of the "Nazara Engine - Graphics module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <memory>
#include <Nazara/Utility/Debug.hpp>
namespace Nz
{
template<typename... Args>
ParticleDeclarationRef ParticleDeclaration::New(Args&&... args)
{
std::unique_ptr<ParticleDeclaration> object(new ParticleDeclaration(std::forward<Args>(args)...));
return object.release();
}
}
#include <Nazara/Utility/DebugOff.hpp>

7
include/Nazara/Utility/VertexDeclaration.hpp
View File

@@ -14,6 +14,7 @@
#include <Nazara/Core/Signal.hpp>
#include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <array>
namespace Nz
{
@@ -69,14 +70,14 @@ namespace Nz
*/
};
Component m_components[VertexComponent_Max+1];
std::array<Component, VertexComponent_Max + 1> m_components;
std::size_t m_stride;
static VertexDeclaration s_declarations[VertexLayout_Max+1];
static std::array<VertexDeclaration, VertexLayout_Max + 1> s_declarations;
static VertexDeclarationLibrary::LibraryMap s_library;
};
}
#include <Nazara/Utility/VertexDeclaration.hpp>
#include <Nazara/Utility/VertexDeclaration.inl>
#endif // NAZARA_VERTEXDECLARATION_HPP