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

10
OpenRA.Game/Widgets/VqaPlayerWidget.cs
View File

@@ -63,8 +63,8 @@ namespace OpenRA.Widgets
var textureSize = Exts.NextPowerOf2(size);
var videoSheet = new Sheet(new Size(textureSize, textureSize));
videoSheet.Texture.ScaleFilter = TextureScaleFilter.Linear;
videoSheet.Texture.SetData(video.FrameData);
videoSheet.GetTexture().ScaleFilter = TextureScaleFilter.Linear;
videoSheet.GetTexture().SetData(video.FrameData);
videoSprite = new Sprite(videoSheet,
new Rectangle(
@@ -90,7 +90,7 @@ namespace OpenRA.Widgets
overlay[y, 0] = black;
var overlaySheet = new Sheet(new Size(1, Exts.NextPowerOf2(scaledHeight)));
overlaySheet.Texture.SetData(overlay);
overlaySheet.GetTexture().SetData(overlay);
overlaySprite = new Sprite(overlaySheet, new Rectangle(0, 0, 1, scaledHeight), TextureChannel.Alpha);
}
@@ -117,7 +117,7 @@ namespace OpenRA.Widgets
while (nextFrame > video.CurrentFrame)
{
video.AdvanceFrame();
videoSprite.sheet.Texture.SetData(video.FrameData);
videoSprite.sheet.GetTexture().SetData(video.FrameData);
skippedFrames++;
}
@@ -185,7 +185,7 @@ namespace OpenRA.Widgets
paused = true;
Sound.StopVideo();
video.Reset();
videoSprite.sheet.Texture.SetData(video.FrameData);
videoSprite.sheet.GetTexture().SetData(video.FrameData);
world.AddFrameEndTask(_ => onComplete());
}
}