Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NAS2D submodule - unwrap EventHandler enums #1580

Merged
merged 4 commits into from
Feb 13, 2025
Merged

Update NAS2D submodule - unwrap EventHandler enums #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9161ce4
Update NAS2D submodule
DanRStevens Feb 13, 2025
8a0033a
Remove `EventHandler::` prefix on enum uses
DanRStevens Feb 13, 2025
ccc41d2
Update NAS2D submodule
DanRStevens Feb 13, 2025
d047954
Update NAS2D submodule
DanRStevens Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appOPHD/States/MainMenuState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ void MainMenuState::onFileIoAction(const std::string& filePath, FileIo::FileOper
/**
* Key down event handler.
*/
void MainMenuState::onKeyDown(NAS2D::EventHandler::KeyCode /*key*/, NAS2D::EventHandler::KeyModifier /*mod*/, bool /*repeat*/)
void MainMenuState::onKeyDown(NAS2D::KeyCode /*key*/, NAS2D::KeyModifier /*mod*/, bool /*repeat*/)
{}


Expand Down
2 changes: 1 addition & 1 deletion appOPHD/States/MainMenuState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class MainMenuState : public NAS2D::State
State* update() override;

private:
void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat);
void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat);
void onWindowResized(NAS2D::Vector<int> newSize);
void onFadeComplete();

Expand Down
12 changes: 6 additions & 6 deletions appOPHD/States/MainReportsUiState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "../UI/Reports/SpaceportsReport.h"
#include "../UI/Reports/WarehouseReport.h"

#include <NAS2D/EventHandlerKeyCode.h>
#include <NAS2D/EventHandlerMouseButton.h>
#include <NAS2D/EnumKeyCode.h>
#include <NAS2D/EnumMouseButton.h>
#include <NAS2D/Utility.h>
#include <NAS2D/Renderer/Renderer.h>

Expand Down Expand Up @@ -237,21 +237,21 @@ void MainReportsUiState::_deactivate()
}


void MainReportsUiState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier /*mod*/, bool /*repeat*/)
void MainReportsUiState::onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier /*mod*/, bool /*repeat*/)
{
if (!active())
{
return;
}

if (key == NAS2D::EventHandler::KeyCode::KEY_ESCAPE)
if (key == NAS2D::KeyCode::KEY_ESCAPE)
{
exit();
}
}


void MainReportsUiState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position)
void MainReportsUiState::onMouseDown(NAS2D::MouseButton button, NAS2D::Point<int> position)
{
if (!active())
{
Expand All @@ -264,7 +264,7 @@ void MainReportsUiState::onMouseDown(NAS2D::EventHandler::MouseButton button, NA
return;
}

if (button == NAS2D::EventHandler::MouseButton::Left)
if (button == NAS2D::MouseButton::Left)
{
for (Panel& panel : Panels)
{
Expand Down
4 changes: 2 additions & 2 deletions appOPHD/States/MainReportsUiState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ class MainReportsUiState : public Wrapper
void _activate() override;

private:
void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat);
void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position);
void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat);
void onMouseDown(NAS2D::MouseButton button, NAS2D::Point<int> position);
void onWindowResized(NAS2D::Vector<int> newSize);

void deselectAllPanels();
Expand Down
68 changes: 34 additions & 34 deletions appOPHD/States/MapViewState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

#include <NAS2D/Utility.h>
#include <NAS2D/EventHandler.h>
#include <NAS2D/EventHandlerKeyCode.h>
#include <NAS2D/EventHandlerMouseButton.h>
#include <NAS2D/EnumKeyCode.h>
#include <NAS2D/EnumMouseButton.h>
#include <NAS2D/Renderer/Renderer.h>
#include <NAS2D/Math/PointInRectangleRange.h>

Expand Down Expand Up @@ -411,7 +411,7 @@ void MapViewState::onWindowResized(NAS2D::Vector<int> newSize)
/**
* Key down event handler.
*/
void MapViewState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool /*repeat*/)
void MapViewState::onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool /*repeat*/)
{
if (!active()) { return; }

Expand All @@ -426,7 +426,7 @@ void MapViewState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandl
return;
}

