X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2FModel.hpp;h=c46caf442740cb7efec78a4aad27087339faf705;hb=7e782291e0ce39eb2d4e8c1df28f682c313e6f8d;hp=95ad086402a6c58838012b0c9102350538cb9499;hpb=b7d09e1e35ef90282c97509e0020b20db3c7ea9f;p=blank.git

diff --git a/src/model/Model.hpp b/src/model/Model.hpp
index 95ad086..c46caf4 100644
--- a/src/model/Model.hpp
+++ b/src/model/Model.hpp
@@ -1,76 +1,43 @@
 #ifndef BLANK_MODEL_MODEL_HPP_
 #define BLANK_MODEL_MODEL_HPP_
 
+#include "Part.hpp"
+
+#include <cstdint>
+#include <list>
 #include <vector>
-#include <GL/glew.h>
 #include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
 
 
 namespace blank {
 
-class Model {
-
-public:
-	using Position = glm::vec3;
-	using Color = glm::vec3;
-	using Normal = glm::vec3;
-	using Index = unsigned int;
-
-	using Positions = std::vector<Position>;
-	using Colors = std::vector<Color>;
-	using Normals = std::vector<Normal>;
-	using Indices = std::vector<Index>;
-
-public:
-	struct Buffer {
-
-		Positions vertices;
-		Colors colors;
-		Normals normals;
-		Indices indices;
-
-		void Clear() noexcept {
-			vertices.clear();
-			colors.clear();
-			normals.clear();
-			indices.clear();
-		}
+class Instance;
+class EntityMesh;
 
-		void Reserve(size_t p, size_t i) {
-			vertices.reserve(p);
-			colors.reserve(p);
-			normals.reserve(p);
-			indices.reserve(i);
-		}
-
-	};
+class Model {
 
 public:
-	Model() noexcept;
-	~Model() noexcept;
+	Model();
 
 	Model(const Model &) = delete;
 	Model &operator =(const Model &) = delete;
 
-	Model(Model &&) noexcept;
-	Model &operator =(Model &&) noexcept;
+	std::uint32_t ID() const noexcept { return id; }
+	void ID(std::uint32_t i) noexcept { id = i; }
 
-	void Update(const Buffer &) noexcept;
+	Part &RootPart() noexcept { return root; }
+	const Part &RootPart() const noexcept { return root; }
+	Part &GetPart(std::size_t i) noexcept { return *part[i]; }
+	const Part &GetPart(std::size_t i) const noexcept { return *part[i]; }
 
-	void Draw() const noexcept;
+	void Enumerate();
+	void Instantiate(Instance &) const;
 
 private:
-	enum Attribute {
-		ATTRIB_VERTEX,
-		ATTRIB_COLOR,
-		ATTRIB_NORMAL,
-		ATTRIB_INDEX,
-		ATTRIB_COUNT,
-	};
-
-	GLuint va;
-	GLuint handle[ATTRIB_COUNT];
-	size_t count;
+	std::uint32_t id;
+	Part root;
+	std::vector<Part *> part;
 
 };