Skip to content

fix(lookat): Fix mouse anchor and direction issue for camera pitch #2421

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
xezon merged 1 commit into from
Mar 8, 2026
Merged

fix(lookat): Fix mouse anchor and direction issue for camera pitch #2421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@ void W3DView::buildCameraPosition( Vector3& sourcePos, Vector3& targetPos )
// construct a matrix to rotate around the up vector by the given angle
const Matrix3D angleTransform( Vector3( 0.0f, 0.0f, 1.0f ), angle );

// construct a matrix to rotate around the horizontal vector by the given angle
const Matrix3D pitchTransform( Vector3( 1.0f, 0.0f, 0.0f ), pitch );
// construct a matrix to rotate around the left vector by the given angle
const Matrix3D pitchTransform( Vector3( -1.0f, 0.0f, 0.0f ), pitch );

// rotate camera position (pitch, then angle)
#ifdef ALLOW_TEMPORARIES
Expand Down
5 changes: 4 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
{
constexpr const Real Scale = 0.01f;
const Real angle = Scale * (m_currentPos.y - m_anchor.y);
TheTacticalView->userSetPitch( TheTacticalView->getPitch() + angle );
TheTacticalView->userSetPitch( TheTacticalView->getPitch() - angle );
m_anchor = msg->getArgument( 0 )->pixel;
}

Expand Down Expand Up @@ -547,6 +547,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
{
DEBUG_ASSERTCRASH(!m_isPitching, ("hmm, mismatched m_isPitching"));
m_isPitching = true;
m_anchor = m_currentPos;
disp = DESTROY_MESSAGE;
break;
}
Expand Down Expand Up @@ -602,6 +603,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
//DEBUG_ASSERTCRASH(!m_isChangingFOV, ("hmm, mismatched m_isChangingFOV"));
m_isChangingFOV = true;
m_anchor = m_currentPos;
disp = DESTROY_MESSAGE;
break;
}
#endif // #if defined(RTS_DEBUG)
Expand All @@ -612,6 +614,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
{
// DEBUG_ASSERTCRASH(m_isChangingFOV, ("hmm, mismatched m_isChangingFOV"));
m_isChangingFOV = false;
disp = DESTROY_MESSAGE;
break;
}
#endif // #if defined(RTS_DEBUG)
Expand Down
Loading