Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
#5338: Rename a few callback routines
  • Loading branch information
codereader committed Sep 26, 2020
1 parent 752c258 commit a976390
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
24 changes: 12 additions & 12 deletions radiant/camera/GlobalCameraWndManager.cpp
Expand Up @@ -77,12 +77,12 @@ void GlobalCameraWndManager::registerCommands()
GlobalEventManager().addWidgetToggle("ToggleCamera");
GlobalEventManager().setToggled("ToggleCamera", true);

GlobalEventManager().addKeyEvent("CameraMoveForward", std::bind(&GlobalCameraWndManager::onFreelookMoveForwardKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveBack", std::bind(&GlobalCameraWndManager::onFreelookMoveBackKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveLeft", std::bind(&GlobalCameraWndManager::onFreelookMoveLeftKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveRight", std::bind(&GlobalCameraWndManager::onFreelookMoveRightKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveUp", std::bind(&GlobalCameraWndManager::onFreelookMoveUpKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveDown", std::bind(&GlobalCameraWndManager::onFreelookMoveDownKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveForward", std::bind(&GlobalCameraWndManager::onMoveForwardKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveBack", std::bind(&GlobalCameraWndManager::onMoveBackKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveLeft", std::bind(&GlobalCameraWndManager::onMoveLeftKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveRight", std::bind(&GlobalCameraWndManager::onMoveRightKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveUp", std::bind(&GlobalCameraWndManager::onMoveUpKey, this, std::placeholders::_1));
GlobalEventManager().addKeyEvent("CameraMoveDown", std::bind(&GlobalCameraWndManager::onMoveDownKey, this, std::placeholders::_1));
}

CamWndPtr GlobalCameraWndManager::getActiveCamWnd()
Expand Down Expand Up @@ -383,32 +383,32 @@ void GlobalCameraWndManager::doWithActiveCamWnd(const std::function<void(CamWnd&
}
}

void GlobalCameraWndManager::onFreelookMoveForwardKey(ui::KeyEventType eventType)
void GlobalCameraWndManager::onMoveForwardKey(ui::KeyEventType eventType)
{
doWithActiveCamWnd([&](CamWnd& cam) { cam.onForwardKey(eventType); });
}

void GlobalCameraWndManager::onFreelookMoveBackKey(ui::KeyEventType eventType)
void GlobalCameraWndManager::onMoveBackKey(ui::KeyEventType eventType)
{
doWithActiveCamWnd([&](CamWnd& cam) { cam.onBackwardKey(eventType); });
}

void GlobalCameraWndManager::onFreelookMoveLeftKey(ui::KeyEventType eventType)
void GlobalCameraWndManager::onMoveLeftKey(ui::KeyEventType eventType)
{
doWithActiveCamWnd([&](CamWnd& cam) { cam.onLeftKey(eventType); });
}

void GlobalCameraWndManager::onFreelookMoveRightKey(ui::KeyEventType eventType)
void GlobalCameraWndManager::onMoveRightKey(ui::KeyEventType eventType)
{
doWithActiveCamWnd([&](CamWnd& cam) { cam.onRightKey(eventType); });
}

void GlobalCameraWndManager::onFreelookMoveUpKey(ui::KeyEventType eventType)
void GlobalCameraWndManager::onMoveUpKey(ui::KeyEventType eventType)
{
doWithActiveCamWnd([&](CamWnd& cam) { cam.onUpKey(eventType); });
}

void GlobalCameraWndManager::onFreelookMoveDownKey(ui::KeyEventType eventType)
void GlobalCameraWndManager::onMoveDownKey(ui::KeyEventType eventType)
{
doWithActiveCamWnd([&](CamWnd& cam) { cam.onDownKey(eventType); });
}
Expand Down
12 changes: 6 additions & 6 deletions radiant/camera/GlobalCameraWndManager.h
Expand Up @@ -120,12 +120,12 @@ class GlobalCameraWndManager :

public:
// Callbacks for the named camera KeyEvents
void onFreelookMoveForwardKey(ui::KeyEventType eventType);
void onFreelookMoveBackKey(ui::KeyEventType eventType);
void onFreelookMoveLeftKey(ui::KeyEventType eventType);
void onFreelookMoveRightKey(ui::KeyEventType eventType);
void onFreelookMoveUpKey(ui::KeyEventType eventType);
void onFreelookMoveDownKey(ui::KeyEventType eventType);
void onMoveForwardKey(ui::KeyEventType eventType);
void onMoveBackKey(ui::KeyEventType eventType);
void onMoveLeftKey(ui::KeyEventType eventType);
void onMoveRightKey(ui::KeyEventType eventType);
void onMoveUpKey(ui::KeyEventType eventType);
void onMoveDownKey(ui::KeyEventType eventType);

// RegisterableModule implementation
const std::string& getName() const;
Expand Down

0 comments on commit a976390

Please sign in to comment.