Skip to content

bugfix(view): Fix camera terrain height adjustment in Replay playback #1597

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 3 commits into from
Sep 20, 2025
Merged

bugfix(view): Fix camera terrain height adjustment in Replay playback #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
583b5b1
bugfix(view): Fix camera terrain height adjustment in Replay playback
xezon Sep 18, 2025
7cbfb03
Replicate in Generals
xezon Sep 20, 2025
eec7334
Also add comments for the prior camera zoom speed decoupling
xezon Sep 20, 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
6 changes: 5 additions & 1 deletion Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,14 +1178,18 @@ void W3DView::update(void)
* scrolling), the zoom will move toward matching the desired height.
*/
// TheSuperHackers @tweak Can now also zoom when the game is paused.
// TheSuperHackers @tweak The camera zoom speed is now decoupled from the render update.
// TheSuperHackers @bugfix The camera terrain height adjustment now also works in replay playback.

m_terrainHeightUnderCamera = getHeightAroundPos(m_pos.x, m_pos.y);
m_currentHeightAboveGround = m_cameraOffset.z * m_zoom - m_terrainHeightUnderCamera;

if (TheTerrainLogic && TheGlobalData && TheInGameUI && m_okToAdjustHeight)
{
Real desiredHeight = (m_terrainHeightUnderCamera + m_heightAboveGround);
Real desiredZoom = desiredHeight / m_cameraOffset.z;

if (didScriptedMovement || (TheGameLogic->isInReplayGame() && TheGlobalData->m_useCameraInReplay))
if (didScriptedMovement)
{
// if we are in a scripted camera movement, take its height above ground as our desired height.
m_heightAboveGround = m_currentHeightAboveGround;
Expand Down
6 changes: 5 additions & 1 deletion GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,14 +1327,18 @@ void W3DView::update(void)
* scrolling), the zoom will move toward matching the desired height.
*/
// TheSuperHackers @tweak Can now also zoom when the game is paused.
// TheSuperHackers @tweak The camera zoom speed is now decoupled from the render update.
// TheSuperHackers @bugfix The camera terrain height adjustment now also works in replay playback.

m_terrainHeightUnderCamera = getHeightAroundPos(m_pos.x, m_pos.y);
m_currentHeightAboveGround = m_cameraOffset.z * m_zoom - m_terrainHeightUnderCamera;

if (TheTerrainLogic && TheGlobalData && TheInGameUI && m_okToAdjustHeight)
{
Real desiredHeight = (m_terrainHeightUnderCamera + m_heightAboveGround);
Real desiredZoom = desiredHeight / m_cameraOffset.z;

if (didScriptedMovement || (TheGameLogic->isInReplayGame() && TheGlobalData->m_useCameraInReplay))
if (didScriptedMovement)
{
// if we are in a scripted camera movement, take its height above ground as our desired height.
m_heightAboveGround = m_currentHeightAboveGround;
Expand Down
Loading