From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Mon, 23 Dec 2013 17:54:47 +0000 (+0100)
Subject: Vector<int> : SDL_Point optimization
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=1129b8ac89f1e614f69793227ccec90157708aea;p=space.git

Vector<int> : SDL_Point optimization
---

diff --git a/src/graphics/Canvas.cpp b/src/graphics/Canvas.cpp
index 45997c6..e4befc0 100644
--- a/src/graphics/Canvas.cpp
+++ b/src/graphics/Canvas.cpp
@@ -95,6 +95,16 @@ void Canvas::Cross(Vector<int> pos, int extent) {
 		Vector<int>(pos.x, pos.y + extent));
 }
 
+void Canvas::Triangle(Vector<int> v1, Vector<int> v2, Vector<int> v3) {
+	SDL_Point points[4] = { v1, v2, v3, v1 };
+	SDL_RenderDrawPoints(canv, points, 4);
+}
+
+void Canvas::Quad(Vector<int> v1, Vector<int> v2, Vector<int> v3, Vector<int> v4) {
+	SDL_Point points[5] = { v1, v2, v3, v4, v1 };
+	SDL_RenderDrawPoints(canv, points, 5);
+}
+
 
 namespace {
 
diff --git a/src/graphics/Canvas.h b/src/graphics/Canvas.h
index 032c7db..c9a6488 100644
--- a/src/graphics/Canvas.h
+++ b/src/graphics/Canvas.h
@@ -38,6 +38,8 @@ public:
 
 	void Dot(Vector<int> pos);
 	void Cross(Vector<int> pos, int extent);
+	void Triangle(Vector<int>, Vector<int>, Vector<int>);
+	void Quad(Vector<int>, Vector<int>, Vector<int>, Vector<int>);
 
 	void Grid(Vector<int> pos, Vector<int> size, Vector<int> step);
 	void Grid(Vector<int> pos, Vector<int> size, Vector<float> step);
diff --git a/src/graphics/Vector.h b/src/graphics/Vector.h
index b5c6d7d..34d8297 100644
--- a/src/graphics/Vector.h
+++ b/src/graphics/Vector.h
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <ostream>
+#include <SDL.h>
 
 
 namespace space {
@@ -29,12 +30,50 @@ public:
 		return *this;
 	}
 
+	SDL_Point ToPoint() const {
+		SDL_Point p;
+		p.x = x;
+		p.y = y;
+		return p;
+	}
+
 public:
 	Scalar x;
 	Scalar y;
 
 };
 
+/// specialization with same layout as SDL_Point
+template<>
+class Vector<int>
+: public SDL_Point {
+
+public:
+	constexpr Vector() : SDL_Point({0, 0}) { }
+	constexpr Vector(int x, int y) : SDL_Point({x, y}) { }
+
+	template<class Other>
+	constexpr Vector(Vector<Other> other)
+	: SDL_Point({int(other.x), int(other.y)}) { }
+
+public:
+	Vector<int> &operator +=(Vector<int> other) {
+		x += other.x;
+		y += other.y;
+		return *this;
+	}
+	Vector<int> &operator -=(Vector<int> other) {
+		x -= other.x;
+		y -= other.y;
+		return *this;
+	}
+
+	SDL_Point ToPoint() const {
+		return *this;
+	}
+
+};
+
 
 template<class Scalar>
 constexpr Vector<Scalar> operator -(Vector<Scalar> v) {