diff options
author | Tyler Murphy <tylermurphy534@gmail.com> | 2022-09-27 13:35:49 -0400 |
---|---|---|
committer | Tyler Murphy <tylermurphy534@gmail.com> | 2022-09-27 13:35:49 -0400 |
commit | 965ff9cc09401ae61c15aca0232d59fac17bfce3 (patch) | |
tree | 9fb7619560e528cbf83edfed57b6b7695e8b9a94 /engine/xe_engine.hpp | |
parent | change shader lighting (diff) | |
download | minecraftvulkan-965ff9cc09401ae61c15aca0232d59fac17bfce3.tar.gz minecraftvulkan-965ff9cc09401ae61c15aca0232d59fac17bfce3.tar.bz2 minecraftvulkan-965ff9cc09401ae61c15aca0232d59fac17bfce3.zip |
async chunk meshing
Diffstat (limited to 'engine/xe_engine.hpp')
-rw-r--r-- | engine/xe_engine.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/xe_engine.hpp b/engine/xe_engine.hpp index 1a208d6..eff2d13 100644 --- a/engine/xe_engine.hpp +++ b/engine/xe_engine.hpp @@ -7,6 +7,7 @@ #include "xe_image.hpp" #include "xe_input.hpp" #include "xe_sound.hpp" +#include "xe_model.hpp" #include <chrono> #include <string> @@ -31,8 +32,8 @@ class Engine { Camera& getCamera() {return xeCamera;} Device& getDevice() {return xeDevice;} - std::shared_ptr<Model> loadModelFromFile(const std::string &filename); - std::shared_ptr<Model> loadModelFromData(std::vector<unsigned char> vertexData, uint32_t vertexSize, std::vector<uint32_t> indices); + Model* loadModelFromFile(const std::string &filename); + Model* loadModelFromData(std::vector<unsigned char> vertexData, uint32_t vertexSize, std::vector<uint32_t> indices); Image* loadImageFromFile(const std::string &filename, bool anisotropic = true); bool beginFrame() { return xeRenderer.beginFrame(); } |