Skip to content

feat(controlbar): Implement full viewport support for 'Control Bar Pro' Addons #1412

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 2 commits into from
Aug 3, 2025
Merged

feat(controlbar): Implement full viewport support for 'Control Bar Pro' Addons #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a357313
feat(controlbar): Implement full viewport support for 'Control Bar Pr…
xezon Aug 3, 2025
0cdcf70
Replicate in Generals
xezon Aug 3, 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/GlobalData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class GlobalData : public SubsystemInterface
Bool setTimeOfDay( TimeOfDay tod ); ///< Use this function to set the Time of day;

static void parseGameDataDefinition( INI* ini );
void parseCustomDefinition();

//-----------------------------------------------------------------------------------------------
struct TerrainLighting
Expand Down Expand Up @@ -178,6 +179,7 @@ class GlobalData : public SubsystemInterface
Real m_skyBoxPositionZ;
Real m_drawSkyBox;
Real m_skyBoxScale;
Real m_viewportHeightScale; // The height scale of the tactical view ranging 0..1. Used to hide the world behind the Control Bar.
Real m_cameraPitch;
Real m_cameraYaw;
Real m_cameraHeight;
Expand Down
4 changes: 3 additions & 1 deletion Generals/Code/GameEngine/Include/GameClient/ControlBar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,9 @@ class ControlBar : public SubsystemInterface
void showSpecialPowerShortcut( void );
void hideSpecialPowerShortcut( void );
void animateSpecialPowerShortcut( Bool isOn );


void setFullViewportHeight();
void setScaledViewportHeight();

/// set the control bar to the proper scheme based off a player template that's passed in
ControlBarSchemeManager *getControlBarSchemeManager( void ) { return m_controlBarSchemeManager; }
Expand Down
12 changes: 12 additions & 0 deletions Generals/Code/GameEngine/Source/Common/CommandLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,15 @@ Int parseUseWaveEditor(char *args[], int num)
return 1;
}

//=============================================================================
//=============================================================================
Int parseFullViewport(char *args[], int num)
{
TheWritableGlobalData->m_viewportHeightScale = 1.0f;

return 1;
}

#if defined(RTS_DEBUG)

//=============================================================================
Expand Down Expand Up @@ -1171,6 +1180,9 @@ static CommandLineParam paramsForEngineInit[] =
{ "-quickstart", parseQuickStart },
{ "-useWaveEditor", parseUseWaveEditor },

// TheSuperHackers @feature xezon 03/08/2025 Force full viewport for 'Control Bar Pro' Addons like GenTool did it.
{ "-forcefullviewport", parseFullViewport },

#if defined(RTS_DEBUG)
{ "-noaudio", parseNoAudio },
{ "-map", parseMapName },
Expand Down
3 changes: 2 additions & 1 deletion Generals/Code/GameEngine/Source/Common/GameEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,8 @@ void GameEngine::init()

DEBUG_ASSERTCRASH(TheWritableGlobalData,("TheWritableGlobalData expected to be created"));
initSubsystem(TheWritableGlobalData, "TheWritableGlobalData", TheWritableGlobalData, &xferCRC, "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini");

TheWritableGlobalData->parseCustomDefinition();

// TheSuperHackers @bugfix helmutbuhler 14/04/2025
// Pump messages during startup to ensure that the application window is correctly
// positioned on slower computers and in debug builds by a later call to SetWindowPos.
Expand Down
19 changes: 19 additions & 0 deletions Generals/Code/GameEngine/Source/Common/GlobalData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
{ "SkyBoxPositionZ", INI::parseReal, NULL, offsetof( GlobalData, m_skyBoxPositionZ ) },
{ "SkyBoxScale", INI::parseReal, NULL, offsetof( GlobalData, m_skyBoxScale ) },
{ "DrawSkyBox", INI::parseBool, NULL, offsetof( GlobalData, m_drawSkyBox ) },
{ "ViewportHeightScale", INI::parseReal, NULL, offsetof( GlobalData, m_viewportHeightScale ) },
{ "CameraPitch", INI::parseReal, NULL, offsetof( GlobalData, m_cameraPitch ) },
{ "CameraYaw", INI::parseReal, NULL, offsetof( GlobalData, m_cameraYaw ) },
{ "CameraHeight", INI::parseReal, NULL, offsetof( GlobalData, m_cameraHeight ) },
Expand Down Expand Up @@ -824,6 +825,8 @@ GlobalData::GlobalData()

