summaryrefslogtreecommitdiff
path: root/src/vk/model.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/vk/model.hpp')
-rw-r--r--src/vk/model.hpp22
1 files changed, 4 insertions, 18 deletions
diff --git a/src/vk/model.hpp b/src/vk/model.hpp
index d6f8b69..72682b2 100644
--- a/src/vk/model.hpp
+++ b/src/vk/model.hpp
@@ -17,13 +17,7 @@
#ifndef CANDY_GEAR_VK_MODEL_H
#define CANDY_GEAR_VK_MODEL_H 1
-#include <string>
-#include <vector>
-
-#include "core.hpp"
-#include "destination_buffer.hpp"
-#include "queue_family.hpp"
-#include "uniform_buffer.hpp"
+#include "mesh.hpp"
#include "texture.hpp"
namespace VK
@@ -31,22 +25,14 @@ namespace VK
struct Model
{
- QueueFamily *queue_family;
-
- uint32_t index_count;
- SourceBuffer *source_vertex_buffer;
- DestinationBuffer *index_buffer;
- DestinationBuffer *vertex_buffer;
+ std::shared_ptr<Mesh> mesh;
+ std::shared_ptr<Texture> texture;
std::vector<UniformBuffer> ub_model_instance;
-
VkDescriptorPool descriptor_pool;
std::vector<VkDescriptorSet> descriptor_sets;
- std::shared_ptr<Texture> texture;
-
- Model(std::string model_path, std::shared_ptr<Texture> texture);
- Model(const char* model_path, std::shared_ptr<Texture> texture);
+ Model(std::shared_ptr<Mesh> mesh, std::shared_ptr<Texture> texture);
~Model();
};