isledecomp/SIEdit
1
0
Fork 0
mirror of https://github.com/isledecomp/SIEdit.git synced 2025-04-12 04:44:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: calculate parent timings at start of loop

Browse source
This commit is contained in:
itsmattkc 2022-07-30 09:03:35 -07:00
parent cbf6492177
commit 3a45b2cce8
1 changed files with 22 additions and 17 deletions

39
lib/interleaf.cpp
View file

@ -517,6 +517,28 @@ void Interleaf::InterleaveObjects(FileBase *f, const std::vector<Object *> &obje
// Next, interleave the rest based on time
while (true) {
// Update parent time too
bool done = false;
while (!done) {
done = true;
for (size_t j=0; j<status.size(); j++) {
ChunkStatus &s = status.at(j);
Object *obj = s.object;
for (size_t i=0; i<status.size(); i++) {
ChunkStatus &p = status.at(i);
if (p.object != obj) {
if (p.object->ContainsChild(obj)) {
if (p.time < s.time) {
p.time = s.time;
done = false;
}
}
}
}
}
}
// Find next chunk
std::vector<ChunkStatus>::iterator s = status.begin();
if (s == status.end()) {
@ -583,23 +605,6 @@ void Interleaf::InterleaveObjects(FileBase *f, const std::vector<Object *> &obje
// Unaffected by time
break;
}
// Update parent time too
bool done = false;
while (!done) {
done = true;
for (size_t i=0; i<status.size(); i++) {
ChunkStatus &p = status.at(i);
if (p.object != obj) {
if (p.object->ContainsChild(obj)) {
if (p.time < s->time) {
p.time = s->time;
done = false;
}
}
}
}
}
}
}