From 2d8b61bf9fc36e933a0091e1098e62faf143412c Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Wed, 27 Dec 2017 21:52:21 +0100
Subject: Add triangle type

---
 include/RenderBackend/OpenGL/DeviceMemory.hpp |  4 +++-
 include/Triangle2D.hpp                        | 16 ++++++++++++++++
 include/Vertex2D.hpp                          | 18 ++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 include/Triangle2D.hpp
 create mode 100644 include/Vertex2D.hpp

(limited to 'include')

diff --git a/include/RenderBackend/OpenGL/DeviceMemory.hpp b/include/RenderBackend/OpenGL/DeviceMemory.hpp
index 10ed040..c37acfb 100644
--- a/include/RenderBackend/OpenGL/DeviceMemory.hpp
+++ b/include/RenderBackend/OpenGL/DeviceMemory.hpp
@@ -2,6 +2,7 @@
 
 #include "../../DataView.hpp"
 #include "../../utils.hpp"
+#include "../../Triangle2D.hpp"
 #include <stdexcept>
 
 namespace amalgine
@@ -36,7 +37,8 @@ namespace amalgine
         };
         
         ~DeviceMemory();
-        void copy(const DataView<f32> &data, StorageType storageType, PrimitiveType primitiveType = PrimitiveType::TRIANGLE);
+        //void copy(const DataView<f32> &data, StorageType storageType, PrimitiveType primitiveType = PrimitiveType::TRIANGLE);
+        void copy(const DataView<Triangle2D> &triangles, StorageType storageType);
         void draw();
     private:
         DeviceMemory();
diff --git a/include/Triangle2D.hpp b/include/Triangle2D.hpp
new file mode 100644
index 0000000..d5d76bd
--- /dev/null
+++ b/include/Triangle2D.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "Vertex2D.hpp"
+
+namespace amalgine
+{
+    class Triangle2D
+    {
+    public:
+        Triangle2D(const Vertex2D &_p1, const Vertex2D &_p2, const Vertex2D &_p3) : p1(_p1), p2(_p2), p3(_p3) {}
+        
+        Vertex2D p1;
+        Vertex2D p2;
+        Vertex2D p3;
+    };
+}
diff --git a/include/Vertex2D.hpp b/include/Vertex2D.hpp
new file mode 100644
index 0000000..de22cd9
--- /dev/null
+++ b/include/Vertex2D.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "types.hpp"
+
+namespace amalgine
+{
+    class Vertex2D
+    {
+    public:
+        Vertex2D(f32 _x = 0.0f, f32 _y = 0.0f) : x(_x), y(_y)
+        {
+            
+        }
+        
+        f32 x;
+        f32 y;
+    };
+}
-- 
cgit v1.2.3