Mirrored_Repos/VPet
1
0
Fork 0
mirror of https://github.com/LorisYounger/VPet.git synced 2024-08-30 18:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

取消 MemoryStream 读取

Browse Source
This commit is contained in:
ZouJin 2023-03-27 09:46:23 +11:00
parent 47c1721134
commit 91c0739214
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
VPet-Simulator.Core/Display/MainDisplay.cs
View File

@ -1114,28 +1114,28 @@ namespace VPet_Simulator.Core
if (petgridcrlf)
{
graph.Run(PetGrid2, EndAction);
((IGraph)(PetGridTag)).Stop(true);
Dispatcher.Invoke(() =>
{
PetGrid.Visibility = Visibility.Hidden;
PetGrid2.Visibility = Visibility.Visible;
//PetGrid2.Tag = graph;
});
graph.Run(PetGrid2, EndAction);
});
}
else
{
graph.Run(PetGrid, EndAction);
((IGraph)(PetGrid2Tag)).Stop(true);
Dispatcher.Invoke(() =>
{
PetGrid2.Visibility = Visibility.Hidden;
PetGrid.Visibility = Visibility.Visible;
//PetGrid.Tag = graph;
});
graph.Run(PetGrid, EndAction);
});
}
petgridcrlf = !petgridcrlf;
GC.Collect();
}
}
}

26
VPet-Simulator.Core/Graph/PNGAnimation.cs
View File

@ -66,7 +66,7 @@ namespace VPet_Simulator.Core
/// <summary>
/// 图片资源
/// </summary>
public MemoryStream stream;
public string Path;
private GraphCore GraphCore;
/// <summary>
/// 新建 PNG 动画
@ -162,9 +162,9 @@ namespace VPet_Simulator.Core
{
//新方法:加载大图片
//生成大文件加载非常慢,先看看有没有缓存能用
string cp = GraphCore.CachePath + $"\\{Sub.GetHashCode(path)}_{paths.Length}.png";
Path = GraphCore.CachePath + $"\\{Sub.GetHashCode(path)}_{paths.Length}.png";
Width = 500 * (paths.Length + 1);
if (File.Exists(cp))
if (File.Exists(Path))
{
for (int i = 0; i < paths.Length; i++)
{
@ -189,12 +189,12 @@ namespace VPet_Simulator.Core
graph.DrawImage(imgs[i], w * i, 0, w, h);
Animations.Add(new Animation(this, time, -500 * i));
}
joinedBitmap.Save(cp);
joinedBitmap.Save(Path);
graph.Dispose();
joinedBitmap.Dispose();
imgs.ForEach(x => x.Dispose());
}
stream = new MemoryStream(File.ReadAllBytes(cp));
//stream = new MemoryStream(File.ReadAllBytes(cp));
IsReady = true;
}
@ -335,14 +335,14 @@ namespace VPet_Simulator.Core
}
}
parant.Tag = this;
var bitmap = new BitmapImage();
bitmap.BeginInit();
stream.Seek(0, SeekOrigin.Begin);
bitmap.StreamSource = stream;
bitmap.CacheOption = BitmapCacheOption.OnLoad;
bitmap.EndInit();
img.Source = bitmap;
//var bitmap = new BitmapImage();
//bitmap.BeginInit();
//stream.Seek(0, SeekOrigin.Begin);
//bitmap.StreamSource = stream;
//bitmap.CacheOption = BitmapCacheOption.OnLoad;
//bitmap.EndInit();
img.Source = new BitmapImage(new Uri(Path));
img.Width = Width;
new Thread(() => Animations[0].Run(parant, EndAction)).Start();
});

18
VPet-Simulator.Core/Graph/Picture.cs
View File

@ -26,7 +26,7 @@ namespace VPet_Simulator.Core
IsLoop = isloop;
Length = length;
GraphCore = graphCore;
stream = new MemoryStream(File.ReadAllBytes(path));
Path = path;
GraphType = graphType;
if (!GraphCore.CommConfig.ContainsKey("PIC_Setup"))
{
@ -39,7 +39,7 @@ namespace VPet_Simulator.Core
/// <summary>
/// 图片资源
/// </summary>
public MemoryStream stream;
public string Path;
public Save.ModeType ModeType { get; private set; }
private GraphCore GraphCore;
public bool PlayState { get; set; }
@ -77,13 +77,13 @@ namespace VPet_Simulator.Core
}
}
}
var bitmap = new BitmapImage();
bitmap.BeginInit();
stream.Seek(0, SeekOrigin.Begin);
bitmap.StreamSource = stream;
bitmap.CacheOption = BitmapCacheOption.OnLoad;
bitmap.EndInit();
img.Source = bitmap;
//var bitmap = new BitmapImage();
//bitmap.BeginInit();
//stream.Seek(0, SeekOrigin.Begin);
//bitmap.StreamSource = stream;
//bitmap.CacheOption = BitmapCacheOption.OnLoad;
//bitmap.EndInit();
img.Source = new BitmapImage(new Uri(Path));
parant.Tag = this;
}
Task.Run(() =>