m_particleEdit = FALSE;

m_viewportHeightScale = 0.80f; // Default value for the original Control Bar.

m_cameraPitch = 0.0f;
m_cameraYaw = 0.0f;
m_cameraHeight = 0.0f;
Expand Down Expand Up @@ -1193,6 +1196,22 @@ void GlobalData::parseGameDataDefinition( INI* ini )
TheWritableGlobalData->m_yResolution = yres;
}

void GlobalData::parseCustomDefinition()
{
{
// TheSuperHackers @feature xezon 03/08/2025 Force full viewport for 'Control Bar Pro' Addons like GenTool did it.
File* file = TheFileSystem->openFile("GenTool/fullviewport.dat", File::READ | File::BINARY);
Copy link

@Mauller Mauller Aug 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does control bar pro put this file into a gentool folder?

Copy link
Author

@xezon xezon Aug 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It is inside one of the .big archives.

if (file != NULL)
{
Char value = '0';
file->read(&value, 1);
if (value != '0')
{
m_viewportHeightScale = 1.0f;
}
}
}
}

UnsignedInt GlobalData::generateExeCRC()
{
Expand Down
16 changes: 13 additions & 3 deletions Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3008,7 +3008,7 @@ void ControlBar::setDefaultControlBarConfig( void )
// m_controlBarSchemeManager->setControlBarSchemeByPlayerTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate(), FALSE);
// }
m_currentControlBarStage = CONTROL_BAR_STAGE_DEFAULT;
TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f));
setScaledViewportHeight();
m_contextParent[ CP_MASTER ]->winSetPosition(m_defaultControlBarPosition.x, m_defaultControlBarPosition.y);
m_contextParent[ CP_MASTER ]->winHide(FALSE);
repopulateBuildTooltipLayout();
Expand All @@ -3025,7 +3025,7 @@ void ControlBar::setSquishedControlBarConfig( void )

// m_controlBarResizer->sizeWindowsAlt();
repopulateBuildTooltipLayout();
TheTacticalView->setHeight((Int)(TheDisplay->getHeight()));
setFullViewportHeight();
m_controlBarSchemeManager->setControlBarSchemeByPlayerTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate(), TRUE);
}

Expand All @@ -3041,7 +3041,7 @@ void ControlBar::setLowControlBarConfig( void )
ICoord2D pos;
pos.x = m_defaultControlBarPosition.x;
pos.y = TheDisplay->getHeight() - .1 * TheDisplay->getHeight();
TheTacticalView->setHeight((Int)(TheDisplay->getHeight()));
setFullViewportHeight();
m_contextParent[ CP_MASTER ]->winSetPosition(pos.x, pos.y);
m_contextParent[ CP_MASTER ]->winHide(FALSE);
setUpDownImages();
Expand Down Expand Up @@ -3506,3 +3506,13 @@ void ControlBar::hideSpecialPowerShortcut( void )
m_specialPowerShortcutParent->winHide(TRUE);

}

void ControlBar::setFullViewportHeight()
{
TheTacticalView->setHeight(TheDisplay->getHeight());
}

void ControlBar::setScaledViewportHeight()
{
TheTacticalView->setHeight(TheDisplay->getHeight() * TheGlobalData->m_viewportHeightScale);
}
16 changes: 8 additions & 8 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ extern void toggleReplayControls( void );
//-------------------------------------------------------------------------------------------------
void ShowControlBar( Bool immediate )
{
if (!TheWindowManager || !TheControlBar || !TheTacticalView)
if (!TheWindowManager || !TheControlBar)
return;

showReplayControls();
Expand All @@ -514,7 +514,7 @@ void ShowControlBar( Bool immediate )
if (window)
{
TheControlBar->switchControlBarStage(CONTROL_BAR_STAGE_DEFAULT);
TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f));
TheControlBar->setScaledViewportHeight();

