Cleaning for opengl rendering prep.

This commit is contained in:
James Grogan 2022-11-14 11:19:51 +00:00
parent 402f381d10
commit 7c6a92f4ec
58 changed files with 570 additions and 533 deletions

View file

@ -25,32 +25,32 @@ std::unique_ptr<DesktopManager> DesktopManager::Create(AbstractDesktopApp* appli
return std::make_unique<DesktopManager>(application);
}
void DesktopManager::ClearEvents()
void DesktopManager::clearEvents()
{
mEventManager->ClearEvents();
}
void DesktopManager::OnKeyboardEvent(const KeyboardEvent* event)
void DesktopManager::onKeyboardEvent(const KeyboardEvent* event)
{
GetWindowManager()->OnKeyboardEvent(event);
mWindowManager->onKeyboardEvent(event);
}
void DesktopManager::OnPaintEvent(const PaintEvent* event)
void DesktopManager::onPaintEvent(const PaintEvent* event)
{
GetWindowManager()->OnPaintEvent(event);
mWindowManager->onPaintEvent(event);
}
void DesktopManager::OnMouseEvent(const MouseEvent* event)
void DesktopManager::onMouseEvent(const MouseEvent* event)
{
GetWindowManager()->OnMouseEvent(event);
mWindowManager->onMouseEvent(event);
}
bool DesktopManager::IsModified() const
bool DesktopManager::isModified() const
{
return mModified;
}
void DesktopManager::OnUiEvent(UiEventUPtr eventUPtr)
void DesktopManager::onUiEvent(UiEventUPtr eventUPtr)
{
mModified = false;
const auto event = mEventManager->AddEvent(std::move(eventUPtr));
@ -58,19 +58,19 @@ void DesktopManager::OnUiEvent(UiEventUPtr eventUPtr)
{
case (UiEvent::Type::Paint):
{
OnPaintEvent(dynamic_cast<const PaintEvent*>(event));
onPaintEvent(dynamic_cast<const PaintEvent*>(event));
break;
}
case (UiEvent::Type::Keyboard):
{
OnKeyboardEvent(dynamic_cast<const KeyboardEvent*>(event));
onKeyboardEvent(dynamic_cast<const KeyboardEvent*>(event));
mModified = true;
break;
}
case (UiEvent::Type::Mouse):
{
auto mouseEvent = dynamic_cast<const MouseEvent*>(event);
OnMouseEvent(mouseEvent);
onMouseEvent(mouseEvent);
if (mouseEvent->GetAction() == MouseEvent::Action::Pressed)
{
mModified = true;
@ -86,17 +86,17 @@ void DesktopManager::OnUiEvent(UiEventUPtr eventUPtr)
}
}
void DesktopManager::SetIsModified(bool modified)
void DesktopManager::setIsModified(bool modified)
{
mModified = modified;
}
Keyboard* DesktopManager::GetKeyboard() const
Keyboard* DesktopManager::getKeyboard() const
{
return mKeyboard.get();
}
void DesktopManager::SetKeyboard(KeyboardUPtr keyboard)
void DesktopManager::setKeyboard(KeyboardUPtr keyboard)
{
mKeyboard = std::move(keyboard);
}
@ -106,12 +106,12 @@ AbstractApp* DesktopManager::getMainApp() const
return mUiApplication->getMainApplication();
}
void DesktopManager::AddScreen(ScreenPtr screen)
void DesktopManager::addScreen(ScreenPtr screen)
{
mScreens.push_back(std::move(screen));
}
mt::Screen* DesktopManager::GetDefaultScreen() const
mt::Screen* DesktopManager::getDefaultScreen() const
{
if (mScreens.size() > 0)
{
@ -120,12 +120,12 @@ mt::Screen* DesktopManager::GetDefaultScreen() const
return nullptr;
}
void DesktopManager::SetWindowManager(WindowManagerUPtr windowManager)
void DesktopManager::setWindowManager(WindowManagerUPtr windowManager)
{
mWindowManager = std::move(windowManager);
}
WindowManager* DesktopManager::GetWindowManager() const
WindowManager* DesktopManager::getWindowManager() const
{
return mWindowManager.get();
}