SOCD revamp #57
Merged
SOCD revamp #57
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
socd_type is no longer a required parameter of InputMode. Instead, a SocdType is included as part of each SocdPair, allowing SOCD resolution method to be defined per-axis without the need to override HandleSocd(). New SOCD resolution methods SOCD_DIR1_PRIORITY and SOCD_DIR2_PRIORITY have been added, which was made possible by the above change. These would previously not have been useful, without the ability to define SocdType per SocdPair. The constructor of FgcMode now accepts two parameters, horizontal_socd and vertical_socd, which can be used to set the SOCD resolution method for the horizontal and vertical axes separately. The default vertical SOCD resolution for FgcMode is now neutral, due to this being a requirement in some rulesets. This can easily be changed by passing socd::SOCD_DIR2_PRIORITY as the second argument to the constructor in mode_selection.hpp.
avahe-kellenberger
pushed a commit
to avahe-kellenberger/HayBox
that referenced
this pull request
Aug 11, 2023
* feat: SOCD cleaning rework socd_type is no longer a required parameter of InputMode. Instead, a SocdType is included as part of each SocdPair, allowing SOCD resolution method to be defined per-axis without the need to override HandleSocd(). New SOCD resolution methods SOCD_DIR1_PRIORITY and SOCD_DIR2_PRIORITY have been added, which was made possible by the above change. These would previously not have been useful, without the ability to define SocdType per SocdPair. The constructor of FgcMode now accepts two parameters, horizontal_socd and vertical_socd, which can be used to set the SOCD resolution method for the horizontal and vertical axes separately. The default vertical SOCD resolution for FgcMode is now neutral, due to this being a requirement in some rulesets. This can easily be changed by passing socd::SOCD_DIR2_PRIORITY as the second argument to the constructor in mode_selection.hpp. * fix: correct function names
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.
socd_typeis no longer a required parameter ofInputMode(). Instead, aSocdTypeis included as part of eachSocdPair, allowing SOCD resolution method to be defined per-axis without the need to overrideHandleSocd().New
SOCDresolution methodsSOCD_DIR1_PRIORITYandSOCD_DIR2_PRIORITYhave been added, which was made possible by the above change. These would previously not have been useful, without the ability to defineSocdTypeperSocdPair.The constructor of
FgcModenow accepts two parameters,horizontal_socdandvertical_socd, which can be used to set the SOCD resolution method for the horizontal and vertical axes separately.The default vertical SOCD resolution for
FgcModeis nowSOCD_NEUTRAL, due to this being a requirement in some rulesets. This can easily be changed by passingsocd::SOCD_DIR2_PRIORITYas the second argument to the constructor insrc/config/mode_selection.hpp.