if (key == NAS2D::EventHandler::KeyCode::KEY_F1)
if (key == NAS2D::KeyCode::KEY_F1)
{
mReportsUiSignal();
return;
Expand All @@ -437,89 +437,89 @@ void MapViewState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandl
switch(key)
{

case NAS2D::EventHandler::KeyCode::KEY_w:
case NAS2D::EventHandler::KeyCode::KEY_UP:
case NAS2D::KeyCode::KEY_w:
case NAS2D::KeyCode::KEY_UP:
moveView(MapOffsetNorthWest * shiftMoveScalar);
break;

case NAS2D::EventHandler::KeyCode::KEY_s:
case NAS2D::EventHandler::KeyCode::KEY_DOWN:
case NAS2D::KeyCode::KEY_s:
case NAS2D::KeyCode::KEY_DOWN:
moveView(MapOffsetSouthEast * shiftMoveScalar);
break;

case NAS2D::EventHandler::KeyCode::KEY_a:
case NAS2D::EventHandler::KeyCode::KEY_LEFT:
case NAS2D::KeyCode::KEY_a:
case NAS2D::KeyCode::KEY_LEFT:
moveView(MapOffsetSouthWest * shiftMoveScalar);
break;

case NAS2D::EventHandler::KeyCode::KEY_d:
case NAS2D::EventHandler::KeyCode::KEY_RIGHT:
case NAS2D::KeyCode::KEY_d:
case NAS2D::KeyCode::KEY_RIGHT:
moveView(MapOffsetNorthEast * shiftMoveScalar);
break;

case NAS2D::EventHandler::KeyCode::KEY_0:
case NAS2D::KeyCode::KEY_0:
changeViewDepth(0);
break;

case NAS2D::EventHandler::KeyCode::KEY_1:
case NAS2D::KeyCode::KEY_1:
changeViewDepth(1);
break;

case NAS2D::EventHandler::KeyCode::KEY_2:
case NAS2D::KeyCode::KEY_2:
changeViewDepth(2);
break;

case NAS2D::EventHandler::KeyCode::KEY_3:
case NAS2D::KeyCode::KEY_3:
changeViewDepth(3);
break;

case NAS2D::EventHandler::KeyCode::KEY_4:
case NAS2D::KeyCode::KEY_4:
changeViewDepth(4);
break;

case NAS2D::EventHandler::KeyCode::KEY_PAGEUP:
case NAS2D::KeyCode::KEY_PAGEUP:
moveView(MapOffsetUp);
break;

case NAS2D::EventHandler::KeyCode::KEY_PAGEDOWN:
case NAS2D::KeyCode::KEY_PAGEDOWN:
moveView(MapOffsetDown);
break;


case NAS2D::EventHandler::KeyCode::KEY_HOME:
case NAS2D::KeyCode::KEY_HOME:
changeViewDepth(0);
break;

case NAS2D::EventHandler::KeyCode::KEY_END:
case NAS2D::KeyCode::KEY_END:
changeViewDepth(mTileMap->maxDepth());
break;

case NAS2D::EventHandler::KeyCode::KEY_F10:
case NAS2D::KeyCode::KEY_F10:
if (NAS2D::Utility<NAS2D::EventHandler>::get().control(mod) && NAS2D::Utility<NAS2D::EventHandler>::get().shift(mod))
{
mCheatMenu.show();
mWindowStack.bringToFront(&mCheatMenu);
}
break;

case NAS2D::EventHandler::KeyCode::KEY_F2:
case NAS2D::KeyCode::KEY_F2:
mFileIoDialog.scanDirectory(constants::SaveGamePath);
mFileIoDialog.setMode(FileIo::FileOperation::Save);
mFileIoDialog.show();
break;

case NAS2D::EventHandler::KeyCode::KEY_F3:
case NAS2D::KeyCode::KEY_F3:
mFileIoDialog.scanDirectory(constants::SaveGamePath);
mFileIoDialog.setMode(FileIo::FileOperation::Load);
mFileIoDialog.show();
break;

case NAS2D::EventHandler::KeyCode::KEY_ESCAPE:
case NAS2D::KeyCode::KEY_ESCAPE:
clearMode();
resetUi();
break;

case NAS2D::EventHandler::KeyCode::KEY_ENTER:
case NAS2D::KeyCode::KEY_ENTER:
if (mBtnTurns.enabled()) { nextTurn(); }
break;

Expand All @@ -529,7 +529,7 @@ void MapViewState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandl
}


void MapViewState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position)
void MapViewState::onMouseDown(NAS2D::MouseButton button, NAS2D::Point<int> position)
{
if (!active()) { return; }

Expand All @@ -541,7 +541,7 @@ void MapViewState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::P
return;
}

