Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 16:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5707 from ericrius1/grabMod

Browse source 
added userData manipulations to grab script
This commit is contained in:
Brad Hefta-Gaub 2015-09-03 14:46:38 -07:00
commit cfdd1cd977
1 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
examples/controllers/hydra/hydraGrab.js
View file

@ -11,9 +11,13 @@
//
Script.include("../../libraries/utils.js");
var RIGHT_HAND_CLICK = Controller.findAction("RIGHT_HAND_CLICK");
var rightTriggerAction = RIGHT_HAND_CLICK;
var GRAB_USER_DATA_KEY = "grabKey";
var LEFT_HAND_CLICK = Controller.findAction("LEFT_HAND_CLICK");
var leftTriggerAction = LEFT_HAND_CLICK;
@ -37,7 +41,7 @@ var INTERSECT_COLOR = {
blue: 10
};
var GRAB_RADIUS = 2;
var GRAB_RADIUS = 0.5;
var GRAB_COLOR = {
red: 250,
@ -154,7 +158,6 @@ controller.prototype.attemptMove = function() {
var newPosition = Vec3.sum(handPosition, Vec3.multiply(direction, this.distanceToEntity))
this.distanceHolding = true;
//TO DO : USE SPRING ACTION UPDATE FOR MOVING
if (this.actionID === null) {
this.actionID = Entities.addAction("spring", this.grabbedEntity, {
targetPosition: newPosition,
@ -184,7 +187,10 @@ controller.prototype.hidePointer = function() {
controller.prototype.letGo = function() {
Entities.deleteAction(this.grabbedEntity, this.actionID);
if (this.grabbedEntity && this.actionID) {
this.deactivateEntity(this.grabbedEntity);
Entities.deleteAction(this.grabbedEntity, this.actionID);
}
this.grabbedEntity = null;
this.actionID = null;
this.distanceHolding = false;
@ -264,11 +270,29 @@ controller.prototype.checkForInRangeObject = function() {
if (grabbedEntity === null) {
return false;
} else {
//We are grabbing an entity, so let it know we've grabbed it
this.grabbedEntity = grabbedEntity;
this.activateEntity(this.grabbedEntity);
return true;
}
}
controller.prototype.activateEntity = function(entity) {
var data = {
activated: true,
avatarId: MyAvatar.sessionUUID
};
setEntityCustomData(GRAB_USER_DATA_KEY, this.grabbedEntity, data);
}
controller.prototype.deactivateEntity = function(entity) {
var data = {
activated: false,
avatarId: null
};
setEntityCustomData(GRAB_USER_DATA_KEY, this.grabbedEntity, data);
}
controller.prototype.onActionEvent = function(action, state) {
if (this.pullAction === action && state === 1) {
@ -293,7 +317,9 @@ controller.prototype.onActionEvent = function(action, state) {
controller.prototype.cleanup = function() {
Entities.deleteEntity(this.pointer);
Entities.deleteAction(this.grabbedEntity, this.actionID);
if (this.grabbedEntity) {
Entities.deleteAction(this.grabbedEntity, this.actionID);
}
}
function update() {
@ -314,6 +340,7 @@ function cleanup() {
}
Script.scriptEnding.connect(cleanup);
Script.update.connect(update)
Controller.actionEvent.connect(onActionEvent);