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

code style.

Browse source
This commit is contained in:
Midnight 2017-08-21 14:48:10 -07:00
parent 6892cdb57d
commit 9185e1d80d
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
View file

@ -53,7 +53,7 @@
azimuthFinish: 180 azimuthFinish: 180
}; };
particleTrailEntity = Entities.addEntity(props); particleTrailEntity = Entities.addEntity(props);
} }
function particleExplode() { function particleExplode() {
@ -93,13 +93,13 @@
azimuthStart: -180, azimuthStart: -180,
azimuthFinish: 180 azimuthFinish: 180
}; };
var exposionParticles = Entities.addEntity(props); var explosionParticles = Entities.addEntity(props);
Entities.editEntity(_entityID, { Entities.editEntity(_entityID, {
velocity: Vec3.ZERO, velocity: Vec3.ZERO,
dynamic: false dynamic: false
}); });
Script.setTimeout(function () { Script.setTimeout(function () {
Entities.deleteEntity(exposionParticles); Entities.deleteEntity(explosionParticles);
Entities.editEntity(_entityID, { Entities.editEntity(_entityID, {
dynamic: true dynamic: true
}) })
@ -114,7 +114,9 @@
particleTrailEntity = null; particleTrailEntity = null;
} }
if (proxTimeout) Script.clearTimeout(proxTimeout); if (proxTimeout) {
Script.clearTimeout(proxTimeout);
}
} }
function proxCheck() { function proxCheck() {
@ -133,7 +135,9 @@
var avatarUUID = triggerHandAndAvatarUUIDArray[1]; var avatarUUID = triggerHandAndAvatarUUIDArray[1];
var ballPos = Entities.getEntityProperties(_entityID, ['position']).position; var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
if (Vec3.distance(ballPos, AvatarList.getAvatar(avatarUUID).position) > 2) { var MAX_DISTANCE_GRAB = 2; //meter
if (Vec3.distance(ballPos, AvatarList.getAvatar(avatarUUID).position) > MAX_DISTANCE_GRAB) {
Messages.sendMessage(FORCE_DROP_CHANNEL, triggerHand, true); Messages.sendMessage(FORCE_DROP_CHANNEL, triggerHand, true);
} }
@ -144,7 +148,9 @@
this.releaseGrab = function (thisEntityID) { this.releaseGrab = function (thisEntityID) {
if (particleTrailEntity === null) particleTrail(); if (particleTrailEntity === null) {
particleTrail();
}
Script.setTimeout(function () { Script.setTimeout(function () {
proxInterval = Script.setInterval(proxCheck, 50); proxInterval = Script.setInterval(proxCheck, 50);
@ -155,7 +161,7 @@
}, 10000) }, 10000)
}; };
this.collisionWithEntity = function(thisEntityID, collisionEntityID, collisionInfo) { this.collisionWithEntity = function (thisEntityID, collisionEntityID, collisionInfo) {
clearProxCheck(); clearProxCheck();
}; };