From 7c1dfec94391ec283e41b6b942d08dbc6bb69a3a Mon Sep 17 00:00:00 2001 From: tylermurphy534 Date: Sun, 25 Sep 2022 12:07:49 -0400 Subject: vertex data no longer hard coded --- engine/xe_engine.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'engine/xe_engine.cpp') diff --git a/engine/xe_engine.cpp b/engine/xe_engine.cpp index 7a6df71..a4ddaea 100644 --- a/engine/xe_engine.cpp +++ b/engine/xe_engine.cpp @@ -35,16 +35,17 @@ std::shared_ptr Engine::loadModelFromFile(const std::string &filename) { return Model::createModelFromFile(xeDevice, filename); } -std::shared_ptr Engine::loadModelFromData(std::vector vertices, std::vector indices) { +std::shared_ptr Engine::loadModelFromData(std::vector vertexData, uint32_t vertexSize, std::vector indices) { Model::Builder builder{}; - builder.vertices = vertices; + builder.vertexData = vertexData; + builder.vertexSize = vertexSize; if(indices.size() > 0) { builder.indices = indices; } return std::make_shared(xeDevice, builder); } -std::shared_ptr Engine::loadImage(const std::string &filename) { +std::shared_ptr Engine::loadImageFromFile(const std::string &filename) { return std::make_shared(xeDevice, filename); } -- cgit v1.2.3-freya