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

remove allowAlpha from SpriteRenderer

Browse Source
This commit is contained in:
Bob
2010-04-11 20:05:08 +12:00
parent 8e315173c8
commit 8a3e5b8ccc
8 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Chrome.cs
View File

@@ -87,9 +87,9 @@ namespace OpenRA
public Chrome(Renderer r, Manifest m) public Chrome(Renderer r, Manifest m)
{ {
this.renderer = r; this.renderer = r;
rgbaRenderer = new SpriteRenderer(renderer, true, renderer.RgbaSpriteShader); rgbaRenderer = new SpriteRenderer(renderer, renderer.RgbaSpriteShader);
lineRenderer = new LineRenderer(renderer); lineRenderer = new LineRenderer(renderer);
shpRenderer = new SpriteRenderer(renderer, true, renderer.WorldSpriteShader); shpRenderer = new SpriteRenderer(renderer, renderer.WorldSpriteShader);
tabSprites = Rules.Info.Values tabSprites = Rules.Info.Values
.Where(u => u.Traits.Contains<BuildableInfo>()) .Where(u => u.Traits.Contains<BuildableInfo>())

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

@@ -51,7 +51,7 @@ namespace OpenRA.Graphics
mapOnlySheet = new Sheet(r, new Size(world.Map.MapSize.X, world.Map.MapSize.Y)); mapOnlySheet = new Sheet(r, new Size(world.Map.MapSize.X, world.Map.MapSize.Y));
lineRenderer = new LineRenderer(r); lineRenderer = new LineRenderer(r);
rgbaRenderer = new SpriteRenderer(r, true, r.RgbaSpriteShader); rgbaRenderer = new SpriteRenderer(r, r.RgbaSpriteShader);
var size = Math.Max(world.Map.Width, world.Map.Height); var size = Math.Max(world.Map.Width, world.Map.Height);
var dw = (size - world.Map.Width) / 2; var dw = (size - world.Map.Width) / 2;
var dh = (size - world.Map.Height) / 2; var dh = (size - world.Map.Height) / 2;

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

@@ -37,7 +37,7 @@ namespace OpenRA.Graphics
int sprites = 0; int sprites = 0;
int nv = 0, ni = 0; int nv = 0, ni = 0;
public SpriteRenderer(Renderer renderer, bool allowAlpha, IShader shader) public SpriteRenderer(Renderer renderer, IShader shader)
{ {
this.renderer = renderer; this.renderer = renderer;
this.shader = shader; this.shader = shader;
@@ -46,8 +46,8 @@ namespace OpenRA.Graphics
indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length ); indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
} }
public SpriteRenderer(Renderer renderer, bool allowAlpha) public SpriteRenderer(Renderer renderer)
: this(renderer, allowAlpha, renderer.SpriteShader) { } : this(renderer, renderer.SpriteShader) { }
public void Flush() public void Flush()
{ {

3
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -23,6 +23,7 @@ using System.Linq;
using OpenRA.Network; using OpenRA.Network;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets; using OpenRA.Widgets;
using OpenRA.Support;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
@@ -57,7 +58,7 @@ namespace OpenRA.Graphics
{ {
this.screenSize = screenSize; this.screenSize = screenSize;
this.renderer = renderer; this.renderer = renderer;
cursorRenderer = new SpriteRenderer(renderer, true); cursorRenderer = new SpriteRenderer(renderer);
this.scrollPosition = Game.CellSize* mapStart; this.scrollPosition = Game.CellSize* mapStart;
} }

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

@@ -42,7 +42,7 @@ namespace OpenRA.Graphics
this.renderer = renderer; this.renderer = renderer;
terrainRenderer = new TerrainRenderer(world, renderer, this); terrainRenderer = new TerrainRenderer(world, renderer, this);
spriteRenderer = new SpriteRenderer(renderer, true); spriteRenderer = new SpriteRenderer(renderer);
lineRenderer = new LineRenderer(renderer); lineRenderer = new LineRenderer(renderer);
uiOverlay = new UiOverlay(spriteRenderer); uiOverlay = new UiOverlay(spriteRenderer);
palette = new HardwarePalette(renderer, world.Map); palette = new HardwarePalette(renderer, world.Map);

2
OpenRA.Game/Traits/World/BibLayer.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Traits
public BibLayer(Actor self, BibLayerInfo info) public BibLayer(Actor self, BibLayerInfo info)
{ {
spriteRenderer = new SpriteRenderer( Game.renderer, true ); spriteRenderer = new SpriteRenderer( Game.renderer );
this.info = info; this.info = info;
bibSprites = info.BibTypes.Select(x => SpriteSheetBuilder.LoadAllSprites(x)).ToArray(); bibSprites = info.BibTypes.Select(x => SpriteSheetBuilder.LoadAllSprites(x)).ToArray();

2
OpenRA.Game/Traits/World/ResourceLayer.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Traits
public ResourceLayer(Actor self) public ResourceLayer(Actor self)
{ {
sr = new SpriteRenderer( Game.renderer, true ); sr = new SpriteRenderer( Game.renderer );
} }
public void Render() public void Render()

2
OpenRA.Game/Traits/World/SmudgeLayer.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Traits
public SmudgeLayer(Actor self, SmudgeLayerInfo info) public SmudgeLayer(Actor self, SmudgeLayerInfo info)
{ {
spriteRenderer = new SpriteRenderer( Game.renderer, true ); spriteRenderer = new SpriteRenderer( Game.renderer );
this.Info = info; this.Info = info;
smudgeSprites = Info.Types.Select(x => SpriteSheetBuilder.LoadAllSprites(x)).ToArray(); smudgeSprites = Info.Types.Select(x => SpriteSheetBuilder.LoadAllSprites(x)).ToArray();
} }