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

switch branches

Browse source
This commit is contained in:
James B. Pollack 2016-02-22 17:54:45 -08:00
parent 6b14fa8dcb
commit 46aebabd9b
2 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
unpublishedScripts/DomainContent/CellScience/Scripts/zoomAndMoveRandomly.js
View file

@ -38,8 +38,8 @@
this.initTimeout = null; this.initTimeout = null;
this.minVelocity = 1; this.minVelocity = 1;
this.maxVelocity = 5; this.maxVelocity = 5;
this.minAngularVelocity = 0.01; this.minAngularVelocity = 0.03;
this.maxAngularVelocity = 0.03; this.maxAngularVelocity = 0.10;
baton = virtualBaton({ baton = virtualBaton({
batonName: 'io.highfidelity.cells:' + entityID, // One winner for each entity batonName: 'io.highfidelity.cells:' + entityID, // One winner for each entity
}); });
@ -69,7 +69,7 @@
}; };
self.teleportSound = SoundCache.getSound("https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/whoosh.wav"); self.teleportSound = SoundCache.getSound("https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/whoosh.wav");
// print(" portal destination is " + self.portalDestination);
} }
} }
@ -81,13 +81,6 @@
print("Teleporting to (" + data.location.x + ", " + data.location.y + ", " + data.location.z + ")"); print("Teleporting to (" + data.location.x + ", " + data.location.y + ", " + data.location.z + ")");
MyAvatar.position = data.location; MyAvatar.position = data.location;
// if (data.hasOwnProperty('entryPoint') && data.hasOwnProperty('target')) {
// this.lookAtTarget(data.entryPoint, data.target);
// }
// else{
// }
} }
} }
@ -143,11 +136,11 @@
} }
this.getTotalWait = function() { this.getTotalWait = function() {
return (Math.random() * 5000) * 2; return (Math.random() * 5000) * 3;
} }
this.move = function() { this.move = function() {
if (self.iOwn===false) { if (self.iOwn === false) {
print('cell is not owned by me...') print('cell is not owned by me...')
return; return;
} }
@ -159,9 +152,8 @@
y: Math.random() - 0.5, y: Math.random() - 0.5,
z: Math.random() - 0.5 z: Math.random() - 0.5
}; };
print("ROT magnitude is " + magnitudeAV + " and direction is " + directionAV.x); // print("ROT magnitude is " + magnitudeAV + " and direction is " + directionAV.x);
Entities.editEntity(self.entityId, { Entities.editEntity(self.entityId, {
// velocity: Vec3.multiply(magnitudeV, Vec3.normalize(directionV)),
angularVelocity: Vec3.multiply(magnitudeAV, Vec3.normalize(directionAV)) angularVelocity: Vec3.multiply(magnitudeAV, Vec3.normalize(directionAV))
}); });

10
unpublishedScripts/DomainContent/CellScience/importCellScience.js
View file

@ -5,7 +5,7 @@
// 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
// //
var version = 1055; var version = 1057;
var cellLayout; var cellLayout;
var baseLocation = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/"; var baseLocation = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/";
@ -103,16 +103,16 @@ var scenes = [{
instances: [{ instances: [{
model: "Cell", model: "Cell",
dimensions: { dimensions: {
x: 550, x: 500,
y: 620, y: 570,
z: 550 z: 500
}, },
offset: { offset: {
x: 0, x: 0,
y: 0, y: 0,
z: 0 z: 0
}, },
radius: 500, radius: 450,
number: 10, number: 10,
userData: JSON.stringify({ userData: JSON.stringify({
entryPoint: locations.cellLayout[1], entryPoint: locations.cellLayout[1],