git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1112 993157c7-ee19-0410-b2c4-bb4e9862e678

This commit is contained in:
chrisf
2007-07-06 11:37:12 +00:00
parent e3ef932bf8
commit ba17286129

View File

@@ -11,19 +11,19 @@ namespace OpenRa.Game
public class TileSheetBuilder<T> public class TileSheetBuilder<T>
where T : class where T : class
{ {
readonly SizeF pageSize; readonly Size pageSize;
readonly Provider<T> pageProvider; readonly Provider<T> pageProvider;
public TileSheetBuilder(SizeF pageSize, Provider<T> pageProvider) public TileSheetBuilder(Size pageSize, Provider<T> pageProvider)
{ {
this.pageSize = pageSize; this.pageSize = pageSize;
this.pageProvider = pageProvider; this.pageProvider = pageProvider;
} }
T current = null; T current = null;
float x = 0, y = 0, rowHeight = 0; int x = 0, y = 0, rowHeight = 0;
public SheetRectangle<T> AddImage(SizeF imageSize) public SheetRectangle<T> AddImage(Size imageSize)
{ {
if (imageSize.Width > pageSize.Width || imageSize.Height > pageSize.Height) if (imageSize.Width > pageSize.Width || imageSize.Height > pageSize.Height)
return null; return null;
@@ -44,7 +44,7 @@ namespace OpenRa.Game
x = y = rowHeight = 0; x = y = rowHeight = 0;
} }
SheetRectangle<T> rect = new SheetRectangle<T>(current, new PointF(x, y), imageSize); SheetRectangle<T> rect = new SheetRectangle<T>(current, new Point(x, y), imageSize);
x += imageSize.Width; x += imageSize.Width;
return rect; return rect;
@@ -54,11 +54,11 @@ namespace OpenRa.Game
public class SheetRectangle<T> public class SheetRectangle<T>
where T : class where T : class
{ {
readonly PointF origin; readonly Point origin;
readonly SizeF size; readonly Size size;
readonly T sheet; readonly T sheet;
internal SheetRectangle(T sheet, PointF origin, SizeF size) internal SheetRectangle(T sheet, Point origin, Size size)
{ {
this.origin = origin; this.origin = origin;
this.size = size; this.size = size;