thunderbrewhq/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-12-12 03:02:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(model): properly handle IsDrawable and WaitForLoad calls

Browse source
This commit is contained in:
fallenoak 2023-02-20 11:15:06 -06:00
parent 5e3d08bf32
commit 961c722825
No known key found for this signature in database
GPG key ID: 7628F8E61AEA070D
3 changed files with 92 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/model/CM2Model.cpp
View file

@ -1,4 +1,5 @@
#include "model/CM2Model.hpp"
#include "async/AsyncFileRead.hpp"
#include "math/Types.hpp"
#include "model/CM2Scene.hpp"
#include "model/CM2Shared.hpp"
@ -1020,7 +1021,33 @@ int32_t CM2Model::IsBatchDoodadCompatible(M2Batch* batch) {
}
int32_t CM2Model::IsDrawable(int32_t a2, int32_t a3) {
// TODO
if (!this->m_loaded && a2) {
this->WaitForLoad(nullptr);
}
if (!this->m_flag2) {
if (!this->m_loaded) {
return 0;
}
for (uint32_t i = 0; i < this->m_shared->m_data->textures.Count(); i++) {
auto texture = this->m_textures[i];
if (!texture) {
continue;
}
if (!TextureGetGxTex(texture, a2, nullptr)) {
return 0;
}
}
this->m_flag2 = 1;
}
if (!this->m_flag200 && a3) {
// TODO
}
return 1;
}
@ -1501,5 +1528,15 @@ void CM2Model::UpdateLoaded() {
}
void CM2Model::WaitForLoad(const char* a2) {
// TODO
if (this->m_shared->asyncObject) {
AsyncFileReadWait(this->m_shared->asyncObject);
}
if (this->m_shared->asyncObject) {
AsyncFileReadWait(this->m_shared->asyncObject);
}
if (this->m_flags & 0x20) {
this->InitializeLoaded();
}
}