1-5
This commit is contained in:
parent
2e27bd5491
commit
88c24c80e5
|
|
@ -294,6 +294,8 @@ namespace RenderHeads.Media.AVProVideo.Editor
|
||||||
GL.sRGBWrite = false;
|
GL.sRGBWrite = false;
|
||||||
|
|
||||||
RenderTexture rt2 = null;
|
RenderTexture rt2 = null;
|
||||||
|
|
||||||
|
|
||||||
Material materialResolve = new Material(Shader.Find(VideoRender.Shader_Resolve));
|
Material materialResolve = new Material(Shader.Find(VideoRender.Shader_Resolve));
|
||||||
VideoRender.SetupVerticalFlipMaterial(materialResolve, _thumbnailPlayer.RequiresVerticalFlip());
|
VideoRender.SetupVerticalFlipMaterial(materialResolve, _thumbnailPlayer.RequiresVerticalFlip());
|
||||||
VideoRender.SetupAlphaPackedMaterial(materialResolve, _thumbnailPlayer.GetTextureAlphaPacking());
|
VideoRender.SetupAlphaPackedMaterial(materialResolve, _thumbnailPlayer.GetTextureAlphaPacking());
|
||||||
|
|
@ -316,6 +318,7 @@ namespace RenderHeads.Media.AVProVideo.Editor
|
||||||
|
|
||||||
Material.DestroyImmediate(materialResolve); materialResolve = null;
|
Material.DestroyImmediate(materialResolve); materialResolve = null;
|
||||||
|
|
||||||
|
|
||||||
Texture2D readTexture = new Texture2D(128, 128, TextureFormat.RGBA32, true, false);
|
Texture2D readTexture = new Texture2D(128, 128, TextureFormat.RGBA32, true, false);
|
||||||
Helper.GetReadableTexture(rt2, readTexture);
|
Helper.GetReadableTexture(rt2, readTexture);
|
||||||
MediaReference mediaRef = (this.targets[_targetIndex]) as MediaReference;
|
MediaReference mediaRef = (this.targets[_targetIndex]) as MediaReference;
|
||||||
|
|
|
||||||
|
|
@ -195,7 +195,7 @@ namespace RenderHeads.Media.AVProVideo.Editor
|
||||||
string path = items[i];
|
string path = items[i];
|
||||||
// Slashes in path must be replaced as they cause the menu to create submenuts
|
// Slashes in path must be replaced as they cause the menu to create submenuts
|
||||||
string itemName = ReplaceSlashes(path);
|
string itemName = ReplaceSlashes(path);
|
||||||
// TODO: shorten if itemName too long
|
|
||||||
menu.AddItem(new GUIContent(prefix + itemName), false, Callback_Select, new RecentMenuItemData(path, propPath, propMediaSource, autoLoadMedia));
|
menu.AddItem(new GUIContent(prefix + itemName), false, Callback_Select, new RecentMenuItemData(path, propPath, propMediaSource, autoLoadMedia));
|
||||||
}
|
}
|
||||||
if (items.Count > 0)
|
if (items.Count > 0)
|
||||||
|
|
|
||||||
|
|
@ -245,7 +245,7 @@ namespace RenderHeads.Media.AVProVideo
|
||||||
|
|
||||||
Rect rect = GetAreaRect();
|
Rect rect = GetAreaRect();
|
||||||
|
|
||||||
// TODO: change this to a material-only path so we only have a single drawing path
|
|
||||||
if (_material != null)
|
if (_material != null)
|
||||||
{
|
{
|
||||||
// TODO: Only setup material when needed
|
// TODO: Only setup material when needed
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ namespace RenderHeads.Media.AVProVideo
|
||||||
{
|
{
|
||||||
_playerInterface.Update();
|
_playerInterface.Update();
|
||||||
|
|
||||||
// TODO: check if Seeking has completed! Then we don't have to wait
|
|
||||||
|
|
||||||
// If frame has changed we can continue
|
// If frame has changed we can continue
|
||||||
// NOTE: this will never happen because GL.IssuePlugin.Event is never called in this loop
|
// NOTE: this will never happen because GL.IssuePlugin.Event is never called in this loop
|
||||||
|
|
|
||||||
|
|
@ -285,7 +285,7 @@ namespace RenderHeads.Media.AVProVideo
|
||||||
Orientation result = Orientation.Landscape;
|
Orientation result = Orientation.Landscape;
|
||||||
if (t != null)
|
if (t != null)
|
||||||
{
|
{
|
||||||
// TODO: check that the Portrait and PortraitFlipped are the right way around
|
|
||||||
if (t[0] == 0f && t[1]== 1f && t[2] == -1f && t[3] == 0f)
|
if (t[0] == 0f && t[1]== 1f && t[2] == -1f && t[3] == 0f)
|
||||||
{
|
{
|
||||||
result = Orientation.Portrait;
|
result = Orientation.Portrait;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue