Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

equip via parenting rather than action. change name of a messaging channel. minor cleanups.

Browse source
This commit is contained in:
Seth Alves 2016-01-26 14:02:21 -08:00
parent 462758ebdd
commit 11d2f9a8fc
1 changed files with 46 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
examples/controllers/handControllerGrab.js
View file

@ -160,7 +160,6 @@ var STATE_EQUIP = 12
var STATE_CONTINUE_EQUIP_BD = 13; // equip while bumper is still held down var STATE_CONTINUE_EQUIP_BD = 13; // equip while bumper is still held down
var STATE_CONTINUE_EQUIP = 14; var STATE_CONTINUE_EQUIP = 14;
var STATE_WAITING_FOR_BUMPER_RELEASE = 15; var STATE_WAITING_FOR_BUMPER_RELEASE = 15;
var STATE_EQUIP_SPRING = 16;
// "collidesWith" is specified by comma-separated list of group names // "collidesWith" is specified by comma-separated list of group names
// the possible group names are: static, dynamic, kinematic, myAvatar, otherAvatar // the possible group names are: static, dynamic, kinematic, myAvatar, otherAvatar
@ -201,8 +200,6 @@ function stateToName(state) {
return "continue_equip"; return "continue_equip";
case STATE_WAITING_FOR_BUMPER_RELEASE: case STATE_WAITING_FOR_BUMPER_RELEASE:
return "waiting_for_bumper_release"; return "waiting_for_bumper_release";
case STATE_EQUIP_SPRING:
return "state_equip_spring";
} }
return "unknown"; return "unknown";
@ -343,9 +340,6 @@ function MyController(hand) {
case STATE_WAITING_FOR_BUMPER_RELEASE: case STATE_WAITING_FOR_BUMPER_RELEASE:
this.waitingForBumperRelease(); this.waitingForBumperRelease();
break; break;
case STATE_EQUIP_SPRING:
this.pullTowardEquipPosition()
break;
case STATE_CONTINUE_NEAR_GRABBING: case STATE_CONTINUE_NEAR_GRABBING:
case STATE_CONTINUE_EQUIP_BD: case STATE_CONTINUE_EQUIP_BD:
case STATE_CONTINUE_EQUIP: case STATE_CONTINUE_EQUIP:
@ -786,7 +780,9 @@ function MyController(hand) {
var distantPickRay = { var distantPickRay = {
origin: PICK_WITH_HAND_RAY ? handPosition : Camera.position, origin: PICK_WITH_HAND_RAY ? handPosition : Camera.position,
direction: PICK_WITH_HAND_RAY ? Quat.getUp(this.getHandRotation()) : Vec3.mix(Quat.getUp(this.getHandRotation()), Quat.getFront(Camera.orientation), HAND_HEAD_MIX_RATIO), direction: PICK_WITH_HAND_RAY ? Quat.getUp(this.getHandRotation()) : Vec3.mix(Quat.getUp(this.getHandRotation()),
Quat.getFront(Camera.orientation),
HAND_HEAD_MIX_RATIO),
length: PICK_MAX_DISTANCE length: PICK_MAX_DISTANCE
}; };
@ -836,7 +832,7 @@ function MyController(hand) {
candidateEntities = rayPickedCandidateEntities.concat(nearPickedCandidateEntities); candidateEntities = rayPickedCandidateEntities.concat(nearPickedCandidateEntities);
var forbiddenNames = ["Grab Debug Entity", "grab pointer"]; var forbiddenNames = ["Grab Debug Entity", "grab pointer"];
var forbiddenTyes = ['Unknown', 'Light', 'ParticleEffect', 'PolyLine', 'Zone']; var forbiddenTypes = ['Unknown', 'Light', 'ParticleEffect', 'PolyLine', 'Zone'];
var minDistance = PICK_MAX_DISTANCE; var minDistance = PICK_MAX_DISTANCE;
var i, props, distance, grabbableData; var i, props, distance, grabbableData;
@ -849,7 +845,7 @@ function MyController(hand) {
if (!grabbable && !grabbableDataForCandidate.wantsTrigger) { if (!grabbable && !grabbableDataForCandidate.wantsTrigger) {
continue; continue;
} }
if (forbiddenTyes.indexOf(propsForCandidate.type) >= 0) { if (forbiddenTypes.indexOf(propsForCandidate.type) >= 0) {
continue; continue;
} }
if (propsForCandidate.locked && !grabbableDataForCandidate.wantsTrigger) { if (propsForCandidate.locked && !grabbableDataForCandidate.wantsTrigger) {
@ -1243,7 +1239,7 @@ function MyController(hand) {
} }
var isPhysical = this.propsArePhysical(grabbedProperties); var isPhysical = this.propsArePhysical(grabbedProperties);
if (isPhysical) { if (isPhysical && this.state == STATE_NEAR_GRABBING) {
// grab entity via action // grab entity via action
if (!this.setupHoldAction()) { if (!this.setupHoldAction()) {
return; return;
@ -1321,8 +1317,7 @@ function MyController(hand) {
Entities.callEntityMethod(this.grabbedEntity, "continueEquip"); Entities.callEntityMethod(this.grabbedEntity, "continueEquip");
} }
//// jbp::: SEND UPDATE MESSAGE TO WEARABLES MANAGER Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
Messages.sendMessage('Hifi-Wearables-Manager', JSON.stringify({
action: 'update', action: 'update',
grabbedEntity: this.grabbedEntity grabbedEntity: this.grabbedEntity
})) }))
@ -1357,60 +1352,6 @@ function MyController(hand) {
} }
}; };
this.pullTowardEquipPosition = function() {
this.turnOffVisualizations();
var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, GRABBABLE_PROPERTIES);
var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, this.grabbedEntity, DEFAULT_GRABBABLE_DATA);
// use a spring to pull the object to where it will be when equipped
var relativeRotation = getSpatialOffsetRotation(this.hand, grabbableData.spatialKey);
var relativePosition = getSpatialOffsetPosition(this.hand, grabbableData.spatialKey);
var ignoreIK = grabbableData.spatialKey.ignoreIK ? grabbableData.spatialKey.ignoreIK : false;
var handRotation = this.getHandRotation();
var handPosition = this.getHandPosition();
var targetRotation = Quat.multiply(handRotation, relativeRotation);
var offset = Vec3.multiplyQbyV(targetRotation, relativePosition);
var targetPosition = Vec3.sum(handPosition, offset);
if (typeof this.equipSpringID === 'undefined' ||
this.equipSpringID === null ||
this.equipSpringID === NULL_UUID) {
this.equipSpringID = Entities.addAction("spring", this.grabbedEntity, {
targetPosition: targetPosition,
linearTimeScale: EQUIP_SPRING_TIMEFRAME,
targetRotation: targetRotation,
angularTimeScale: EQUIP_SPRING_TIMEFRAME,
ttl: ACTION_TTL,
ignoreIK: ignoreIK
});
if (this.equipSpringID === NULL_UUID) {
this.equipSpringID = null;
this.setState(STATE_OFF);
return;
}
} else {
var success = Entities.updateAction(this.grabbedEntity, this.equipSpringID, {
targetPosition: targetPosition,
linearTimeScale: EQUIP_SPRING_TIMEFRAME,
targetRotation: targetRotation,
angularTimeScale: EQUIP_SPRING_TIMEFRAME,
ttl: ACTION_TTL,
ignoreIK: ignoreIK
});
if (!success) {
print("pullTowardEquipPosition -- updateActionfailed");
}
}
if (Vec3.distance(grabbedProperties.position, targetPosition) < EQUIP_SPRING_SHUTOFF_DISTANCE) {
Entities.deleteAction(this.grabbedEntity, this.equipSpringID);
this.equipSpringID = null;
this.setState(STATE_EQUIP);
}
};
this.nearTrigger = function() { this.nearTrigger = function() {
if (this.triggerSmoothedReleased()) { if (this.triggerSmoothedReleased()) {
this.setState(STATE_RELEASE); this.setState(STATE_RELEASE);
@ -1595,12 +1536,10 @@ function MyController(hand) {
this.actionID = null; this.actionID = null;
this.setState(STATE_OFF); this.setState(STATE_OFF);
//// jbp::: SEND RELEASE MESSAGE TO WEARABLES MANAGER Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
action: 'release',
Messages.sendMessage('Hifi-Wearables-Manager', JSON.stringify({
action: 'checkIfWearable',
grabbedEntity: this.grabbedEntity grabbedEntity: this.grabbedEntity
})) }));
this.grabbedEntity = null; this.grabbedEntity = null;
}; };
@ -1670,6 +1609,24 @@ function MyController(hand) {
} }
setEntityCustomData(GRAB_USER_DATA_KEY, entityID, data); setEntityCustomData(GRAB_USER_DATA_KEY, entityID, data);
}; };
this.checkNewlyLoaded = function(loadedEntityID) {
if (this.state == STATE_OFF ||
this.state == STATE_SEARCHING ||
this.state == STATE_EQUIP_SEARCHING) {
var loadedProps = Entities.getEntityProperties(loadedEntityID, ["parentID", "parentJointIndex"]);
if (loadedProps.parentID != MyAvatar.sessionUUID) {
return;
}
var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
if (loadedProps.parentJointIndex != handJointIndex) {
return;
}
// an entity has been loaded and it's where this script would have equipped something, so switch states.
this.grabbedEntity = loadedEntityID;
this.setState(STATE_EQUIP);
}
}
}; };
var rightController = new MyController(RIGHT_HAND); var rightController = new MyController(RIGHT_HAND);
@ -1701,6 +1658,7 @@ function update() {
Messages.subscribe('Hifi-Hand-Disabler'); Messages.subscribe('Hifi-Hand-Disabler');
Messages.subscribe('Hifi-Hand-Grab'); Messages.subscribe('Hifi-Hand-Grab');
Messages.subscribe('Hifi-Hand-RayPick-Blacklist'); Messages.subscribe('Hifi-Hand-RayPick-Blacklist');
Messages.subscribe('Hifi-Object-Manipulation');
handleHandMessages = function(channel, message, sender) { handleHandMessages = function(channel, message, sender) {
if (sender === MyAvatar.sessionUUID) { if (sender === MyAvatar.sessionUUID) {
@ -1741,6 +1699,23 @@ handleHandMessages = function(channel, message, sender) {
} }
} catch (e) {} } catch (e) {}
} else if (channel === 'Hifi-Object-Manipulation') {
if (sender !== MyAvatar.sessionUUID) {
return;
}
var parsedMessage = null;
try {
parsedMessage = JSON.parse(message);
} catch (e) {
print('error parsing Hifi-Object-Manipulation message');
return;
}
if (parsedMessage.action === 'loaded') {
rightController.checkNewlyLoaded(parsedMessage['grabbedEntity']);
leftController.checkNewlyLoaded(parsedMessage['grabbedEntity']);
}
} }
} }
} }