Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix mouse showing sprite 258 pressing esc #2629

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Fix mouse showing sprite 258 pressing esc #2629

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fe8512c
fix mouse show sprite 258 pressing esc
Miguel-hrvs Jul 11, 2024
cd174d2
clicks centered
Miguel-hrvs Aug 4, 2024
f25bed5
Merge branch 'nesbox:main' into fix-mouse-show-sprite-258-pressing-esc
Miguel-hrvs Aug 4, 2024
b689920
just ibeam centered
Miguel-hrvs Aug 4, 2024
a6e0bb2
fix cursor invisible at the top bar
Miguel-hrvs Aug 4, 2024
4107a50
fix black cursor at start
Miguel-hrvs Aug 4, 2024
6dcf735
better fix
Miguel-hrvs Aug 14, 2024
589a5e5
Final fix
Miguel-hrvs Sep 3, 2024
119c7df
now should be good to go
Miguel-hrvs Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 26 additions & 29 deletions src/studio/studio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2329,37 +2329,34 @@ static void blitCursor(Studio* studio)

if(tic->input.mouse && !m->relative && (s32)m->x < TIC80_FULLWIDTH && (s32)m->y < TIC80_FULLHEIGHT)
{
s32 sprite = CLAMP(tic->ram->vram.vars.cursor.sprite, 0, TIC_BANK_SPRITES - 1);
const s32 sprite = CLAMP(tic->ram->vram.vars.cursor.sprite, 0, TIC_BANK_SPRITES - 1);
const tic_bank* bank = &tic->cart.bank0;

tic_point hot = {0};

if(tic->ram->vram.vars.cursor.system)
{
bank = &getConfig(studio)->cart->bank0;
hot = (tic_point[])
nesbox marked this conversation as resolved.
Show resolved Hide resolved
{
{0, 0},
{3, 0},
{2, 3},
}[CLAMP(sprite, 0, 2)];
}

if(tic->ram->vram.vars.cursor.system)
{
bank = &getConfig(studio)->cart->bank0;
const tic_palette* pal = &bank->palette.vbank0;
const tic_tile* tile = &bank->sprites.data[sprite];
const tic_point hot = (tic_point[])
{
{0, 0},
{3, 0},
{2, 3},
}[CLAMP(sprite, 0, 2)];

const tic_point s = {m->x - hot.x, m->y - hot.y};
u32* dst = tic->product.screen + TIC80_FULLWIDTH * s.y + s.x;

for(s32 y = s.y, endy = MIN(y + TIC_SPRITESIZE, TIC80_FULLHEIGHT), i = 0; y != endy; ++y, dst += TIC80_FULLWIDTH - TIC_SPRITESIZE)
for(s32 x = s.x, endx = x + TIC_SPRITESIZE; x != endx; ++x, ++i, ++dst)
if(x < TIC80_FULLWIDTH)
{
u8 c = tic_tool_peek4(tile->data, i);
if(c)
*dst = tic_rgba(&pal->colors[c]);
}
}
else if(sprite == 0) return;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:) we don't draw anything if tic->ram->vram.vars.cursor.system == false


const tic_palette* pal = &bank->palette.vbank0;
const tic_tile* tile = &bank->sprites.data[sprite];

tic_point s = {m->x - hot.x, m->y - hot.y};
u32* dst = tic->product.screen + TIC80_FULLWIDTH * s.y + s.x;

for(s32 y = s.y, endy = MIN(y + TIC_SPRITESIZE, TIC80_FULLHEIGHT), i = 0; y != endy; ++y, dst += TIC80_FULLWIDTH - TIC_SPRITESIZE)
for(s32 x = s.x, endx = x + TIC_SPRITESIZE; x != endx; ++x, ++i, ++dst)
if(x < TIC80_FULLWIDTH)
{
u8 c = tic_tool_peek4(tile->data, i);
if(c)
*dst = tic_rgba(&pal->colors[c]);
}
}
}

Expand Down
Loading