mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-11 07:25:50 +02:00
Merge pull request #7814 from imgntn/cellGUI
[CellScience] Move buttons; update ribosome location
This commit is contained in:
commit
4cd5123aa6
5 changed files with 12 additions and 12 deletions
|
@ -7,7 +7,7 @@
|
|||
|
||||
(function() {
|
||||
|
||||
var version = 12;
|
||||
var version = 13;
|
||||
|
||||
var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/";
|
||||
var button;
|
||||
|
@ -47,7 +47,7 @@
|
|||
var buttonPadding = 10;
|
||||
var offset = 0;
|
||||
var buttonPositionX = (offset + 1) * (buttonWidth + buttonPadding) + (windowDimensions.x / 2) - (buttonWidth * 3 + buttonPadding * 2.5);
|
||||
var buttonPositionY = (windowDimensions.y - buttonHeight) - 50;
|
||||
var buttonPositionY = (windowDimensions.y - buttonHeight) - 150;
|
||||
button = Overlays.addOverlay("image", {
|
||||
x: buttonPositionX,
|
||||
y: buttonPositionY,
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
(function() {
|
||||
|
||||
var version = 12;
|
||||
var version = 13;
|
||||
|
||||
var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/";
|
||||
var button;
|
||||
|
@ -53,7 +53,7 @@
|
|||
var buttonPadding = 10;
|
||||
var offset = 3;
|
||||
var buttonPositionX = (offset + 1) * (buttonWidth + buttonPadding) + (windowDimensions.x / 2) - (buttonWidth * 3 + buttonPadding * 2.5);
|
||||
var buttonPositionY = (windowDimensions.y - buttonHeight) - 50;
|
||||
var buttonPositionY = (windowDimensions.y - buttonHeight) - 150;
|
||||
button = Overlays.addOverlay("image", {
|
||||
x: buttonPositionX,
|
||||
y: buttonPositionY,
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
(function() {
|
||||
|
||||
var version = 12;
|
||||
var version = 13;
|
||||
|
||||
var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/";
|
||||
var button;
|
||||
|
@ -47,7 +47,7 @@
|
|||
var buttonPadding = 10;
|
||||
var offset = 1;
|
||||
var buttonPositionX = (offset + 1) * (buttonWidth + buttonPadding) + (windowDimensions.x / 2) - (buttonWidth * 3 + buttonPadding * 2.5);
|
||||
var buttonPositionY = (windowDimensions.y - buttonHeight) - 50;
|
||||
var buttonPositionY = (windowDimensions.y - buttonHeight) - 150;
|
||||
button = Overlays.addOverlay("image", {
|
||||
x: buttonPositionX,
|
||||
y: buttonPositionY,
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
//
|
||||
(function() {
|
||||
|
||||
var version = 12;
|
||||
var version = 13;
|
||||
|
||||
var baseURL = "https://hifi-production.s3.amazonaws.com/DomainContent/CellScience/";
|
||||
var button;
|
||||
|
@ -26,9 +26,9 @@
|
|||
z: 3000
|
||||
},
|
||||
target: {
|
||||
x: 3276.6,
|
||||
y: 13703.3,
|
||||
z: 4405.6
|
||||
x: 13500,
|
||||
y: 3000,
|
||||
z: 3000
|
||||
},
|
||||
preload: function(entityId) {
|
||||
print('CELL PRELOAD RIBOSOME 1')
|
||||
|
@ -46,7 +46,7 @@
|
|||
var buttonPadding = 10;
|
||||
var offset = 2;
|
||||
var buttonPositionX = (offset + 1) * (buttonWidth + buttonPadding) + (windowDimensions.x / 2) - (buttonWidth * 3 + buttonPadding * 2.5);
|
||||
var buttonPositionY = (windowDimensions.y - buttonHeight) - 50;
|
||||
var buttonPositionY = (windowDimensions.y - buttonHeight) - 150;
|
||||
button = Overlays.addOverlay("image", {
|
||||
x: buttonPositionX,
|
||||
y: buttonPositionY,
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
var version = 1217;
|
||||
var version = 1219;
|
||||
|
||||
var WORLD_OFFSET = {
|
||||
x: 0,
|
||||
|
|
Loading…
Reference in a new issue