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

only add actions to physical objects

Browse source
This commit is contained in:
ericrius1 2015-09-02 16:45:50 -07:00
parent 1e6198cf59
commit d303c7e119
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,8 @@
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
var RIGHT_HAND_CLICK = Controller.findAction("RIGHT_HAND_CLICK"); var RIGHT_HAND_CLICK = Controller.findAction("RIGHT_HAND_CLICK");
var rightTriggerAction = RIGHT_HAND_CLICK; var rightTriggerAction = RIGHT_HAND_CLICK;
@ -70,6 +72,7 @@ function controller(side, triggerAction, pullAction, hand) {
this.actionID = null; this.actionID = null;
this.tractorBeamActive = false; this.tractorBeamActive = false;
this.distanceHolding = false; this.distanceHolding = false;
this.closeGrabbing = false;
this.triggerValue = 0; this.triggerValue = 0;
this.prevTriggerValue = 0; this.prevTriggerValue = 0;
this.palm = 2 * side; this.palm = 2 * side;
@ -127,8 +130,7 @@ controller.prototype.checkForIntersections = function(origin, direction) {
}; };
var intersection = Entities.findRayIntersection(pickRay, true); var intersection = Entities.findRayIntersection(pickRay, true);
if (intersection.intersects && intersection.properties.collisionsWillMove === 1) {
if (intersection.intersects) {
this.distanceToEntity = Vec3.distance(origin, intersection.properties.position); this.distanceToEntity = Vec3.distance(origin, intersection.properties.position);
Entities.editEntity(this.pointer, { Entities.editEntity(this.pointer, {
linePoints: [ linePoints: [
@ -156,7 +158,7 @@ controller.prototype.attemptMove = function() {
if (this.actionID === null) { if (this.actionID === null) {
this.actionID = Entities.addAction("spring", this.grabbedEntity, { this.actionID = Entities.addAction("spring", this.grabbedEntity, {
targetPosition: newPosition, targetPosition: newPosition,
linearTimeScale: 0.1 linearTimeScale: .1
}); });
} else { } else {
Entities.updateAction(this.grabbedEntity, this.actionID, { Entities.updateAction(this.grabbedEntity, this.actionID, {
@ -188,6 +190,7 @@ controller.prototype.letGo = function() {
this.distanceHolding = false; this.distanceHolding = false;
this.tractorBeamActive = false; this.tractorBeamActive = false;
this.checkForEntityArrival = false; this.checkForEntityArrival = false;
this.closeGrabbing = false;
} }
controller.prototype.update = function() { controller.prototype.update = function() {
@ -216,7 +219,7 @@ controller.prototype.update = function() {
if (this.shouldDisplayLine) { if (this.shouldDisplayLine) {
this.updateLine(); this.updateLine();
} }
if (this.triggerValue > DISTANCE_HOLD_THRESHOLD) { if (this.triggerValue > DISTANCE_HOLD_THRESHOLD && !this.closeGrabbing) {
this.attemptMove(); this.attemptMove();
} }
@ -234,6 +237,7 @@ controller.prototype.grabEntity = function() {
var objectPosition = Entities.getEntityProperties(this.grabbedEntity).position; var objectPosition = Entities.getEntityProperties(this.grabbedEntity).position;
var offset = Vec3.subtract(objectPosition, handPosition); var offset = Vec3.subtract(objectPosition, handPosition);
var offsetPosition = Vec3.multiplyQbyV(Quat.inverse(Quat.multiply(handRotation, offsetRotation)), offset); var offsetPosition = Vec3.multiplyQbyV(Quat.inverse(Quat.multiply(handRotation, offsetRotation)), offset);
this.closeGrabbing = true;
this.actionID = Entities.addAction("hold", this.grabbedEntity, { this.actionID = Entities.addAction("hold", this.grabbedEntity, {
relativePosition: offsetPosition, relativePosition: offsetPosition,
relativeRotation: offsetRotation, relativeRotation: offsetRotation,
@ -252,7 +256,7 @@ controller.prototype.checkForInRangeObject = function() {
for (var i = 0; i < entities.length; i++) { for (var i = 0; i < entities.length; i++) {
var props = Entities.getEntityProperties(entities[i]); var props = Entities.getEntityProperties(entities[i]);
var distance = Vec3.distance(props.position, handPosition); var distance = Vec3.distance(props.position, handPosition);
if (distance < minDistance && props.name !== "pointer") { if (distance < minDistance && props.name !== "pointer" && props.collisionsWillMove === 1) {
grabbedEntity = entities[i]; grabbedEntity = entities[i];
minDistance = distance; minDistance = distance;
} }