unify(view): Merge and move View, W3DView, ParabolicEase, CameraShakeSystem to Core#1904
Merged
xezon merged 3 commits intoTheSuperHackers:mainfrom Nov 29, 2025
Merged
Conversation
xezon
added
Gen
xezon
force-pushed
the
xezon/unify-w3dview
branch
2 times, most recently
from
55e87e7 to
b216d5b
Compare
Author
|
Fixed compile error. |
xezon
force-pushed
the
xezon/unify-w3dview
branch
from
b216d5b to
911ece7
Compare
Author
|
Rebased on main. |
Skyaero42
approved these changes
Nov 26, 2025
| #if RTS_GENERALS | ||
| m_rcInfo.angle.endAngle = m_angle + angle; | ||
| #else | ||
| m_rcInfo.angle.endAngle = angle; |
There was a problem hiding this comment.
ZH code seems to be the correct one here, angle is absolute here, not a delta.
Mauller
reviewed
Nov 26, 2025
Mauller
requested changes
Nov 26, 2025
Mauller
left a comment
Mauller
left a comment
There was a problem hiding this comment.
Will take a look at it again tomorrow just to double check, but the W3DShaderManager needs merging with this change due to the changes in the shader structs and their use within the view code.
xezon
force-pushed
the
xezon/unify-w3dview
branch
2 times, most recently
from
f33c8ab to
4b1ae9c
Compare
Author
|
Compile error fixed. |
xezon
force-pushed
the
xezon/unify-w3dview
branch
from
4b1ae9c to
7fe65e2
Compare
Author
|
The individual commits compile successfully. |
Mauller
approved these changes
Nov 29, 2025
Mauller
left a comment
Mauller
left a comment
There was a problem hiding this comment.
Looks good, kind of annoying there are data issues caused by small differences in some of the camera code between both games.
xezon
added a commit
that referenced
this pull request
Nov 29, 2025
xezon
added a commit
that referenced
this pull request
Nov 29, 2025
fbraz3
pushed a commit
to fbraz3/GeneralsX
that referenced
this pull request
Feb 23, 2026
fbraz3
pushed a commit
to fbraz3/GeneralsX
that referenced
this pull request
Feb 23, 2026
fbraz3
pushed a commit
to fbraz3/GeneralsX
that referenced
this pull request
Feb 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge with Rebase
This change merges and moves View, W3DView, ParabolicEase, CameraShakeSystem to Core.
There are 3 camera changes in Zero Hour which change the way Generals cut scenes look. The relevant Generals logic is preserved with conditional compile.
Generals inherits the following changes