From 737f11fb7ab49cd7696b92c0d8d1918c60023223 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Mon, 12 Dec 2016 23:03:38 +0000 Subject: [PATCH] merge fix --- scripts/system/libraries/WebTablet.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index 26bd295975..5f0891d642 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -39,7 +39,7 @@ function calcSpawnInfo() { } // ctor -WebTablet = function (url, width, dpi, clientOnly) { +WebTablet = function (url, width, dpi, location, clientOnly) { var _this = this; var ASPECT = 4.0 / 3.0; var WIDTH = width || DEFAULT_WIDTH; @@ -99,11 +99,10 @@ WebTablet = function (url, width, dpi, clientOnly) { this.createWebEntity(url); - var homeButtonPosition = Vec3.sum(spawnInfo.position, Vec3.multiply(HOME_BUTTON_Y_OFFSET, Quat.getUp(webEntityRotation))); this.homeButtonEntity = Entities.addEntity({ name: "homeButton", type: "Sphere", - position: homeButtonPosition, + localPosition: {x: 0, y: HOME_BUTTON_Y_OFFSET, z: 0}, dimensions: {x: 0.05, y: 0.05, z: 0.05}, parentID: this.tabletEntityID, script: "https://people.ucsc.edu/~druiz4/scripts/homeButton.js"