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

remove orb in the otherAvatar destructor, and check

Browse source 
_otherAvatarOrbMeshPlaceholder pointer before updating the position
This commit is contained in:
amantley 2018-06-27 11:15:33 -07:00
parent eba4a27329
commit 1804422df0
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/avatar/OtherAvatar.cpp
View file

@ -22,6 +22,10 @@ OtherAvatar::OtherAvatar(QThread* thread) : Avatar(thread) {
createOrb();
}
OtherAvatar::~OtherAvatar() {
removeOrb();
}
void OtherAvatar::removeOrb() {
if (qApp->getOverlays().isAddedOverlay(_otherAvatarOrbMeshPlaceholderID)) {
qApp->getOverlays().deleteOverlay(_otherAvatarOrbMeshPlaceholderID);
@ -29,7 +33,9 @@ void OtherAvatar::removeOrb() {
}
void OtherAvatar::updateOrbPosition() {
_otherAvatarOrbMeshPlaceholder->setWorldPosition(getHead()->getPosition());
if (_otherAvatarOrbMeshPlaceholder != nullptr) {
_otherAvatarOrbMeshPlaceholder->setWorldPosition(getHead()->getPosition());
}
}
void OtherAvatar::createOrb() {

2
interface/src/avatar/OtherAvatar.h
View file

@ -17,6 +17,8 @@
class OtherAvatar : public Avatar {
public:
explicit OtherAvatar(QThread* thread);
~OtherAvatar();
virtual void instantiableAvatar() override { };
void createOrb() override;
void updateOrbPosition();