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

merge fix

Browse source
This commit is contained in:
Dante Ruiz 2016-12-12 23:03:38 +00:00
parent 1b7c89c41d
commit 737f11fb7a
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/libraries/WebTablet.js
View file

@ -39,7 +39,7 @@ function calcSpawnInfo() {
} }
// ctor // ctor
WebTablet = function (url, width, dpi, clientOnly) { WebTablet = function (url, width, dpi, location, clientOnly) {
var _this = this; var _this = this;
var ASPECT = 4.0 / 3.0; var ASPECT = 4.0 / 3.0;
var WIDTH = width || DEFAULT_WIDTH; var WIDTH = width || DEFAULT_WIDTH;
@ -99,11 +99,10 @@ WebTablet = function (url, width, dpi, clientOnly) {
this.createWebEntity(url); this.createWebEntity(url);
var homeButtonPosition = Vec3.sum(spawnInfo.position, Vec3.multiply(HOME_BUTTON_Y_OFFSET, Quat.getUp(webEntityRotation)));
this.homeButtonEntity = Entities.addEntity({ this.homeButtonEntity = Entities.addEntity({
name: "homeButton", name: "homeButton",
type: "Sphere", type: "Sphere",
position: homeButtonPosition, localPosition: {x: 0, y: HOME_BUTTON_Y_OFFSET, z: 0},
dimensions: {x: 0.05, y: 0.05, z: 0.05}, dimensions: {x: 0.05, y: 0.05, z: 0.05},
parentID: this.tabletEntityID, parentID: this.tabletEntityID,
script: "https://people.ucsc.edu/~druiz4/scripts/homeButton.js" script: "https://people.ucsc.edu/~druiz4/scripts/homeButton.js"