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

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 = { var spriteDimensions = {
x: 10, x: 10,
y: 10, y: 10,

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

@ -13,7 +13,7 @@
z: -1 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; var self = this;

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

@ -14,7 +14,7 @@
Script.include(utilsScript); Script.include(utilsScript);
var self = this; 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.preload = function(entityId) {
this.entityId = entityId; this.entityId = entityId;

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

@ -6,7 +6,7 @@
// //
(function() { (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; var self = this;
this.buttonImageURL = baseURL + "GUI/play_audio.svg?2"; this.buttonImageURL = baseURL + "GUI/play_audio.svg?2";
@ -50,6 +50,7 @@
self.sound = SoundCache.getSound(this.soundURL); self.sound = SoundCache.getSound(this.soundURL);
} }
}
this.addButton = function() { this.addButton = function() {
this.windowDimensions = Controller.getViewportDimensions(); this.windowDimensions = Controller.getViewportDimensions();
@ -115,4 +116,4 @@
Controller.mousePressEvent.connect(this.onClick); Controller.mousePressEvent.connect(this.onClick);
Script.update.connect(this.update); Script.update.connect(this.update);
}); });

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

@ -8,7 +8,7 @@
(function() { (function() {
var self = this; 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; var version = 3;
this.preload = function(entityId) { this.preload = function(entityId) {

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

@ -22,7 +22,12 @@
this.initialize = function(entityID) { this.initialize = function(entityID) {
// print(' should initialize') // print(' should initialize')
var properties = Entities.getEntityProperties(entityID); 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() { 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); self.initialize(entityID);
@ -39,7 +44,7 @@
volume: 0.5 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); // print(" portal destination is " + self.portalDestination);
} }
} }
@ -57,7 +62,7 @@
} }
this.lookAtTarget = function(entryPoint,target) { this.lookAtTarget = function(entryPoint, target) {
//print('SHOULD LOOK AT TARGET') //print('SHOULD LOOK AT TARGET')
var direction = Vec3.normalize(Vec3.subtract(entryPoint, target)); var direction = Vec3.normalize(Vec3.subtract(entryPoint, target));
var pitch = Quat.angleAxis(Math.asin(-direction.y) * 180.0 / Math.PI, { var pitch = Quat.angleAxis(Math.asin(-direction.y) * 180.0 / Math.PI, {

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

@ -1,6 +1,6 @@
var soundMap = [{ var soundMap = [{
name: 'Cells', 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: { audioOptions: {
position: { position: {
x: 15850, x: 15850,
@ -12,7 +12,7 @@ var soundMap = [{
} }
}, { }, {
name: 'Cell Layout', 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: { audioOptions: {
position: { position: {
x: 15950, x: 15950,
@ -24,7 +24,7 @@ var soundMap = [{
} }
}, { }, {
name: 'Ribsome', 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: { audioOptions: {
position: { position: {
x: 15650, x: 15650,
@ -36,7 +36,7 @@ var soundMap = [{
} }
}, { }, {
name: 'Hexokinase', 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: { audioOptions: {
position: { position: {
x: 15750, x: 15750,

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

File diff suppressed because one or more lines are too long

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

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

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

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

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

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