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

Rename Renderer.Device to Renderer.Window.

Browse Source
This commit is contained in:
Paul Chote
2018-06-05 20:08:44 +01:00
parent 28c8089bc7
commit ab14a86d39
10 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -523,7 +523,7 @@ namespace OpenRA
Bitmap bitmap; Bitmap bitmap;
using (new PerfTimer("Renderer.TakeScreenshot")) using (new PerfTimer("Renderer.TakeScreenshot"))
bitmap = Renderer.Device.TakeScreenshot(); bitmap = Renderer.Window.TakeScreenshot();
ThreadPool.QueueUserWorkItem(_ => ThreadPool.QueueUserWorkItem(_ =>
{ {

6
OpenRA.Game/Graphics/HardwareCursor.cs
View File

@@ -80,7 +80,7 @@ namespace OpenRA.Graphics
} }
} }
return Game.Renderer.Device.CreateHardwareCursor(name, new Size(dataWidth, dataHeight), data, hotspot); return Game.Renderer.Window.CreateHardwareCursor(name, new Size(dataWidth, dataHeight), data, hotspot);
} }
public void SetCursor(string cursorName) public void SetCursor(string cursorName)
@@ -113,13 +113,13 @@ namespace OpenRA.Graphics
void Update() void Update()
{ {
if (cursor == null) if (cursor == null)
Game.Renderer.Device.SetHardwareCursor(null); Game.Renderer.Window.SetHardwareCursor(null);
else else
{ {
if (frame >= cursor.Length) if (frame >= cursor.Length)
frame = frame % cursor.Length; frame = frame % cursor.Length;
Game.Renderer.Device.SetHardwareCursor(hardwareCursors[cursor.Name][frame]); Game.Renderer.Window.SetHardwareCursor(hardwareCursors[cursor.Name][frame]);
} }
} }

2
OpenRA.Game/Graphics/HardwarePalette.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Graphics
public HardwarePalette() public HardwarePalette()
{ {
Texture = Game.Renderer.Device.CreateTexture(); Texture = Game.Renderer.Window.CreateTexture();
readOnlyModifiablePalettes = modifiablePalettes.AsReadOnly(); readOnlyModifiablePalettes = modifiablePalettes.AsReadOnly();
} }

6
OpenRA.Game/Graphics/ModelRenderer.cs
View File

@@ -300,14 +300,14 @@ namespace OpenRA.Graphics
Game.Renderer.Flush(); Game.Renderer.Flush();
fbo.Bind(); fbo.Bind();
Game.Renderer.Device.EnableDepthBuffer(); Game.Renderer.Window.EnableDepthBuffer();
return fbo; return fbo;
} }
void DisableFrameBuffer(IFrameBuffer fbo) void DisableFrameBuffer(IFrameBuffer fbo)
{ {
Game.Renderer.Flush(); Game.Renderer.Flush();
Game.Renderer.Device.DisableDepthBuffer(); Game.Renderer.Window.DisableDepthBuffer();
fbo.Unbind(); fbo.Unbind();
} }
@@ -356,7 +356,7 @@ namespace OpenRA.Graphics
} }
var size = new Size(renderer.SheetSize, renderer.SheetSize); var size = new Size(renderer.SheetSize, renderer.SheetSize);
var framebuffer = renderer.Device.CreateFrameBuffer(size); var framebuffer = renderer.Window.CreateFrameBuffer(size);
var sheet = new Sheet(SheetType.BGRA, framebuffer.Texture); var sheet = new Sheet(SheetType.BGRA, framebuffer.Texture);
mappedBuffers.Add(sheet, framebuffer); mappedBuffers.Add(sheet, framebuffer);

2
OpenRA.Game/Graphics/Sheet.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA.Graphics
{ {
if (texture == null) if (texture == null)
{ {
texture = Game.Renderer.Device.CreateTexture(); texture = Game.Renderer.Window.CreateTexture();
dirty = true; dirty = true;
} }

2
OpenRA.Game/Graphics/SoftwareCursor.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Graphics
sheetBuilder.Current.ReleaseBuffer(); sheetBuilder.Current.ReleaseBuffer();
Game.Renderer.Device.SetHardwareCursor(null); Game.Renderer.Window.SetHardwareCursor(null);
} }
PaletteReference CreatePaletteReference(string name) PaletteReference CreatePaletteReference(string name)

