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

update queryAACube during grab rather than only when grab is released

Browse source
This commit is contained in:
Seth Alves 2019-01-15 15:07:05 -08:00
parent b5326936d8
commit b1c34eb9ec
4 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,8 @@ void GrabManager::simulateGrabs() {
// Update grabbed objects // Update grabbed objects
auto entityTreeRenderer = DependencyManager::get<EntityTreeRenderer>(); auto entityTreeRenderer = DependencyManager::get<EntityTreeRenderer>();
auto entityTree = entityTreeRenderer->getTree(); auto entityTree = entityTreeRenderer->getTree();
auto sessionID = DependencyManager::get<NodeList>()->getSessionUUID();
EntityEditPacketSender* packetSender = entityTreeRenderer ? entityTreeRenderer->getPacketSender() : nullptr;
entityTree->withReadLock([&] { entityTree->withReadLock([&] {
PROFILE_RANGE(simulation, "Grabs"); PROFILE_RANGE(simulation, "Grabs");
@ -33,6 +35,8 @@ void GrabManager::simulateGrabs() {
glm::vec3 finalPosition = acc.finalizePosition(); glm::vec3 finalPosition = acc.finalizePosition();
glm::quat finalOrientation = acc.finalizeOrientation(); glm::quat finalOrientation = acc.finalizeOrientation();
grabbedThing->setTransform(createMatFromQuatAndPos(finalOrientation, finalPosition)); grabbedThing->setTransform(createMatFromQuatAndPos(finalOrientation, finalPosition));
bool iShouldTellServer = grabbedThing->getEditSenderID() == sessionID;
entityTree->updateEntityQueryAACube(grabbedThing, packetSender, false, iShouldTellServer);
} }
} }
}); });

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

@ -3349,7 +3349,8 @@ void EntityItem::prepareForSimulationOwnershipBid(EntityItemProperties& properti
} }
bool EntityItem::isWearable() const { bool EntityItem::isWearable() const {
return isVisible() && (getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || getParentID() == AVATAR_SELF_ID); return isVisible() &&
(getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || getParentID() == AVATAR_SELF_ID);
} }
void EntityItem::addGrab(GrabPointer grab) { void EntityItem::addGrab(GrabPointer grab) {

1
libraries/entities/src/EntityTree.cpp
View file

@ -2982,6 +2982,7 @@ void EntityTree::updateEntityQueryAACubeWorker(SpatiallyNestablePointer object,
properties.setLastEdited(now); properties.setLastEdited(now);
packetSender->queueEditEntityMessage(PacketType::EntityEdit, getThisPointer(), entity->getID(), properties); packetSender->queueEditEntityMessage(PacketType::EntityEdit, getThisPointer(), entity->getID(), properties);
entity->setLastEdited(now); // so we ignore the echo from the server
entity->setLastBroadcast(now); // for debug/physics status icons entity->setLastBroadcast(now); // for debug/physics status icons
} }

13
scripts/system/libraries/controllerDispatcherUtils.js
View file

@ -33,6 +33,7 @@
getGrabbableData:true, getGrabbableData:true,
isAnothersAvatarEntity:true, isAnothersAvatarEntity:true,
isAnothersChildEntity:true, isAnothersChildEntity:true,
entityIsEquippable:true,
entityIsGrabbable:true, entityIsGrabbable:true,
entityIsDistanceGrabbable:true, entityIsDistanceGrabbable:true,
getControllerJointIndexCacheTime:true, getControllerJointIndexCacheTime:true,
@ -332,10 +333,18 @@ entityIsEquippable = function (eieProps) {
return false; return false;
} }
return true; return true;
} };
entityIsGrabbable = function (eigProps) { entityIsGrabbable = function (eigProps) {
return entityIsEquippable(eigProps) && !eigProps.locked; var grabbable = getGrabbableData(eigProps).grabbable;
if (!grabbable ||
eigProps.locked ||
isAnothersAvatarEntity(eigProps) ||
isAnothersChildEntity(eigProps) ||
FORBIDDEN_GRAB_TYPES.indexOf(eigProps.type) >= 0) {
return false;
}
return true;
}; };
clearHighlightedEntities = function() { clearHighlightedEntities = function() {