Merge branch 'instancing-pt2'

2 files changed, 13 insertions, 1 deletions

diff --git a/lib/location.cpp b/lib/location.cpp
new file mode 100644
index 0000000..bff27a2
--- /dev/null
+++ b/lib/location.cpp
@@ -0,0 +1,9 @@
+#include "location.hpp"
+#include "maths.h"
+#include <glm/gtx/transform.hpp>
+
+glm::mat4
+Location::getTransform() const
+{
+	return glm::translate(pos) * rotate_ypr(rot);
+}
diff --git a/lib/location.hpp b/lib/location.hpp
index 1360c47..078f5d3 100644
--- a/lib/location.hpp
+++ b/lib/location.hpp
@@ -1,11 +1,14 @@
 #pragma once
 
-#include <glm/glm.hpp>
+#include <glm/mat4x4.hpp>
+#include <glm/vec3.hpp>
 
 class Location {
 public:
 	explicit Location(glm::vec3 pos = {}, glm::vec3 rot = {}) : pos {pos}, rot {rot} { }
 
+	glm::mat4 getTransform() const;
+
 	glm::vec3 pos;
 	glm::vec3 rot;
 };