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

increase drop-on-joint radius. fix bug that kept from dropping on hips (index 0). save adjustments if in dressing room

Browse source
This commit is contained in:
Seth Alves 2016-02-02 14:31:20 -08:00
parent 3bbecf5c8b
commit 260d27f4d7
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/attachedEntitiesManager.js
View file

@ -18,7 +18,7 @@ var DEFAULT_WEARABLE_DATA = {
};
var MINIMUM_DROP_DISTANCE_FROM_JOINT = 0.4;
var MINIMUM_DROP_DISTANCE_FROM_JOINT = 0.8;
var ATTACHED_ENTITY_SEARCH_DISTANCE = 10.0;
var ATTACHED_ENTITIES_SETTINGS_KEY = "ATTACHED_ENTITIES";
var DRESSING_ROOM_DISTANCE = 2.0;
@ -154,7 +154,7 @@ function AttachedEntitiesManager() {
continue;
}
var jointIndex = MyAvatar.getJointIndex(jointName);
if (jointIndex > 0) {
if (jointIndex >= 0) {
var jointPosition = MyAvatar.getJointPosition(jointIndex);
var distanceFromJoint = Vec3.distance(jointPosition, props.position);
if (distanceFromJoint <= MINIMUM_DROP_DISTANCE_FROM_JOINT) {
@ -175,7 +175,9 @@ function AttachedEntitiesManager() {
};
if (bestJointOffset && bestJointOffset.constructor === Array && bestJointOffset.length > 1) {
if (!this.avatarIsInDressingRoom()) {
if (this.avatarIsInDressingRoom()) {
this.updateRelativeOffsets(grabbedEntity);
} else {
// don't snap the entity to the preferred position if the avatar is in the dressing room.
wearProps.localPosition = bestJointOffset[0];
wearProps.localRotation = bestJointOffset[1];