git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1199 993157c7-ee19-0410-b2c4-bb4e9862e678
This commit is contained in:
@@ -13,36 +13,37 @@ namespace OpenRa.Game
|
||||
class MainWindow : Form
|
||||
{
|
||||
readonly Renderer renderer;
|
||||
|
||||
readonly Map map;
|
||||
readonly TileSet tileSet;
|
||||
|
||||
Palette pal, playerPal;
|
||||
Package TileMix;
|
||||
string TileSuffix;
|
||||
|
||||
Dictionary<TileReference, SheetRectangle<Sheet>> tileMapping =
|
||||
new Dictionary<TileReference, SheetRectangle<Sheet>>();
|
||||
|
||||
FvfVertexBuffer<Vertex> vertexBuffer;
|
||||
|
||||
Dictionary<Sheet, IndexBuffer> drawBatches = new Dictionary<Sheet, IndexBuffer>();
|
||||
|
||||
World world;
|
||||
TreeCache treeCache;
|
||||
TerrainRenderer terrain;
|
||||
|
||||
void LoadTextures()
|
||||
static Size GetResolution(Settings settings)
|
||||
{
|
||||
Size tileSize = new Size(24, 24);
|
||||
Size desktopResolution = Screen.PrimaryScreen.Bounds.Size;
|
||||
|
||||
for (int i = 0; i < map.Width; i++)
|
||||
for (int j = 0; j < map.Height; j++)
|
||||
{
|
||||
TileReference tileRef = map.MapTiles[i + map.XOffset, j + map.YOffset];
|
||||
return new Size(settings.GetValue("width", desktopResolution.Width),
|
||||
settings.GetValue("height", desktopResolution.Height));
|
||||
}
|
||||
|
||||
if (!tileMapping.ContainsKey(tileRef))
|
||||
tileMapping.Add(tileRef, CoreSheetBuilder.Add(tileSet.GetBytes(tileRef), tileSize));
|
||||
}
|
||||
public MainWindow( Settings settings )
|
||||
{
|
||||
FormBorderStyle = FormBorderStyle.None;
|
||||
BackColor = Color.Black;
|
||||
renderer = new Renderer(this, GetResolution(settings), false);
|
||||
Visible = true;
|
||||
|
||||
CoreSheetBuilder.Initialize(renderer.Device);
|
||||
|
||||
map = new Map(new IniFile(File.OpenRead("../../../" + settings.GetValue("map", "scm12ea.ini"))));
|
||||
|
||||
TileMix = new Package("../../../" + map.Theater + ".mix");
|
||||
|
||||
renderer.SetPalette(new HardwarePalette(renderer.Device, map));
|
||||
terrain = new TerrainRenderer(renderer, map, TileMix);
|
||||
|
||||
world = new World(renderer.Device);
|
||||
treeCache = new TreeCache(renderer.Device, map, TileMix);
|
||||
@@ -60,63 +61,6 @@ namespace OpenRa.Game
|
||||
world.Add(new Mcv(new PointF(24 * 9, 24 * 5), 1));
|
||||
}
|
||||
|
||||
void LoadVertexBuffer()
|
||||
{
|
||||
Dictionary<Sheet, List<ushort>> indexMap = new Dictionary<Sheet, List<ushort>>();
|
||||
List<Vertex> vertices = new List<Vertex>();
|
||||
|
||||
for (int j = 0; j < map.Height; j++)
|
||||
for (int i = 0; i < map.Width; i++)
|
||||
{
|
||||
SheetRectangle<Sheet> tile = tileMapping[map.MapTiles[i + map.XOffset, j + map.YOffset]];
|
||||
|
||||
List<ushort> indexList;
|
||||
if (!indexMap.TryGetValue(tile.sheet, out indexList))
|
||||
indexMap.Add(tile.sheet, indexList = new List<ushort>());
|
||||
|
||||
Util.CreateQuad(vertices, indexList, new PointF(24 * i, 24 * j), tile, 0);
|
||||
}
|
||||
|
||||
vertexBuffer = new FvfVertexBuffer<Vertex>(renderer.Device, vertices.Count, Vertex.Format);
|
||||
vertexBuffer.SetData(vertices.ToArray());
|
||||
|
||||
foreach (KeyValuePair<Sheet, List<ushort>> p in indexMap)
|
||||
{
|
||||
IndexBuffer indexBuffer = new IndexBuffer(renderer.Device, p.Value.Count);
|
||||
indexBuffer.SetData(p.Value.ToArray());
|
||||
drawBatches.Add(p.Key, indexBuffer);
|
||||
}
|
||||
}
|
||||
|
||||
static Size GetResolution(Settings settings)
|
||||
{
|
||||
Size desktopResolution = Screen.PrimaryScreen.Bounds.Size;
|
||||
|
||||
return new Size(settings.GetValue("width", desktopResolution.Width),
|
||||
settings.GetValue("height", desktopResolution.Height));
|
||||
}
|
||||
|
||||
public MainWindow( Settings settings )
|
||||
{
|
||||
FormBorderStyle = FormBorderStyle.None;
|
||||
renderer = new Renderer(this, GetResolution(settings), false);
|
||||
Visible = true;
|
||||
|
||||
CoreSheetBuilder.Initialize(renderer.Device);
|
||||
|
||||
string mapName = settings.GetValue("map", "scm12ea.ini");
|
||||
|
||||
IniFile mapFile = new IniFile(File.OpenRead("../../../" + mapName));
|
||||
map = new Map(mapFile);
|
||||
|
||||
Text = string.Format("OpenRA - {0} - {1}", map.Title, mapName);
|
||||
|
||||
tileSet = LoadTileSet(map);
|
||||
|
||||
LoadTextures();
|
||||
LoadVertexBuffer();
|
||||
}
|
||||
|
||||
internal void Run()
|
||||
{
|
||||
while (Created && Visible)
|
||||
@@ -126,8 +70,7 @@ namespace OpenRa.Game
|
||||
}
|
||||
}
|
||||
|
||||
PointF scrollPos = new PointF(1, 5);
|
||||
PointF oldPos;
|
||||
PointF scrollPos, oldPos;
|
||||
int x1,y1;
|
||||
|
||||
protected override void OnMouseDown(MouseEventArgs e)
|
||||
@@ -158,8 +101,7 @@ namespace OpenRa.Game
|
||||
|
||||
renderer.BeginFrame(r1, r2, scrollPos);
|
||||
|
||||
foreach (KeyValuePair<Sheet, IndexBuffer> batch in drawBatches)
|
||||
DrawTerrainBatch(batch);
|
||||
terrain.Draw( ClientSize, scrollPos );
|
||||
|
||||
world.Draw(renderer,
|
||||
new Range<float>(scrollPos.X, scrollPos.X + ClientSize.Width),
|
||||
@@ -167,54 +109,5 @@ namespace OpenRa.Game
|
||||
|
||||
renderer.EndFrame();
|
||||
}
|
||||
|
||||
void DrawTerrainBatch(KeyValuePair<Sheet, IndexBuffer> batch)
|
||||
{
|
||||
int indicesPerRow = map.Width * 6;
|
||||
int verticesPerRow = map.Width * 4;
|
||||
|
||||
int visibleRows = (int)(ClientSize.Height / 24.0f + 2);
|
||||
|
||||
int firstRow = (int)(scrollPos.Y / 24.0f);
|
||||
int lastRow = firstRow + visibleRows;
|
||||
|
||||
if (lastRow < 0 || firstRow > map.Height)
|
||||
return;
|
||||
|
||||
if (firstRow < 0) firstRow = 0;
|
||||
if (lastRow > map.Height) lastRow = map.Height;
|
||||
|
||||
renderer.DrawWithShader(ShaderQuality.Low, delegate
|
||||
{
|
||||
renderer.DrawBatch(vertexBuffer, batch.Value,
|
||||
new Range<int>(verticesPerRow * firstRow, verticesPerRow * lastRow),
|
||||
new Range<int>(indicesPerRow * firstRow, indicesPerRow * lastRow),
|
||||
batch.Key.Texture);
|
||||
});
|
||||
}
|
||||
|
||||
TileSet LoadTileSet(Map currentMap)
|
||||
{
|
||||
string theaterName = currentMap.Theater;
|
||||
if (theaterName.Length > 8)
|
||||
theaterName = theaterName.Substring(0, 8);
|
||||
|
||||
pal = new Palette(File.OpenRead("../../../" + theaterName + ".pal"));
|
||||
TileMix = new Package("../../../" + theaterName + ".mix");
|
||||
TileSuffix = "." + theaterName.Substring(0, 3);
|
||||
|
||||
playerPal = new Palette(pal, new PaletteRemap(File.OpenRead("../../../red.rem")));
|
||||
|
||||
HardwarePalette hardwarePalette = new HardwarePalette(renderer.Device);
|
||||
hardwarePalette.AddPalette(pal);
|
||||
|
||||
foreach (string remap in new string[] { "blue", "red", "orange", "teal", "salmon", "green", "gray" })
|
||||
hardwarePalette.AddPalette(new Palette(pal, new PaletteRemap(
|
||||
File.OpenRead("../../../" + remap + ".rem"))));
|
||||
|
||||
renderer.SetPalette(hardwarePalette);
|
||||
|
||||
return new TileSet(TileMix, TileSuffix, pal);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user