derek/fall-fever
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format code with clang-format.

Browse Source
This commit is contained in:
Derek Christ
2021-07-04 13:12:34 +02:00
parent 9937a36526
commit f816f5f565
37 changed files with 470 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Light.cpp
View File

@@ -6,21 +6,19 @@ uint32_t Light::id_counter = 0;
// Light
Light::Light(glm::vec3 color, float intensity, ShaderProgram* shaderProgram) :
shaderProgram(shaderProgram),
intensity(intensity)
Light::Light(glm::vec3 color, float intensity, ShaderProgram *shaderProgram)
: shaderProgram(shaderProgram), intensity(intensity)
{
id = id_counter++;
lightColor = color * intensity;
}
glm::vec3 Light::getColor()
{
return lightColor;
}
void Light::setShaderProgram(ShaderProgram* shaderProgram)
void Light::setShaderProgram(ShaderProgram *shaderProgram)
{
this->shaderProgram = shaderProgram;
update();
@@ -37,7 +35,6 @@ void Light::setIntensity(float intensity)
this->intensity = intensity;
}
void Light::setActive(bool active)
{
isActive = active;
@@ -46,9 +43,8 @@ void Light::setActive(bool active)
// PointLight
PointLight::PointLight(glm::vec3 position, glm::vec3 color, float intensity, ShaderProgram *shaderProgram) :
Light(color, intensity, shaderProgram),
position(position)
PointLight::PointLight(glm::vec3 position, glm::vec3 color, float intensity, ShaderProgram *shaderProgram)
: Light(color, intensity, shaderProgram), position(position)
{
// Empty
}
@@ -84,9 +80,8 @@ void PointLight::setPosition(glm::vec3 position)
// DirectionalLight
DirectionalLight::DirectionalLight(glm::vec3 direction, glm::vec3 color, float intensity, ShaderProgram *shaderProgram) :
Light(color, intensity, shaderProgram),
direction(direction)
DirectionalLight::DirectionalLight(glm::vec3 direction, glm::vec3 color, float intensity, ShaderProgram *shaderProgram)
: Light(color, intensity, shaderProgram), direction(direction)
{
// Empty
}