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

move cellscience to production

Browse source
This commit is contained in:
James B. Pollack 2016-04-25 10:16:39 -07:00
parent 0f8842f582
commit 8899ac71a1
11 changed files with 161 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js
View file

@ -6,7 +6,7 @@
//
var spriteURL = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Sprites/nucleosomes_sprite.fbx";
var spriteURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Sprites/nucleosomes_sprite.fbx";
var spriteDimensions = {
x: 10,
y: 10,

2
unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js
View file

@ -13,7 +13,7 @@
z: -1
}
var baseURL = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/";
var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/";
var self = this;

2
unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js
View file

@ -14,7 +14,7 @@
Script.include(utilsScript);
var self = this;
var baseURL = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/";
var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/";
this.preload = function(entityId) {
this.entityId = entityId;

3
unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js
View file

@ -6,7 +6,7 @@
//
(function() {
var baseURL = "https://hifi-content.s3.amazonaws.com/hifi-content/DomainContent/CellScience/";
var baseURL = "https://hifi-production.s3.amazonaws.com/hifi-production/DomainContent/CellScience/";
var self = this;
this.buttonImageURL = baseURL + "GUI/play_audio.svg?2";
@ -50,6 +50,7 @@
self.sound = SoundCache.getSound(this.soundURL);
}
}
this.addButton = function() {
this.windowDimensions = Controller.getViewportDimensions();

2
unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js
View file

@ -8,7 +8,7 @@
(function() {
var self = this;
var baseURL = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/";
var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/";
var version = 3;
this.preload = function(entityId) {

9
unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js
View file

@ -22,7 +22,12 @@
this.initialize = function(entityID) {
// print(' should initialize')
var properties = Entities.getEntityProperties(entityID);
if (properties.userData.length === 0 || properties.hasOwnProperty('userData') === false) {
if (properties.hasOwnProperty('userData') === false) {
self.initTimeout = Script.setTimeout(function() {
// print(' no user data yet, try again in one second')
self.initialize(entityID);
}, 1000)
} else if (properties.userData.length === 0 || ) {
self.initTimeout = Script.setTimeout(function() {
// print(' no user data yet, try again in one second')
self.initialize(entityID);
@ -39,7 +44,7 @@
volume: 0.5
};
self.teleportSound = SoundCache.getSound("https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/whoosh.wav");
self.teleportSound = SoundCache.getSound("https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Audio/whoosh.wav");
// print(" portal destination is " + self.portalDestination);
}
}

8
unpublishedScripts/DomainContent/CellScience/backgroundMusicAC.js
View file

@ -1,6 +1,6 @@
var soundMap = [{
name: 'Cells',
url: "http://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/Cells.wav",
url: "http://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Audio/Cells.wav",
audioOptions: {
position: {
x: 15850,
@ -12,7 +12,7 @@ var soundMap = [{
}
}, {
name: 'Cell Layout',
url: "http://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/CellLayout.wav",
url: "http://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Audio/CellLayout.wav",
audioOptions: {
position: {
x: 15950,
@ -24,7 +24,7 @@ var soundMap = [{
}
}, {
name: 'Ribsome',
url: "http://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/Ribosome.wav",
url: "http://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Audio/Ribosome.wav",
audioOptions: {
position: {
x: 15650,
@ -36,7 +36,7 @@ var soundMap = [{
}
}, {
name: 'Hexokinase',
url: "http://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/Hexokinase.wav",
url: "http://hifi-production.s3.amazonaws.com/DomainContent/CellScience/Audio/Hexokinase.wav",
audioOptions: {
position: {
x: 15750,

47
unpublishedScripts/DomainContent/CellScience/importCellScience.js → unpublishedScripts/DomainContent/CellScience/importEverything.js
View file

@ -38,7 +38,7 @@ function transformToSmallerWorld(vector) {
}
var cellLayout;
var baseLocation = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/";
var baseLocation = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/";
var utilsScript = Script.resolvePath('Scripts/utils.js');
Script.include(utilsScript);
@ -219,6 +219,7 @@ var scenes = [{
grabbable: false
}
}),
script: null,
visible: true
}, { //golgi vesicles
model: "vesicle",
@ -240,7 +241,7 @@ var scenes = [{
grabbable: false
}
}),
script: "",
script: null,
visible: true
}, { //golgi vesicles
model: "vesicle",
@ -262,6 +263,7 @@ var scenes = [{
grabbable: false
}
}),
script: null,
visible: true
}, {
model: "vesicle",
@ -283,7 +285,7 @@ var scenes = [{
grabbable: false
}
}),
script: "",
script: null,
visible: true
}, { //outer vesicles
model: "vesicle",
@ -305,7 +307,7 @@ var scenes = [{
grabbable: false
}
}),
script: "",
script: null,
visible: true
}, { //outer vesicles
model: "vesicle",
@ -327,6 +329,7 @@ var scenes = [{
grabbable: false
}
}),
script: null,
visible: true
}, { //outer vesicles
model: "vesicle",
@ -348,6 +351,7 @@ var scenes = [{
grabbable: false
}
}),
script: null,
visible: true
}, {
model: "hexokinase",
@ -469,7 +473,7 @@ var scenes = [{
grabbable: false
}
}),
script: "",
script: null,
visible: true
}],
boundary: {
@ -518,7 +522,7 @@ var scenes = [{
grabbable: false
}
}),
script: "",
script: null,
visible: true
}],
boundary: {
@ -863,15 +867,8 @@ function getPointOnSphereOfRadius(radius, number, totalNumber) {
}
function CreateEntity(name, position, rotation, dimensions, url, script, userData, visible) {
var scriptLocation;
if (script === "") {
scriptLocation = "";
} else {
scriptLocation = baseLocation + "Scripts/" + script;
}
//print(' SCRIPT LOCATION IN CREATE ENTITY' + scriptLocation)
Entities.addEntity({
var entityProps = {
type: "Model",
name: name,
position: position,
@ -895,11 +892,19 @@ function CreateEntity(name, position, rotation, dimensions, url, script, userDat
startAutomatically: true
}),
userData: userData,
script: scriptLocation,
collisionless: true,
shapeType: "compound",
compoundShapeURL: url
});
}
if (script !== null) {
if (script !== "" && typeof script !== undefined) {
entityProps.script = baseLocation + "Scripts/" + script;
}
}
Entities.addEntity(entityProps);
// print("added " + name + " at (" + position.x + ", " + position.y + ", " + position.z + ")");
@ -9005,7 +9010,7 @@ Script.setTimeout(function(){
for (var i = 0; i < scenes.length; i++) {
// print('setting up scene. first, delete' + JSON.stringify(scenes[i]))
// deleteAllInRadius(scenes[i].location, scenes[i].zone.dimensions.x);
CreateNavigationButton(scenes[i], i);
ImportScene(scenes[i]);
@ -9018,3 +9023,11 @@ createLayoutLights();
}, 3500)
// Script.scriptEnding.connect(function() {
// Entities.addingEntity.disconnect(makeUngrabbable);
// });
// Script.setTimeout(function() {
// print('JBP stopping cell science import');
// Script.stop();
// }, 30000)

8
unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js
View file

@ -9,12 +9,8 @@ var numDynein = 2;
var numKinesin = 2;
var percentOnMainMT = 100;
var baseLocation;
if (USE_LOCAL_HOST === true) {
baseLocation = "http://localhost:8080/";
} else {
baseLocation = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/"
}
baseLocation = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/"
var WORLD_OFFSET = {
x: 0,

1
unpublishedScripts/DomainContent/CellScience/moveCellsAC.js
View file

@ -18,7 +18,6 @@ function offsetVectorToWorld(vector) {
newVector = Vec3.sum(vector, WORLD_OFFSET);
print('JBP NEW VECTOR IS:: ' + JSON.stringify(newVector))
return newVector
}

1
unpublishedScripts/DomainContent/CellScience/moveVesiclesAC.js
View file

@ -17,7 +17,6 @@ function offsetVectorToWorld(vector) {
newVector = Vec3.sum(vector, WORLD_OFFSET);
print('JBP NEW VECTOR IS:: ' + JSON.stringify(newVector))
return newVector
}