From 911c8ebfcc0cb80171e92bf10d2f91c184593a37 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Fri, 31 Oct 2014 10:38:06 +0100 Subject: [PATCH] Made Entity inheritence public. --- light.hh | 2 +- object.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/light.hh b/light.hh index b02bb6d..c4c73d1 100644 --- a/light.hh +++ b/light.hh @@ -6,7 +6,7 @@ //To distinguish various light types -class Light : Entity { +class Light : public Entity { public: Light(glm::vec3 position, glm::vec3 rotation, glm::vec3 colour, float intensity); ~Light(); diff --git a/object.hh b/object.hh index 111c2a3..539ea65 100644 --- a/object.hh +++ b/object.hh @@ -10,7 +10,7 @@ #include #include -class Object : Entity { +class Object : public Entity { public: Object(Model model, Texture texture, glm::vec3 position, glm::vec3 rotation, glm::vec3 velocity, glm::vec3 angularVelocity, Shader shader);