if (TheControlBar->m_animateWindowManager && !immediate)
{
Expand All @@ -536,7 +536,7 @@ void ShowControlBar( Bool immediate )
//-------------------------------------------------------------------------------------------------
void HideControlBar( Bool immediate )
{
if (!TheWindowManager || !TheControlBar || !TheTacticalView)
if (!TheWindowManager || !TheControlBar)
return;

hideReplayControls();
Expand All @@ -549,9 +549,9 @@ void HideControlBar( Bool immediate )
if (window)
{
#ifdef SLIDE_LETTERBOX
TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f));
TheControlBar->setScaledViewportHeight();
#else
TheTacticalView->setHeight(TheDisplay->getHeight());
TheControlBar->setFullViewportHeight();
#endif
if (immediate)
{
Expand All @@ -574,7 +574,7 @@ void HideControlBar( Bool immediate )
//-------------------------------------------------------------------------------------------------
void ToggleControlBar( Bool immediate )
{
if (!TheWindowManager || !TheControlBar || !TheTacticalView)
if (!TheWindowManager || !TheControlBar)
return;

toggleReplayControls();
Expand All @@ -589,7 +589,7 @@ void ToggleControlBar( Bool immediate )
TheControlBar->showSpecialPowerShortcut();

//now hidden, we're making it visible again so shrink viewport under the window
TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f));
TheControlBar->setScaledViewportHeight();
window->winHide(FALSE);
TheControlBar->switchControlBarStage(CONTROL_BAR_STAGE_DEFAULT);

Expand All @@ -604,7 +604,7 @@ void ToggleControlBar( Bool immediate )
else
{
TheControlBar->hideSpecialPowerShortcut();
TheTacticalView->setHeight(TheDisplay->getHeight());
TheControlBar->setFullViewportHeight();
window->winHide(TRUE);
}
}
Expand Down
7 changes: 3 additions & 4 deletions Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,10 +1166,9 @@ void InGameUI::init( void )
TheTacticalView->init();
TheDisplay->attachView( TheTacticalView );

// make the tactical display the full screen width for now
TheTacticalView->setWidth( TheDisplay->getWidth());
// make the tactical display 0.76 of full screen so no drawing under GUI.
TheTacticalView->setHeight( TheDisplay->getHeight() * 0.77f);
// make the tactical display the full screen width and height
TheTacticalView->setWidth( TheDisplay->getWidth() );
TheTacticalView->setHeight( TheDisplay->getHeight() );
}
TheTacticalView->setDefaultView(0.0f, 0.0f, 1.0f);

Expand Down
2 changes: 2 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class GlobalData : public SubsystemInterface
Bool setTimeOfDay( TimeOfDay tod ); ///< Use this function to set the Time of day;

static void parseGameDataDefinition( INI* ini );
void parseCustomDefinition();

//-----------------------------------------------------------------------------------------------
struct TerrainLighting
Expand Down Expand Up @@ -184,6 +185,7 @@ class GlobalData : public SubsystemInterface
Real m_skyBoxPositionZ;
Real m_drawSkyBox;
Real m_skyBoxScale;
Real m_viewportHeightScale; // The height scale of the tactical view ranging 0..1. Used to hide the world behind the Control Bar.
Real m_cameraPitch;
Real m_cameraYaw;
Real m_cameraHeight;
Expand Down
4 changes: 3 additions & 1 deletion GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,9 @@ class ControlBar : public SubsystemInterface
void showSpecialPowerShortcut( void );
void hideSpecialPowerShortcut( void );
void animateSpecialPowerShortcut( Bool isOn );


void setFullViewportHeight();
void setScaledViewportHeight();

/// set the control bar to the proper scheme based off a player template that's passed in
ControlBarSchemeManager *getControlBarSchemeManager( void ) { return m_controlBarSchemeManager; }
Expand Down
12 changes: 12 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,15 @@ Int parseUseWaveEditor(char *args[], int num)
return 1;
}

//=============================================================================
//=============================================================================
Int parseFullViewport(char *args[], int num)
{
TheWritableGlobalData->m_viewportHeightScale = 1.0f;

return 1;
}

#if defined(RTS_DEBUG)

//=============================================================================
Expand Down Expand Up @@ -1171,6 +1180,9 @@ static CommandLineParam paramsForEngineInit[] =
{ "-quickstart", parseQuickStart },
{ "-useWaveEditor", parseUseWaveEditor },

// TheSuperHackers @feature xezon 03/08/2025 Force full viewport for 'Control Bar Pro' Addons like GenTool did it.
{ "-forcefullviewport", parseFullViewport },

#if defined(RTS_DEBUG)
{ "-noaudio", parseNoAudio },
{ "-map", parseMapName },
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ void GameEngine::init()

