PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 13:35:11 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' of https://github.com/HarbourMasters/Starship
Some checks are pending
GenerateBuilds / generate-port-otr (push) Waiting to run
Details
GenerateBuilds / build-windows (push) Blocked by required conditions
Details
GenerateBuilds / build-macos (push) Blocked by required conditions
Details
GenerateBuilds / build-linux (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Sonic Dreamcaster 2024-12-31 05:27:45 -03:00
commit b931e51517
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/fox_play.c
View File

@ -3699,7 +3699,8 @@ void Player_MoveArwing360(Player* player) {
gPlayerTurnStickMod = 0.68f; gPlayerTurnStickMod = 0.68f;
sp7C = -gInputPress->stick_x; sp7C = -gInputPress->stick_x;
sp78 = gInputPress->stick_y;
sp78 = gInputPress->stick_y * (CVarGetInteger("gInvertYAxis", 0) == 1 ? -1 : 1);
Math_SmoothStepToAngle(&player->aerobaticPitch, 0.0f, 0.1f, 5.0f, 0.01f); Math_SmoothStepToAngle(&player->aerobaticPitch, 0.0f, 0.1f, 5.0f, 0.01f);
Matrix_RotateZ(gCalcMatrix, -player->zRotBank * M_DTOR, MTXF_NEW); Matrix_RotateZ(gCalcMatrix, -player->zRotBank * M_DTOR, MTXF_NEW);
@ -3945,7 +3946,7 @@ void Player_MoveArwingOnRails(Player* player) {
} }
stickX = -gInputPress->stick_x; stickX = -gInputPress->stick_x;
stickY = +gInputPress->stick_y; stickY = gInputPress->stick_y * (CVarGetInteger("gInvertYAxis", 0) == 1 ? -1 : 1);
Math_SmoothStepToAngle(&player->aerobaticPitch, 0.0f, 0.1f, 5.0f, 0.01f); Math_SmoothStepToAngle(&player->aerobaticPitch, 0.0f, 0.1f, 5.0f, 0.01f);

5
src/engine/fox_tank.c
View File

@ -380,7 +380,7 @@ void func_tank_80044868(Player* player) {
f32 stickTilt; f32 stickTilt;
f32 sp2C; f32 sp2C;
stickTilt = (gInputPress->stick_y * 0.7f) - 8.0f; stickTilt = (gInputPress->stick_y * 0.7f * (CVarGetInteger("gInvertYAxis", 0) == 1 ? -1 : 1)) - 8.0f;
if (stickTilt < -40.0f) { if (stickTilt < -40.0f) {
stickTilt = -40.0f; stickTilt = -40.0f;
} }
@ -664,7 +664,8 @@ void func_tank_80045678(Player* player) {
AUDIO_PLAY_SFX(NA_SE_TANK_GO_UP, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_GO_UP, player->sfxSource, 0);
} }
player->zRotBank += ((__cosf(gGameFrameCount * M_DTOR * 8.0f) * 10.0f) - player->zRotBank) * 0.1f; player->zRotBank += ((__cosf(gGameFrameCount * M_DTOR * 8.0f) * 10.0f) - player->zRotBank) * 0.1f;
temp = -gInputPress->stick_y;
temp = -gInputPress->stick_y * (CVarGetInteger("gInvertYAxis", 0) == 1 ? -1 : 1);
Math_SmoothStepToF(&player->rot.x, temp * 0.3f, 0.05f, 5.0f, 0.00001f); Math_SmoothStepToF(&player->rot.x, temp * 0.3f, 0.05f, 5.0f, 0.00001f);
Math_SmoothStepToF(&player->boostSpeed, 15.0f, 0.5f, 5.0f, 0.0f); Math_SmoothStepToF(&player->boostSpeed, 15.0f, 0.5f, 5.0f, 0.0f);
Math_SmoothStepToF(&player->rot.z, 0.0f, 0.1f, 5.0f, 0.00001f); Math_SmoothStepToF(&player->rot.z, 0.0f, 0.1f, 5.0f, 0.00001f);

4
src/overlays/ovl_i1/fox_tr.c
View File

@ -9,9 +9,9 @@
void Training_RingPassCount_Draw(void) { void Training_RingPassCount_Draw(void) {
if (gRingPassCount != 0) { if (gRingPassCount != 0) {
RCP_SetupDL(&gMasterDisp, SETUPDL_83); RCP_SetupDL(&gMasterDisp, SETUPDL_83_POINT);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
HUD_Number_Draw(250.0f, 50.0f, gRingPassCount, 1.0f, 0, 999); HUD_Number_Draw(OTRGetDimensionFromRightEdge(250.0f), 50.0f, gRingPassCount, 1.0f, 0, 999);
} }
} }

5
src/overlays/ovl_i3/fox_aq.c
View File

@ -803,7 +803,7 @@ void Aquas_801AA4BC(Player* player) {
void Aquas_UpdateCamera(Player* player) { void Aquas_UpdateCamera(Player* player) {
f32 stickX = +gInputPress->stick_x; f32 stickX = +gInputPress->stick_x;
f32 stickY = -gInputPress->stick_y; f32 stickY = -gInputPress->stick_y * (CVarGetInteger("gInvertYAxis", 0) == 1 ? -1 : 1);
f32 zRot; f32 zRot;
if (player->state != PLAYERSTATE_ACTIVE) { if (player->state != PLAYERSTATE_ACTIVE) {
@ -877,7 +877,8 @@ void Aquas_BlueMarineMove(Player* player) {
Aquas_801A8E30(); Aquas_801A8E30();
stickX = -gInputPress->stick_x; stickX = -gInputPress->stick_x;
stickY = +gInputPress->stick_y;
stickY = +gInputPress->stick_y * (CVarGetInteger("gInvertYAxis", 0) == 1 ? -1 : 1);
gPlayerTurnStickMod = 0.68f; gPlayerTurnStickMod = 0.68f;

3
src/port/ui/ImguiUI.cpp
View File

@ -186,6 +186,9 @@ void DrawSettingsMenu(){
.format = "%.1fx", .format = "%.1fx",
}); });
} }
UIWidgets::CVarCheckbox("Invert Y Axis", "gInvertYAxis",{
.tooltip = "Inverts the Y axis for controlling vehicles"
});
ImGui::EndMenu(); ImGui::EndMenu();
} }