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

25
src/Screen.cpp
View File

@@ -3,11 +3,9 @@
uint32_t Screen::id_counter = 0;
Screen::Screen(const std::string &name, std::vector<Widget*> widgets, Framebuffer *framebuffer, ShaderProgram *shaderProgram) :
unique_name(name),
framebuffer(framebuffer),
shaderProgram(shaderProgram),
widgets(widgets)
Screen::Screen(const std::string &name, std::vector<Widget *> widgets, Framebuffer *framebuffer,
ShaderProgram *shaderProgram)
: unique_name(name), framebuffer(framebuffer), shaderProgram(shaderProgram), widgets(widgets)
{
id = id_counter++;
}
@@ -15,31 +13,31 @@ Screen::Screen(const std::string &name, std::vector<Widget*> widgets, Framebuffe
Screen::~Screen()
{
// Iterate over Widgets and Textures to delete all of them
for(auto it = widgets.begin(); it != widgets.end(); it++) {
for (auto it = widgets.begin(); it != widgets.end(); it++) {
delete *it;
}
for(auto it = textures.begin(); it != textures.end(); it++) {
for (auto it = textures.begin(); it != textures.end(); it++) {
delete *it;
}
}
const std::string& Screen::getUniqueName() const
const std::string &Screen::getUniqueName() const
{
return unique_name;
}
std::vector<Widget*> Screen::getWidgets() const
std::vector<Widget *> Screen::getWidgets() const
{
return widgets;
}
Widget *Screen::getWidgetByName(const std::string& name) const
Widget *Screen::getWidgetByName(const std::string &name) const
{
if (m_widget_name_cache.find(name) != m_widget_name_cache.end())
return m_widget_name_cache[name];
for (auto it : widgets) {
if(it->getUniqueName() == name) {
if (it->getUniqueName() == name) {
m_widget_name_cache[name] = it;
return it;
}
@@ -56,8 +54,8 @@ void Screen::draw() const
{
framebuffer->setExposureCorrection(false);
framebuffer->bind();
for(auto it = widgets.begin(); it != widgets.end(); it++) {
for (auto it = widgets.begin(); it != widgets.end(); it++) {
(*it)->draw(shaderProgram);
}
@@ -65,4 +63,3 @@ void Screen::draw() const
framebuffer->render();
framebuffer->setExposureCorrection(true);
}