Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-27 00:00:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Couple HUD Editor fixes (#440)

Browse Source 
* fix a button viewport going out of bounds

* fix beating heart hud scaling

* update minimap position when resting to vanilla hud
This commit is contained in:
Archez 2024-05-21 21:24:46 -04:00 committed by Garrett Cox
parent b109d4eb68
commit 0ce2df93e3
3 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mm/src/code/z_lifemeter.c
View File

@ -418,24 +418,16 @@ void LifeMeter_Draw(PlayState* play) {
hudEditorActiveElement = HUD_EDITOR_ELEMENT_NONE;
Mtx_SetTranslateScaleMtx(mtx, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
} else {
// All of this information was derived from the original call to gSPTextureRectangle below
s16 offsetFromBaseX = (-130.0f + offsetX) - hudEditorElements[hudEditorActiveElement].defaultX;
s16 offsetFromBaseY = -(94.5f - offsetY) - hudEditorElements[hudEditorActiveElement].defaultY;
// TODO: These scale offsets don't seem to be working correctly
s16 rectLeft = CVarGetInteger(hudEditorElements[hudEditorActiveElement].xCvar, hudEditorElements[hudEditorActiveElement].defaultX) + (offsetFromBaseX / CVarGetFloat(hudEditorElements[hudEditorActiveElement].scaleCvar, 1.0f));
s16 rectTop = CVarGetInteger(hudEditorElements[hudEditorActiveElement].yCvar, hudEditorElements[hudEditorActiveElement].defaultY) + (offsetFromBaseY / CVarGetFloat(hudEditorElements[hudEditorActiveElement].scaleCvar, 1.0f));
float size = 1.0f - (0.32f * lifesize);
// All of this information was derived from the original call to Mtx_SetTranslateScaleMtx below
f32 transX = -130.0f + offsetX;
f32 transY = 94.5f - offsetY;
f32 size = 1.0f - (0.32f * lifesize);
size *= CVarGetFloat(hudEditorElements[hudEditorActiveElement].scaleCvar, 1.0f);
if (CVarGetInteger(hudEditorElements[hudEditorActiveElement].modeCvar, HUD_EDITOR_ELEMENT_MODE_VANILLA) == HUD_EDITOR_ELEMENT_MODE_MOVABLE_LEFT) {
rectLeft = OTRGetRectDimensionFromLeftEdge(rectLeft);
} else if (CVarGetInteger(hudEditorElements[hudEditorActiveElement].modeCvar, HUD_EDITOR_ELEMENT_MODE_VANILLA) == HUD_EDITOR_ELEMENT_MODE_MOVABLE_RIGHT) {
rectLeft = OTRGetRectDimensionFromRightEdge(rectLeft);
}
size *= HudEditor_GetActiveElementScale();
HudEditor_ModifyMatrixValues(&transX, &transY);
hudEditorActiveElement = HUD_EDITOR_ELEMENT_NONE;
Mtx_SetTranslateScaleMtx(mtx, size, size, size, rectLeft, -rectTop, 0.0f);
Mtx_SetTranslateScaleMtx(mtx, size, size, size, transX, transY, 0.0f);
}
// #endregion
} else {

16
mm/src/code/z_map_disp.c
View File

@ -998,22 +998,24 @@ void MapDisp_Update(PlayState* play) {
if ((sMapDisp.mapDataScene != NULL) && (sSceneNumRooms != 0)) {
// #region 2S2H [Cosmetic] Hud Editor minimap base position
// This value is used to determine the relative positioning for all the other elements
MapDataRoom* mapDataRoom = &sMapDisp.mapDataScene->rooms[sMapDisp.curRoom];
HudEditor_SetActiveElement(HUD_EDITOR_ELEMENT_MINIMAP);
if (HudEditor_ShouldOverrideDraw()) {
if (mapDataRoom != NULL && mapDataRoom->mapId != MAP_DATA_NO_MAP) {
s32 width;
s32 height;
MapDataRoom* mapDataRoom = &sMapDisp.mapDataScene->rooms[sMapDisp.curRoom];
if (mapDataRoom != NULL && mapDataRoom->mapId != MAP_DATA_NO_MAP) {
MapDisp_GetMapTexDim(mapDataRoom, &width, &height);
sMapDisp.minimapBaseX = 295;
sMapDisp.minimapBaseY = 220;
HudEditor_ModifyRectPosValues(&sMapDisp.minimapBaseX, &sMapDisp.minimapBaseY);
if (HudEditor_ShouldOverrideDraw()) {
// We don't want to scale width/height here, it will happen later when the texture is drawn
HudEditor_ModifyRectPosValues(&sMapDisp.minimapBaseX, &sMapDisp.minimapBaseY);
}
sMapDisp.minimapBaseX -= width;
sMapDisp.minimapBaseY -= height;
}
}
// #endregion
sMapDisp.pauseMapCurStorey = DUNGEON_FLOOR_INDEX_0 - pauseCtx->cursorMapDungeonItem;
@ -1098,8 +1100,8 @@ void MapDisp_SwapRooms(s16 nextRoom) {
if (HudEditor_ShouldOverrideDraw()) {
sMapDisp.minimapBaseX = 295;
sMapDisp.minimapBaseY = 220;
HudEditor_ModifyRectPosValues(&sMapDisp.minimapBaseX, &sMapDisp.minimapBaseY);
// We don't want to scale width/height here, it will happen later when the texture is drawn
HudEditor_ModifyRectPosValues(&sMapDisp.minimapBaseX, &sMapDisp.minimapBaseY);
sMapDisp.minimapBaseX -= width;
sMapDisp.minimapBaseY -= height;

13
mm/src/code/z_parameter.c
View File

@ -5074,6 +5074,19 @@ void Interface_SetPerspectiveView(PlayState* play, s32 topY, s32 bottomY, s32 le
HudEditor_ModifyDrawValues(&rectLeft, &rectTop, &rectWidth, &rectHeight, &dsdx, &dtdy);
hudEditorActiveElement = HUD_EDITOR_ELEMENT_NONE;
// Clamp the values to the avialable screen space while preserving the shape
// to avoid undefined behavior like stretching or hiding of the A button
rectLeft = MAX(rectLeft, OTRGetRectDimensionFromLeftEdge(0));
rectTop = MAX(rectTop, 0);
if (rectLeft + rectWidth > OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH)) {
rectLeft = OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH) - rectWidth;
}
if (rectTop + rectHeight > SCREEN_HEIGHT) {
rectTop = SCREEN_HEIGHT - rectHeight;
}
interfaceCtx->viewport.leftX = OTRConvertHUDXToScreenX(rectLeft);
interfaceCtx->viewport.rightX = OTRConvertHUDXToScreenX(rectLeft + rectWidth);
interfaceCtx->viewport.topY = rectTop;