GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ICloseable

Browse Source
This commit is contained in:
Georg Hagen
2025-01-06 16:28:27 +01:00
parent 46c1d1f18f
commit ac0a0e84b4
22 changed files with 48 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openVulkanoCpp/Scene/Drawable.hpp
View File

@@ -6,7 +6,6 @@
#pragma once
#include "Base/ICloseable.hpp"
#include "Scene/IRayIntersectable.hpp"
#include "DrawEncoder.hpp"
#include <memory>
@@ -27,7 +26,7 @@ namespace OpenVulkano::Scene
BACKGROUND = 0, MAIN, TRANSPARENT, POST
};
class Drawable : public ICloseable, public IRayIntersectable
class Drawable : public IRayIntersectable
{
std::vector<Node*> m_nodes;
Scene* m_scene = nullptr;
@@ -43,7 +42,7 @@ namespace OpenVulkano::Scene
~Drawable() override {/* if (m_scene) Drawable::Close();*/ }
void Close() override;
virtual void Close();
void SetShader(Shader* shader) { m_shader = shader; }

5
openVulkanoCpp/Scene/Geometry.hpp
View File

@@ -6,7 +6,6 @@
#pragma once
#include "Base/ICloseable.hpp"
#include "Base/Render/RenderResource.hpp"
#include "Math/AABB.hpp"
#include "Base/Utils.hpp"
@@ -22,7 +21,7 @@ namespace OpenVulkano
UINT16 = sizeof(uint16_t), UINT32 = sizeof(uint32_t)
};
class Geometry : public RenderResourceHolder<Geometry>, public ICloseable
class Geometry : public RenderResourceHolder<Geometry>
{
friend class MeshLoader;
public:
@@ -51,7 +50,7 @@ namespace OpenVulkano
void SetIndices(const uint32_t* data, uint32_t size, uint32_t dstOffset = 0) const;
void Close() override;
virtual void Close();
void Free();

7
openVulkanoCpp/Scene/Node.hpp
View File

@@ -6,7 +6,6 @@
#pragma once
#include "Base/ICloseable.hpp"
#include "Base/Render/RenderResource.hpp"
#include "Math/Math.hpp"
#include "Math/Pose.hpp"
@@ -20,7 +19,7 @@ namespace OpenVulkano::Scene
{
class Scene;
class Node : public RenderResourceHolder<Node>, public ICloseable
class Node : public RenderResourceHolder<Node>
{
friend Scene;
@@ -41,11 +40,11 @@ namespace OpenVulkano::Scene
Node(const Math::Matrix4f& pose);
~Node() noexcept override;
virtual ~Node() noexcept;
void Init();
void Close() override;
virtual void Close();
void AddChild(Node* node);

4
openVulkanoCpp/Scene/Scene.hpp
View File

@@ -15,7 +15,7 @@ namespace OpenVulkano
{
namespace Scene
{
class Scene : public ICloseable
class Scene
{
public:
Node* root;
@@ -46,7 +46,7 @@ namespace OpenVulkano
this->root = root;
}
void Close() override
virtual void Close()
{
//TODO
}

7
openVulkanoCpp/Scene/Shader/Shader.hpp
View File

@@ -6,7 +6,6 @@
#pragma once
#include "Base/ICloseable.hpp"
#include "Base/Utils.hpp"
#include "Base/Render/RenderResource.hpp"
#include "VertexInputDescription.hpp"
@@ -81,7 +80,7 @@ namespace OpenVulkano::Scene
};
class Shader final : public RenderResourceHolder<Shader>, public ICloseable
class Shader final : public RenderResourceHolder<Shader>
{
public:
std::vector<ShaderProgram> shaderPrograms{};
@@ -99,7 +98,7 @@ namespace OpenVulkano::Scene
float depthBiasClamp = 0.0f, depthBiasSlope = 0.0f, depthBiasConstant = 0.0f;
Shader() = default;
~Shader() override { Shader::Close(); }
~Shader() { Shader::Close(); }
Shader& AddShaderProgram(const ShaderProgram& shaderProgram)
{
@@ -173,7 +172,7 @@ namespace OpenVulkano::Scene
depthBiasConstant = constant;
}
void Close() override
void Close()
{
if (HasRenderResource())
GetRenderResource().Release();