remove allowAlpha from SpriteRenderer
This commit is contained in:
@@ -87,9 +87,9 @@ namespace OpenRA
|
||||
public Chrome(Renderer r, Manifest m)
|
||||
{
|
||||
this.renderer = r;
|
||||
rgbaRenderer = new SpriteRenderer(renderer, true, renderer.RgbaSpriteShader);
|
||||
rgbaRenderer = new SpriteRenderer(renderer, renderer.RgbaSpriteShader);
|
||||
lineRenderer = new LineRenderer(renderer);
|
||||
shpRenderer = new SpriteRenderer(renderer, true, renderer.WorldSpriteShader);
|
||||
shpRenderer = new SpriteRenderer(renderer, renderer.WorldSpriteShader);
|
||||
|
||||
tabSprites = Rules.Info.Values
|
||||
.Where(u => u.Traits.Contains<BuildableInfo>())
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace OpenRA.Graphics
|
||||
mapOnlySheet = new Sheet(r, new Size(world.Map.MapSize.X, world.Map.MapSize.Y));
|
||||
|
||||
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 dw = (size - world.Map.Width) / 2;
|
||||
var dh = (size - world.Map.Height) / 2;
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace OpenRA.Graphics
|
||||
int sprites = 0;
|
||||
int nv = 0, ni = 0;
|
||||
|
||||
public SpriteRenderer(Renderer renderer, bool allowAlpha, IShader shader)
|
||||
public SpriteRenderer(Renderer renderer, IShader shader)
|
||||
{
|
||||
this.renderer = renderer;
|
||||
this.shader = shader;
|
||||
@@ -46,8 +46,8 @@ namespace OpenRA.Graphics
|
||||
indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
|
||||
}
|
||||
|
||||
public SpriteRenderer(Renderer renderer, bool allowAlpha)
|
||||
: this(renderer, allowAlpha, renderer.SpriteShader) { }
|
||||
public SpriteRenderer(Renderer renderer)
|
||||
: this(renderer, renderer.SpriteShader) { }
|
||||
|
||||
public void Flush()
|
||||
{
|
||||
|
||||
@@ -23,6 +23,7 @@ using System.Linq;
|
||||
using OpenRA.Network;
|
||||
using OpenRA.Traits;
|
||||
using OpenRA.Widgets;
|
||||
using OpenRA.Support;
|
||||
|
||||
namespace OpenRA.Graphics
|
||||
{
|
||||
@@ -57,7 +58,7 @@ namespace OpenRA.Graphics
|
||||
{
|
||||
this.screenSize = screenSize;
|
||||
this.renderer = renderer;
|
||||
cursorRenderer = new SpriteRenderer(renderer, true);
|
||||
cursorRenderer = new SpriteRenderer(renderer);
|
||||
|
||||
this.scrollPosition = Game.CellSize* mapStart;
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace OpenRA.Graphics
|
||||
this.renderer = renderer;
|
||||
|
||||
terrainRenderer = new TerrainRenderer(world, renderer, this);
|
||||
spriteRenderer = new SpriteRenderer(renderer, true);
|
||||
spriteRenderer = new SpriteRenderer(renderer);
|
||||
lineRenderer = new LineRenderer(renderer);
|
||||
uiOverlay = new UiOverlay(spriteRenderer);
|
||||
palette = new HardwarePalette(renderer, world.Map);
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace OpenRA.Traits
|
||||
|
||||
public BibLayer(Actor self, BibLayerInfo info)
|
||||
{
|
||||
spriteRenderer = new SpriteRenderer( Game.renderer, true );
|
||||
spriteRenderer = new SpriteRenderer( Game.renderer );
|
||||
this.info = info;
|
||||
bibSprites = info.BibTypes.Select(x => SpriteSheetBuilder.LoadAllSprites(x)).ToArray();
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace OpenRA.Traits
|
||||
|
||||
public ResourceLayer(Actor self)
|
||||
{
|
||||
sr = new SpriteRenderer( Game.renderer, true );
|
||||
sr = new SpriteRenderer( Game.renderer );
|
||||
}
|
||||
|
||||
public void Render()
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace OpenRA.Traits
|
||||
|
||||
public SmudgeLayer(Actor self, SmudgeLayerInfo info)
|
||||
{
|
||||
spriteRenderer = new SpriteRenderer( Game.renderer, true );
|
||||
spriteRenderer = new SpriteRenderer( Game.renderer );
|
||||
this.Info = info;
|
||||
smudgeSprites = Info.Types.Select(x => SpriteSheetBuilder.LoadAllSprites(x)).ToArray();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user