Add missing collision functions and clean up #245
Merged
Conversation
This file contains 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
malleoz
force-pushed
the
add_other_coursecolmgr_functions
branch
from
c584084 to
944b8dc
Compare
vabold
requested changes
Mar 1, 2025
source/game/field/KColData.cc
Outdated
Comment on lines
589
to
596
| KCLTypeMask attrMask = KCL_ATTRIBUTE_TYPE_BIT(prism.attribute); | ||
| if (!(attrMask & m_typeMask)) { | ||
| return false; | ||
| } | ||
|
|
||
| if (movement && (attrMask & KCL_TYPE_DIRECTIONAL) && m_movement.dot(fnrm) < 0.0f) { | ||
| return false; | ||
| } |
There was a problem hiding this comment.
The flag checking can be moved to the top of the function for performance gains.
Suggested change
| KCLTypeMask attrMask = KCL_ATTRIBUTE_TYPE_BIT(prism.attribute); | |
| if (!(attrMask & m_typeMask)) { | |
| return false; | |
| } | |
| if (movement && (attrMask & KCL_TYPE_DIRECTIONAL) && m_movement.dot(fnrm) < 0.0f) { | |
| return false; | |
| } | |
| if (movement && m_movement.ps_dot(fnrm) > 0.0f) { | |
| return false; | |
| } |
There was a problem hiding this comment.
The one expr is dependent on fnrm, so I'll leave that one where it is
These will be required for ObjectDrivable and (mainly) ObjectKCL
malleoz
force-pushed
the
add_other_coursecolmgr_functions
branch
from
944b8dc to
5fe1f5a
Compare
vabold
approved these changes
Mar 1, 2025
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.
These will be required for ObjectDrivable and (mainly) ObjectKCL. Function signatures are standardized across all collision check funcs (some had float arg out-of-order, some had different variable names). Just like with spheres, I combined the two main collision check functions since they differ only by a few instructions.