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

treat ModelEntityItem-s with relayParentJoints as wearables

Browse source
This commit is contained in:
Alexander Ivash 2018-08-09 01:22:11 +03:00
parent 56194bba8e
commit 0a28361dc8
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/AvatarBookmarks.cpp
View file

@ -25,6 +25,7 @@
#include <avatar/AvatarManager.h> #include <avatar/AvatarManager.h>
#include <EntityItemID.h> #include <EntityItemID.h>
#include <EntityTree.h> #include <EntityTree.h>
#include <ModelEntityItem.h>
#include <PhysicalEntitySimulation.h> #include <PhysicalEntitySimulation.h>
#include <EntityEditPacketSender.h> #include <EntityEditPacketSender.h>
#include <VariantMapToScriptValue.h> #include <VariantMapToScriptValue.h>
@ -35,7 +36,7 @@
#include "QVariantGLM.h" #include "QVariantGLM.h"
#include <QtQuick/QQuickWindow> #include <QtQuick/QQuickWindow>
#include <memory>
void addAvatarEntities(const QVariantList& avatarEntities) { void addAvatarEntities(const QVariantList& avatarEntities) {
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
@ -145,8 +146,8 @@ void AvatarBookmarks::removeBookmark(const QString& bookmarkName) {
} }
bool isWearableEntity(const EntityItemPointer& entity) { bool isWearableEntity(const EntityItemPointer& entity) {
return entity->isVisible() && entity->getParentJointIndex() != INVALID_JOINT_INDEX && return entity->isVisible() && (entity->getParentJointIndex() != INVALID_JOINT_INDEX || (entity->getType() == EntityTypes::Model && (std::static_pointer_cast<ModelEntityItem>(entity))->getRelayParentJoints()))
(entity->getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || entity->getParentID() == DependencyManager::get<AvatarManager>()->getMyAvatar()->getSelfID()); && (entity->getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || entity->getParentID() == DependencyManager::get<AvatarManager>()->getMyAvatar()->getSelfID());
} }
void AvatarBookmarks::updateAvatarEntities(const QVariantList &avatarEntities) { void AvatarBookmarks::updateAvatarEntities(const QVariantList &avatarEntities) {

2
scripts/system/avatarapp.js
View file

@ -31,7 +31,7 @@ function executeLater(callback) {
var INVALID_JOINT_INDEX = -1 var INVALID_JOINT_INDEX = -1
function isWearable(avatarEntity) { function isWearable(avatarEntity) {
return avatarEntity.properties.visible === true && avatarEntity.properties.parentJointIndex !== INVALID_JOINT_INDEX && return avatarEntity.properties.visible === true && (avatarEntity.properties.parentJointIndex !== INVALID_JOINT_INDEX || avatarEntity.properties.relayParentJoints === true) &&
(avatarEntity.properties.parentID === MyAvatar.sessionUUID || avatarEntity.properties.parentID === MyAvatar.SELF_ID); (avatarEntity.properties.parentID === MyAvatar.sessionUUID || avatarEntity.properties.parentID === MyAvatar.SELF_ID);
} }