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

Fix CI build

This commit is contained in:
Callie LeFave 2018-04-16 16:44:18 -04:00
parent 0d9ced7d83
commit a10d0ec6cc
No known key found for this signature in database
GPG Key ID: 8493D3582582BD5C
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs
View File

@ -1026,7 +1026,7 @@ namespace BizHawk.Client.EmuHawk
[LuaMethod( [LuaMethod(
"drawPolygon", "drawPolygon",
"Draws a polygon using the table of coordinates specified in points. This should be a table of tables(each of size 2). If x or y is passed, the polygon will be translated by the passed coordinate pair. Line is the color of the polygon. Background is the optional fill color")] "Draws a polygon using the table of coordinates specified in points. This should be a table of tables(each of size 2). If x or y is passed, the polygon will be translated by the passed coordinate pair. Line is the color of the polygon. Background is the optional fill color")]
public void DrawPolygon(int componentHandle, LuaTable points, int x = 0, int y = 0, Color? line = null, Color? background = null) public void DrawPolygon(int componentHandle, LuaTable points, int? x = null, int? y = null, Color? line = null, Color? background = null)
{ {
try try
{ {

4
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
View File

@ -450,7 +450,7 @@ namespace BizHawk.Client.EmuHawk
[LuaMethodExample("gui.drawPolygon( { { 5, 10 }, { 10, 10 }, { 10, 20 }, { 5, 20 } }, 10, 30, 0x007F00FF, 0x7F7F7FFF );")] [LuaMethodExample("gui.drawPolygon( { { 5, 10 }, { 10, 10 }, { 10, 20 }, { 5, 20 } }, 10, 30, 0x007F00FF, 0x7F7F7FFF );")]
[LuaMethod("drawPolygon", "Draws a polygon using the table of coordinates specified in points. This should be a table of tables(each of size 2). If x or y is passed, the polygon will be translated by the passed coordinate pair. Line is the color of the polygon. Background is the optional fill color")] [LuaMethod("drawPolygon", "Draws a polygon using the table of coordinates specified in points. This should be a table of tables(each of size 2). If x or y is passed, the polygon will be translated by the passed coordinate pair. Line is the color of the polygon. Background is the optional fill color")]
public void DrawPolygon(LuaTable points, int x = 0, int y = 0, Color? line = null, Color? background = null) public void DrawPolygon(LuaTable points, int? x = null, int? y = null, Color? line = null, Color? background = null)
{ {
using (var g = GetGraphics()) using (var g = GetGraphics())
{ {
@ -460,7 +460,7 @@ namespace BizHawk.Client.EmuHawk
var i = 0; var i = 0;
foreach (LuaTable point in points.Values) foreach (LuaTable point in points.Values)
{ {
pointsArr[i] = new Point(LuaInt(point[1]) + x, LuaInt(point[2]) + y); pointsArr[i] = new Point(LuaInt(point[1]) + x ?? 0, LuaInt(point[2]) + y ?? 0);
i++; i++;
} }

2
BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs
View File

@ -291,7 +291,7 @@ namespace BizHawk.Client.EmuHawk
[LuaMethod( [LuaMethod(
"drawPolygon", "drawPolygon",
"Draws a polygon using the table of coordinates specified in points. This should be a table of tables(each of size 2). Line is the color of the polygon. Background is the optional fill color")] "Draws a polygon using the table of coordinates specified in points. This should be a table of tables(each of size 2). Line is the color of the polygon. Background is the optional fill color")]
public void DrawPolygon(LuaTable points, int x = 0, int y = 0, Color? line = null, Color? background = null) public void DrawPolygon(LuaTable points, int? x = null, int? y = null, Color? line = null, Color? background = null)
{ {
try try
{ {

4
BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs
View File

@ -255,13 +255,13 @@ namespace BizHawk.Client.EmuHawk
boxBackground.DrawLine(GetPen(color ?? _defaultForeground), x, y, x + 0.1F, y); boxBackground.DrawLine(GetPen(color ?? _defaultForeground), x, y, x + 0.1F, y);
} }
public void DrawPolygon(LuaTable points, int x = 0, int y = 0, Color? line = null, Color? background = null) public void DrawPolygon(LuaTable points, int? x = null, int? y = null, Color? line = null, Color? background = null)
{ {
var pointsArr = new Point[points.Values.Count]; var pointsArr = new Point[points.Values.Count];
var i = 0; var i = 0;
foreach (LuaTable point in points.Values) foreach (LuaTable point in points.Values)
{ {
pointsArr[i] = new Point((int)(double)(point[1]) + x, (int)(double)(point[2]) + y); pointsArr[i] = new Point((int)(double)(point[1]) + x ?? 0, (int)(double)(point[2]) + y ?? 0);
i++; i++;
} }