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

Utility/Mesh: Add Build static method

This commit is contained in:
Jérôme Leclercq 2021-06-20 13:42:22 +02:00
parent e073e1a44d
commit de6be67ea6
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Utility/Mesh.hpp
View File

@ -57,6 +57,7 @@ namespace Nz
class Mesh; class Mesh;
struct Primitive; struct Primitive;
class PrimitiveList; class PrimitiveList;
class StaticMesh;
class SubMesh; class SubMesh;
using MeshVertex = VertexStruct_XYZ_Normal_UV_Tangent; using MeshVertex = VertexStruct_XYZ_Normal_UV_Tangent;
@ -132,6 +133,8 @@ namespace Nz
Mesh& operator=(const Mesh&) = delete; Mesh& operator=(const Mesh&) = delete;
Mesh& operator=(Mesh&&) = delete; Mesh& operator=(Mesh&&) = delete;
static inline std::shared_ptr<Mesh> Build(std::shared_ptr<StaticMesh> staticMesh);
static std::shared_ptr<Mesh> LoadFromFile(const std::filesystem::path& filePath, const MeshParams& params = MeshParams()); static std::shared_ptr<Mesh> LoadFromFile(const std::filesystem::path& filePath, const MeshParams& params = MeshParams());
static std::shared_ptr<Mesh> LoadFromMemory(const void* data, std::size_t size, const MeshParams& params = MeshParams()); static std::shared_ptr<Mesh> LoadFromMemory(const void* data, std::size_t size, const MeshParams& params = MeshParams());
static std::shared_ptr<Mesh> LoadFromStream(Stream& stream, const MeshParams& params = MeshParams()); static std::shared_ptr<Mesh> LoadFromStream(Stream& stream, const MeshParams& params = MeshParams());

12
include/Nazara/Utility/Mesh.inl
View File

@ -4,16 +4,26 @@
#include <Nazara/Utility/Mesh.hpp> #include <Nazara/Utility/Mesh.hpp>
#include <memory> #include <memory>
#include <Nazara/Utility/StaticMesh.hpp>
#include <Nazara/Utility/Debug.hpp> #include <Nazara/Utility/Debug.hpp>
namespace Nz namespace Nz
{ {
Mesh::Mesh() : inline Mesh::Mesh() :
m_materialData(1), m_materialData(1),
m_aabbUpdated(false), m_aabbUpdated(false),
m_isValid(false) m_isValid(false)
{ {
} }
inline std::shared_ptr<Mesh> Mesh::Build(std::shared_ptr<StaticMesh> staticMesh)
{
std::shared_ptr<Mesh> mesh = std::make_shared<Mesh>();
mesh->CreateStatic();
mesh->AddSubMesh(std::move(staticMesh));
return mesh;
}
} }
#include <Nazara/Utility/DebugOff.hpp> #include <Nazara/Utility/DebugOff.hpp>