8
OpenRA.Game/Graphics/SpriteRenderer.cs
View File

@@ -43,10 +43,10 @@ namespace OpenRA.Graphics
sheets[i] = null; sheets[i] = null;
} }
renderer.Device.SetBlendMode(currentBlend); renderer.Window.SetBlendMode(currentBlend);
shader.PrepareRender(); shader.PrepareRender();
renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList); renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
renderer.Device.SetBlendMode(BlendMode.None); renderer.Window.SetBlendMode(BlendMode.None);
nv = 0; nv = 0;
ns = 0; ns = 0;
@@ -131,10 +131,10 @@ namespace OpenRA.Graphics
public void DrawVertexBuffer(IVertexBuffer<Vertex> buffer, int start, int length, PrimitiveType type, Sheet sheet, BlendMode blendMode) public void DrawVertexBuffer(IVertexBuffer<Vertex> buffer, int start, int length, PrimitiveType type, Sheet sheet, BlendMode blendMode)
{ {
shader.SetTexture("Texture0", sheet.GetTexture()); shader.SetTexture("Texture0", sheet.GetTexture());
renderer.Device.SetBlendMode(blendMode); renderer.Window.SetBlendMode(blendMode);
shader.PrepareRender(); shader.PrepareRender();
renderer.DrawBatch(buffer, start, length, type); renderer.DrawBatch(buffer, start, length, type);
renderer.Device.SetBlendMode(BlendMode.None); renderer.Window.SetBlendMode(BlendMode.None);
} }
// For RGBAColorRenderer // For RGBAColorRenderer

2
OpenRA.Game/Graphics/TerrainSpriteLayer.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Graphics
rowStride = 6 * map.MapSize.X; rowStride = 6 * map.MapSize.X;
vertices = new Vertex[rowStride * map.MapSize.Y]; vertices = new Vertex[rowStride * map.MapSize.Y];
vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(vertices.Length); vertexBuffer = Game.Renderer.Window.CreateVertexBuffer(vertices.Length);
emptySprite = new Sprite(sheet, Rectangle.Empty, TextureChannel.Alpha); emptySprite = new Sprite(sheet, Rectangle.Empty, TextureChannel.Alpha);
wr.PaletteInvalidated += UpdatePaletteIndices; wr.PaletteInvalidated += UpdatePaletteIndices;

4
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -179,7 +179,7 @@ namespace OpenRA.Graphics
Game.Renderer.EnableScissor(bounds); Game.Renderer.EnableScissor(bounds);
if (enableDepthBuffer) if (enableDepthBuffer)
Game.Renderer.Device.EnableDepthBuffer(); Game.Renderer.Window.EnableDepthBuffer();
terrainRenderer.Draw(this, Viewport); terrainRenderer.Draw(this, Viewport);
Game.Renderer.Flush(); Game.Renderer.Flush();
@@ -203,7 +203,7 @@ namespace OpenRA.Graphics
a.Trait.RenderShroud(renderShroud, this); a.Trait.RenderShroud(renderShroud, this);
if (enableDepthBuffer) if (enableDepthBuffer)
Game.Renderer.Device.DisableDepthBuffer(); Game.Renderer.Window.DisableDepthBuffer();
Game.Renderer.DisableScissor(); Game.Renderer.DisableScissor();

