Bye Bye Chrome!

This commit is contained in:
alzeih
2010-07-21 17:57:06 +12:00
parent 0ac91d3c5e
commit 222b29cec6
35 changed files with 180 additions and 199 deletions

View File

@@ -81,7 +81,7 @@ namespace OpenRA.Graphics
mod.AdjustPalette(b);
Texture.SetData(b);
Game.renderer.PaletteTexture = Texture;
Game.Renderer.PaletteTexture = Texture;
}
}
}

View File

@@ -13,7 +13,7 @@ using OpenRA.FileFormats.Graphics;
namespace OpenRA.Graphics
{
class LineRenderer
public class LineRenderer
{
Renderer renderer;
IVertexBuffer<Vertex> vertexBuffer;

View File

@@ -18,7 +18,7 @@ using OpenRA.Support;
namespace OpenRA.Graphics
{
internal class Renderer
public class Renderer
{
internal static int SheetSize;
@@ -32,6 +32,7 @@ namespace OpenRA.Graphics
public SpriteRenderer SpriteRenderer { get; private set; }
public SpriteRenderer RgbaSpriteRenderer { get; private set; }
public SpriteRenderer WorldSpriteRenderer { get; private set; }
public LineRenderer LineRenderer { get; private set; }
public ITexture PaletteTexture;
@@ -51,6 +52,7 @@ namespace OpenRA.Graphics
SpriteRenderer = new SpriteRenderer( this, SpriteShader );
RgbaSpriteRenderer = new SpriteRenderer( this, RgbaSpriteShader );
WorldSpriteRenderer = new SpriteRenderer( this, WorldSpriteShader );
LineRenderer = new LineRenderer(this);
RegularFont = new SpriteFont(this, "FreeSans.ttf", 14);
BoldFont = new SpriteFont(this, "FreeSansBold.ttf", 14);
@@ -118,5 +120,12 @@ namespace OpenRA.Graphics
PerfHistory.Increment("batches", 1);
}
public void Flush()
{
WorldSpriteRenderer.Flush();
RgbaSpriteRenderer.Flush();
LineRenderer.Flush();
}
}
}

View File

@@ -17,7 +17,7 @@ using Tao.FreeType;
namespace OpenRA.Graphics
{
class SpriteFont
public class SpriteFont
{
Renderer renderer;
int size;

View File

@@ -12,7 +12,7 @@ using OpenRA.FileFormats.Graphics;
namespace OpenRA.Graphics
{
class SpriteRenderer
public class SpriteRenderer
{
IVertexBuffer<Vertex> vertexBuffer;
IIndexBuffer indexBuffer;

View File

@@ -67,7 +67,7 @@ namespace OpenRA.Graphics
world.WorldRenderer.Draw();
Timer.Time( "worldRenderer: {0}" );
Game.chrome.Draw(world);
Widget.DoDraw(world);
Timer.Time( "widgets: {0}" );
var cursorName = Widget.RootWidget.GetCursorOuter(mousePos) ?? Game.controller.ChooseCursor( world );