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

formatting

Browse source
This commit is contained in:
bwent 2015-08-14 11:06:44 -07:00
parent 2c5c362957
commit 68fcf4ec8a
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
examples/example/planets-ui.js
View file

@ -167,11 +167,11 @@ Script.include('https://hifi-staff.s3.amazonaws.com/bridget/tween.js');
pauseButton.addAction('onClick', function() {
if (tweening) {
if(!tweeningPaused) {
if (!tweeningPaused) {
tweeningPaused = true;
} else {
tweeningPaused = false;
}
}
}
if (!paused) {
pause();
@ -182,13 +182,13 @@ pauseButton.addAction('onClick', function() {
// Allow to toggle pause with spacebar
function keyPressEvent(event) {
if(event.text == "SPACE") {
if (tweening) {
if(!tweeningPaused) {
if (event.text == "SPACE") {
if (tweening) {
if (!tweeningPaused) {
tweeningPaused = true;
} else {
tweeningPaused = false;
}
}
}
if (!paused) {
pause();
@ -201,7 +201,7 @@ function keyPressEvent(event) {
rideButton.addAction('onClick', function() {
if (!paused) {
pause();
}
}
if (tweening) {
tweening = false;
tweeningPaused = true;
@ -388,7 +388,7 @@ satelliteButton.addAction('onClick', function() {
if (satelliteGame && satelliteGame.isActive) {
MyAvatar.position = startingPosition;
satelliteGame.quitGame();
if(paused) {
if (paused) {
resume();
}
} else {

8
examples/example/solarsystem.js
View file

@ -24,7 +24,7 @@ CreateSimulation = function() {
trailsEnabled = true;
var DAMPING = this.DAMPING = 0.0;
var LIFETIME = this.LIFETIME = 6000;
var BASE_URL = this.BASE_URL = "https://s3.amazonaws.com/hifi-public/marketplace/hificontent/Scripts/planets/planets/";
@ -222,7 +222,7 @@ CreateSimulation = function() {
visible: false
});
}
}
this.resetTrails = function() {
@ -344,7 +344,7 @@ CreateSimulation = function() {
};
this.initPlanets = function() {
planets.push(new Planet("mercury", MERCURY_LINE_COLOR, 0.387, 0.383));
planets.push(new Planet("mercury", MERCURY_LINE_COLOR, 0.387, 0.383));
planets.push(new Planet("venus", VENUS_LINE_COLOR, 0.723, 0.949));
planets.push(new Planet("earth", EARTH_LINE_COLOR, 1.0, 1.0));
planets.push(new Planet("mars", MARS_LINE_COLOR, 1.52, 0.532));
@ -355,7 +355,7 @@ CreateSimulation = function() {
planets.push(new Planet("pluto", PLUTO_LINE_COLOR, 39.48, 0.186));
}
initPlanets();
var LABEL_X = 8.0;
var LABEL_Y = 3.0;
var LABEL_Z = 1.0;