Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 01:12:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

relax 'isWearable()' condition to match latest changes in 'master'

Browse source
This commit is contained in:
Alexander Ivash 2018-11-19 00:53:51 +05:30
parent 72a91668a5
commit 600d09e533
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/EntityItem.cpp
View file

@ -3280,6 +3280,5 @@ void EntityItem::prepareForSimulationOwnershipBid(EntityItemProperties& properti
}
bool EntityItem::isWearable() const {
return isVisible() && getParentJointIndex() != INVALID_JOINT_INDEX
&& (getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || getParentID() == AVATAR_SELF_ID);
return isVisible() && (getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || getParentID() == AVATAR_SELF_ID);
}

6
libraries/entities/src/ModelEntityItem.cpp
View file

@ -519,12 +519,6 @@ QVector<bool> ModelEntityItem::getJointTranslationsSet() const {
return result;
}
bool ModelEntityItem::isWearable() const
{
return isVisible() && (getParentJointIndex() != INVALID_JOINT_INDEX || getRelayParentJoints())
&& (getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || getParentID() == AVATAR_SELF_ID);
}
bool ModelEntityItem::hasModel() const {
return resultWithReadLock<bool>([&] {
return !_modelURL.isEmpty();

1
libraries/entities/src/ModelEntityItem.h
View file

@ -123,7 +123,6 @@ public:
QVector<glm::vec3> getJointTranslations() const;
QVector<bool> getJointTranslationsSet() const;
virtual bool isWearable() const override;
private:
void setAnimationSettings(const QString& value); // only called for old bitstream format
bool applyNewAnimationProperties(AnimationPropertyGroup newProperties);