54
OpenRA.Game/Renderer.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA
public RgbaSpriteRenderer RgbaSpriteRenderer { get; private set; } public RgbaSpriteRenderer RgbaSpriteRenderer { get; private set; }
public IReadOnlyDictionary<string, SpriteFont> Fonts; public IReadOnlyDictionary<string, SpriteFont> Fonts;
internal IPlatformWindow Device { get; private set; } internal IPlatformWindow Window { get; private set; }
internal int SheetSize { get; private set; } internal int SheetSize { get; private set; }
internal int TempBufferSize { get; private set; } internal int TempBufferSize { get; private set; }
@@ -51,20 +51,20 @@ namespace OpenRA
{ {
var resolution = GetResolution(graphicSettings); var resolution = GetResolution(graphicSettings);
Device = platform.CreateWindow(new Size(resolution.Width, resolution.Height), graphicSettings.Mode); Window = platform.CreateWindow(new Size(resolution.Width, resolution.Height), graphicSettings.Mode);
TempBufferSize = graphicSettings.BatchSize; TempBufferSize = graphicSettings.BatchSize;
SheetSize = graphicSettings.SheetSize; SheetSize = graphicSettings.SheetSize;
WorldSpriteRenderer = new SpriteRenderer(this, Device.CreateShader("combined")); WorldSpriteRenderer = new SpriteRenderer(this, Window.CreateShader("combined"));
WorldRgbaSpriteRenderer = new RgbaSpriteRenderer(WorldSpriteRenderer); WorldRgbaSpriteRenderer = new RgbaSpriteRenderer(WorldSpriteRenderer);
WorldRgbaColorRenderer = new RgbaColorRenderer(WorldSpriteRenderer); WorldRgbaColorRenderer = new RgbaColorRenderer(WorldSpriteRenderer);
WorldModelRenderer = new ModelRenderer(this, Device.CreateShader("model")); WorldModelRenderer = new ModelRenderer(this, Window.CreateShader("model"));
SpriteRenderer = new SpriteRenderer(this, Device.CreateShader("combined")); SpriteRenderer = new SpriteRenderer(this, Window.CreateShader("combined"));
RgbaSpriteRenderer = new RgbaSpriteRenderer(SpriteRenderer); RgbaSpriteRenderer = new RgbaSpriteRenderer(SpriteRenderer);
RgbaColorRenderer = new RgbaColorRenderer(SpriteRenderer); RgbaColorRenderer = new RgbaColorRenderer(SpriteRenderer);
tempBuffer = Device.CreateVertexBuffer(TempBufferSize); tempBuffer = Window.CreateVertexBuffer(TempBufferSize);
} }
static Size GetResolution(GraphicSettings graphicsSettings) static Size GetResolution(GraphicSettings graphicsSettings)
@@ -87,10 +87,10 @@ namespace OpenRA
fontSheetBuilder = new SheetBuilder(SheetType.BGRA, 512); fontSheetBuilder = new SheetBuilder(SheetType.BGRA, 512);
Fonts = modData.Manifest.Fonts.ToDictionary(x => x.Key, Fonts = modData.Manifest.Fonts.ToDictionary(x => x.Key,
x => new SpriteFont(x.Value.First, modData.DefaultFileSystem.Open(x.Value.First).ReadAllBytes(), x => new SpriteFont(x.Value.First, modData.DefaultFileSystem.Open(x.Value.First).ReadAllBytes(),
x.Value.Second, Device.WindowScale, fontSheetBuilder)).AsReadOnly(); x.Value.Second, Window.WindowScale, fontSheetBuilder)).AsReadOnly();
} }
Device.OnWindowScaleChanged += (before, after) => Window.OnWindowScaleChanged += (before, after) =>
{ {
foreach (var f in Fonts) foreach (var f in Fonts)
f.Value.SetScale(after); f.Value.SetScale(after);
@@ -113,7 +113,7 @@ namespace OpenRA
public void BeginFrame(int2 scroll, float zoom) public void BeginFrame(int2 scroll, float zoom)
{ {
Device.Clear(); Window.Clear();
SetViewportParams(scroll, zoom); SetViewportParams(scroll, zoom);
} }
@@ -153,8 +153,8 @@ namespace OpenRA
public void EndFrame(IInputHandler inputHandler) public void EndFrame(IInputHandler inputHandler)
{ {
Flush(); Flush();
Device.PumpInput(inputHandler); Window.PumpInput(inputHandler);
Device.Present(); Window.Present();
} }
public void DrawBatch(Vertex[] vertices, int numVertices, PrimitiveType type) public void DrawBatch(Vertex[] vertices, int numVertices, PrimitiveType type)
@@ -168,7 +168,7 @@ namespace OpenRA
where T : struct where T : struct
{ {
vertices.Bind(); vertices.Bind();
Device.DrawPrimitives(type, firstVertex, numVertices); Window.DrawPrimitives(type, firstVertex, numVertices);
PerfHistory.Increment("batches", 1); PerfHistory.Increment("batches", 1);
} }
@@ -177,8 +177,8 @@ namespace OpenRA
CurrentBatchRenderer = null; CurrentBatchRenderer = null;
} }
public Size Resolution { get { return Device.WindowSize; } } public Size Resolution { get { return Window.WindowSize; } }
public float WindowScale { get { return Device.WindowScale; } } public float WindowScale { get { return Window.WindowScale; } }
public interface IBatchRenderer { void Flush(); } public interface IBatchRenderer { void Flush(); }
@@ -201,7 +201,7 @@ namespace OpenRA
public IVertexBuffer<Vertex> CreateVertexBuffer(int length) public IVertexBuffer<Vertex> CreateVertexBuffer(int length)
{ {
return Device.CreateVertexBuffer(length); return Window.CreateVertexBuffer(length);
} }
public void EnableScissor(Rectangle rect) public void EnableScissor(Rectangle rect)
@@ -211,7 +211,7 @@ namespace OpenRA
rect.Intersect(scissorState.Peek()); rect.Intersect(scissorState.Peek());
Flush(); Flush();
Device.EnableScissor(rect.Left, rect.Top, rect.Width, rect.Height); Window.EnableScissor(rect.Left, rect.Top, rect.Width, rect.Height);
scissorState.Push(rect); scissorState.Push(rect);
} }
@@ -224,43 +224,43 @@ namespace OpenRA
if (scissorState.Any()) if (scissorState.Any())
{ {
var rect = scissorState.Peek(); var rect = scissorState.Peek();
Device.EnableScissor(rect.Left, rect.Top, rect.Width, rect.Height); Window.EnableScissor(rect.Left, rect.Top, rect.Width, rect.Height);
} }
else else
Device.DisableScissor(); Window.DisableScissor();
} }
public void EnableDepthBuffer() public void EnableDepthBuffer()
{ {
Flush(); Flush();
Device.EnableDepthBuffer(); Window.EnableDepthBuffer();
} }
public void DisableDepthBuffer() public void DisableDepthBuffer()
{ {
Flush(); Flush();
Device.DisableDepthBuffer(); Window.DisableDepthBuffer();
} }
public void ClearDepthBuffer() public void ClearDepthBuffer()
{ {
Flush(); Flush();
Device.ClearDepthBuffer(); Window.ClearDepthBuffer();
} }
public void GrabWindowMouseFocus() public void GrabWindowMouseFocus()
{ {
Device.GrabWindowMouseFocus(); Window.GrabWindowMouseFocus();
} }
public void ReleaseWindowMouseFocus() public void ReleaseWindowMouseFocus()
{ {
Device.ReleaseWindowMouseFocus(); Window.ReleaseWindowMouseFocus();
} }
public void Dispose() public void Dispose()
{ {
Device.Dispose(); Window.Dispose();
WorldModelRenderer.Dispose(); WorldModelRenderer.Dispose();
tempBuffer.Dispose(); tempBuffer.Dispose();
if (fontSheetBuilder != null) if (fontSheetBuilder != null)
@@ -272,17 +272,17 @@ namespace OpenRA
public string GetClipboardText() public string GetClipboardText()
{ {
return Device.GetClipboardText(); return Window.GetClipboardText();
} }
public bool SetClipboardText(string text) public bool SetClipboardText(string text)
{ {
return Device.SetClipboardText(text); return Window.SetClipboardText(text);
} }
public string GLVersion public string GLVersion
{ {
get { return Device.GLVersion; } get { return Window.GLVersion; }
} }
} }
} }