From c377254cb0f7b0aa289be43846e42e3b54445140 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Thu, 4 Feb 2016 14:34:41 -0800 Subject: [PATCH] revert junkyardreset --- examples/junkyard/junkyardClientReset.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/junkyard/junkyardClientReset.js b/examples/junkyard/junkyardClientReset.js index 36c87ea0dc..c4dfa19c4f 100644 --- a/examples/junkyard/junkyardClientReset.js +++ b/examples/junkyard/junkyardClientReset.js @@ -13,18 +13,18 @@ // var IMPORT_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/arfs/junkyard.json"; -var PASTE_ENTITIES_LOCATION = {x: 0, y: 20, z: 0}; -// reset(); +var PASTE_ENTITIES_LOCATION = {x: 0, y: 0, z: 0}; +reset(); + +function reset() { + // Delete everything and re-import the junkyard arf + var e = Entities.findEntities(MyAvatar.position, 1000); + for (i = 0; i < e.length; i++) { + Entities.deleteEntity(e[i]); + } + importAssetResourceFile(); +} -// function reset() { -// // Delete everything and re-import the junkyard arf -// var e = Entities.findEntities(MyAvatar.position, 1000); -// for (i = 0; i < e.length; i++) { -// Entities.deleteEntity(e[i]); -// } -// importAssetResourceFile(); -// } - importAssetResourceFile() function importAssetResourceFile() { Clipboard.importEntities(IMPORT_URL); Clipboard.pasteEntities(PASTE_ENTITIES_LOCATION);