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

Remove space before and after function calls, add spaces btw functions

Browse source
This commit is contained in:
James Pollack 2015-09-24 15:03:02 -07:00
parent 37ecd18054
commit 9eb3b56e5d
2 changed files with 82 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

165
examples/controllers/handControllerGrab.js
View file

@ -2,6 +2,7 @@
// examples // examples
// //
// Created by Eric Levin on 9/2/15 // Created by Eric Levin on 9/2/15
// Additions by James B. Pollack @imgntn on 9/24/2015
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// //
// Grabs physically moveable entities with hydra-like controllers; it works for either near or far objects. // Grabs physically moveable entities with hydra-like controllers; it works for either near or far objects.
@ -28,21 +29,9 @@ var TRIGGER_ON_VALUE = 0.2;
var DISTANCE_HOLDING_RADIUS_FACTOR = 5; // multiplied by distance between hand and object var DISTANCE_HOLDING_RADIUS_FACTOR = 5; // multiplied by distance between hand and object
var DISTANCE_HOLDING_ACTION_TIMEFRAME = 0.1; // how quickly objects move to their new position var DISTANCE_HOLDING_ACTION_TIMEFRAME = 0.1; // how quickly objects move to their new position
var DISTANCE_HOLDING_ROTATION_EXAGGERATION_FACTOR = 2.0; // object rotates this much more than hand did var DISTANCE_HOLDING_ROTATION_EXAGGERATION_FACTOR = 2.0; // object rotates this much more than hand did
var NO_INTERSECT_COLOR = { var NO_INTERSECT_COLOR = { red: 10, green: 10, blue: 255}; // line color when pick misses
red: 10, var INTERSECT_COLOR = { red: 250, green: 10, blue: 10}; // line color when pick hits
green: 10, var LINE_ENTITY_DIMENSIONS = { x: 1000, y: 1000, z: 1000};
blue: 255
}; // line color when pick misses
var INTERSECT_COLOR = {
red: 250,
green: 10,
blue: 10
}; // line color when pick hits
var LINE_ENTITY_DIMENSIONS = {
x: 1000,
y: 1000,
z: 1000
};
var LINE_LENGTH = 500; var LINE_LENGTH = 500;
@ -65,11 +54,7 @@ var RELEASE_VELOCITY_MULTIPLIER = 1.5; // affects throwing things
var RIGHT_HAND = 1; var RIGHT_HAND = 1;
var LEFT_HAND = 0; var LEFT_HAND = 0;
var ZERO_VEC = { var ZERO_VEC = { x: 0, y: 0, z: 0};
x: 0,
y: 0,
z: 0
};
var NULL_ACTION_ID = "{00000000-0000-0000-000000000000}"; var NULL_ACTION_ID = "{00000000-0000-0000-000000000000}";
var MSEC_PER_SEC = 1000.0; var MSEC_PER_SEC = 1000.0;
@ -89,8 +74,7 @@ var STATE_RELEASE = 7;
var GRAB_USER_DATA_KEY = "grabKey"; var GRAB_USER_DATA_KEY = "grabKey";
function MyController(hand, triggerAction) {
function controller(hand, triggerAction) {
this.hand = hand; this.hand = hand;
if (this.hand === RIGHT_HAND) { if (this.hand === RIGHT_HAND) {
this.getHandPosition = MyAvatar.getRightPalmPosition; this.getHandPosition = MyAvatar.getRightPalmPosition;
@ -99,6 +83,7 @@ function controller(hand, triggerAction) {
this.getHandPosition = MyAvatar.getLeftPalmPosition; this.getHandPosition = MyAvatar.getLeftPalmPosition;
this.getHandRotation = MyAvatar.getLeftPalmRotation; this.getHandRotation = MyAvatar.getLeftPalmRotation;
} }
this.triggerAction = triggerAction; this.triggerAction = triggerAction;
this.palm = 2 * hand; this.palm = 2 * hand;
// this.tip = 2 * hand + 1; // unused, but I'm leaving this here for fear it will be needed // this.tip = 2 * hand + 1; // unused, but I'm leaving this here for fear it will be needed
@ -110,37 +95,38 @@ function controller(hand, triggerAction) {
this.pointer = null; // entity-id of line object this.pointer = null; // entity-id of line object
this.triggerValue = 0; // rolling average of trigger value this.triggerValue = 0; // rolling average of trigger value
var _this = this; var _this = this;
this.update = function () {
this.update = function() {
switch (this.state) { switch (this.state) {
case STATE_SEARCHING: case STATE_SEARCHING:
this.search(); this.search();
this.touchTest(); this.touchTest();
break; break;
case STATE_DISTANCE_HOLDING: case STATE_DISTANCE_HOLDING:
this.distanceHolding(); this.distanceHolding();
break; break;
case STATE_CONTINUE_DISTANCE_HOLDING: case STATE_CONTINUE_DISTANCE_HOLDING:
this.continueDistanceHolding(); this.continueDistanceHolding();
break; break;
case STATE_NEAR_GRABBING: case STATE_NEAR_GRABBING:
this.nearGrabbing(); this.nearGrabbing();
break; break;
case STATE_CONTINUE_NEAR_GRABBING: case STATE_CONTINUE_NEAR_GRABBING:
this.continueNearGrabbing(); this.continueNearGrabbing();
break; break;
case STATE_NEAR_GRABBING_NON_COLLIDING: case STATE_NEAR_GRABBING_NON_COLLIDING:
this.nearGrabbingNonColliding(); this.nearGrabbingNonColliding();
break; break;
case STATE_CONTINUE_NEAR_GRABBING_NON_COLLIDING: case STATE_CONTINUE_NEAR_GRABBING_NON_COLLIDING:
this.continueNearGrabbingNonColliding(); this.continueNearGrabbingNonColliding();
break; break;
case STATE_RELEASE: case STATE_RELEASE:
this.release(); this.release();
break; break;
} }
}; };
_this.pointerIDs = [];
this.lineOn = function (closePoint, farPoint, color) { this.lineOn = function(closePoint, farPoint, color) {
// draw a line // draw a line
if (this.pointer === null) { if (this.pointer === null) {
this.pointer = Entities.addEntity({ this.pointer = Entities.addEntity({
@ -153,7 +139,6 @@ function controller(hand, triggerAction) {
color: color, color: color,
lifetime: LIFETIME lifetime: LIFETIME
}); });
_this.pointerIDs.push(this.pointer);
} else { } else {
Entities.editEntity(this.pointer, { Entities.editEntity(this.pointer, {
position: closePoint, position: closePoint,
@ -165,20 +150,14 @@ function controller(hand, triggerAction) {
}; };
this.lineOff = function() {
this.lineOff = function () {
if (this.pointer !== null) { if (this.pointer !== null) {
Entities.deleteEntity(this.pointer); Entities.deleteEntity(this.pointer);
} }
var index = _this.pointerIDs.indexOf(this.pointer);
if (index > -1) {
_this.pointerIDs.splice(index, 1);
}
this.pointer = null; this.pointer = null;
}; };
this.triggerSmoothedSqueezed = function() {
this.triggerSmoothedSqueezed = function () {
var triggerValue = Controller.getActionValue(this.triggerAction); var triggerValue = Controller.getActionValue(this.triggerAction);
// smooth out trigger value // smooth out trigger value
this.triggerValue = (this.triggerValue * TRIGGER_SMOOTH_RATIO) + this.triggerValue = (this.triggerValue * TRIGGER_SMOOTH_RATIO) +
@ -186,16 +165,12 @@ function controller(hand, triggerAction) {
return this.triggerValue > TRIGGER_ON_VALUE; return this.triggerValue > TRIGGER_ON_VALUE;
}; };
this.triggerSqueezed = function() {
this.triggerSqueezed = function () {
var triggerValue = Controller.getActionValue(this.triggerAction); var triggerValue = Controller.getActionValue(this.triggerAction);
return triggerValue > TRIGGER_ON_VALUE; return triggerValue > TRIGGER_ON_VALUE;
}; };
this.search = function() {
this.search = function () {
if (!this.triggerSmoothedSqueezed()) { if (!this.triggerSmoothedSqueezed()) {
this.state = STATE_RELEASE; this.state = STATE_RELEASE;
return; return;
@ -248,8 +223,7 @@ function controller(hand, triggerAction) {
}; };
this.distanceHolding = function() {
this.distanceHolding = function () {
var handControllerPosition = Controller.getSpatialControlPosition(this.palm); var handControllerPosition = Controller.getSpatialControlPosition(this.palm);
var handRotation = Quat.multiply(MyAvatar.orientation, Controller.getSpatialControlRawRotation(this.palm)); var handRotation = Quat.multiply(MyAvatar.orientation, Controller.getSpatialControlRawRotation(this.palm));
var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, ["position", "rotation"]); var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, ["position", "rotation"]);
@ -282,12 +256,9 @@ function controller(hand, triggerAction) {
Entities.callEntityMethod(this.grabbedEntity, "startDistantGrab"); Entities.callEntityMethod(this.grabbedEntity, "startDistantGrab");
} }
}; };
this.continueDistanceHolding = function() {
this.continueDistanceHolding = function () {
if (!this.triggerSmoothedSqueezed()) { if (!this.triggerSmoothedSqueezed()) {
this.state = STATE_RELEASE; this.state = STATE_RELEASE;
return; return;
@ -319,9 +290,7 @@ function controller(hand, triggerAction) {
this.currentObjectTime = now; this.currentObjectTime = now;
// this doubles hand rotation // this doubles hand rotation
var handChange = Quat.multiply(Quat.slerp(this.handPreviousRotation, handRotation, var handChange = Quat.multiply(Quat.slerp(this.handPreviousRotation, handRotation, DISTANCE_HOLDING_ROTATION_EXAGGERATION_FACTOR), Quat.inverse(this.handPreviousRotation));
DISTANCE_HOLDING_ROTATION_EXAGGERATION_FACTOR),
Quat.inverse(this.handPreviousRotation));
this.handPreviousRotation = handRotation; this.handPreviousRotation = handRotation;
this.currentObjectRotation = Quat.multiply(handChange, this.currentObjectRotation); this.currentObjectRotation = Quat.multiply(handChange, this.currentObjectRotation);
@ -335,8 +304,7 @@ function controller(hand, triggerAction) {
}); });
}; };
this.nearGrabbing = function() {
this.nearGrabbing = function () {
if (!this.triggerSmoothedSqueezed()) { if (!this.triggerSmoothedSqueezed()) {
this.state = STATE_RELEASE; this.state = STATE_RELEASE;
return; return;
@ -381,7 +349,7 @@ function controller(hand, triggerAction) {
this.currentObjectTime = Date.now(); this.currentObjectTime = Date.now();
}; };
this.continueNearGrabbing = function () { this.continueNearGrabbing = function() {
if (!this.triggerSmoothedSqueezed()) { if (!this.triggerSmoothedSqueezed()) {
this.state = STATE_RELEASE; this.state = STATE_RELEASE;
return; return;
@ -400,7 +368,7 @@ function controller(hand, triggerAction) {
Entities.callEntityMethod(this.grabbedEntity, "continueNearGrab"); Entities.callEntityMethod(this.grabbedEntity, "continueNearGrab");
}; };
this.nearGrabbingNonColliding = function () { this.nearGrabbingNonColliding = function() {
if (!this.triggerSmoothedSqueezed()) { if (!this.triggerSmoothedSqueezed()) {
this.state = STATE_RELEASE; this.state = STATE_RELEASE;
return; return;
@ -409,7 +377,7 @@ function controller(hand, triggerAction) {
this.state = STATE_CONTINUE_NEAR_GRABBING_NON_COLLIDING; this.state = STATE_CONTINUE_NEAR_GRABBING_NON_COLLIDING;
}; };
this.continueNearGrabbingNonColliding = function () { this.continueNearGrabbingNonColliding = function() {
if (!this.triggerSmoothedSqueezed()) { if (!this.triggerSmoothedSqueezed()) {
this.state = STATE_RELEASE; this.state = STATE_RELEASE;
return; return;
@ -417,28 +385,28 @@ function controller(hand, triggerAction) {
Entities.callEntityMethod(this.grabbedEntity, "continueNearGrabbingNonColliding"); Entities.callEntityMethod(this.grabbedEntity, "continueNearGrabbingNonColliding");
}; };
_this.allTouchedIDs = {}; this.touchTest = function() {
this.touchTest = function () {
//print('touch test');
var maxDistance = 0.05; var maxDistance = 0.05;
var leftHandPosition = MyAvatar.getLeftPalmPosition(); var leftHandPosition = MyAvatar.getLeftPalmPosition();
var rightHandPosition = MyAvatar.getRightPalmPosition(); var rightHandPosition = MyAvatar.getRightPalmPosition();
var leftEntities = Entities.findEntities(leftHandPosition, maxDistance); var leftEntities = Entities.findEntities(leftHandPosition, maxDistance);
var rightEntities = Entities.findEntities(rightHandPosition, maxDistance); var rightEntities = Entities.findEntities(rightHandPosition, maxDistance);
var ids = []; var ids = [];
if (leftEntities.length !== 0) { if (leftEntities.length !== 0) {
leftEntities.forEach(function (entity) { leftEntities.forEach(function(entity) {
ids.push(entity); ids.push(entity);
}); });
} }
if (rightEntities.length !== 0) { if (rightEntities.length !== 0) {
rightEntities.forEach(function (entity) { rightEntities.forEach(function(entity) {
ids.push(entity); ids.push(entity);
}); });
} }
ids.forEach(function (id) { ids.forEach(function(id) {
var props = Entities.getEntityProperties(id, ["boundingBox", "name"]); var props = Entities.getEntityProperties(id, ["boundingBox", "name"]);
if (props.name === 'pointer') { if (props.name === 'pointer') {
@ -471,23 +439,22 @@ function controller(hand, triggerAction) {
}; };
this.startTouch = function (entityID) { this.startTouch = function(entityID) {
// print('START TOUCH' + entityID); // print('START TOUCH' + entityID);
Entities.callEntityMethod(entityID, "startTouch"); Entities.callEntityMethod(entityID, "startTouch");
}; };
this.continueTouch = function (entityID) { this.continueTouch = function(entityID) {
// print('CONTINUE TOUCH' + entityID); // print('CONTINUE TOUCH' + entityID);
Entities.callEntityMethod(entityID, "continueTouch"); Entities.callEntityMethod(entityID, "continueTouch");
}; };
this.stopTouch = function (entityID) { this.stopTouch = function(entityID) {
// print('STOP TOUCH' + entityID); // print('STOP TOUCH' + entityID);
Entities.callEntityMethod(entityID, "stopTouch"); Entities.callEntityMethod(entityID, "stopTouch");
}; };
this.computeReleaseVelocity = function (deltaPosition, deltaTime, useMultiplier) { this.computeReleaseVelocity = function(deltaPosition, deltaTime, useMultiplier) {
if (deltaTime > 0.0 && !vec3equal(deltaPosition, ZERO_VEC)) { if (deltaTime > 0.0 && !vec3equal(deltaPosition, ZERO_VEC)) {
var grabbedVelocity = Vec3.multiply(deltaPosition, 1.0 / deltaTime); var grabbedVelocity = Vec3.multiply(deltaPosition, 1.0 / deltaTime);
// don't update grabbedVelocity if the trigger is off. the smoothing of the trigger // don't update grabbedVelocity if the trigger is off. the smoothing of the trigger
@ -504,8 +471,7 @@ function controller(hand, triggerAction) {
} }
}; };
this.release = function() {
this.release = function () {
this.lineOff(); this.lineOff();
if (this.grabbedEntity !== null && this.actionID !== null) { if (this.grabbedEntity !== null && this.actionID !== null) {
@ -526,12 +492,11 @@ function controller(hand, triggerAction) {
this.state = STATE_SEARCHING; this.state = STATE_SEARCHING;
}; };
this.cleanup = function() {
this.cleanup = function () {
this.release(); this.release();
}; };
this.activateEntity = function () { this.activateEntity = function() {
var data = { var data = {
activated: true, activated: true,
avatarId: MyAvatar.sessionUUID avatarId: MyAvatar.sessionUUID
@ -539,7 +504,7 @@ function controller(hand, triggerAction) {
setEntityCustomData(GRAB_USER_DATA_KEY, this.grabbedEntity, data); setEntityCustomData(GRAB_USER_DATA_KEY, this.grabbedEntity, data);
}; };
this.deactivateEntity = function () { this.deactivateEntity = function() {
var data = { var data = {
activated: false, activated: false,
avatarId: null avatarId: null
@ -548,22 +513,18 @@ function controller(hand, triggerAction) {
}; };
} }
var rightController = new MyController(RIGHT_HAND, Controller.findAction("RIGHT_HAND_CLICK"));
var rightController = new controller(RIGHT_HAND, Controller.findAction("RIGHT_HAND_CLICK")); var leftController = new MyController(LEFT_HAND, Controller.findAction("LEFT_HAND_CLICK"));
var leftController = new controller(LEFT_HAND, Controller.findAction("LEFT_HAND_CLICK"));
function update() { function update() {
rightController.update(); rightController.update();
leftController.update(); leftController.update();
} }
function cleanup() { function cleanup() {
rightController.cleanup(); rightController.cleanup();
leftController.cleanup(); leftController.cleanup();
} }
Script.scriptEnding.connect(cleanup); Script.scriptEnding.connect(cleanup);
Script.update.connect(update); Script.update.connect(update);

38
examples/entityScripts/changeColorOnTouch.js
View file

@ -13,54 +13,54 @@
// 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
// //
/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */
(function () {
ChangeColorOnTouch = function () { (function() {
function ChangeColorOnTouch () {
this.oldColor = {}; this.oldColor = {};
this.oldColorKnown = false; this.oldColorKnown = false;
}; }
ChangeColorOnTouch.prototype = { ChangeColorOnTouch.prototype = {
storeOldColor: function (entityID) { storeOldColor: function(entityID) {
var oldProperties = Entities.getEntityProperties(entityID); var oldProperties = Entities.getEntityProperties(entityID);
this.oldColor = oldProperties.color; this.oldColor = oldProperties.color;
this.oldColorKnown = true; this.oldColorKnown = true;
print("storing old color... this.oldColor=" + this.oldColor.red + "," + this.oldColor.green + "," + this.oldColor.blue); print("storing old color... this.oldColor=" + this.oldColor.red + "," + this.oldColor.green + "," + this.oldColor.blue);
}, },
preload: function (entityID) { preload: function(entityID) {
print("preload"); print("preload");
this.entityID = entityID; this.entityID = entityID;
this.storeOldColor(entityID); this.storeOldColor(entityID);
}, },
startTouch: function () { startTouch: function() {
print("startTouch"); print("startTouch");
if (!this.oldColorKnown) { if (!this.oldColorKnown) {
this.storeOldColor(this.entityID); this.storeOldColor(this.entityID);
} }
Entities.editEntity(this.entityID, {
color: { Entities.editEntity(this.entityID, {color: { red: 0, green: 255, blue: 255 }});
red: 0,
green: 255,
blue: 255
}
});
}, },
continueTouch: function () { continueTouch: function() {
//unused here //unused here
return; return;
}, },
stopTouch: function () { stopTouch: function() {
print("stopTouch"); print("stopTouch");
if (this.oldColorKnown) { if (this.oldColorKnown) {
print("leave restoring old color... this.oldColor=" + this.oldColor.red + "," + this.oldColor.green + "," + this.oldColor.blue); print("leave restoring old color... this.oldColor=" + this.oldColor.red + "," + this.oldColor.green + "," + this.oldColor.blue);
Entities.editEntity(this.entityID, { Entities.editEntity(this.entityID, {color: this.oldColor});
color: this.oldColor
});
} }
} }
@ -68,4 +68,4 @@
}; };
return new ChangeColorOnTouch(); return new ChangeColorOnTouch();
}) });