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

Made Sheet.Texture into Sheet.GetTexture() since we will want to call it for side-effects.

Browse Source 
Do the same for Sheet.Data since it has the side effect of generating a buffer.
This commit is contained in:
RoosterDragon
2014-10-14 17:02:48 +01:00
committed by RoosterDragon
parent ff16690b86
commit a6f5a21ed4
9 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Widgets
var rect = new Rectangle((int)(255*SRange[0]), (int)(255*(1 - VRange[1])), (int)(255*(SRange[1] - SRange[0]))+1, (int)(255*(VRange[1] - VRange[0])) + 1);
var mixerSheet = new Sheet(new Size(256, 256));
mixerSheet.Texture.SetData(front, 256, 256);
mixerSheet.GetTexture().SetData(front, 256, 256);
mixerSprite = new Sprite(mixerSheet, rect, TextureChannel.Alpha);
}
@@ -123,7 +123,7 @@ namespace OpenRA.Mods.Common.Widgets
{
try
{
mixerSprite.sheet.Texture.SetData(front, 256, 256);
mixerSprite.sheet.GetTexture().SetData(front, 256, 256);
}
finally
{

2
OpenRA.Mods.Common/Widgets/HueSliderWidget.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Widgets
*(c + h) = HSLColor.FromHSV(h / 255f, 1, 1).RGB.ToArgb();
}
hueBitmap.UnlockBits(bitmapData);
hueSheet.Texture.SetData(hueBitmap);
hueSheet.GetTexture().SetData(hueBitmap);
}
}

8
OpenRA.Mods.Common/Widgets/RadarWidget.cs
View File

@@ -74,7 +74,7 @@ namespace OpenRA.Mods.Common.Widgets
var r = new Rectangle(0, 0, width, height);
var s = new Size(terrainBitmap.Width, terrainBitmap.Height);
var terrainSheet = new Sheet(s);
terrainSheet.Texture.SetData(terrainBitmap);
terrainSheet.GetTexture().SetData(terrainBitmap);
terrainSprite = new Sprite(terrainSheet, r, TextureChannel.Alpha);
// Data is set in Tick()
@@ -203,16 +203,16 @@ namespace OpenRA.Mods.Common.Widgets
{
updateTicks = 12;
using (var bitmap = Minimap.CustomTerrainBitmap(world))
customTerrainSprite.sheet.Texture.SetData(bitmap);
customTerrainSprite.sheet.GetTexture().SetData(bitmap);
}
if (updateTicks == 8)
using (var bitmap = Minimap.ActorsBitmap(world))
actorSprite.sheet.Texture.SetData(bitmap);
actorSprite.sheet.GetTexture().SetData(bitmap);
if (updateTicks == 4)
using (var bitmap = Minimap.ShroudBitmap(world))
shroudSprite.sheet.Texture.SetData(bitmap);
shroudSprite.sheet.GetTexture().SetData(bitmap);
// Enable/Disable the radar
var enabled = IsEnabled();