Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-11 08:54:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

saving changes

Browse source
This commit is contained in:
Dante Ruiz 2018-06-05 15:44:17 -07:00
parent 4ebfca0c57
commit b275bbe5a7
2 changed files with 17 additions and 2 deletions
interface/resources/meshes
tablet-with-home-button-small-bezel.fbx
scripts/system/libraries
WebTablet.js

BIN
interface/resources/meshes/tablet-with-home-button-small-bezel.fbx
View file

Binary file not shown.

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

@ -15,6 +15,7 @@ Script.include(Script.resolvePath("../libraries/controllers.js"));
Script.include(Script.resolvePath("../libraries/Xform.js"));
var Y_AXIS = {x: 0, y: 1, z: 0};
var X_AXIS = {x: 1, y: 0, z: 0};
var DEFAULT_DPI = 31;
var DEFAULT_WIDTH = 0.4375;
var DEFAULT_VERTICAL_FIELD_OF_VIEW = 45; // degrees
@ -142,7 +143,7 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
name: "WebTablet Web",
url: url,
localPosition: { x: 0, y: WEB_ENTITY_Y_OFFSET, z: -WEB_ENTITY_Z_OFFSET },
localRotation: Quat.angleAxis(180, Y_AXIS),
localRotation: Quat.multiply(Quat.angleAxis(-0.25, X_AXIS), Quat.angleAxis(180, Y_AXIS)),
dimensions: {x: screenWidth, y: screenHeight, z: 0.1},
dpi: tabletDpi,
color: { red: 255, green: 255, blue: 255 },
@ -185,7 +186,21 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
drawInFront: false,
parentID: this.tabletEntityID,
parentJointIndex: -1
});
});
this.homeButtonMaterial = Entities.addEntity({
type: "Material",
materialURL: "",
priority: 1,
parentID: this.homeButtonHighlightID
}, true);
this.homeButtonHighlight = Entities.addEntity({
type: "Material",
materialURL: "",
priority: 1
}, true);
this.receive = function (channel, senderID, senderUUID, localOnly) {
if (_this.homeButtonID == senderID) {