From 965ff9cc09401ae61c15aca0232d59fac17bfce3 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Tue, 27 Sep 2022 13:35:49 -0400 Subject: async chunk meshing --- engine/xe_engine.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/xe_engine.cpp') diff --git a/engine/xe_engine.cpp b/engine/xe_engine.cpp index 44e5a4e..6392d78 100644 --- a/engine/xe_engine.cpp +++ b/engine/xe_engine.cpp @@ -32,18 +32,18 @@ void Engine::loadDescriptorPool() { .build(); } -std::shared_ptr Engine::loadModelFromFile(const std::string &filename) { +Model* Engine::loadModelFromFile(const std::string &filename) { return Model::createModelFromFile(xeDevice, filename); } -std::shared_ptr Engine::loadModelFromData(std::vector vertexData, uint32_t vertexSize, std::vector indices) { +Model* Engine::loadModelFromData(std::vector vertexData, uint32_t vertexSize, std::vector indices) { Model::Builder builder{}; builder.vertexData.data = vertexData; builder.vertexSize = vertexSize; if(indices.size() > 0) { builder.indices = indices; } - return std::make_shared(xeDevice, builder); + return new Model(xeDevice, builder); } Image* Engine::loadImageFromFile(const std::string &filename, bool anisotropic) { -- cgit v1.2.3-freya