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

This commit is contained in:
chrisf
2007-07-14 07:07:00 +00:00
parent 23beeb477b
commit fb5200b5ee
2 changed files with 18 additions and 12 deletions

View File

@@ -41,12 +41,13 @@ namespace OpenRa.Game
Visible = true;
renderer = new Renderer(this, GetResolution(settings), false);
viewport = new Viewport(ClientSize);
SheetBuilder.Initialize(renderer.Device);
map = new Map(new IniFile(File.OpenRead("../../../" + settings.GetValue("map", "scm12ea.ini"))));
viewport = new Viewport(ClientSize, new float2(map.Size));
SheetBuilder.Initialize(renderer.Device);
TileMix = new Package("../../../" + map.Theater + ".mix");
renderer.SetPalette(new HardwarePalette(renderer.Device, map));
@@ -91,14 +92,10 @@ namespace OpenRa.Game
if (e.Button == 0)
return;
float2 scrollPos = new float2(viewport.ScrollPosition) + lastPos - new float2(e.Location);
float2 mapSize = 24 * new float2(map.Size) - viewport.Size + new float2(128, 0);
float2 p = new float2(e.Location);
scrollPos = scrollPos.Constrain(new Range<float2>(float2.Zero, mapSize));
lastPos = new float2(e.Location);
viewport.ScrollPosition = scrollPos.ToPointF();
viewport.Scroll(lastPos - p);
lastPos = p;
}
void Frame()