Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #159 from westonCoder/center-reticle-addition

Browse source 
Simply Added center Reticle
This commit is contained in:
lambertjamesd 2023-05-05 07:25:18 -06:00 committed by GitHub
parent d1e1eb6e08 6393e2ff71
commit 0ff8f7bd62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/images/center_reticle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

20
assets/materials/hud.skm.yaml
View file

@ -18,6 +18,26 @@ materials:
g: 255
b: 255
a: 255
center_reticle:
gDPSetTile:
filename: "../images/center_reticle.png"
siz: G_IM_SIZ_8b
fmt: G_IM_FMT_I
gDPSetRenderMode: G_RM_XLU_SURF
gDPSetCombineMode:
color: ["0", "0", "0", "PRIMITIVE"]
alpha: ["0", "0", "0", "TEXEL0"]
gSPGeometryMode:
clear: [G_ZBUFFER]
gDPSetTexturePersp: G_TP_NONE
gDPSetTextureLUT: G_TT_NONE
gDPSetTextureFilter: G_TF_POINT
gDPSetPrimColor:
r: 255
g: 255
b: 255
a: 255
death_overlay:
gDPSetRenderMode: G_RM_XLU_SURF

14
src/scene/hud.c
View file

@ -21,6 +21,11 @@
#define HUD_LOWER_X ((SCREEN_WD - HUD_OUTER_WIDTH + (HUD_OUTER_OFFSET_X << 1)) << 1)
#define HUD_LOWER_Y ((SCREEN_HT - HUD_OUTER_HEIGHT + (HUD_OUTER_OFFSET_Y << 1)) << 1)
#define RETICLE_XMIN ((SCREEN_WD - (8 << 1)) << 1)
#define RETICLE_YMIN ((SCREEN_HT - (8 << 1)) << 1)
#define RETICLE_WIDTH 16
#define RETICLE_HEIGHT 16
void hudRender(struct RenderState* renderState, struct Player* player, int last_portal_idx_shot, int looked_wall_portalable_0, int looked_wall_portalable_1) {
if (player->flags & PlayerIsDead) {
gSPDisplayList(renderState->dl++, hud_death_overlay);
@ -102,4 +107,13 @@ void hudRender(struct RenderState* renderState, struct Player* player, int last_
G_TX_RENDERTILE, position_of_portal_indicator << 5, 0 << 5, 1 << 10, 1 << 10);
}
}
// center reticle is drawn over top everything
gSPDisplayList(renderState->dl++, hud_material_list[CENTER_RETICLE_INDEX]);
gDPSetPrimColor(renderState->dl++, 255, 255, 210, 210, 210, 255);
gSPTextureRectangle(renderState->dl++,
RETICLE_XMIN, RETICLE_YMIN,
RETICLE_XMIN + (RETICLE_WIDTH << 2), RETICLE_YMIN + (RETICLE_HEIGHT << 2),
G_TX_RENDERTILE, 0 << 5, 0 << 5, 1 << 10, 1 << 10);
}