Skip to content

refactor(view): Simplify code to set location for Replay Camera #2353

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 2 commits into from
Feb 26, 2026
Merged

refactor(view): Simplify code to set location for Replay Camera #2353

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
bf434ab
refactor(view): Simplify code to set location for Replay Camera
xezon Feb 25, 2026
64f8d56
Replicate in Generals
xezon Feb 26, 2026
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
15 changes: 6 additions & 9 deletions Core/GameEngine/Include/GameClient/View.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ class View : public Snapshot
virtual Real getPitch() { return m_pitch; } ///< Return current camera pitch
virtual void setAngleToDefault(); ///< Set the view angle back to default
virtual void setPitchToDefault(); ///< Set the view pitch back to default
virtual void getPosition(Coord3D *pos) { *pos=m_pos;} ///< Returns position camera is looking at (z will be zero)
void setPosition( const Coord3D *pos ) { m_pos = *pos; }
void getPosition(Coord3D *pos) { *pos = m_pos;} ///< Returns position camera is looking at (z will be zero)

virtual const Coord3D& get3DCameraPosition() const = 0; ///< Returns the actual camera position

Expand All @@ -205,14 +206,10 @@ class View : public Snapshot
virtual void getLocation ( ViewLocation *location ); ///< write the view's current location in to the view location object
virtual void setLocation ( const ViewLocation *location ); ///< set the view's current location from to the view location object


virtual void drawView() = 0; ///< Render the world visible in this view.
virtual void updateView() = 0; ///<called once per frame to determine the final camera and object transforms
virtual void stepView() = 0; ///< Update view for every fixed time step




virtual ObjectID getCameraLock() const { return m_cameraLock; }
virtual void setCameraLock(ObjectID id) { m_cameraLock = id; m_lockDist = 0.0f; m_lockType = LOCK_FOLLOW; }
virtual void snapToCameraLock() { m_snapImmediate = TRUE; }
Expand Down Expand Up @@ -241,14 +238,12 @@ class View : public Snapshot
virtual void xfer( Xfer *xfer );
virtual void loadPostProcess() { }

void setPosition( const Coord3D *pos ) { m_pos = *pos; }
const Coord3D *getPosition() const { return &m_pos; }

virtual View *prependViewToList( View *list ); ///< Prepend this view to the given list, return the new list
virtual View *getNextView() { return m_next; } ///< Return next view in the set


// **********************************************************************************************
protected:

View *m_next; ///< List links used by the Display class

Expand Down Expand Up @@ -310,7 +305,9 @@ class ViewLocation
{
m_valid = FALSE;
m_pos.zero();
m_angle = m_pitch = m_zoom = 0.0;
m_angle = 0.0f;
m_pitch = 0.0f;
m_zoom = 0.0f;
}

const Coord3D& getPosition() const { return m_pos; }
Expand Down
18 changes: 9 additions & 9 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1861,15 +1861,15 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
{
if (TheTacticalView->isCameraMovementFinished())
{
ViewLocation loc;
Coord3D pos;
Real pitch, angle, zoom;
pos = msg->getArgument( 0 )->location;
angle = msg->getArgument( 1 )->real;
pitch = msg->getArgument( 2 )->real;
zoom = msg->getArgument( 3 )->real;
loc.init(pos.x, pos.y, pos.z, angle, pitch, zoom);
TheTacticalView->setLocation( &loc );
const Coord3D pos = msg->getArgument( 0 )->location;
const Real angle = msg->getArgument( 1 )->real;
const Real pitch = msg->getArgument( 2 )->real;
const Real zoom = msg->getArgument( 3 )->real;

TheTacticalView->setPosition(&pos);
TheTacticalView->setAngle(angle);
TheTacticalView->setPitch(pitch);
TheTacticalView->setZoom(zoom);

// TheSuperHackers @fix xezon 18/09/2025 Lock the new location to avoid user input from changing the camera in this frame.
TheTacticalView->lockViewUntilFrame( getFrame() + 1 );
Expand Down
18 changes: 9 additions & 9 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1889,15 +1889,15 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
{
if (TheTacticalView->isCameraMovementFinished())
{
ViewLocation loc;
Coord3D pos;
Real pitch, angle, zoom;
pos = msg->getArgument( 0 )->location;
angle = msg->getArgument( 1 )->real;
pitch = msg->getArgument( 2 )->real;
zoom = msg->getArgument( 3 )->real;
loc.init(pos.x, pos.y, pos.z, angle, pitch, zoom);
TheTacticalView->setLocation( &loc );
const Coord3D pos = msg->getArgument( 0 )->location;
const Real angle = msg->getArgument( 1 )->real;
const Real pitch = msg->getArgument( 2 )->real;
const Real zoom = msg->getArgument( 3 )->real;

TheTacticalView->setPosition(&pos);
TheTacticalView->setAngle(angle);
TheTacticalView->setPitch(pitch);
TheTacticalView->setZoom(zoom);
Comment thread
xezon marked this conversation as resolved.

// TheSuperHackers @fix xezon 18/09/2025 Lock the new location to avoid user input from changing the camera in this frame.
TheTacticalView->lockViewUntilFrame( getFrame() + 1 );
Expand Down
Loading