github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-26 16:15:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'actor-accessibility-experiments' of https://www.github.com/caturria/shipwright into actor-accessibility-experiments

Browse source
This commit is contained in:
Ryan 2023-08-25 21:16:44 -04:00
commit e5a6b50246
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soh/soh/Enhancements/audio/AudioEditor.cpp
View file

@ -27,7 +27,7 @@ s8 reverbAdd = 0;
#define SEQ_COUNT_BGM_EVENT 17 #define SEQ_COUNT_BGM_EVENT 17
#define SEQ_COUNT_INSTRUMENT 6 #define SEQ_COUNT_INSTRUMENT 6
#define SEQ_COUNT_SFX 57 #define SEQ_COUNT_SFX 57
#define SEQ_COUNT_VOICE 78 #define SEQ_COUNT_VOICE 107
size_t AuthenticCountBySequenceType(SeqType type) { size_t AuthenticCountBySequenceType(SeqType type) {
switch (type) { switch (type) {
@ -220,7 +220,7 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) {
} }
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::PushItemWidth(-FLT_MIN); ImGui::PushItemWidth(-FLT_MIN);
DrawPreviewButton((type == SEQ_SFX || type == SEQ_INSTRUMENT) ? defaultValue : currentValue, seqData.sfxKey, type); DrawPreviewButton((type == SEQ_SFX || type == SEQ_VOICE || type == SEQ_INSTRUMENT) ? defaultValue : currentValue, seqData.sfxKey, type);
ImGui::SameLine(); ImGui::SameLine();
ImGui::PushItemWidth(-FLT_MIN); ImGui::PushItemWidth(-FLT_MIN);
if (ImGui::Button(resetButton.c_str())) { if (ImGui::Button(resetButton.c_str())) {
@ -273,7 +273,7 @@ std::string GetSequenceTypeName(SeqType type) {
case SEQ_SFX: case SEQ_SFX:
return "SFX"; return "SFX";
case SEQ_VOICE: case SEQ_VOICE:
return "VOICE"; return "Voice";
case SEQ_INSTRUMENT: case SEQ_INSTRUMENT:
return "Instrument"; return "Instrument";
case SEQ_BGM_CUSTOM: case SEQ_BGM_CUSTOM:

4
soh/soh/Enhancements/controls/GameControlEditor.cpp
View file

@ -237,6 +237,10 @@ namespace GameControlEditor {
DrawHelpIcon("Inverts the Camera X Axis in:\n-First-Person/C-Up view\n-Weapon Aiming"); DrawHelpIcon("Inverts the Camera X Axis in:\n-First-Person/C-Up view\n-Weapon Aiming");
UIWidgets::PaddedEnhancementCheckbox("Invert Aiming Y Axis", "gInvertAimingYAxis", true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true); UIWidgets::PaddedEnhancementCheckbox("Invert Aiming Y Axis", "gInvertAimingYAxis", true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true);
DrawHelpIcon("Inverts the Camera Y Axis in:\n-First-Person/C-Up view\n-Weapon Aiming"); DrawHelpIcon("Inverts the Camera Y Axis in:\n-First-Person/C-Up view\n-Weapon Aiming");
UIWidgets::PaddedEnhancementCheckbox("Invert Shield Aiming Y Axis", "gInvertShieldAimingYAxis", true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true);
DrawHelpIcon("Inverts the Shield Aiming Y Axis");
UIWidgets::PaddedEnhancementCheckbox("Invert Shield Aiming X Axis", "gInvertShieldAimingXAxis");
DrawHelpIcon("Inverts the Shield Aiming X Axis");
UIWidgets::PaddedEnhancementCheckbox("Disable Auto-Centering in First-Person View", "gDisableAutoCenterViewFirstPerson"); UIWidgets::PaddedEnhancementCheckbox("Disable Auto-Centering in First-Person View", "gDisableAutoCenterViewFirstPerson");
DrawHelpIcon("Prevents the C-Up view from auto-centering, allowing for Gyro Aiming"); DrawHelpIcon("Prevents the C-Up view from auto-centering, allowing for Gyro Aiming");
if (UIWidgets::PaddedEnhancementCheckbox("Enable Custom Aiming/First-Person sensitivity", "gEnableFirstPersonSensitivity", true, false)) { if (UIWidgets::PaddedEnhancementCheckbox("Enable Custom Aiming/First-Person sensitivity", "gEnableFirstPersonSensitivity", true, false)) {

4
soh/src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -8185,8 +8185,8 @@ void func_80843188(Player* this, PlayState* play) {
func_8083721C(this); func_8083721C(this);
if (this->unk_850 != 0) { if (this->unk_850 != 0) {
sp54 = sControlInput->rel.stick_y * 100; sp54 = sControlInput->rel.stick_y * 100 * (CVarGetInteger("gInvertShieldAimingYAxis", 1) ? 1 : -1);
sp50 = sControlInput->rel.stick_x * (CVarGetInteger("gMirroredWorld", 0) ? 120 : -120); sp50 = sControlInput->rel.stick_x * (CVarGetInteger("gMirroredWorld", 0) ? 120 : -120) * (CVarGetInteger("gInvertShieldAimingXAxis", 0) ? -1 : 1);
sp4E = this->actor.shape.rot.y - Camera_GetInputDirYaw(GET_ACTIVE_CAM(play)); sp4E = this->actor.shape.rot.y - Camera_GetInputDirYaw(GET_ACTIVE_CAM(play));
sp40 = Math_CosS(sp4E); sp40 = Math_CosS(sp4E);