Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 10:00:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add create wand script, add offset to bubble spawn point so that it is at the end of the wand

Browse source
This commit is contained in:
James Pollack 2015-09-03 17:42:41 -07:00
parent cf0d236174
commit 1e9bac8dee
2 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
examples/toys/bubblewand/createWand.js Normal file
View file

@ -0,0 +1,27 @@
function randInt(min, max) {
return Math.floor(Math.random() * (max - min)) + min;
}
var wandModel = "http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx?" + randInt(0, 10000);
var scriptURL = "http://hifi-public.s3.amazonaws.com/james/bubblewand/scripts/wand.js" + randInt(1, 10048)
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(Camera.getOrientation())));
var paintGun = Entities.addEntity({
type: "Model",
modelURL: wandModel,
position: center,
dimensions: {
x: 0.1,
y: 1,
z: 0.1
},
collisionsWillMove: true,
shapeType: 'box',
script: scriptURL
});
function cleanup() {
Entities.deleteEntity(paintGun);
}
Script.scriptEnding.connect(cleanup);

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

@ -64,7 +64,7 @@ function findSphereSphereHit(firstCenter, firstRadius, secondCenter, secondRadiu
var bubbleModel = "http://hifi-public.s3.amazonaws.com/james/bubblewand/models/bubble/bubble.fbx";
var bubbleScript = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/scripts/bubble.js?' + randInt(2, 5096);
var popSound = SoundCache.getSound("http://hifi-public.s3.amazonaws.com/james/bubblewand/sounds/pop.wav");
var wandModel = "http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx";
@ -272,7 +272,7 @@ function findSphereSphereHit(firstCenter, firstRadius, secondCenter, secondRadiu
}
Entities.editEntity(_t.currentBubble, {
position: wandPosition,
position: _t.wandTipPosition,
dimensions: dimensions
});
@ -302,17 +302,23 @@ function findSphereSphereHit(firstCenter, firstRadius, secondCenter, secondRadiu
var _t = this;
var properties = Entities.getEntityProperties(thisEntity.entityID);
var wandPosition = properties.position;
var upVector = Quat.getUp(properties.rotation);
var frontVector = Quat.getFront(properties.rotation);
var upOffset = Vec3.multiply(upVector,0.5);
var forwardOffset =Vec3.multiply(frontVector,0.1);
var offsetVector = Vec3.sum(upOffset,forwardOffset);
var wandTipPosition = Vec3.sum(wandPosition,offsetVector);
_t.wandTipPosition=wandTipPosition;
_t.currentBubble = Entities.addEntity({
type: 'Model',
modelURL: bubbleModel,
position: wandPosition,
position: wandTipPosition,
dimensions: {
x: 0.01,
y: 0.01,
z: 0.01
},
collisionsWillMove:false,
ignoreForCollisions: true,
gravity: BUBBLE_GRAVITY,
// collisionSoundURL:popSound,