Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 00:15:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix Web tablet screen size

Browse source
This commit is contained in:
David Rowe 2016-12-05 10:03:30 +13:00
parent 71de106594
commit b723f3d92e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@
var RAD_TO_DEG = 180 / Math.PI; var RAD_TO_DEG = 180 / Math.PI;
var X_AXIS = {x: 1, y: 0, z: 0}; var X_AXIS = {x: 1, y: 0, z: 0};
var Y_AXIS = {x: 0, y: 1, z: 0}; var Y_AXIS = {x: 0, y: 1, z: 0};
var DEFAULT_DPI = 32; var DEFAULT_DPI = 30;
var DEFAULT_WIDTH = 0.5; var DEFAULT_WIDTH = 0.5;
var TABLET_URL = "https://s3.amazonaws.com/hifi-public/tony/tablet.fbx"; var TABLET_URL = "https://s3.amazonaws.com/hifi-public/tony/tablet.fbx";
@ -43,7 +43,8 @@ WebTablet = function (url, width, dpi, clientOnly) {
var ASPECT = 4.0 / 3.0; var ASPECT = 4.0 / 3.0;
var WIDTH = width || DEFAULT_WIDTH; var WIDTH = width || DEFAULT_WIDTH;
var HEIGHT = WIDTH * ASPECT; var TABLET_HEIGHT_SCALE = 640 / 680; // Screen size of tablet entity isn't quite the desired aspect.
var HEIGHT = WIDTH * ASPECT * TABLET_HEIGHT_SCALE;
var DEPTH = 0.025; var DEPTH = 0.025;
var DPI = dpi || DEFAULT_DPI; var DPI = dpi || DEFAULT_DPI;
@ -62,10 +63,9 @@ WebTablet = function (url, width, dpi, clientOnly) {
}), }),
dimensions: {x: WIDTH, y: HEIGHT, z: DEPTH}, dimensions: {x: WIDTH, y: HEIGHT, z: DEPTH},
parentID: MyAvatar.sessionUUID, parentID: MyAvatar.sessionUUID,
parentJointIndex: -2 parentJointIndex: -1
}, clientOnly); }, clientOnly);
var WEB_OVERLAY_SCALE_FACTOR = { x: 2, y: 1.6 };
var WEB_OVERLAY_Z_OFFSET = -0.01; var WEB_OVERLAY_Z_OFFSET = -0.01;
var webOverlayRotation = Quat.multiply(spawnInfo.rotation, Quat.angleAxis(180, Y_AXIS)); var webOverlayRotation = Quat.multiply(spawnInfo.rotation, Quat.angleAxis(180, Y_AXIS));
@ -73,10 +73,10 @@ WebTablet = function (url, width, dpi, clientOnly) {
this.webOverlayID = Overlays.addOverlay("web3d", { this.webOverlayID = Overlays.addOverlay("web3d", {
url: url, url: url,
dimensions: { x: WIDTH * WEB_OVERLAY_SCALE_FACTOR.x, y: HEIGHT * WEB_OVERLAY_SCALE_FACTOR.y },
position: webOverlayPosition, position: webOverlayPosition,
rotation: webOverlayRotation, rotation: webOverlayRotation,
resolution: { x: 480, y: 640 }, resolution: { x: 480, y: 640 },
dpi: DPI,
color: { red: 255, green: 255, blue: 255 }, color: { red: 255, green: 255, blue: 255 },
parentID: this.tabletEntityID, parentID: this.tabletEntityID,
parentJointIndex: -1 parentJointIndex: -1