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

Added vector of flames to the level.

Browse Source
This commit is contained in:
Steffen Fündgens 2015-02-17 12:41:15 +01:00
parent 25e016d70f
commit aa1287cdaa
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
level.cc
View File

@ -227,6 +227,10 @@ void Level::addTrigger(Trigger trigger) {
this->triggers.push_back(trigger); this->triggers.push_back(trigger);
} }
void Level::addFlame(Flame flame){
this->flames.push_back(flame);
}
lua_State* Level::getLuaState() { lua_State* Level::getLuaState() {
return luaState; return luaState;
} }

3
level.hh
View File

@ -10,6 +10,7 @@
#include "camera.hh" #include "camera.hh"
#include "physics.hh" #include "physics.hh"
#include "trigger.hh" #include "trigger.hh"
#include "flame.hh"
extern "C" { extern "C" {
#include "extern/lua/src/lua.h" #include "extern/lua/src/lua.h"
@ -44,6 +45,7 @@ class Level {
void setSkydomeObject(Object* object); void setSkydomeObject(Object* object);
void addObject(Object* object); void addObject(Object* object);
void addPhysicsObject(Object* object); void addPhysicsObject(Object* object);
void addFlame(Flame flame);
void setAmbientLight(glm::vec3 colour); void setAmbientLight(glm::vec3 colour);
void setFogColour(glm::vec4 colour); void setFogColour(glm::vec4 colour);
void setDirectionalLight(Light light); void setDirectionalLight(Light light);
@ -62,6 +64,7 @@ class Level {
std::vector<Object*> physicsObjects; std::vector<Object*> physicsObjects;
std::vector<Light> lights; std::vector<Light> lights;
std::vector<Trigger> triggers; std::vector<Trigger> triggers;
std::vector<Flame> flames;
glm::vec3 ambientLight; glm::vec3 ambientLight;
glm::vec4 fogColour; glm::vec4 fogColour;
Light directionalLight; Light directionalLight;