From f92c7bf6c318d64e2401a856d6a3e8d6fd4714ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20F=C3=BCndgens?= Date: Tue, 17 Feb 2015 12:41:15 +0100 Subject: [PATCH] Added vector of flames to the level. --- level.cc | 4 ++++ level.hh | 3 +++ 2 files changed, 7 insertions(+) diff --git a/level.cc b/level.cc index fef60ca..ebb9ece 100644 --- a/level.cc +++ b/level.cc @@ -227,6 +227,10 @@ void Level::addTrigger(Trigger trigger) { this->triggers.push_back(trigger); } +void Level::addFlame(Flame flame){ + this->flames.push_back(flame); +} + lua_State* Level::getLuaState() { return luaState; } diff --git a/level.hh b/level.hh index 93d11fa..e046d65 100644 --- a/level.hh +++ b/level.hh @@ -10,6 +10,7 @@ #include "camera.hh" #include "physics.hh" #include "trigger.hh" +#include "flame.hh" extern "C" { #include "extern/lua/src/lua.h" @@ -44,6 +45,7 @@ class Level { void setSkydomeObject(Object* object); void addObject(Object* object); void addPhysicsObject(Object* object); + void addFlame(Flame flame); void setAmbientLight(glm::vec3 colour); void setFogColour(glm::vec4 colour); void setDirectionalLight(Light light); @@ -62,6 +64,7 @@ class Level { std::vector physicsObjects; std::vector lights; std::vector triggers; + std::vector flames; glm::vec3 ambientLight; glm::vec4 fogColour; Light directionalLight;