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

This commit is contained in:
beedee
2007-07-13 15:19:18 +00:00
parent c5bfcacc69
commit b0213cb005
2 changed files with 17 additions and 6 deletions

View File

@@ -26,7 +26,7 @@ namespace OpenRa.Game
} }
} }
static class BeedeeSheetBuilder static class SpriteSheetBuilder
{ {
static Dictionary<string, SheetRectangle<Sheet>> sprites = static Dictionary<string, SheetRectangle<Sheet>> sprites =
new Dictionary<string, SheetRectangle<Sheet>>(); new Dictionary<string, SheetRectangle<Sheet>>();

View File

@@ -8,6 +8,7 @@ using System.Drawing;
namespace OpenRa.Game namespace OpenRa.Game
{ {
using Sprite = SheetRectangle<Sheet>;
class Sidebar class Sidebar
{ {
TechTree.TechTree techTree = new TechTree.TechTree(); TechTree.TechTree techTree = new TechTree.TechTree();
@@ -16,13 +17,14 @@ namespace OpenRa.Game
FvfVertexBuffer<Vertex> vertexBuffer; FvfVertexBuffer<Vertex> vertexBuffer;
IndexBuffer indexBuffer; IndexBuffer indexBuffer;
const int spritesPerBatch = 1024; const int spritesPerBatch = 1024;
SheetRectangle<Sheet> sprite; Dictionary<string, Sprite> sprites = new Dictionary<string,Sprite>();
public Sidebar(Race race, Renderer renderer) public Sidebar(Race race, Renderer renderer)
{ {
Package package = new Package("../../../hires.mix"); Package package = new Package("../../../hires.mix");
sprite = BeedeeSheetBuilder.LoadSprite(package, "e7icon.shp"); sprites.Add("e7", SpriteSheetBuilder.LoadSprite(package, "e7icon.shp"));
sprites.Add("e6", SpriteSheetBuilder.LoadSprite(package, "e6icon.shp"));
techTree.CurrentRace = race; techTree.CurrentRace = race;
this.renderer = renderer; this.renderer = renderer;
vertexBuffer = new FvfVertexBuffer<Vertex>(renderer.Device, 4 * spritesPerBatch, Vertex.Format); vertexBuffer = new FvfVertexBuffer<Vertex>(renderer.Device, 4 * spritesPerBatch, Vertex.Format);
@@ -34,14 +36,23 @@ namespace OpenRa.Game
List<Vertex> vertices = new List<Vertex>(); List<Vertex> vertices = new List<Vertex>();
List<ushort> indicies = new List<ushort>(); List<ushort> indicies = new List<ushort>();
PointF location = new PointF(0 + scrollOffset.X, 0 + scrollOffset.Y); int x = 0, y = 0;
//foreach (SheetRectangle<Sheet> sprite in sprites.Values)
foreach (Item i in techTree.BuildableBuildings)
{
Sprite sprite;
if (!sprites.TryGetValue(i.tag, out sprite)) continue;
PointF location = new PointF(x + scrollOffset.X, y + scrollOffset.Y);
Util.CreateQuad(vertices, indicies, location, sprite, 0); Util.CreateQuad(vertices, indicies, location, sprite, 0);
y += 48;
}
renderer.DrawWithShader(ShaderQuality.Low, delegate renderer.DrawWithShader(ShaderQuality.Low, delegate
{ {
vertexBuffer.SetData(vertices.ToArray()); vertexBuffer.SetData(vertices.ToArray());
indexBuffer.SetData(indicies.ToArray()); indexBuffer.SetData(indicies.ToArray());
foreach (Sprite sprite in sprites.Values)
renderer.DrawBatch(vertexBuffer, indexBuffer, new Range<int>(0, vertices.Count), new Range<int>(0, indicies.Count), sprite.sheet.Texture); renderer.DrawBatch(vertexBuffer, indexBuffer, new Range<int>(0, vertices.Count), new Range<int>(0, indicies.Count), sprite.sheet.Texture);
}); });
} }