Merge branch 'wip'
This commit is contained in:
@@ -7,6 +7,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "Base/ICloseable.hpp"
|
||||
#include "Base/Render/RenderResource.hpp"
|
||||
#include "Math/AABB.hpp"
|
||||
#include "Base/Utils.hpp"
|
||||
#include "Vertex.hpp"
|
||||
@@ -21,7 +22,7 @@ namespace OpenVulkano
|
||||
UINT16 = sizeof(uint16_t), UINT32 = sizeof(uint32_t)
|
||||
};
|
||||
|
||||
class Geometry : public ICloseable
|
||||
class Geometry : public RenderResourceHolder<Geometry>, public ICloseable
|
||||
{
|
||||
friend class MeshLoader;
|
||||
public:
|
||||
@@ -31,7 +32,6 @@ namespace OpenVulkano
|
||||
VertexIndexType indexType = VertexIndexType::UINT16;
|
||||
bool ownsMemory = true, freeAfterUpload = true;
|
||||
Math::AABB aabb;
|
||||
ICloseable* renderGeo = nullptr;
|
||||
public:
|
||||
Geometry() = default;
|
||||
Geometry(const Geometry& other);
|
||||
|
||||
Reference in New Issue
Block a user