ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

snesgfxdebugger-add in-place sprite viewing mode

This commit is contained in:
zeromus 2012-12-03 17:57:19 +00:00
parent 4d8a178703
commit 3398aefc7a
2 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BizHawk.Emulation/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs
View File

@ -263,7 +263,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
int x = high & 1;
high >>= 1;
Size = high & 1;
X |= (x << 9);
X |= (x << 8);
X = (X << 23) >> 23;
Tile = Table*256 + Name;
@ -897,10 +897,11 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
}
public void RenderSpriteToScreen(int* screen, int stride, int destx, int desty, ScreenInfo si, int spritenum)
public void RenderSpriteToScreen(int* screen, int stride, int destx, int desty, ScreenInfo si, int spritenum, OAMInfo oam = null, int xlimit = 1024, int ylimit = 1024, byte[,] spriteMap = null)
{
var dims = new[] { SNESGraphicsDecoder.ObjSizes[si.OBSEL_Size, 0], SNESGraphicsDecoder.ObjSizes[si.OBSEL_Size, 1] };
var oam = new OAMInfo(this, si, spritenum);
if(oam == null)
oam = new OAMInfo(this, si, spritenum);
var dim = dims[oam.Size];
int[] tilebuf = _tileCache[4];
@ -933,6 +934,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
dx += destx;
dy += desty;
if(dx>=xlimit || dy>=ylimit || dx<0 || dy<0)
continue;
int col = (bcol + (x >> 3)) & 0xF;
int row = (brow + (y >> 3)) & 0xF;
int sx = x & 0x7;
@ -942,9 +946,18 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
addr += sy * 8 + sx;
int dofs = stride*dy+dx;
screen[dofs] = tilebuf[addr];
Paletteize(screen, dofs, oam.Palette * 16 + 128, 1);
Colorize(screen, dofs, 1);
int color = tilebuf[addr];
if (spriteMap != null && color == 0)
{
//skip transparent pixels
}
else
{
screen[dofs] = color;
Paletteize(screen, dofs, oam.Palette * 16 + 128, 1);
Colorize(screen, dofs, 1);
if (spriteMap != null) spriteMap[dx, dy] = (byte)spritenum;
}
}
}

34
BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs
View File

@ -7,6 +7,7 @@
//TODO - show the priority list for the current mode. make the priority list have checkboxes, and use that to control whether that item displays (does bsnes have that granularity? maybe)
//TODO - use custom checkboxes for register-viewing checkboxes to make them green and checked
//TODO - make freeze actually save the info caches, and re-render in realtime, so that you can pick something you want to see animate without having to hover your mouse just right. also add a checkbox to do the literal freeze (stop it from updating)
//TODO - sprite wrapping is not correct
//DEFERRED:
//. 256bpp modes (difficult to use)
@ -48,6 +49,7 @@ namespace BizHawk.MultiClient
viewer.ScaleImage = false;
displayTypeItems.Add(new DisplayTypeItem("Sprites", eDisplayType.Sprites));
displayTypeItems.Add(new DisplayTypeItem("OBJ", eDisplayType.OBJ));
displayTypeItems.Add(new DisplayTypeItem("BG1", eDisplayType.BG1));
displayTypeItems.Add(new DisplayTypeItem("BG2",eDisplayType.BG2));
@ -61,7 +63,7 @@ namespace BizHawk.MultiClient
displayTypeItems.Add(new DisplayTypeItem("Mode7Ext tiles",eDisplayType.TilesMode7Ext));
displayTypeItems.Add(new DisplayTypeItem("Mode7 tiles (DC)", eDisplayType.TilesMode7DC));
comboDisplayType.DataSource = displayTypeItems;
comboDisplayType.SelectedIndex = 1;
comboDisplayType.SelectedIndex = 2;
var paletteTypeItems = new List<PaletteTypeItem>();
paletteTypeItems.Add(new PaletteTypeItem("BizHawk", SnesColors.ColorType.BizHawk));
@ -182,6 +184,7 @@ namespace BizHawk.MultiClient
SNESGraphicsDecoder gd = new SNESGraphicsDecoder(SnesColors.ColorType.BizHawk);
SNESGraphicsDecoder.ScreenInfo si;
SNESGraphicsDecoder.TileEntry[] map;
byte[,] spriteMap = new byte[256, 224];
SNESGraphicsDecoder.BGMode viewBgMode;
void RegenerateData()
@ -335,6 +338,17 @@ namespace BizHawk.MultiClient
gd.RenderSpriteToScreen(pixelptr, stride / 4, x,y, si, i);
}
}
if (selection == eDisplayType.Sprites)
{
//render sprites in-place
allocate(256, 224);
for (int y = 0; y < 224; y++) for (int x = 0; x < 256; x++) spriteMap[x, y] = 0xFF;
for(int i=127;i>=0;i--)
{
var oam = new SNESGraphicsDecoder.OAMInfo(gd, si, i);
gd.RenderSpriteToScreen(pixelptr, stride / 4, oam.X, oam.Y, si, i, oam, 256, 224, spriteMap);
}
}
if (selection == eDisplayType.OBJTiles0 || selection == eDisplayType.OBJTiles1)
{
allocate(128, 256);
@ -437,7 +451,7 @@ namespace BizHawk.MultiClient
enum eDisplayType
{
OBJ, BG1 = 1, BG2 = 2, BG3 = 3, BG4 = 4, OBJTiles0, OBJTiles1, Tiles2bpp, Tiles4bpp, Tiles8bpp, TilesMode7, TilesMode7Ext, TilesMode7DC
BG1 = 1, BG2 = 2, BG3 = 3, BG4 = 4, OBJTiles0, OBJTiles1, Tiles2bpp, Tiles4bpp, Tiles8bpp, TilesMode7, TilesMode7Ext, TilesMode7DC, Sprites, OBJ
}
static bool IsDisplayTypeBG(eDisplayType type) { return type == eDisplayType.BG1 || type == eDisplayType.BG2 || type == eDisplayType.BG3 || type == eDisplayType.BG4; }
static bool IsDisplayTypeOBJ(eDisplayType type) { return type == eDisplayType.OBJTiles0 || type == eDisplayType.OBJTiles1; }
@ -1053,6 +1067,19 @@ namespace BizHawk.MultiClient
}
void HandleSpriteMouseOver(int px, int py)
{
if (px < 0 || py < 0 || px >= 256 || py >= 224) return;
int sprite = spriteMap[px,py];
if(sprite == 0xFF) return;
currObjDataState = new ObjDataState();
currObjDataState.Number = sprite;
SetTab(tpOBJ);
}
void HandleObjMouseOver(int px, int py)
{
int ox = px / si.ObjSizeBounds.Width;
int oy = py / si.ObjSizeBounds.Height;
@ -1097,6 +1124,9 @@ namespace BizHawk.MultiClient
HandleTileViewMouseOver(128, 256, 4, tx, ty);
break;
case eDisplayType.OBJ:
HandleObjMouseOver(loc.X, loc.Y);
break;
case eDisplayType.Sprites:
HandleSpriteMouseOver(loc.X, loc.Y);
break;
case eDisplayType.Tiles2bpp: