From 8899ac71a18fb96eb296859d6bdc6b126d1061dd Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 25 Apr 2016 10:16:39 -0700 Subject: [PATCH] move cellscience to production --- .../CellScience/Scripts/billboard.js | 2 +- .../CellScience/Scripts/clickToRideAndLook.js | 2 +- .../CellScience/Scripts/navigationButton.js | 2 +- .../Scripts/showButtonToPlaySound.js | 203 +++++++++--------- .../CellScience/Scripts/showIdentification.js | 2 +- .../DomainContent/CellScience/Scripts/zoom.js | 15 +- .../CellScience/backgroundMusicAC.js | 8 +- ...portCellScience.js => importEverything.js} | 65 +++--- .../CellScience/motorProteinControllerAC.js | 8 +- .../DomainContent/CellScience/moveCellsAC.js | 1 - .../CellScience/moveVesiclesAC.js | 1 - 11 files changed, 161 insertions(+), 148 deletions(-) rename unpublishedScripts/DomainContent/CellScience/{importCellScience.js => importEverything.js} (99%) diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js b/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js index e0d5fe0cac..b5e725cfcf 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js @@ -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, diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js b/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js index d6a9b79467..61ccec9f9b 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js @@ -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; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js b/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js index b143678b42..9992c13acb 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js @@ -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; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js b/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js index 8ee5e0092e..6ee3b9645b 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js @@ -6,113 +6,114 @@ // (function() { - var baseURL = "https://hifi-content.s3.amazonaws.com/hifi-content/DomainContent/CellScience/"; - var self = this; - this.buttonImageURL = baseURL + "GUI/play_audio.svg?2"; + var baseURL = "https://hifi-production.s3.amazonaws.com/hifi-production/DomainContent/CellScience/"; + var self = this; + this.buttonImageURL = baseURL + "GUI/play_audio.svg?2"; + + this.preload = function(entityId) { + this.entityId = entityId; + this.initialize(entityId) + this.initTimeout = null; + } + + this.initialize = function(entityId) { + //print(' should initialize' + entityId) + var properties = Entities.getEntityProperties(entityId); + if (properties.userData.length === 0 || properties.hasOwnProperty('userData') === false) { + self.initTimeout = Script.setTimeout(function() { + // print(' no user data yet, try again in one second') + self.initialize(entityId); + }, 1000) + + } else { + //print(' userdata before parse attempt' + properties.userData) + self.userData = null; + try { + self.userData = JSON.parse(properties.userData); + } catch (err) { + // print(' error parsing json'); + // print(' properties are:' + properties.userData); + return; + } + + self.addButton(); + self.buttonShowing = false; + self.showDistance = self.userData.showDistance; + self.soundURL = baseURL + "Audio/" + self.userData.soundName + ".wav"; + // print("distance = " + self.userData.showDistance + ", sound = " + self.soundURL); + self.soundOptions = { + stereo: true, + loop: false, + localOnly: true, + volume: 1 + }; + self.sound = SoundCache.getSound(this.soundURL); - this.preload = function(entityId) { - this.entityId = entityId; - this.initialize(entityId) - this.initTimeout = null; } + } - this.initialize = function(entityId) { - //print(' should initialize' + entityId) - var properties = Entities.getEntityProperties(entityId); - if (properties.userData.length === 0 || properties.hasOwnProperty('userData') === false) { - self.initTimeout = Script.setTimeout(function() { - // print(' no user data yet, try again in one second') - self.initialize(entityId); - }, 1000) + this.addButton = function() { + this.windowDimensions = Controller.getViewportDimensions(); + this.buttonWidth = 100; + this.buttonHeight = 100; + this.buttonPadding = 0; + this.buttonPositionX = (self.windowDimensions.x - self.buttonPadding) / 2 - self.buttonWidth; + this.buttonPositionY = (self.windowDimensions.y - self.buttonHeight) - (self.buttonHeight + self.buttonPadding); + this.button = Overlays.addOverlay("image", { + x: self.buttonPositionX, + y: self.buttonPositionY, + width: self.buttonWidth, + height: self.buttonHeight, + imageURL: self.buttonImageURL, + visible: false, + alpha: 1.0 + }); + } + + this.update = function(deltaTime) { + + self.distance = Vec3.distance(MyAvatar.position, Entities.getEntityProperties(self.entityId).position); + //print(self.distance); + if (!self.buttonShowing && self.distance < self.userData.showDistance) { + self.buttonShowing = true; + Overlays.editOverlay(self.button, { + visible: true + }); + } else if (self.buttonShowing && self.distance > self.userData.showDistance) { + self.buttonShowing = false; + Overlays.editOverlay(self.button, { + visible: false + }); + } + } + + this.onClick = function(event) { + var clickedOverlay = Overlays.getOverlayAtPoint({ + x: event.x, + y: event.y + }); + if (clickedOverlay === self.button) { + //print("button was clicked"); + if (self.sound.downloaded) { + //print("play sound"); + Audio.playSound(self.sound, self.soundOptions); } else { - //print(' userdata before parse attempt' + properties.userData) - self.userData = null; - try { - self.userData = JSON.parse(properties.userData); - } catch (err) { - // print(' error parsing json'); - // print(' properties are:' + properties.userData); - return; - } - - self.addButton(); - self.buttonShowing = false; - self.showDistance = self.userData.showDistance; - self.soundURL = baseURL + "Audio/" + self.userData.soundName + ".wav"; - // print("distance = " + self.userData.showDistance + ", sound = " + self.soundURL); - self.soundOptions = { - stereo: true, - loop: false, - localOnly: true, - volume: 1 - }; - self.sound = SoundCache.getSound(this.soundURL); - + //print("not downloaded"); } + } + } - this.addButton = function() { - this.windowDimensions = Controller.getViewportDimensions(); - this.buttonWidth = 100; - this.buttonHeight = 100; - this.buttonPadding = 0; + this.unload = function() { + Overlays.deleteOverlay(self.button); + Controller.mousePressEvent.disconnect(this.onClick); + Script.update.disconnect(this.update); + if (this.initTimeout !== null) { + Script.clearTimeout(this.initTimeout); + } + } - this.buttonPositionX = (self.windowDimensions.x - self.buttonPadding) / 2 - self.buttonWidth; - this.buttonPositionY = (self.windowDimensions.y - self.buttonHeight) - (self.buttonHeight + self.buttonPadding); - this.button = Overlays.addOverlay("image", { - x: self.buttonPositionX, - y: self.buttonPositionY, - width: self.buttonWidth, - height: self.buttonHeight, - imageURL: self.buttonImageURL, - visible: false, - alpha: 1.0 - }); - } + Controller.mousePressEvent.connect(this.onClick); + Script.update.connect(this.update); - this.update = function(deltaTime) { - - self.distance = Vec3.distance(MyAvatar.position, Entities.getEntityProperties(self.entityId).position); - //print(self.distance); - if (!self.buttonShowing && self.distance < self.userData.showDistance) { - self.buttonShowing = true; - Overlays.editOverlay(self.button, { - visible: true - }); - } else if (self.buttonShowing && self.distance > self.userData.showDistance) { - self.buttonShowing = false; - Overlays.editOverlay(self.button, { - visible: false - }); - } - } - - this.onClick = function(event) { - var clickedOverlay = Overlays.getOverlayAtPoint({ - x: event.x, - y: event.y - }); - if (clickedOverlay === self.button) { - //print("button was clicked"); - if (self.sound.downloaded) { - //print("play sound"); - Audio.playSound(self.sound, self.soundOptions); - } else { - //print("not downloaded"); - } - } - } - - this.unload = function() { - Overlays.deleteOverlay(self.button); - Controller.mousePressEvent.disconnect(this.onClick); - Script.update.disconnect(this.update); - if (this.initTimeout !== null) { - Script.clearTimeout(this.initTimeout); - } - } - - Controller.mousePressEvent.connect(this.onClick); - Script.update.connect(this.update); - - }); \ No newline at end of file +}); \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js b/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js index 3f6067693c..a7a74fa79c 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js @@ -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) { diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js index 3fc5acae2a..665049198e 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js @@ -22,9 +22,14 @@ 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') + // 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); }, 1000) } else { @@ -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); } } @@ -51,13 +56,13 @@ if (data != null) { print("Teleporting to (" + data.location.x + ", " + data.location.y + ", " + data.location.z + ")"); - MyAvatar.position = data.location; + MyAvatar.position = data.location; } } - this.lookAtTarget = function(entryPoint,target) { + this.lookAtTarget = function(entryPoint, target) { //print('SHOULD LOOK AT TARGET') var direction = Vec3.normalize(Vec3.subtract(entryPoint, target)); var pitch = Quat.angleAxis(Math.asin(-direction.y) * 180.0 / Math.PI, { diff --git a/unpublishedScripts/DomainContent/CellScience/backgroundMusicAC.js b/unpublishedScripts/DomainContent/CellScience/backgroundMusicAC.js index 1b4c06caaa..829dfbeae9 100644 --- a/unpublishedScripts/DomainContent/CellScience/backgroundMusicAC.js +++ b/unpublishedScripts/DomainContent/CellScience/backgroundMusicAC.js @@ -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, diff --git a/unpublishedScripts/DomainContent/CellScience/importCellScience.js b/unpublishedScripts/DomainContent/CellScience/importEverything.js similarity index 99% rename from unpublishedScripts/DomainContent/CellScience/importCellScience.js rename to unpublishedScripts/DomainContent/CellScience/importEverything.js index bd9da50989..11c3d95523 100644 --- a/unpublishedScripts/DomainContent/CellScience/importCellScience.js +++ b/unpublishedScripts/DomainContent/CellScience/importEverything.js @@ -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 + ")"); @@ -9001,20 +9006,28 @@ function assignVariables() { cellLayout = "Object Name,TranslateX,TranslateY,TranslateZ,DimensionX,DimensionY,DimensionZ, RotateX, RotateY, RotateZ;NPC,197.8817968,187.1750856,343.3718791,24.13382446,34.22486206,30.38697693,46.23119528,-8.353895581,8.869973765;NPC,213.3709151,2.456316462,423.9885128,25.53621185,34.58618774,24.07834717,90.38281992,-7.832244708,0;NPC,33.34912856,2.090308135,365.04642,25.53621185,34.58618774,24.07834717,90.39885078,-38.49088523,0;NPC,397.5101386,159.5911591,319.6113615,25.53621185,34.58618774,24.07834717,50.3605842,37.83254121,0;NPC,156.5827125,-122.5087526,377.9210147,25.53621185,34.58618774,24.07834717,115.9481277,-11.66518146,0;golgi,-318.7046145,66.9773569,976.6478796,211.1744971,156.6775269,204.0570996,115.0039041,-35.67118658,-77.29622127;golgi,456.0077009,0,-837.4997205,235.0718115,174.4077612,227.1489771,-25.72753579,12.39046363,101.1906405;microtubule1,212.4149854,132.4649414,944.2434082,142.5869824,122.8758984,880.6406836,0,0,0;microtubule10,673.8832031,311.0911194,-148.9548248,200.3548828,452.0626831,200.2862878,0,0,0;microtubule11,732.2112598,361.0221094,-546.264873,89.10005859,364.5919922,488.656582,0,0,0;microtubule12,739.5973828,340.5306592,-314.7477979,71.43855469,381.5696191,163.5716895,0,0,0;microtubule13,547.683501,315.5453137,-194.0386853,450.7195605,452.5557788,230.4621606,0,0,0;microtubule14,556.663916,415.2724512,-436.4479395,283.920293,207.0583008,657.0294727,0,0,0;microtubule15,660.601377,201.7332788,-572.2047363,508.4347852,224.4388916,408.4554492,0,0,0;microtubule16,506.7585205,204.8784119,-527.3789355,154.4813965,242.6824146,450.410918,0,0,0;microtubule17,212.1601877,58.27322021,-728.5755762,367.6139996,489.4616455,107.694668,0,0,0;microtubule18,398.5259912,137.8724231,-665.1991992,112.6322754,371.4562866,196.6646484,0,0,0;microtubule19,380.7953174,226.3009131,-449.3071655,81.91825195,156.3450879,654.2884424,0,0,0;microtubule2,30.6969873,141.0839227,876.8226709,232.4791699,192.0579456,920.3092676,0,0,0;microtubule20,-17.70177979,102.1328238,-793.8511963,249.8578271,254.9617255,626.1412793,0,0,0;microtubule21,77.27729828,414.6652734,-875.5563281,112.0010284,370.8857812,414.7598437,0,0,0;microtubule22,206.3877283,127.7296783,-799.063623,248.5948755,233.9102527,596.1479883,0,0,0;microtubule23,26.83012939,306.4021143,-869.8149609,151.6807324,229.8870996,438.0902344,0,0,0;microtubule24,130.2055444,10.68804199,-875.882373,102.7668896,337.1855273,478.814707,0,0,0;microtubule25,466.3101562,323.6335986,125.3250128,363.4645312,146.882959,368.3232751,0,0,0;microtubule26,486.9932666,242.030116,363.5398682,289.2078809,287.3686157,132.0589746,0,0,0;microtubule27,577.1186426,218.112627,122.2437305,136.8993164,381.0901172,311.8405664,0,0,0;microtubule28,477.9364307,294.2746069,284.5083691,329.104834,203.73854,36.79857422,0,0,0;microtubule29,602.5964648,317.1294214,80.40759521,130.0769531,205.3262549,366.1346924,0,0,0;microtubule3,-139.0224133,-173.8191055,-427.1847363,337.7971655,363.020246,759.5431055,0,0,0;microtubule30,559.5994629,-337.2936108,210.2427393,166.3097461,468.162583,203.6533301,0,0,0;microtubule31,419.9002661,-500.184126,316.3121631,407.9912256,122.8493262,84.17920898,0,0,0;microtubule32,532.1963672,-447.1643115,104.0702747,257.4648047,199.2719238,389.7403491,0,0,0;microtubule33,482.8850098,-448.0571045,311.7472119,325.9098633,212.6162988,44.34436523,0,0,0;microtubule34,621.9338965,-416.982041,118.7065613,126.4250977,271.4240039,329.2003931,0,0,0;microtubule35,-118.3220728,110.4977856,955.7098828,622.6587451,493.0616748,154.8304687,0,0,0;microtubule36,-38.73700195,295.7910132,735.6735938,813.0149414,130.0887158,432.2794922,0,0,0;microtubule37,-147.0284253,183.0389575,716.1807568,518.7239502,341.7746631,490.7852051,0,0,0;microtubule38,-505.4994727,260.7653027,570.3792847,172.7321484,194.3118164,730.0565479,0,0,0;microtubule39,-330.203606,255.0918164,658.6816846,226.97896,194.4717773,593.7860449,0,0,0;microtubule4,97.25859375,-81.19509682,-651.4826221,787.3532813,177.7109001,338.228584,0,0,0;microtubule40,-200.9843848,60.38698975,720.7139062,519.6625781,586.7271533,430.7780859,0,0,0;microtubule41,287.1684814,114.7601161,777.7985156,734.9856152,206.0788889,468.8053125,0,0,0;microtubule42,589.3171875,134.296333,583.4237842,159.3030469,180.6350391,838.2054785,0,0,0;microtubule43,445.5135352,-95.13089355,938.1663281,392.8723828,599.7641895,169.9720312,0,0,0;microtubule44,428.9714355,45.15916992,676.3465869,449.8033008,347.0653711,673.1271387,0,0,0;microtubule45,505.1379199,-83.39869629,677.9993848,336.0916992,599.8922168,643.4302148,0,0,0;microtubule46,-279.8748102,-401.6762476,540.5428711,625.014364,334.9703174,104.5120312,0,0,0;microtubule47,-522.0736963,-360.1754443,303.4938977,123.0875684,374.5616895,402.6039624,0,0,0;microtubule48,-264.077915,-531.3914502,398.5253467,593.5828418,83.4909668,304.2609082,0,0,0;microtubule49,-462.3454541,-368.403479,406.0618945,204.1284668,400.7098389,246.7103906,0,0,0;microtubule5,-235.8658887,142.852633,-458.1761499,168.1641211,281.0347536,659.5777002,0,0,0;microtubule50,-270.6177164,-552.1942676,517.5230713,567.2812079,107.8213477,107.9428418,0,0,0;microtubule51,-309.9686316,345.4123975,-270.0235071,393.3619556,196.0721777,612.4700171,0,0,0;microtubule52,-461.5955127,164.0074951,-133.1996063,94.17870117,568.1300684,386.5102991,0,0,0;microtubule53,-349.3235669,233.7860156,-66.56753998,315.557124,399.5180273,164.2730255,0,0,0;microtubule54,-363.6500024,351.6772412,320.7801343,276.5947998,201.2884863,511.4768408,0,0,0;microtubule55,-393.347124,280.0743311,102.1417091,227.8053223,299.9349316,204.8680662,0,0,0;microtubule56,-227.535769,288.7856909,-53.67977051,539.6171338,325.6723096,250.9921875,0,0,0;microtubule6,-20.18329102,-70.09014084,-483.5474414,577.0610156,153.2483414,647.0252344,0,0,0;microtubule7,15.20736328,62.57915131,-463.1074878,619.3040039,159.3178107,683.8982666,0,0,0;microtubule8,557.853501,434.7157031,14.36625,435.7967871,218.8402734,572.1272461,0,0,0;microtubule9,790.0964648,302.6857306,-46.75898437,106.6875,484.5883044,487.1542383,0,0,0;mitochondria1,509.9553464,60.67585787,598.6037478,56.38573425,55.78621948,97.22390625,18.53970718,0,0;mitochondria2,236.1862652,8.347496228,771.7170695,69.44670044,68.70831848,160.0913306,0,-58.66119162,0;mitochondria3,-237.8879342,-80.8010362,794.9918666,74.3063324,72.65880615,278.4640576,12.50616674,-13.37802957,-34.78928216;mitochondria4,-480.3502638,0,623.5202907,56.38573425,55.78621948,97.22390625,0,0,0;mitochondria5,654.307804,246.0744739,370.0455458,69.44670044,68.70831848,160.0913306,-55.07883972,0,0;mitochondria6,0,-464.9341727,0,69.44670044,68.70831848,160.0913306,-25.64558815,-58.48676953,-21.37185167;mitochondria7,0,0,-581.7224431,69.44670044,68.70831848,160.0913306,4.948279917,-70.48661547,121.4859061;mitochondria8,624.0007,49.31601383,-87.21635338,69.44670044,68.70831848,160.0913306,89.76656115,-5.023110397,-48.14947773;nucleus,208.5936936,6.113100222,153.3202277,522.7149005,515.7176939,518.1826595,0,0,0;rough_ER1,253.871543,-69.16218018,184.1513013,624.6314062,553.1499756,621.0511084,0,0,0;rough_ER2,221.76854,64.61654297,146.9922729,621.8760059,558.2816016,585.9084229,0,0,0;smoothER,-132.954492,-89.25859014,80.62120204,376.5313623,386.0319287,318.3009668,122.954661,-71.58529221,-50.75833529;smoothER,-139.2748633,-37.55435675,275.4559992,350.3096777,359.3174121,299.3762402,-12.50517141,-27.97002065,5.954923214;smoothER,243.6573639,10.98815226,-278.1663356,402.7864746,412.9494434,340.4957227,0,0,0;"; } -Script.setTimeout(function(){ +Script.setTimeout(function() { -for (var i = 0; i < scenes.length; i++) { - // print('setting up scene. first, delete' + JSON.stringify(scenes[i])) + 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); - CreateNavigationButton(scenes[i], i); - - ImportScene(scenes[i]); - // print('setting up scene. then import') + ImportScene(scenes[i]); + // print('setting up scene. then import') -} + } -createLayoutLights(); -},3500) + createLayoutLights(); +}, 3500) +// Script.scriptEnding.connect(function() { +// Entities.addingEntity.disconnect(makeUngrabbable); +// }); + +// Script.setTimeout(function() { +// print('JBP stopping cell science import'); +// Script.stop(); +// }, 30000) \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js b/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js index 5f2ef48369..54f8d8a924 100644 --- a/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js +++ b/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js @@ -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, diff --git a/unpublishedScripts/DomainContent/CellScience/moveCellsAC.js b/unpublishedScripts/DomainContent/CellScience/moveCellsAC.js index 595da71774..d696d464bf 100644 --- a/unpublishedScripts/DomainContent/CellScience/moveCellsAC.js +++ b/unpublishedScripts/DomainContent/CellScience/moveCellsAC.js @@ -18,7 +18,6 @@ function offsetVectorToWorld(vector) { newVector = Vec3.sum(vector, WORLD_OFFSET); - print('JBP NEW VECTOR IS:: ' + JSON.stringify(newVector)) return newVector } diff --git a/unpublishedScripts/DomainContent/CellScience/moveVesiclesAC.js b/unpublishedScripts/DomainContent/CellScience/moveVesiclesAC.js index b222abdb72..4d4ce76d74 100644 --- a/unpublishedScripts/DomainContent/CellScience/moveVesiclesAC.js +++ b/unpublishedScripts/DomainContent/CellScience/moveVesiclesAC.js @@ -17,7 +17,6 @@ function offsetVectorToWorld(vector) { newVector = Vec3.sum(vector, WORLD_OFFSET); - print('JBP NEW VECTOR IS:: ' + JSON.stringify(newVector)) return newVector }