X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel.hpp;h=7b9fc3d1b09cf702109111ae51568e694f45736a;hb=e74f1ad236429f05db90c0ace825277e2a3fbc05;hp=c0bda4112fe052231340dbcd3a30ce7857e4c3df;hpb=d18be10ef3f0a7b61c6f5c4c4096ca2b776c75b3;p=blank.git

diff --git a/src/model.hpp b/src/model.hpp
index c0bda41..7b9fc3d 100644
--- a/src/model.hpp
+++ b/src/model.hpp
@@ -1,6 +1,8 @@
 #ifndef BLANK_MODEL_HPP_
 #define BLANK_MODEL_HPP_
 
+#include <vector>
+#include <GL/glew.h>
 #include <glm/glm.hpp>
 
 
@@ -8,25 +10,188 @@ 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() {
+			vertices.clear();
+			colors.clear();
+			normals.clear();
+			indices.clear();
+		}
+
+		void Reserve(size_t p, size_t i) {
+			vertices.reserve(p);
+			colors.reserve(p);
+			normals.reserve(p);
+			indices.reserve(i);
+		}
+
+	};
+
 public:
 	Model();
 	~Model();
 
-	glm::mat4 Transform() const;
+	Model(const Model &) = delete;
+	Model &operator =(const Model &) = delete;
 
-	void Position(glm::vec3 pos) { position = pos; }
-	void Move(glm::vec3 delta) { position += delta; }
+	Model(Model &&);
+	Model &operator =(Model &&);
 
-	// all angles in radians (full circle = 2π)
-	void Pitch(float p) { pitch = p; }
-	void RotatePitch(float delta) { pitch += delta; }
-	void Yaw(float y) { yaw = y; }
-	void RotateYaw(float delta) { yaw += delta; }
+	void Update(const Buffer &);
+
+	void Draw() const;
 
 private:
-	glm::vec3 position;
-	float pitch;
-	float yaw;
+	enum Attribute {
+		ATTRIB_VERTEX,
+		ATTRIB_COLOR,
+		ATTRIB_NORMAL,
+		ATTRIB_INDEX,
+		ATTRIB_COUNT,
+	};
+
+	GLuint va;
+	GLuint handle[ATTRIB_COUNT];
+	size_t count;
+
+};
+
+
+class BlockModel {
+
+public:
+	using Position = glm::vec3;
+	using Color = glm::vec3;
+	using Normal = glm::vec3;
+	using Light = float;
+	using Index = unsigned int;
+
+	using Positions = std::vector<Position>;
+	using Colors = std::vector<Color>;
+	using Normals = std::vector<Normal>;
+	using Lights = std::vector<Light>;
+	using Indices = std::vector<Index>;
+
+public:
+	struct Buffer {
+
+		Positions vertices;
+		Colors colors;
+		Normals normals;
+		Lights lights;
+		Indices indices;
+
+		void Clear() {
+			vertices.clear();
+			colors.clear();
+			normals.clear();
+			lights.clear();
+			indices.clear();
+		}
+
+		void Reserve(size_t p, size_t i) {
+			vertices.reserve(p);
+			colors.reserve(p);
+			normals.reserve(p);
+			lights.reserve(p);
+			indices.reserve(i);
+		}
+
+	};
+
+public:
+	BlockModel();
+	~BlockModel();
+
+	BlockModel(const BlockModel &) = delete;
+	BlockModel &operator =(const Model &) = delete;
+
+	BlockModel(BlockModel &&);
+	BlockModel &operator =(BlockModel &&);
+
+	void Update(const Buffer &);
+
+	void Draw() const;
+
+private:
+	enum Attribute {
+		ATTRIB_VERTEX,
+		ATTRIB_COLOR,
+		ATTRIB_NORMAL,
+		ATTRIB_LIGHT,
+		ATTRIB_INDEX,
+		ATTRIB_COUNT,
+	};
+
+	GLuint va;
+	GLuint handle[ATTRIB_COUNT];
+	size_t count;
+
+};
+
+
+class OutlineModel {
+
+public:
+	using Position = glm::vec3;
+	using Color = glm::vec3;
+	using Index = unsigned short;
+
+	using Positions = std::vector<Position>;
+	using Colors = std::vector<Color>;
+	using Indices = std::vector<Index>;
+
+public:
+	Positions vertices;
+	Colors colors;
+	Indices indices;
+
+public:
+	OutlineModel();
+	~OutlineModel();
+
+	OutlineModel(const OutlineModel &) = delete;
+	OutlineModel &operator =(const OutlineModel &) = delete;
+
+	void Invalidate() { dirty = true; }
+
+	void Clear();
+	void Reserve(int vtx_count, int idx_count);
+
+	void Draw();
+
+private:
+	void Update();
+
+private:
+	enum Attribute {
+		ATTRIB_VERTEX,
+		ATTRIB_COLOR,
+		ATTRIB_INDEX,
+		ATTRIB_COUNT,
+	};
+
+	GLuint va;
+	GLuint handle[ATTRIB_COUNT];
+	bool dirty;
 
 };