forked from electronicarts/CnC_Generals_Zero_Hour
-
Notifications
You must be signed in to change notification settings - Fork 62
[GEN] Backport collision test related changes and fixes in WWMath from Zero Hour #772
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.
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
Conversation
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
… from Zero Hour (#772)
…ox-AABox collision from Zero Hour (#772)
…ute_contact_normal from Zero Hour (#772)
…function from Zero Hour (#772)
…Collide for OBBox-Tri collision from Zero Hour (#772)
8156d8e
to
3e55f5c
Compare
roossienb
approved these changes
Apr 28, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Checked that
colmathaabtri.cpp
,colmathobbob.cpp
andcolmathobbtri.cpp
are not used in Generals- CardinalSpline3DClass::Update_Tangents() is never used.
- CollisionMath::Collide() in
colmathaabox.cpp
is never used. - Tested it against the Skirmish 1 replay and had no issues.
Changes in this PR have no effect on Generals and can be safely merged.
tomsons26
approved these changes
Apr 28, 2025
xezon
added a commit
that referenced
this pull request
Apr 28, 2025
…ox-AABox collision from Zero Hour (#772)
xezon
added a commit
that referenced
this pull request
Apr 28, 2025
…ute_contact_normal from Zero Hour (#772)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 unifies the remaining code of WWMath.
Generals inherits the following changes:
As far as I could tell, the collision math changes in colmathaabox, colmathaabtri, colmathobbtri are never called in Zero Hour (should have checked Generals but it is probably the same). So these math changes are probably inconsequential. If there were actual game logic relevant collisions using this code, it could incur behaviour changes.
Regarding CollisionContext, there appears to be a relevant comment nearby:
The math changes are split into separate commits to make testing of older changes easier if we ever wanted to revisit a particular change.