Archive/portal64-still-alive
1
0
Fork 0
mirror of https://github.com/mwpenny/portal64-still-alive.git synced 2024-10-20 10:37:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #206 from westonCoder/hud-console-color-flip

Browse source 
HUD Conforms to Console Version of Game
This commit is contained in:
lambertjamesd 2023-08-05 20:56:42 -06:00 committed by GitHub
parent 8086bbdae4 cf16f07c8a
commit f03dec9f2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/scene/hud.c
View file

@ -74,22 +74,22 @@ void hudRender(struct RenderState* renderState, struct Player* player, int last_
if (player->flags & PlayerHasFirstPortalGun){
gDPSetPrimColor(renderState->dl++, 255, 255, 0, 128, 255, 255);
if (looked_wall_portalable_1){
position_of_left_asset = (HUD_OUTER_WIDTH*2);
position_of_right_asset = (HUD_OUTER_WIDTH*3);
}
gSPTextureRectangle(renderState->dl++,
HUD_UPPER_X, HUD_UPPER_Y,
HUD_UPPER_X + (HUD_OUTER_WIDTH << 2), HUD_UPPER_Y + (HUD_OUTER_HEIGHT << 2),
G_TX_RENDERTILE, position_of_left_asset << 5, 0 << 5, 1 << 10, 1 << 10);
HUD_LOWER_X, HUD_LOWER_Y,
HUD_LOWER_X + (HUD_OUTER_WIDTH << 2), HUD_LOWER_Y + (HUD_OUTER_HEIGHT << 2),
G_TX_RENDERTILE, position_of_right_asset << 5, 0 << 5, 1 << 10, 1 << 10);
// if the player has the first gun but not second both left and right are blue
if (!(player->flags & PlayerHasSecondPortalGun)){
if (looked_wall_portalable_1){
position_of_right_asset = (HUD_OUTER_WIDTH*3);
position_of_left_asset = (HUD_OUTER_WIDTH*2);
}
gSPTextureRectangle(renderState->dl++,
HUD_LOWER_X, HUD_LOWER_Y,
HUD_LOWER_X + (HUD_OUTER_WIDTH << 2), HUD_LOWER_Y + (HUD_OUTER_HEIGHT << 2),
G_TX_RENDERTILE, position_of_right_asset << 5, 0 << 5, 1 << 10, 1 << 10);
HUD_UPPER_X, HUD_UPPER_Y,
HUD_UPPER_X + (HUD_OUTER_WIDTH << 2), HUD_UPPER_Y + (HUD_OUTER_HEIGHT << 2),
G_TX_RENDERTILE, position_of_left_asset << 5, 0 << 5, 1 << 10, 1 << 10);
}
}
@ -97,30 +97,32 @@ void hudRender(struct RenderState* renderState, struct Player* player, int last_
if (player->flags & PlayerHasSecondPortalGun){
gDPSetPrimColor(renderState->dl++, 255, 255, 255, 128, 0, 255);
if (looked_wall_portalable_0){
position_of_right_asset = (HUD_OUTER_WIDTH*3);
position_of_left_asset = (HUD_OUTER_WIDTH*2);
}
gSPTextureRectangle(renderState->dl++,
HUD_LOWER_X, HUD_LOWER_Y,
HUD_LOWER_X + (HUD_OUTER_WIDTH << 2), HUD_LOWER_Y + (HUD_OUTER_HEIGHT << 2),
G_TX_RENDERTILE, position_of_right_asset << 5, 0 << 5, 1 << 10, 1 << 10);
HUD_UPPER_X, HUD_UPPER_Y,
HUD_UPPER_X + (HUD_OUTER_WIDTH << 2), HUD_UPPER_Y + (HUD_OUTER_HEIGHT << 2),
G_TX_RENDERTILE, position_of_left_asset << 5, 0 << 5, 1 << 10, 1 << 10);
}
}
// both portal guns owned is only time when the last shot portal indicator appears
if ((player->flags & PlayerHasSecondPortalGun) && (player->flags & PlayerHasFirstPortalGun) && last_portal_idx_shot != -1){
//orange indicator
if (last_portal_idx_shot == 0){
gDPSetPrimColor(renderState->dl++, 255, 255, 255, 128, 0, 255);
gSPTextureRectangle(renderState->dl++,
HUD_UPPER_X + 100, HUD_LOWER_Y,
HUD_UPPER_X + 100 + (HUD_OUTER_WIDTH << 2), HUD_LOWER_Y + (HUD_OUTER_HEIGHT << 2) ,
HUD_LOWER_X - 68, HUD_LOWER_Y,
HUD_LOWER_X - 68 + (HUD_OUTER_WIDTH << 2), HUD_LOWER_Y + (HUD_OUTER_HEIGHT << 2),
G_TX_RENDERTILE, position_of_portal_indicator << 5, 0 << 5, 1 << 10, 1 << 10);
}
//blue indicator
else if (last_portal_idx_shot == 1){
gDPSetPrimColor(renderState->dl++, 255, 255, 0, 128, 255, 255);
gSPTextureRectangle(renderState->dl++,
HUD_LOWER_X - 68, HUD_LOWER_Y,
HUD_LOWER_X - 68 + (HUD_OUTER_WIDTH << 2), HUD_LOWER_Y + (HUD_OUTER_HEIGHT << 2) ,
HUD_UPPER_X + 100, HUD_LOWER_Y,
HUD_UPPER_X + 100 + (HUD_OUTER_WIDTH << 2), HUD_LOWER_Y + (HUD_OUTER_HEIGHT << 2),
G_TX_RENDERTILE, position_of_portal_indicator << 5, 0 << 5, 1 << 10, 1 << 10);
}
}