From af2c31f29b925c979ed70787270f61d1ca9b8a14 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Wed, 17 Aug 2016 13:33:16 -0700 Subject: [PATCH] Renamed WebBuddy to WebTablet --- .../libraries/{WebBuddy.js => WebTablet.js} | 8 ++++---- scripts/system/marketplace.js | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) rename scripts/system/libraries/{WebBuddy.js => WebTablet.js} (97%) diff --git a/scripts/system/libraries/WebBuddy.js b/scripts/system/libraries/WebTablet.js similarity index 97% rename from scripts/system/libraries/WebBuddy.js rename to scripts/system/libraries/WebTablet.js index cb6f29d943..6a0a3fcbb1 100644 --- a/scripts/system/libraries/WebBuddy.js +++ b/scripts/system/libraries/WebTablet.js @@ -1,5 +1,5 @@ // -// WebBuddy.js +// WebTablet.js // // Created by Anthony J. Thibault on 8/8/2016 // Copyright 2016 High Fidelity, Inc. @@ -39,7 +39,7 @@ function calcSpawnInfo() { } // ctor -WebBuddy = function (url) { +WebTablet = function (url) { var ASPECT = 4.0 / 3.0; var WIDTH = 0.4; @@ -99,13 +99,13 @@ WebBuddy = function (url) { Script.update.connect(this.updateFunc); }; -WebBuddy.prototype.destroy = function () { +WebTablet.prototype.destroy = function () { Entities.deleteEntity(this.webEntityID); Entities.deleteEntity(this.tabletEntityID); Script.update.disconnect(this.updateFunc); }; -WebBuddy.prototype.update = function (dt) { +WebTablet.prototype.update = function (dt) { var props = Entities.getEntityProperties(this.tabletEntityID, ["position", "rotation", "parentID", "parentJointIndex"]); var entityWorldMat; diff --git a/scripts/system/marketplace.js b/scripts/system/marketplace.js index 26d46d6219..af0be21077 100644 --- a/scripts/system/marketplace.js +++ b/scripts/system/marketplace.js @@ -8,8 +8,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -/* global WebBuddy */ -Script.include("./libraries/WebBuddy.js"); +/* global WebTablet */ +Script.include("./libraries/WebTablet.js"); var toolIconUrl = Script.resolvePath("assets/images/tools/"); @@ -26,17 +26,17 @@ var toolHeight = 50; var toolWidth = 50; var TOOLBAR_MARGIN_Y = 0; var marketplaceVisible = false; -var marketplaceWebBuddy; +var marketplaceWebTablet; -function shouldShowWebBuddyMarketplace() { +function shouldShowWebTablet() { var rightPose = Controller.getPoseValue(Controller.Standard.RightHand); var leftPose = Controller.getPoseValue(Controller.Standard.LeftHand); return HMD.active && (leftPose.valid || rightPose.valid); } function showMarketplace(marketplaceID) { - if (shouldShowWebBuddyMarketplace()) { - marketplaceWebBuddy = new WebBuddy("https://metaverse.highfidelity.com/marketplace"); + if (shouldShowWebTablet()) { + marketplaceWebTablet = new WebTablet("https://metaverse.highfidelity.com/marketplace"); } else { var url = MARKETPLACE_URL; if (marketplaceID) { @@ -55,8 +55,8 @@ function hideMarketplace() { marketplaceWindow.setVisible(false); marketplaceWindow.setURL("about:blank"); } else { - marketplaceWebBuddy.destroy(); - marketplaceWebBuddy = null; + marketplaceWebTablet.destroy(); + marketplaceWebTablet = null; } marketplaceVisible = false; }