git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1200 993157c7-ee19-0410-b2c4-bb4e9862e678
This commit is contained in:
@@ -20,6 +20,7 @@ namespace OpenRa.Game
|
|||||||
World world;
|
World world;
|
||||||
TreeCache treeCache;
|
TreeCache treeCache;
|
||||||
TerrainRenderer terrain;
|
TerrainRenderer terrain;
|
||||||
|
Sidebar sidebar;
|
||||||
|
|
||||||
static Size GetResolution(Settings settings)
|
static Size GetResolution(Settings settings)
|
||||||
{
|
{
|
||||||
@@ -59,6 +60,8 @@ namespace OpenRa.Game
|
|||||||
world.Add(new Mcv(new PointF(24 * 5, 24 * 5), 3));
|
world.Add(new Mcv(new PointF(24 * 5, 24 * 5), 3));
|
||||||
world.Add(new Mcv(new PointF(24 * 7, 24 * 5), 2));
|
world.Add(new Mcv(new PointF(24 * 7, 24 * 5), 2));
|
||||||
world.Add(new Mcv(new PointF(24 * 9, 24 * 5), 1));
|
world.Add(new Mcv(new PointF(24 * 9, 24 * 5), 1));
|
||||||
|
|
||||||
|
sidebar = new Sidebar(OpenRa.TechTree.Race.None, renderer);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void Run()
|
internal void Run()
|
||||||
@@ -107,6 +110,8 @@ namespace OpenRa.Game
|
|||||||
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));
|
||||||
|
|
||||||
|
sidebar.Paint(scrollPos);
|
||||||
|
|
||||||
renderer.EndFrame();
|
renderer.EndFrame();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,48 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using OpenRa.TechTree;
|
using OpenRa.TechTree;
|
||||||
|
using BluntDirectX.Direct3D;
|
||||||
|
using OpenRa.FileFormats;
|
||||||
|
using System.Drawing;
|
||||||
|
|
||||||
namespace OpenRa.Game
|
namespace OpenRa.Game
|
||||||
{
|
{
|
||||||
class Sidebar
|
class Sidebar
|
||||||
{
|
{
|
||||||
|
TechTree.TechTree techTree = new TechTree.TechTree();
|
||||||
|
Renderer renderer;
|
||||||
|
|
||||||
|
FvfVertexBuffer<Vertex> vertexBuffer;
|
||||||
|
IndexBuffer indexBuffer;
|
||||||
|
const int spritesPerBatch = 1024;
|
||||||
|
SheetRectangle<Sheet> sprite;
|
||||||
|
|
||||||
|
|
||||||
|
public Sidebar(Race race, Renderer renderer)
|
||||||
|
{
|
||||||
|
Package package = new Package("../../../hires.mix");
|
||||||
|
sprite = BeedeeSheetBuilder.LoadSprite(package, "e7icon.shp");
|
||||||
|
techTree.CurrentRace = race;
|
||||||
|
this.renderer = renderer;
|
||||||
|
vertexBuffer = new FvfVertexBuffer<Vertex>(renderer.Device, 4 * spritesPerBatch, Vertex.Format);
|
||||||
|
indexBuffer = new IndexBuffer(renderer.Device, 6 * spritesPerBatch);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Paint(PointF scrollOffset)
|
||||||
|
{
|
||||||
|
List<Vertex> vertices = new List<Vertex>();
|
||||||
|
List<ushort> indicies = new List<ushort>();
|
||||||
|
|
||||||
|
PointF location = new PointF(0 + scrollOffset.X, 0 + scrollOffset.Y);
|
||||||
|
|
||||||
|
Util.CreateQuad(vertices, indicies, location, sprite, 0);
|
||||||
|
|
||||||
|
renderer.DrawWithShader(ShaderQuality.Low, delegate
|
||||||
|
{
|
||||||
|
vertexBuffer.SetData(vertices.ToArray());
|
||||||
|
indexBuffer.SetData(indicies.ToArray());
|
||||||
|
renderer.DrawBatch(vertexBuffer, indexBuffer, new Range<int>(0, vertices.Count), new Range<int>(0, indicies.Count), sprite.sheet.Texture);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,10 +9,15 @@ namespace OpenRa.TechTree
|
|||||||
{
|
{
|
||||||
public class Item
|
public class Item
|
||||||
{
|
{
|
||||||
|
readonly bool isStructure;
|
||||||
|
|
||||||
|
public bool IsStructure { get { return isStructure; } }
|
||||||
|
|
||||||
public Item(string tag, string friendlyName, IniSection section, bool isStructure)
|
public Item(string tag, string friendlyName, IniSection section, bool isStructure)
|
||||||
{
|
{
|
||||||
this.tag = tag;
|
this.tag = tag;
|
||||||
this.friendlyName = friendlyName;
|
this.friendlyName = friendlyName;
|
||||||
|
this.isStructure = isStructure;
|
||||||
|
|
||||||
owner = ParseOwner(section);
|
owner = ParseOwner(section);
|
||||||
techLevel = ParseTechLevel(section);
|
techLevel = ParseTechLevel(section);
|
||||||
|
|||||||
@@ -12,11 +12,20 @@ namespace OpenRa.TechTree
|
|||||||
Dictionary<string, Item> objects = new Dictionary<string, Item>();
|
Dictionary<string, Item> objects = new Dictionary<string, Item>();
|
||||||
public ICollection<string> built = new List<string>();
|
public ICollection<string> built = new List<string>();
|
||||||
|
|
||||||
readonly Race currentRace;
|
Race currentRace = Race.None;
|
||||||
|
|
||||||
public TechTree(Race race)
|
public Race CurrentRace
|
||||||
|
{
|
||||||
|
get { return currentRace; }
|
||||||
|
set
|
||||||
|
{
|
||||||
|
currentRace = value;
|
||||||
|
CheckAll();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public TechTree()
|
||||||
{
|
{
|
||||||
this.currentRace = race;
|
|
||||||
LoadRules();
|
LoadRules();
|
||||||
|
|
||||||
built.Add("FACT");
|
built.Add("FACT");
|
||||||
@@ -89,5 +98,25 @@ namespace OpenRa.TechTree
|
|||||||
yield return b;
|
yield return b;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IEnumerable<Item> BuildableBuildings
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
foreach (Item i in BuildableItems)
|
||||||
|
if (i.IsStructure)
|
||||||
|
yield return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<Item> BuildableUnits
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
foreach (Item i in BuildableItems)
|
||||||
|
if (!i.IsStructure)
|
||||||
|
yield return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user