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

Add m_ to member variables.

Browse Source
This commit is contained in:
Derek Christ
2021-07-04 19:42:12 +02:00
parent 482b041059
commit 498de84943
39 changed files with 679 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Menu.cpp
View File

@@ -5,29 +5,29 @@
#include <iostream>
Menu::Menu(Framebuffer *p_framebuffer, ShaderProgram *p_shaderProgram)
: framebuffer(p_framebuffer), shaderProgram(p_shaderProgram)
Menu::Menu(FrameBuffer *p_framebuffer, ShaderProgram *p_shaderProgram)
: m_frameBuffer(p_framebuffer), m_shaderProgram(p_shaderProgram)
{
JsonParser screenParser("data/screens.json");
screens = screenParser.getScreens(shaderProgram, framebuffer);
m_screens = screenParser.getScreens(m_shaderProgram, m_frameBuffer);
}
Menu::~Menu()
{
// Iterate over screens delete all items
for (auto it = screens.begin(); it != screens.end(); it++) {
for (auto it = m_screens.begin(); it != m_screens.end(); it++) {
delete (*it);
}
}
Screen *Menu::getScreenByName(const std::string &name) const
{
if (m_screen_name_cache.find(name) != m_screen_name_cache.end())
return m_screen_name_cache[name];
if (m_screenNameCache.find(name) != m_screenNameCache.end())
return m_screenNameCache[name];
for (auto it : screens) {
for (auto it : m_screens) {
if (it->getUniqueName() == name) {
m_screen_name_cache[name] = it;
m_screenNameCache[name] = it;
return it;
}
}
@@ -37,7 +37,7 @@ Screen *Menu::getScreenByName(const std::string &name) const
Screen *Menu::getActiveScreen() const
{
return activeScreen;
return m_activeScreen;
}
void Menu::showScreenByName(const std::string &name)
@@ -48,25 +48,25 @@ void Menu::showScreenByName(const std::string &name)
return;
screen->draw();
activeScreen = screen;
m_activeScreen = screen;
}
void Menu::resetActiveScreen()
{
activeScreen = nullptr;
m_activeScreen = nullptr;
}
void Menu::handleMouseButtonActionMap(const MouseButtonActionMap &mouseButtonActionMap, Window *window)
{
if (mouseButtonActionMap.at(MouseButtonAction::LeftClicked)) {
auto widgets = activeScreen->getWidgets();
auto widgets = m_activeScreen->getWidgets();
for (auto it = widgets.begin(); it != widgets.end(); it++) {
if ((*it)->isHovered(window)) {
// std::cout << (*it)->getUniqueName() << " clicked!" << std::endl;
if ((*it)->getCallbackId() == 1)
resetActiveScreen();
if ((*it)->getCallbackId() == 2)
shouldExit = true;
m_shouldExit = true;
}
}
}
@@ -74,7 +74,7 @@ void Menu::handleMouseButtonActionMap(const MouseButtonActionMap &mouseButtonAct
void Menu::writeWindowActions(WindowActionMap &windowActionMap)
{
if (shouldExit)
if (m_shouldExit)
windowActionMap[WindowAction::WindowShouldClose] = true;
}