Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:43:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Wait until both head and body are loaded before rendering. Closes #2145.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-02-28 12:22:10 -08:00
parent f6ed9c7b4b
commit 2639796402
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/avatar/Avatar.cpp
View file

@ -309,6 +309,9 @@ void Avatar::renderBody() {
renderBillboard();
return;
}
if (!(_skeletonModel.isRenderable() && getHead()->getFaceModel().isRenderable())) {
return; // wait until both models are loaded
}
_skeletonModel.render(1.0f);
getHead()->render(1.0f);
getHand()->render(false);

4
interface/src/avatar/MyAvatar.cpp
View file

@ -677,6 +677,10 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
}
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
_skeletonModel.render(1.0f);

2
interface/src/renderer/Model.h
View file

@ -46,6 +46,8 @@ public:
bool isActive() const { return _geometry && _geometry->isLoaded(); }
bool isRenderable() const { return !_meshStates.isEmpty(); }
bool isLoadedWithTextures() const;
void init();