From e25b567ff136f1d22e788a49addf9647bf2eb9bf Mon Sep 17 00:00:00 2001 From: humbletim Date: Mon, 19 Jun 2017 16:09:20 -0400 Subject: [PATCH] comment-out debug requires, bump back to 60fps --- .../app-doppleganger-attachments.js | 6 ++++-- .../doppleganger-attachments/doppleganger-attachments.js | 4 ++-- .../marketplace/doppleganger-attachments/doppleganger.js | 6 +++--- .../marketplace/doppleganger-attachments/model-helper.js | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js b/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js index c487232aa5..b7702d9348 100644 --- a/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js +++ b/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js @@ -10,9 +10,11 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -var require = function DEBUG_REQUIRE(id) { +/*var require = function DEBUG_REQUIRE(id) { return Script.require(id + '?'+new Date().getTime().toString(36)); -}; +};*/ + +var require = Script.require; var DopplegangerClass = require('./doppleganger.js'), DopplegangerAttachments = require('./doppleganger-attachments.js'), diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js index 85c3d3589e..7c6f846fa1 100644 --- a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js +++ b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js @@ -6,9 +6,9 @@ module.exports = DopplegangerAttachments; DopplegangerAttachments.version = '0.0.0'; -var require = function DEBUG_REQUIRE(id) { +/*var require = function DEBUG_REQUIRE(id) { return Script.require(id + '?'+new Date().getTime().toString(36)); -}; +};*/ var _modelHelper = require('./model-helper.js'), modelHelper = _modelHelper.modelHelper, diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js index f7001f5a88..58280a09f2 100644 --- a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js +++ b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js @@ -24,9 +24,9 @@ module.exports = Doppleganger; -var require = function DEBUG_REQUIRE(id) { +/*var require = function DEBUG_REQUIRE(id) { return Script.require(id + '?'+new Date().getTime().toString(36)); -}; +};*/ var _modelHelper = require('./model-helper.js'), modelHelper = _modelHelper.modelHelper, @@ -36,7 +36,7 @@ var _modelHelper = require('./model-helper.js'), Doppleganger.USE_SCRIPT_UPDATE = false; // @property {int} - the frame rate to target when using setInterval for joint updates -Doppleganger.TARGET_FPS = 24;/// 60; +Doppleganger.TARGET_FPS = 60; // @property {int} - the maximum time in seconds to wait for the model overlay to finish loading Doppleganger.MAX_WAIT_SECS = 10; diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js b/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js index 8987695473..e3dcc0de1f 100644 --- a/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js +++ b/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js @@ -18,9 +18,9 @@ function log() { print('model-helper | ' + [].slice.call(arguments).join(' ')); } -var require = function DEBUG_REQUIRE(id) { +/*var require = function DEBUG_REQUIRE(id) { return Script.require(id + '?'+new Date().getTime().toString(36)); -}; +};*/ var utils = require('./utils.js'), assert = utils.assert;