faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Made Entity inheritence public.

Browse Source
This commit is contained in:
Faerbit 2014-10-31 10:38:06 +01:00
parent a88490b622
commit 911c8ebfcc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
light.hh
View File

@ -6,7 +6,7 @@
//To distinguish various light types //To distinguish various light types
class Light : Entity { class Light : public Entity {
public: public:
Light(glm::vec3 position, glm::vec3 rotation, glm::vec3 colour, float intensity); Light(glm::vec3 position, glm::vec3 rotation, glm::vec3 colour, float intensity);
~Light(); ~Light();

2
object.hh
View File

@ -10,7 +10,7 @@
#include <ACGL/OpenGL/Managers.hh> #include <ACGL/OpenGL/Managers.hh>
#include <ACGL/OpenGL/Objects.hh> #include <ACGL/OpenGL/Objects.hh>
class Object : Entity { class Object : public Entity {
public: public:
Object(Model model, Texture texture, glm::vec3 position, glm::vec3 rotation, Object(Model model, Texture texture, glm::vec3 position, glm::vec3 rotation,
glm::vec3 velocity, glm::vec3 angularVelocity, Shader shader); glm::vec3 velocity, glm::vec3 angularVelocity, Shader shader);