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

cleanup

Browse source
This commit is contained in:
James B. Pollack 2015-09-16 18:48:06 -07:00
parent a8fe3b3edd
commit 75df4e96e8
3 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/toys/bubblewand/bubble.js
View file

@ -106,4 +106,4 @@
};
})
});

31
examples/toys/bubblewand/createWand.js
View file

@ -17,26 +17,25 @@ Script.include("../../libraries/utils.js");
var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/collisionHull.obj';
var WAND_SCRIPT_URL = Script.resolvePath("wand.js?"+randInt(0,4000));
var WAND_SCRIPT_URL = Script.resolvePath("wand.js?" + randInt(0, 4000));
//create the wand in front of the avatar
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1, Quat.getFront(Camera.getOrientation())));
var wand = Entities.addEntity({
type: "Model",
modelURL: WAND_MODEL,
position: center,
dimensions: {
x: 0.025,
y: 0.125,
z: 0.025
},
//must be enabled to be grabbable in the physics engine
collisionsWillMove: true,
compoundShapeURL: WAND_COLLISION_SHAPE,
script: WAND_SCRIPT_URL
});
var wand = Entities.addEntity({
type: "Model",
modelURL: WAND_MODEL,
position: center,
dimensions: {
x: 0.025,
y: 0.125,
z: 0.025
},
//must be enabled to be grabbable in the physics engine
collisionsWillMove: true,
compoundShapeURL: WAND_COLLISION_SHAPE,
script: WAND_SCRIPT_URL
});
function cleanup() {
Entities.deleteEntity(wand);
}

32
examples/toys/bubblewand/wand.js
View file

@ -11,8 +11,6 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// 'use strict';
(function() {
Script.include("../../utilities.js");
@ -28,20 +26,21 @@
x: 0,
y: -0.1,
z: 0
}
};
var WAVE_MODE_GROWTH_FACTOR = 0.005;
var SHRINK_LOWER_LIMIT = 0.02;
var SHRINK_FACTOR = 0.001;
var VELOCITY_STRENGTH_LOWER_LIMIT = 0.01;
var MAX_VELOCITY_STRENGTH = 10;
var BUBBLE_DIVISOR = 50;
var BUBBLE_LIFETIME_MIN = 3;
var BUBBLE_LIFETIME_MAX = 8;
var WAND_TIP_OFFSET = 0.05;
var BUBBLE_SIZE_MIN = 1;
var BUBBLE_SIZE_MAX = 5;
var VELOCITY_THRESHOLD = 1;
var WAND_TIP_OFFSET = 0.05;
var VELOCITY_STRENGTH_LOWER_LIMIT = 0.01;
var MAX_VELOCITY_STRENGTH = 10;
var VELOCITY_THRESHOLD = 1;
var VELOCITY_STRENGTH_MULTIPLIER = 100;
function getGustDetectorPosition() {
//put the zone in front of your avatar's face
@ -60,7 +59,7 @@
var offset = Vec3.sum(Vec3.sum(rightOffset, frontOffset), upOffset);
var position = Vec3.sum(MyAvatar.position, offset);
return position;
}
};
var wandEntity = this;
@ -93,7 +92,7 @@
},
internalUpdate: function(deltaTime) {
var properties = Entities.getEntityProperties(wandEntity.entityID);
var _t = this;
var GRAB_USER_DATA_KEY = "grabKey";
var defaultGrabData = {
@ -116,15 +115,14 @@
return
}
var wandTipPosition = _t.getWandTipPosition(properties);
//update the bubble to stay with the wand tip
Entities.editEntity(_t.currentBubble, {
position: wandTipPosition,
var wandTipPosition = _t.getWandTipPosition(properties);
//update the bubble to stay with the wand tip
Entities.editEntity(_t.currentBubble, {
position: wandTipPosition,
});
});
},
getWandTipPosition: function(properties) {
print('get wand position')
var upVector = Quat.getUp(properties.rotation);
var frontVector = Quat.getFront(properties.rotation);
var upOffset = Vec3.multiply(upVector, WAND_TIP_OFFSET);
@ -140,7 +138,7 @@
_t.wandTipPosition = wandTipPosition;
var velocity = Vec3.subtract(wandPosition, _t.lastPosition)
var velocityStrength = Vec3.length(velocity) * 100;
var velocityStrength = Vec3.length(velocity) * VELOCITY_STRENGTH_MULTIPLIER;
if (velocityStrength < VELOCITY_STRENGTH_LOWER_LIMIT) {
velocityStrength = 0
@ -193,7 +191,7 @@
//update the bubble to stay with the wand tip
Entities.editEntity(_t.currentBubble, {
position: _t.wandTipPosition,
dimensions: dimensions
});
},