if (button == NAS2D::EventHandler::MouseButton::Right || button == NAS2D::EventHandler::MouseButton::Middle)
if (button == NAS2D::MouseButton::Right || button == NAS2D::MouseButton::Middle)
{
if (mInsertMode != InsertMode::None)
{
Expand All @@ -554,12 +554,12 @@ void MapViewState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::P
if (!mTileMap->isValidPosition(tilePosition)) { return; }

const bool inspectModifier = NAS2D::Utility<NAS2D::EventHandler>::get().shift() ||
button == NAS2D::EventHandler::MouseButton::Middle;
button == NAS2D::MouseButton::Middle;

onInspect(tilePosition, inspectModifier);
}

if (button == NAS2D::EventHandler::MouseButton::Left)
if (button == NAS2D::MouseButton::Left)
{
if (mTooltipSystemButton.rect().contains(MOUSE_COORDS))
{
Expand All @@ -585,11 +585,11 @@ void MapViewState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::P
}


void MapViewState::onMouseDoubleClick(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> /*position*/)
void MapViewState::onMouseDoubleClick(NAS2D::MouseButton button, NAS2D::Point<int> /*position*/)
{
if (!active()) { return; }

if (button == NAS2D::EventHandler::MouseButton::Left)
if (button == NAS2D::MouseButton::Left)
{
if (mWindowStack.pointInWindow(MOUSE_COORDS)) { return; }
if (!mDetailMap->isMouseOverTile()) { return; }
Expand Down Expand Up @@ -625,9 +625,9 @@ void MapViewState::onMouseDoubleClick(NAS2D::EventHandler::MouseButton button, N
}


void MapViewState::onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position)
void MapViewState::onMouseUp(NAS2D::MouseButton button, NAS2D::Point<int> position)
{
if (button == NAS2D::EventHandler::MouseButton::Left)
if (button == NAS2D::MouseButton::Left)
{
mMiniMap->onMouseUp(button, position);
}
Expand Down
8 changes: 4 additions & 4 deletions appOPHD/States/MapViewState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ class MapViewState : public Wrapper

// EVENT HANDLERS
void onActivate(bool newActiveValue);
void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat);
void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position);
void onMouseDoubleClick(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position);
void onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position);
void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat);
void onMouseDown(NAS2D::MouseButton button, NAS2D::Point<int> position);
void onMouseDoubleClick(NAS2D::MouseButton button, NAS2D::Point<int> position);
void onMouseUp(NAS2D::MouseButton button, NAS2D::Point<int> position);
void onMouseMove(NAS2D::Point<int> position, NAS2D::Vector<int> relative);
void onMouseWheel(NAS2D::Vector<int> changeAmount);
void onWindowResized(NAS2D::Vector<int> newSize);
Expand Down
2 changes: 1 addition & 1 deletion appOPHD/States/PlanetSelectState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ NAS2D::State* PlanetSelectState::update()
}


