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

increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something

Browse source
This commit is contained in:
Seth Alves 2015-09-30 16:07:22 -07:00
parent cd2a1542e0
commit 91965db5ab
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/grab.js
View file

@ -13,6 +13,7 @@
var MAX_SOLID_ANGLE = 0.01; // objects that appear smaller than this can't be grabbed var MAX_SOLID_ANGLE = 0.01; // objects that appear smaller than this can't be grabbed
var ZERO_VEC3 = {x: 0, y: 0, z: 0}; var ZERO_VEC3 = {x: 0, y: 0, z: 0};
var IDENTITY_QUAT = {x: 0, y: 0, z: 0, w: 0}; var IDENTITY_QUAT = {x: 0, y: 0, z: 0, w: 0};
var ACTION_LIFETIME = 120; // 2 minutes
function getTag() { function getTag() {
return "grab-" + MyAvatar.sessionUUID; return "grab-" + MyAvatar.sessionUUID;
@ -307,7 +308,7 @@ Grabber.prototype.moveEvent = function(event) {
} }
this.currentPosition = entityProperties.position; this.currentPosition = entityProperties.position;
var actionArgs = {tag: getTag(), lifetime: 5}; var actionArgs = {tag: getTag(), lifetime: ACTION_LIFETIME};
if (this.mode === "rotate") { if (this.mode === "rotate") {
var drag = mouse.getDrag(); var drag = mouse.getDrag();
@ -322,7 +323,7 @@ Grabber.prototype.moveEvent = function(event) {
// var qZero = entityProperties.rotation; // var qZero = entityProperties.rotation;
//var qZero = this.lastRotation; //var qZero = this.lastRotation;
this.lastRotation = Quat.multiply(deltaQ, this.lastRotation); this.lastRotation = Quat.multiply(deltaQ, this.lastRotation);
actionArgs = {targetRotation: this.lastRotation, angularTimeScale: 0.1, tag: getTag(), lifetime: 5}; actionArgs = {targetRotation: this.lastRotation, angularTimeScale: 0.1, tag: getTag(), lifetime: ACTION_LIFETIME};
} else { } else {
var newPointOnPlane; var newPointOnPlane;
if (this.mode === "verticalCylinder") { if (this.mode === "verticalCylinder") {
@ -346,7 +347,7 @@ Grabber.prototype.moveEvent = function(event) {
} }
} }
this.targetPosition = Vec3.subtract(newPointOnPlane, this.offset); this.targetPosition = Vec3.subtract(newPointOnPlane, this.offset);
actionArgs = {targetPosition: this.targetPosition, linearTimeScale: 0.1, tag: getTag(), lifetime: 5}; actionArgs = {targetPosition: this.targetPosition, linearTimeScale: 0.1, tag: getTag(), lifetime: ACTION_LIFETIME};
beacon.updatePosition(this.targetPosition); beacon.updatePosition(this.targetPosition);
} }