Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Logic cleanup.

Browse Source
This commit is contained in:
PopSlime
2022-11-01 11:28:48 +08:00
parent 6aa8ba6190
commit 3bfc7eb643
2 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Assets/Cryville/Crtr/ChartPlayer.cs
View File

@@ -328,23 +328,6 @@ namespace Cryville.Crtr {
FileInfo skinFile = new FileInfo( FileInfo skinFile = new FileInfo(
Game.GameDataPath + "/skins/" + Settings.Default.LoadSkin Game.GameDataPath + "/skins/" + Settings.Default.LoadSkin
); );
Logger.Log("main", 0, "Load/MainThread", "Loading textures...");
texloadtimer = new diag::Stopwatch();
texloadtimer.Start();
texs = new Dictionary<string, Texture2D>();
var flist = skinFile.Directory.GetFiles("*.png");
foreach (FileInfo f in flist) {
#if NO_THREAD
using (WWW w = new WWW("file:///" + f.FullName)) {
string name = StringUtils.TrimExt(f.Name);
while (!w.isDone);
texs.Add(name, w.texture);
}
#else
texLoadQueue.Enqueue(f.FullName);
#endif
}
#if NO_THREAD #if NO_THREAD
texloadtimer.Stop(); texloadtimer.Stop();
Logger.LogFormat("main", 0, "Load/MainThread", "Textures loaded successfully ({0}ms)", texloadtimer.Elapsed.TotalMilliseconds); Logger.LogFormat("main", 0, "Load/MainThread", "Textures loaded successfully ({0}ms)", texloadtimer.Elapsed.TotalMilliseconds);
@@ -362,6 +345,23 @@ namespace Cryville.Crtr {
skinFile = skinFile, skinFile = skinFile,
}); });
#endif #endif
Logger.Log("main", 0, "Load/MainThread", "Loading textures...");
texloadtimer = new diag::Stopwatch();
texloadtimer.Start();
texs = new Dictionary<string, Texture2D>();
var flist = skinFile.Directory.GetFiles("*.png");
foreach (FileInfo f in flist) {
#if NO_THREAD
using (WWW w = new WWW("file:///" + f.FullName)) {
string name = StringUtils.TrimExt(f.Name);
while (!w.isDone);
texs.Add(name, w.texture);
}
#else
texLoadQueue.Enqueue(f.FullName);
#endif
}
} }
void Prehandle() { void Prehandle() {

14
Assets/Cryville/Crtr/Event/ContainerState.cs
View File

@@ -314,7 +314,6 @@ namespace Cryville.Crtr.Event {
public void Handle(StampedEvent ev, Action<StampedEvent> callback = null) { public void Handle(StampedEvent ev, Action<StampedEvent> callback = null) {
if (breakflag) return; if (breakflag) return;
if (ev != null) { if (ev != null) {
bool flag = false;
if (ev.Unstamped is Chart.Motion) { if (ev.Unstamped is Chart.Motion) {
var tev = (Chart.Motion)ev.Unstamped; var tev = (Chart.Motion)ev.Unstamped;
var mv = RMVPool.Rent(tev.Name); var mv = RMVPool.Rent(tev.Name);
@@ -354,18 +353,9 @@ namespace Cryville.Crtr.Event {
} }
} }
} }
if (ev.Unstamped == null) { Callback(ev.Unstamped == null || ev.Unstamped.Priority >= 0 ? ev : null, callback);
Callback(ev, callback);
flag = true;
} }
else if (ev.Unstamped.Priority >= 0) { else Callback(null, callback);
Callback(ev, callback);
flag = true;
}
if (!flag) Callback(null, callback);
return;
}
Callback(null, callback);
} }
void Callback(StampedEvent ev, Action<StampedEvent> callback) { void Callback(StampedEvent ev, Action<StampedEvent> callback) {