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

tweaks for coding standards

Browse source
This commit is contained in:
ericrius1 2016-01-21 13:24:07 -08:00
parent b3b1793035
commit e11e4d196b
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
examples/junkyard/junkyardClientReset.js
View file

@ -12,8 +12,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
var importURL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/arfs/junkyard.json";
var IMPORT_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/arfs/junkyard.json";
var PASTE_ENTITIES_LOCATION = {x: 0, y: 0, z: 0};
reset();
function reset() {
@ -26,10 +26,6 @@ function reset() {
}
function importArf() {
Clipboard.importEntities(importURL);
Clipboard.pasteEntities({
x: 0,
y: 0,
z: 0
});
Clipboard.importEntities(IMPORT_URL);
Clipboard.pasteEntities(PASTE_ENTITIES_LOCATION);
}

11
examples/junkyard/junkyardResetEntityScript.js
View file

@ -12,7 +12,8 @@
(function() {
Script.include("../libraries/utils.js");
var _this;
var importURL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/arfs/junkyard.json";
var IMPORT_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/arfs/junkyard.json";
var PASTE_ENTITIES_LOCATION = {x: 0, y: 0, z: 0};
var JunkyardResetter = function() {
_this = this;
};
@ -40,12 +41,8 @@
},
importArf: function() {
Clipboard.importEntities(importURL);
Clipboard.pasteEntities({
x: 0,
y: 0,
z: 0
});
Clipboard.importEntities(IMPORT_URL);
Clipboard.pasteEntities(PASTE_ENTITIES_LOCATION);
},
preload: function(entityID) {