summaryrefslogtreecommitdiff
path: root/engine/xe_engine.cpp
diff options
context:
space:
mode:
authorTyler Murphy <tylermurphy534@gmail.com>2022-09-27 13:35:49 -0400
committerTyler Murphy <tylermurphy534@gmail.com>2022-09-27 13:35:49 -0400
commit965ff9cc09401ae61c15aca0232d59fac17bfce3 (patch)
tree9fb7619560e528cbf83edfed57b6b7695e8b9a94 /engine/xe_engine.cpp
parentchange shader lighting (diff)
downloadminecraftvulkan-965ff9cc09401ae61c15aca0232d59fac17bfce3.tar.gz
minecraftvulkan-965ff9cc09401ae61c15aca0232d59fac17bfce3.tar.bz2
minecraftvulkan-965ff9cc09401ae61c15aca0232d59fac17bfce3.zip
async chunk meshing
Diffstat (limited to 'engine/xe_engine.cpp')
-rw-r--r--engine/xe_engine.cpp6
1 files changed, 3 insertions, 3 deletions
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<Model> Engine::loadModelFromFile(const std::string &filename) {
+Model* Engine::loadModelFromFile(const std::string &filename) {
return Model::createModelFromFile(xeDevice, filename);
}
-std::shared_ptr<Model> Engine::loadModelFromData(std::vector<unsigned char> vertexData, uint32_t vertexSize, std::vector<uint32_t> indices) {
+Model* Engine::loadModelFromData(std::vector<unsigned char> vertexData, uint32_t vertexSize, std::vector<uint32_t> indices) {
Model::Builder builder{};
builder.vertexData.data = vertexData;
builder.vertexSize = vertexSize;
if(indices.size() > 0) {
builder.indices = indices;
}
- return std::make_shared<Model>(xeDevice, builder);
+ return new Model(xeDevice, builder);
}
Image* Engine::loadImageFromFile(const std::string &filename, bool anisotropic) {