epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
beedee
2007-07-13 16:55:53 +00:00
parent 8ac1535e13
commit 289cc091bc
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/MainWindow.cs
View File

@@ -94,7 +94,7 @@ namespace OpenRa.Game
x1 = e.X; x1 = e.X;
y1 = e.Y; y1 = e.Y;
scrollPos.X = Util.Constrain(scrollPos.X, new Range<float>(0, map.Width * 24 - ClientSize.Width)); scrollPos.X = Util.Constrain(scrollPos.X, new Range<float>(0, map.Width * 24 - ClientSize.Width + 128));
scrollPos.Y = Util.Constrain(scrollPos.Y, new Range<float>(0, map.Height * 24 - ClientSize.Height)); scrollPos.Y = Util.Constrain(scrollPos.Y, new Range<float>(0, map.Height * 24 - ClientSize.Height));
} }
} }
@@ -106,12 +106,14 @@ namespace OpenRa.Game
renderer.BeginFrame(r1, r2, scrollPos); renderer.BeginFrame(r1, r2, scrollPos);
renderer.Device.EnableScissor(0, 0, ClientSize.Width - 128, ClientSize.Height);
terrain.Draw( ClientSize, scrollPos ); terrain.Draw( ClientSize, scrollPos );
world.Draw(renderer, world.Draw(renderer,
new Range<float>(scrollPos.X, scrollPos.X + ClientSize.Width), new Range<float>(scrollPos.X, scrollPos.X + ClientSize.Width),
new Range<float>(scrollPos.Y, scrollPos.Y + ClientSize.Height)); new Range<float>(scrollPos.Y, scrollPos.Y + ClientSize.Height));
renderer.Device.DisableScissor();
sidebar.Paint(ClientSize, scrollPos); sidebar.Paint(ClientSize, scrollPos);
renderer.EndFrame(); renderer.EndFrame();

2
OpenRa.Game/Renderer.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRa.Game
public void BeginFrame( PointF r1, PointF r2, PointF scroll ) public void BeginFrame( PointF r1, PointF r2, PointF scroll )
{ {
device.Begin(); device.Begin();
//device.Clear(0, Surfaces.Color); //device.Clear(Color.Gray.ToArgb(), Surfaces.Color);
shader.SetValue(scrollHandle, scroll); shader.SetValue(scrollHandle, scroll);
shader.SetValue(r1Handle, r1); shader.SetValue(r1Handle, r1);

19
OpenRa.Game/Sidebar.cs
View File

@@ -34,18 +34,14 @@ namespace OpenRa.Game
this.spriteRenderer = new SpriteRenderer(renderer); this.spriteRenderer = new SpriteRenderer(renderer);
package = new Package("../../../hires.mix"); package = new Package("../../../hires.mix");
LoadSprites(); LoadSprites("../../../buildings.txt");
LoadSprites("../../../units.txt");
techTree.CurrentRace = race; techTree.CurrentRace = race;
} }
void LoadSprites() void LoadSprites(string filename)
{ {
foreach (string line in File.ReadAllLines("../../../buildings.txt")) foreach (string line in File.ReadAllLines(filename))
{
string key = line.Substring(0, line.IndexOf(','));
sprites.Add(key, SpriteSheetBuilder.LoadSprite(package, key + "icon.shp"));
}
foreach (string line in File.ReadAllLines("../../../units.txt"))
{ {
string key = line.Substring(0, line.IndexOf(',')); string key = line.Substring(0, line.IndexOf(','));
sprites.Add(key, SpriteSheetBuilder.LoadSprite(package, key + "icon.shp")); sprites.Add(key, SpriteSheetBuilder.LoadSprite(package, key + "icon.shp"));
@@ -71,6 +67,13 @@ namespace OpenRa.Game
spriteRenderer.DrawSprite(sprite, location); spriteRenderer.DrawSprite(sprite, location);
y2 += 48; y2 += 48;
} }
while (y2 < clientSize.Height)
{
Sprite sprite = sprites["DOG"];
PointF location = new PointF(clientSize.Width - 64 + scrollOffset.X, y2 + scrollOffset.Y);
spriteRenderer.DrawSprite(sprite, location);
y2 += 48;
}
spriteRenderer.Flush(); spriteRenderer.Flush();
} }