Skip to content

feat(view): Add ability to rotate the camera in 45 degree increments using the numpad #1846

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

Merged
merged 4 commits into from
Nov 14, 2025
Merged

feat(view): Add ability to rotate the camera in 45 degree increments using the numpad #1846

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
be37123
feat: Add ability to rotate the camera in 45 degree increments
Stubbjax Nov 13, 2025
55069d8
fix: Remove erroneous categories
Stubbjax Nov 14, 2025
e39e610
docs: Add comments
Stubbjax Nov 14, 2025
e581044
tweak: Streamline easing values
Stubbjax Nov 14, 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: 2 additions & 0 deletions Generals/Code/GameEngine/Include/Common/MessageStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,10 @@ class GameMessage : public MemoryPoolObject

MSG_META_BEGIN_CAMERA_ROTATE_LEFT,
MSG_META_END_CAMERA_ROTATE_LEFT,
MSG_META_ALT_CAMERA_ROTATE_LEFT, ///< TheSuperHackers @feature Rotate camera in 45 degree increments
MSG_META_BEGIN_CAMERA_ROTATE_RIGHT,
MSG_META_END_CAMERA_ROTATE_RIGHT,
MSG_META_ALT_CAMERA_ROTATE_RIGHT, ///< TheSuperHackers @feature Rotate camera in 45 degree increments
MSG_META_BEGIN_CAMERA_ZOOM_IN,
MSG_META_END_CAMERA_ZOOM_IN,
MSG_META_BEGIN_CAMERA_ZOOM_OUT,
Expand Down
8 changes: 8 additions & 0 deletions Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3271,6 +3271,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
DEBUG_ASSERTCRASH(TheInGameUI->isCameraRotatingLeft(), ("Clearing rotate camera left, but it's already clear!"));
TheInGameUI->setCameraRotateLeft( false );
break;
case GameMessage::MSG_META_ALT_CAMERA_ROTATE_LEFT:
if (TheTacticalView->isCameraMovementFinished())
TheTacticalView->rotateCamera(-1.0f / 8.0f, 500);
break;
case GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_RIGHT:
DEBUG_ASSERTCRASH(!TheInGameUI->isCameraRotatingRight(), ("Setting rotate camera right, but it's already set!"));
TheInGameUI->setCameraRotateRight( true );
Expand All @@ -3279,6 +3283,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
DEBUG_ASSERTCRASH(TheInGameUI->isCameraRotatingRight(), ("Clearing rotate camera right, but it's already clear!"));
TheInGameUI->setCameraRotateRight( false );
break;
case GameMessage::MSG_META_ALT_CAMERA_ROTATE_RIGHT:
if (TheTacticalView->isCameraMovementFinished())
TheTacticalView->rotateCamera(1.0f / 8.0f, 500);
break;
case GameMessage::MSG_META_BEGIN_CAMERA_ZOOM_IN:
DEBUG_ASSERTCRASH(!TheInGameUI->isCameraZoomingIn(), ("Setting zoom camera in, but it's already set!"));
TheInGameUI->setCameraZoomIn( true );
Expand Down
18 changes: 18 additions & 0 deletions Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,24 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
map->m_displayName = TheGameText->FETCH_OR_SUBSTITUTE("GUI:SelectNextIdleWorker", L"Next Idle Worker");
}
}
{
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_ALT_CAMERA_ROTATE_LEFT);
if (map->m_key == MK_NONE) {
map->m_key = MK_KP4;
map->m_transition = DOWN;
map->m_modState = CTRL;
map->m_usableIn = COMMANDUSABLE_GAME;
}
}
{
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_ALT_CAMERA_ROTATE_RIGHT);
if (map->m_key == MK_NONE) {
map->m_key = MK_KP6;
map->m_transition = DOWN;
map->m_modState = CTRL;
map->m_usableIn = COMMANDUSABLE_GAME;
}
}

#if defined(RTS_DEBUG)
{
Expand Down
2 changes: 2 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,10 @@ class GameMessage : public MemoryPoolObject

MSG_META_BEGIN_CAMERA_ROTATE_LEFT,
MSG_META_END_CAMERA_ROTATE_LEFT,
MSG_META_ALT_CAMERA_ROTATE_LEFT, ///< TheSuperHackers @feature Rotate camera in 45 degree increments
MSG_META_BEGIN_CAMERA_ROTATE_RIGHT,
MSG_META_END_CAMERA_ROTATE_RIGHT,
MSG_META_ALT_CAMERA_ROTATE_RIGHT, ///< TheSuperHackers @feature Rotate camera in 45 degree increments
MSG_META_BEGIN_CAMERA_ZOOM_IN,
MSG_META_END_CAMERA_ZOOM_IN,
MSG_META_BEGIN_CAMERA_ZOOM_OUT,
Expand Down
8 changes: 8 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3416,6 +3416,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
DEBUG_ASSERTCRASH(TheInGameUI->isCameraRotatingLeft(), ("Clearing rotate camera left, but it's already clear!"));
TheInGameUI->setCameraRotateLeft( false );
break;
case GameMessage::MSG_META_ALT_CAMERA_ROTATE_LEFT:
if (TheTacticalView->isCameraMovementFinished())
TheTacticalView->rotateCamera(-1.0f / 8.0f, 500, 100, 400);
break;
case GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_RIGHT:
DEBUG_ASSERTCRASH(!TheInGameUI->isCameraRotatingRight(), ("Setting rotate camera right, but it's already set!"));
TheInGameUI->setCameraRotateRight( true );
Expand All @@ -3424,6 +3428,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
DEBUG_ASSERTCRASH(TheInGameUI->isCameraRotatingRight(), ("Clearing rotate camera right, but it's already clear!"));
TheInGameUI->setCameraRotateRight( false );
break;
case GameMessage::MSG_META_ALT_CAMERA_ROTATE_RIGHT:
if (TheTacticalView->isCameraMovementFinished())
TheTacticalView->rotateCamera(1.0f / 8.0f, 500, 100, 400);
break;
case GameMessage::MSG_META_BEGIN_CAMERA_ZOOM_IN:
DEBUG_ASSERTCRASH(!TheInGameUI->isCameraZoomingIn(), ("Setting zoom camera in, but it's already set!"));
TheInGameUI->setCameraZoomIn( true );
Expand Down
18 changes: 18 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,24 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
map->m_displayName = TheGameText->FETCH_OR_SUBSTITUTE("GUI:SelectNextIdleWorker", L"Next Idle Worker");
}
}
{
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_ALT_CAMERA_ROTATE_LEFT);
if (map->m_key == MK_NONE) {
map->m_key = MK_KP4;
map->m_transition = DOWN;
map->m_modState = CTRL;
map->m_usableIn = COMMANDUSABLE_GAME;
}
}
{
MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_ALT_CAMERA_ROTATE_RIGHT);
if (map->m_key == MK_NONE) {
map->m_key = MK_KP6;
map->m_transition = DOWN;
map->m_modState = CTRL;
map->m_usableIn = COMMANDUSABLE_GAME;
}
}

#if defined(RTS_DEBUG)
{
Expand Down
Loading