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

Add DrawImage and DrawImageRegion overloads to Gui API to allow for drawing an image from a prepared Image object rather than requiring a file in all cases.

This commit is contained in:
upthorn 2020-05-22 02:37:23 -07:00
parent 2437e0dba9
commit e5efeb49ac
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.Common/Api/Interfaces/IGui.cs
View File

@ -31,8 +31,10 @@ namespace BizHawk.Client.Common
void DrawBox(int x, int y, int x2, int y2, Color? line = null, Color? background = null);
void DrawEllipse(int x, int y, int width, int height, Color? line = null, Color? background = null);
void DrawIcon(string path, int x, int y, int? width = null, int? height = null);
void DrawImage(Image img, int x, int y, int? width = null, int? height = null, bool cache = true);
void DrawImage(string path, int x, int y, int? width = null, int? height = null, bool cache = true);
void ClearImageCache();
void DrawImageRegion(Image img, int source_x, int source_y, int source_width, int source_height, int dest_x, int dest_y, int? dest_width = null, int? dest_height = null);
void DrawImageRegion(string path, int source_x, int source_y, int source_width, int source_height, int dest_x, int dest_y, int? dest_width = null, int? dest_height = null);
void DrawLine(int x1, int y1, int x2, int y2, Color? color = null);
void DrawAxis(int x, int y, int size, Color? color = null);

31
src/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs
View File

@ -246,6 +246,21 @@ namespace BizHawk.Client.EmuHawk
}
}
public void DrawImage(Image img, int x, int y, int? width = null, int? height = null, bool cache = true)
{
using var g = GetGraphics();
g.CompositingMode = _compositingMode;
g.DrawImage(
img,
new Rectangle(x, y, width ?? img.Width, height ?? img.Height),
0,
0,
img.Width,
img.Height,
GraphicsUnit.Pixel,
_attributes
);
}
public void DrawImage(string path, int x, int y, int? width = null, int? height = null, bool cache = true)
{
if (!File.Exists(path))
@ -276,6 +291,22 @@ namespace BizHawk.Client.EmuHawk
_imageCache.Clear();
}
public void DrawImageRegion(Image img, int source_x, int source_y, int source_width, int source_height, int dest_x, int dest_y, int? dest_width = null, int? dest_height = null)
{
using var g = GetGraphics();
g.CompositingMode = _compositingMode;
g.DrawImage(
img,
new Rectangle(dest_x, dest_y, dest_width ?? source_width, dest_height ?? source_height),
source_x,
source_y,
source_width,
source_height,
GraphicsUnit.Pixel,
_attributes
);
}
public void DrawImageRegion(string path, int source_x, int source_y, int source_width, int source_height, int dest_x, int dest_y, int? dest_width = null, int? dest_height = null)
{
if (!File.Exists(path))