From 80db1456d6239fb7699e61c0f91bbc22c71f6c1a Mon Sep 17 00:00:00 2001
From: Faerbit <faerbit@gmail.com>
Date: Mon, 20 Oct 2014 19:09:19 +0200
Subject: [PATCH] Added object.hh

---
 object.hh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 object.hh

diff --git a/object.hh b/object.hh
new file mode 100644
index 0000000..8a95240
--- /dev/null
+++ b/object.hh
@@ -0,0 +1,20 @@
+#ifndef OBJECT_HH_INCLUDED
+#define OBJECT_HH_INCLUDED
+
+#include "entity.hh"
+#include "model.hh"
+#include "texture.hh"   
+#include <ACGL/Math/Math.hh>
+
+class Object : Entity {
+    public:
+        Object(Model model, Texture texture, glm::vec3 position, glm::vec3 rotation, glm::vec3 velocity, glm::vec3 angularVelocity);
+        ~Object();
+    private:
+        Model model;
+        Texture texture;
+        glm::vec3 velocity;
+        glm::vec3 angularVelocity;
+};
+
+#endif