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

Clarifing which offset is meant.

Browse Source
This commit is contained in:
Faerbit 2015-02-24 14:04:56 +01:00
parent e08eda317c
commit 1f89ec9e32
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
light.cc
View File

@ -1,10 +1,10 @@
#include "light.hh" #include "light.hh"
Light::Light(glm::vec3 position, glm::vec3 colour, float intensity, float flameOffset) Light::Light(glm::vec3 position, glm::vec3 colour, float intensity, float flameYOffset)
: Entity(position, glm::vec3(0.0f, 0.0f, 0.0f)) { : Entity(position, glm::vec3(0.0f, 0.0f, 0.0f)) {
this->colour = colour; this->colour = colour;
this->intensity = intensity; this->intensity = intensity;
this->flameOffset = flameOffset; this->flameYOffset = flameYOffset;
} }
Light::Light() { Light::Light() {
@ -21,6 +21,6 @@ float Light::getIntensity() {
return intensity; return intensity;
} }
float Light::getFlameOffset() { float Light::getFlameYOffset() {
return flameOffset; return flameYOffset;
} }

6
light.hh
View File

@ -6,14 +6,14 @@
class Light : public Entity { class Light : public Entity {
public: public:
Light(glm::vec3 position, glm::vec3 colour, float intensity, float flameOffset = 0.0f); Light(glm::vec3 position, glm::vec3 colour, float intensity, float flameYOffset = 0.0f);
Light(); Light();
glm::vec3 getColour(); glm::vec3 getColour();
float getIntensity(); float getIntensity();
float getFlameOffset(); float getFlameYOffset();
~Light(); ~Light();
private: private:
float flameOffset; float flameYOffset;
float intensity; float intensity;
glm::vec3 colour; glm::vec3 colour;
}; };