sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop into master #9

Merged
SemvdH merged 126 commits from develop into main 2021-06-18 15:56:41 +00:00
Conversation 4 Commits 126 Files Changed 73 +2 -2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 75c745427c - Show all commits

2
src/shaders/entity_shader.cpp
View File

@@ -161,7 +161,7 @@ namespace shaders
} }
} }
void EntityShader::LoadLights(std::deque<entities::Light>& lights) const void EntityShader::LoadLightsDeque(std::deque<entities::Light>& lights) const
{ {
for (int i = 0; i < MAX_LIGHTS; ++i) for (int i = 0; i < MAX_LIGHTS; ++i)
{ {

2
src/shaders/entity_shader.h
View File

@@ -64,7 +64,7 @@ namespace shaders
* *
* @param lights the deque containing the lights to load * @param lights the deque containing the lights to load
*/ */
void LoadLights(std::deque<entities::Light>& lights) const; void LoadLightsDeque(std::deque<entities::Light>& lights) const;
/* /*
* @brief: A method to load the the shine variables from a model into the shader * @brief: A method to load the the shine variables from a model into the shader