Merge branch 'assimp'

1 files changed, 16 insertions, 0 deletions

diff --git a/gfx/image.cpp b/gfx/image.cpp
index e3e3b01..fb86cb6 100644
--- a/gfx/image.cpp
+++ b/gfx/image.cpp
@@ -19,6 +19,22 @@ Image::Image(const char * fileName, int flags) : width {}, height {}, numCompone
 	data = {bytes, static_cast<size_t>(width * height * numComponents)};
 }
 
+Image::Image(std::span<unsigned char> buffer, int flags)
+{
+	stbi_set_flip_vertically_on_load(1);
+	int w, h, nc;
+	unsigned char * bytes = stbi_load_from_memory(buffer.data(), static_cast<int>(buffer.size()), &w, &h, &nc, flags);
+	width = static_cast<unsigned int>(w);
+	height = static_cast<unsigned int>(h);
+	numComponents = static_cast<unsigned int>(nc);
+
+	if (!bytes) {
+		throw std::runtime_error {"Unable to load image from memory buffer "};
+	}
+
+	data = {bytes, static_cast<size_t>(width * height * numComponents)};
+}
+
 Image::~Image()
 {
 	stbi_image_free(data.data());