void PlanetSelectState::onMouseDown(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point<int> /*position*/)
void PlanetSelectState::onMouseDown(NAS2D::MouseButton /*button*/, NAS2D::Point<int> /*position*/)
{
for (std::size_t i = 0; i < mPlanets.size(); ++i)
{
Expand Down
2 changes: 1 addition & 1 deletion appOPHD/States/PlanetSelectState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class PlanetSelectState : public NAS2D::State
State* update() override;

private:
void onMouseDown(NAS2D::EventHandler::MouseButton, NAS2D::Point<int> position);
void onMouseDown(NAS2D::MouseButton, NAS2D::Point<int> position);

void onMousePlanetEnter();
void onMousePlanetExit();
Expand Down
4 changes: 2 additions & 2 deletions appOPHD/States/SplashState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ NAS2D::State* SplashState::update()
}


void SplashState::onKeyDown(NAS2D::EventHandler::KeyCode /*key*/, NAS2D::EventHandler::KeyModifier /*mod*/, bool /*repeat*/)
void SplashState::onKeyDown(NAS2D::KeyCode /*key*/, NAS2D::KeyModifier /*mod*/, bool /*repeat*/)
{
skipSplash();
}


void SplashState::onMouseDown(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point<int> /*position*/)
void SplashState::onMouseDown(NAS2D::MouseButton /*button*/, NAS2D::Point<int> /*position*/)
{
skipSplash();
}
4 changes: 2 additions & 2 deletions appOPHD/States/SplashState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ class SplashState : public NAS2D::State
NAS2D::State* update() override;

private:
void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat);
void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position);
void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat);
void onMouseDown(NAS2D::MouseButton button, NAS2D::Point<int> position);

void skipSplash();

Expand Down
10 changes: 5 additions & 5 deletions appOPHD/UI/FileIo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "MessageBox.h"

#include <NAS2D/EventHandlerKeyCode.h>
#include <NAS2D/EnumKeyCode.h>
#include <NAS2D/Utility.h>
#include <NAS2D/Filesystem.h>

Expand Down Expand Up @@ -60,7 +60,7 @@ FileIo::~FileIo()
}


void FileIo::onDoubleClick(EventHandler::MouseButton /*button*/, NAS2D::Point<int> position)
void FileIo::onDoubleClick(MouseButton /*button*/, NAS2D::Point<int> position)
{
if (!visible()) { return; } // ignore key presses when hidden.

Expand All @@ -77,18 +77,18 @@ void FileIo::onDoubleClick(EventHandler::MouseButton /*button*/, NAS2D::Point<in
/**
* Event handler for Key Down.
*/
void FileIo::onKeyDown(EventHandler::KeyCode key, EventHandler::KeyModifier /*mod*/, bool /*repeat*/)
void FileIo::onKeyDown(KeyCode key, KeyModifier /*mod*/, bool /*repeat*/)
{
if (!visible()) { return; } // ignore key presses when hidden.

if (key == EventHandler::KeyCode::KEY_ENTER || key == EventHandler::KeyCode::KEY_KP_ENTER)
if (key == KeyCode::KEY_ENTER || key == KeyCode::KEY_KP_ENTER)
{
if (!mFileName.empty())
{
onFileIo();
}
}
else if (key == EventHandler::KeyCode::KEY_ESCAPE)
else if (key == KeyCode::KEY_ESCAPE)
{
onClose();
}
Expand Down
4 changes: 2 additions & 2 deletions appOPHD/UI/FileIo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class FileIo : public Window
void update() override;

protected:
void onDoubleClick(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position);
void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat);
void onDoubleClick(NAS2D::MouseButton button, NAS2D::Point<int> position);
void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat);

private:
void onOpenFolder() const;
Expand Down
Loading
Loading