Added generateModel to renderer

widberg · widberg · commit ac85e05ba108 · 2019-08-02T16:18:06.000-04:00
diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@
 [![Documentation Status](https://readthedocs.org/projects/igneous/badge/?version=latest)](https://igneous.readthedocs.io/en/latest/?badge=latest)
 [![Join the chat at https://discord.gg/CCUwTar](https://img.shields.io/badge/chat-on_discord-7389D8.svg?logo=discord&logoColor=ffffff&labelColor=6A7EC2)](https://discord.gg/CCUwTar)
 [![Join the chat at https://www.reddit.com/r/igneous/](https://img.shields.io/badge/chat-on_reddit-FF5700.svg?logo=reddit&logoColor=ffffff&labelColor=FF4500)](https://www.reddit.com/r/igneous/)
+[![Track on https://trello.com/b/05omR9Mj/igneous](https://img.shields.io/badge/track-on_trello-007BC2.svg?logo=trello&logoColor=ffffff&labelColor=026AA7)](https://trello.com/b/05omR9Mj/igneous)
 
 Igneous is an open source game engine written in C++.
 
diff --git a/igneous/include/igneous/renderer/renderer.hpp b/igneous/include/igneous/renderer/renderer.hpp
@@ -21,6 +21,7 @@ namespace renderer
 	bgfx::ProgramHandle loadProgram(const char* vs, const char* fs);
 
 	ModelHandle loadModel(std::string path, bgfx::ProgramHandle program);
+	ModelHandle generateModel(std::vector<std::pair<unsigned int, unsigned int>> modelSizes, void* modelData, bgfx::VertexDecl vertexDecl, bgfx::ProgramHandle program);
 
 	void render();
 	void screenshot();
diff --git a/igneous/src/renderer/renderer.cpp b/igneous/src/renderer/renderer.cpp
@@ -275,6 +275,10 @@ namespace renderer
 
 	ModelHandle loadModel(std::string path, bgfx::ProgramHandle program)
 	{
+		if (models.count(path))
+		{
+			return models.at(path);
+		}
 		std::ifstream file(path, std::ios::in | std::ios::binary);
 		if (file.fail())
 		{
@@ -363,6 +367,33 @@ namespace renderer
 		model->meshes = meshes;
 		model->program = program;
 
+		models[path] = model;
+		return model;
+	}
+
+	ModelHandle generateModel(std::vector<std::pair<unsigned int, unsigned int>> modelSizes, void* modelData, bgfx::VertexDecl vertexDecl, bgfx::ProgramHandle program)
+	{
+		std::vector<Mesh> meshes;
+		uint32_t amountRead = 0;
+		for (auto meshSize : modelSizes)
+		{
+			unsigned int numVerticies = meshSize.first;
+			unsigned int numIndicies = meshSize.second;
+			uint32_t verticiesSize = (uint32_t)numVerticies * (uint32_t)vertexDecl.getStride();
+			uint32_t indiciesSize = (uint32_t)numIndicies * sizeof(uint16_t);
+			Mesh mesh;
+			mesh.vbh = bgfx::createVertexBuffer(bgfx::makeRef((uint8_t*)modelData + amountRead, verticiesSize), vertexDecl);
+			amountRead += verticiesSize;
+			mesh.ibh = bgfx::createIndexBuffer(bgfx::makeRef((uint8_t*)modelData + amountRead, indiciesSize));
+			amountRead += indiciesSize;
+
+			meshes.push_back(mesh);
+		}
+
+		Model* model = new Model;
+		model->meshes = meshes;
+		model->program = program;
+
 		return model;
 	}
 
