mirror of
https://github.com/overte-org/overte.git
synced 2025-08-12 18:55:08 +02:00
Wait until both head and body are loaded before rendering. Closes #2145.
This commit is contained in:
parent
f6ed9c7b4b
commit
2639796402
3 changed files with 9 additions and 0 deletions
|
@ -309,6 +309,9 @@ void Avatar::renderBody() {
|
||||||
renderBillboard();
|
renderBillboard();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (!(_skeletonModel.isRenderable() && getHead()->getFaceModel().isRenderable())) {
|
||||||
|
return; // wait until both models are loaded
|
||||||
|
}
|
||||||
_skeletonModel.render(1.0f);
|
_skeletonModel.render(1.0f);
|
||||||
getHead()->render(1.0f);
|
getHead()->render(1.0f);
|
||||||
getHand()->render(false);
|
getHand()->render(false);
|
||||||
|
|
|
@ -677,6 +677,10 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MyAvatar::renderBody(bool forceRenderHead) {
|
void MyAvatar::renderBody(bool forceRenderHead) {
|
||||||
|
if (!(_skeletonModel.isRenderable() && getHead()->getFaceModel().isRenderable())) {
|
||||||
|
return; // wait until both models are loaded
|
||||||
|
}
|
||||||
|
|
||||||
// Render the body's voxels and head
|
// Render the body's voxels and head
|
||||||
_skeletonModel.render(1.0f);
|
_skeletonModel.render(1.0f);
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,8 @@ public:
|
||||||
|
|
||||||
bool isActive() const { return _geometry && _geometry->isLoaded(); }
|
bool isActive() const { return _geometry && _geometry->isLoaded(); }
|
||||||
|
|
||||||
|
bool isRenderable() const { return !_meshStates.isEmpty(); }
|
||||||
|
|
||||||
bool isLoadedWithTextures() const;
|
bool isLoadedWithTextures() const;
|
||||||
|
|
||||||
void init();
|
void init();
|
||||||
|
|
Loading…
Reference in a new issue