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

修复 #141 自定义分辨率失效 和 修复大长动画导致过长分辨率导致可能的报错

Browse Source
This commit is contained in:
ZouJin 2023-09-01 00:05:07 +08:00
parent cf7bea0de4
commit 902834c0d8
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,17 +164,21 @@ namespace VPet_Simulator.Core
} }
public double Width; public double Width;
/// <summary>
/// 最大同时加载数
/// </summary>
public static int MaxLoadNumber = 20;
private void startup(string path, FileInfo[] paths) private void startup(string path, FileInfo[] paths)
{ {
while (NowLoading > 20) while (NowLoading > MaxLoadNumber)
{ {
Thread.Sleep(100); Thread.Sleep(100);
} }
Interlocked.Increment(ref NowLoading); Interlocked.Increment(ref NowLoading);
//新方法:加载大图片 //新方法:加载大图片
//生成大文件加载非常慢,先看看有没有缓存能用 //生成大文件加载非常慢,先看看有没有缓存能用
Path = System.IO.Path.Combine(GraphCore.CachePath, $"{GraphCore.Resolution}_{Sub.GetHashCode(path)}_{paths.Length}.png"); Path = System.IO.Path.Combine(GraphCore.CachePath, $"{GraphCore.Resolution}_{Math.Abs(Sub.GetHashCode(path))}_{paths.Length}.png");
Width = 500 * (paths.Length + 1); Width = 500 * (paths.Length + 1);
if (!File.Exists(Path) && !((List<string>)GraphCore.CommConfig["Cache"]).Contains(path)) if (!File.Exists(Path) && !((List<string>)GraphCore.CommConfig["Cache"]).Contains(path))
{ {
@ -185,10 +189,15 @@ namespace VPet_Simulator.Core
var img = System.Drawing.Image.FromFile(firstImage.FullName); var img = System.Drawing.Image.FromFile(firstImage.FullName);
w = img.Width; w = img.Width;
h = img.Height; h = img.Height;
if (w > 1000) if (w > GraphCore.Resolution)
{ {
w = 1000; w = GraphCore.Resolution;
h = (int)(h * (1000 / (double)img.Width)); h = (int)(h * (GraphCore.Resolution / (double)img.Width));
}
if(paths.Length * w >= 6000)
{//修复大长动画导致过长分辨率导致可能的报错
w = 6000 / paths.Length;
h = (int)(h * (GraphCore.Resolution / (double)img.Width));
} }
using (Bitmap joinedBitmap = new Bitmap(w * paths.Length, h)) using (Bitmap joinedBitmap = new Bitmap(w * paths.Length, h))
@ -204,7 +213,6 @@ namespace VPet_Simulator.Core
graph.DrawImage(img, w * i, 0, w, h); graph.DrawImage(img, w * i, 0, w, h);
} }
}); });
if (!File.Exists(Path)) if (!File.Exists(Path))
joinedBitmap.Save(Path); joinedBitmap.Save(Path);
} }

6
VPet-Simulator.Windows/MainWindow.xaml.cs
View File

@ -43,6 +43,12 @@ namespace VPet_Simulator.Windows
public System.Timers.Timer AutoSaveTimer = new System.Timers.Timer(); public System.Timers.Timer AutoSaveTimer = new System.Timers.Timer();
public MainWindow() public MainWindow()
{ {
#if X64
PNGAnimation.MaxLoadNumber = 1000;
#else
PNGAnimation.MaxLoadNumber = 20;
#endif
LocalizeCore.StoreTranslation = true; LocalizeCore.StoreTranslation = true;
CultureInfo.CurrentCulture = new CultureInfo(CultureInfo.CurrentCulture.Name); CultureInfo.CurrentCulture = new CultureInfo(CultureInfo.CurrentCulture.Name);
CultureInfo.CurrentCulture.NumberFormat = new CultureInfo("en-US").NumberFormat; CultureInfo.CurrentCulture.NumberFormat = new CultureInfo("en-US").NumberFormat;