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

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)
@@ -113,13 +113,13 @@ namespace OpenRA.Graphics
void Update()
{
if (cursor == null)
Game.Renderer.Device.SetHardwareCursor(null);
Game.Renderer.Window.SetHardwareCursor(null);
else
{
if (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()
{
Texture = Game.Renderer.Device.CreateTexture();
Texture = Game.Renderer.Window.CreateTexture();
readOnlyModifiablePalettes = modifiablePalettes.AsReadOnly();
}

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

@@ -300,14 +300,14 @@ namespace OpenRA.Graphics
Game.Renderer.Flush();
fbo.Bind();
Game.Renderer.Device.EnableDepthBuffer();
Game.Renderer.Window.EnableDepthBuffer();
return fbo;
}
void DisableFrameBuffer(IFrameBuffer fbo)
{
Game.Renderer.Flush();
Game.Renderer.Device.DisableDepthBuffer();
Game.Renderer.Window.DisableDepthBuffer();
fbo.Unbind();
}
@@ -356,7 +356,7 @@ namespace OpenRA.Graphics
}
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);
mappedBuffers.Add(sheet, framebuffer);

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

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

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

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

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

@@ -43,10 +43,10 @@ namespace OpenRA.Graphics
sheets[i] = null;
}
renderer.Device.SetBlendMode(currentBlend);
renderer.Window.SetBlendMode(currentBlend);
shader.PrepareRender();
renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
renderer.Device.SetBlendMode(BlendMode.None);
renderer.Window.SetBlendMode(BlendMode.None);
nv = 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)
{
shader.SetTexture("Texture0", sheet.GetTexture());
renderer.Device.SetBlendMode(blendMode);
renderer.Window.SetBlendMode(blendMode);
shader.PrepareRender();
renderer.DrawBatch(buffer, start, length, type);
renderer.Device.SetBlendMode(BlendMode.None);
renderer.Window.SetBlendMode(BlendMode.None);
}
// For RGBAColorRenderer

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

@@ -46,7 +46,7 @@ namespace OpenRA.Graphics
rowStride = 6 * map.MapSize.X;
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);
wr.PaletteInvalidated += UpdatePaletteIndices;

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

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