DEBUG_ASSERTCRASH(TheWritableGlobalData,("TheWritableGlobalData expected to be created"));
initSubsystem(TheWritableGlobalData, "TheWritableGlobalData", TheWritableGlobalData, &xferCRC, "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini");
TheWritableGlobalData->parseCustomDefinition();


#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
Expand Down
19 changes: 19 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
{ "SkyBoxPositionZ", INI::parseReal, NULL, offsetof( GlobalData, m_skyBoxPositionZ ) },
{ "SkyBoxScale", INI::parseReal, NULL, offsetof( GlobalData, m_skyBoxScale ) },
{ "DrawSkyBox", INI::parseBool, NULL, offsetof( GlobalData, m_drawSkyBox ) },
{ "ViewportHeightScale", INI::parseReal, NULL, offsetof( GlobalData, m_viewportHeightScale ) },
{ "CameraPitch", INI::parseReal, NULL, offsetof( GlobalData, m_cameraPitch ) },
{ "CameraYaw", INI::parseReal, NULL, offsetof( GlobalData, m_cameraYaw ) },
{ "CameraHeight", INI::parseReal, NULL, offsetof( GlobalData, m_cameraHeight ) },
Expand Down Expand Up @@ -830,6 +831,8 @@ GlobalData::GlobalData()

m_particleEdit = FALSE;

m_viewportHeightScale = 0.80f; // Default value for the original Control Bar.

m_cameraPitch = 0.0f;
m_cameraYaw = 0.0f;
m_cameraHeight = 0.0f;
Expand Down Expand Up @@ -1221,6 +1224,22 @@ void GlobalData::parseGameDataDefinition( INI* ini )
TheWritableGlobalData->m_yResolution = yres;
}

void GlobalData::parseCustomDefinition()
{
{
// TheSuperHackers @feature xezon 03/08/2025 Force full viewport for 'Control Bar Pro' Addons like GenTool did it.
File* file = TheFileSystem->openFile("GenTool/fullviewport.dat", File::READ | File::BINARY);
if (file != NULL)
{
Char value = '0';
file->read(&value, 1);
if (value != '0')
{
m_viewportHeightScale = 1.0f;
}
}
}
}

UnsignedInt GlobalData::generateExeCRC()
{
Expand Down
16 changes: 13 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3031,7 +3031,7 @@ void ControlBar::setDefaultControlBarConfig( void )
// m_controlBarSchemeManager->setControlBarSchemeByPlayerTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate(), FALSE);
// }
m_currentControlBarStage = CONTROL_BAR_STAGE_DEFAULT;
TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f));
setScaledViewportHeight();
m_contextParent[ CP_MASTER ]->winSetPosition(m_defaultControlBarPosition.x, m_defaultControlBarPosition.y);
m_contextParent[ CP_MASTER ]->winHide(FALSE);
repopulateBuildTooltipLayout();
Expand All @@ -3048,7 +3048,7 @@ void ControlBar::setSquishedControlBarConfig( void )

// m_controlBarResizer->sizeWindowsAlt();
repopulateBuildTooltipLayout();
TheTacticalView->setHeight((Int)(TheDisplay->getHeight()));
setFullViewportHeight();
m_controlBarSchemeManager->setControlBarSchemeByPlayerTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate(), TRUE);
}

Expand All @@ -3064,7 +3064,7 @@ void ControlBar::setLowControlBarConfig( void )
ICoord2D pos;
pos.x = m_defaultControlBarPosition.x;
pos.y = TheDisplay->getHeight() - .1 * TheDisplay->getHeight();
TheTacticalView->setHeight((Int)(TheDisplay->getHeight()));
setFullViewportHeight();
m_contextParent[ CP_MASTER ]->winSetPosition(pos.x, pos.y);
m_contextParent[ CP_MASTER ]->winHide(FALSE);
setUpDownImages();
Expand Down Expand Up @@ -3770,3 +3770,13 @@ void ControlBar::hideSpecialPowerShortcut( void )
m_specialPowerShortcutParent->winHide(TRUE);

}

void ControlBar::setFullViewportHeight()
{
TheTacticalView->setHeight(TheDisplay->getHeight());
}

void ControlBar::setScaledViewportHeight()
{
TheTacticalView->setHeight(TheDisplay->getHeight() * TheGlobalData->m_viewportHeightScale);
}
Loading
Loading