Populate the list from yaml; Define ra-allies movies; Additional polish.

This commit is contained in:
Paul Chote
2010-08-12 19:31:29 +12:00
parent 0f953226a6
commit 11aed465a8
7 changed files with 97 additions and 32 deletions

View File

@@ -28,6 +28,12 @@ namespace OpenRA.Widgets
if (filename == cachedVideo)
return;
if (playing)
{
playing = false;
Sound.StopVideoSoundtrack();
}
cachedVideo = filename;
video = new VqaReader(FileSystem.Open(filename));
invLength = video.Framerate*1f/video.Frames;
@@ -35,7 +41,8 @@ namespace OpenRA.Widgets
var size = Math.Max(video.Width, video.Height);
var textureSize = OpenRA.Graphics.Util.NextPowerOf2(size);
videoSprite = new Sprite(new Sheet(new Size(textureSize,textureSize)), new Rectangle( 0, 0, video.Width, video.Height ), TextureChannel.Alpha);
videoSprite.sheet.Texture.SetData(video.FrameData);
var scale = Math.Min(RenderBounds.Width / video.Width, RenderBounds.Height / video.Height);
videoOrigin = new float2(RenderBounds.X + (RenderBounds.Width - scale*video.Width)/2, RenderBounds.Y + (RenderBounds.Height - scale*video.Height)/2);
videoSize = new float2(video.Width * scale, video.Height * scale);
@@ -45,38 +52,47 @@ namespace OpenRA.Widgets
Stopwatch sw = new Stopwatch();
public override void DrawInner(World world)
{
if (!playing)
if (video == null)
return;
var nextFrame = (int)float2.Lerp(0, video.Frames, (float)(sw.ElapsedTime()*invLength));
if (nextFrame > video.Frames)
{
Stop();
return;
}
while (nextFrame > video.CurrentFrame)
if (playing)
{
video.AdvanceFrame();
if (nextFrame == video.CurrentFrame)
videoSprite.sheet.Texture.SetData(video.FrameData);
var nextFrame = (int)float2.Lerp(0, video.Frames, (float)(sw.ElapsedTime()*invLength));
if (nextFrame > video.Frames)
{
Stop();
return;
}
while (nextFrame > video.CurrentFrame)
{
video.AdvanceFrame();
if (nextFrame == video.CurrentFrame)
videoSprite.sheet.Texture.SetData(video.FrameData);
}
}
Game.Renderer.RgbaSpriteRenderer.DrawSprite(videoSprite, videoOrigin, "chrome", videoSize);
}
public void Play()
{
if (playing || video == null)
return;
playing = true;
video.Reset();
videoSprite.sheet.Texture.SetData(video.FrameData);
sw.Reset();
Sound.PlayVideoSoundtrack(video.AudioData);
}
public void Stop()
{
if (!playing || video == null)
return;
playing = false;
Sound.StopVideoSoundtrack();
video.Reset();
videoSprite.sheet.Texture.SetData(video.FrameData);
}
}
}