Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 22:22:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed tabs and also remove script from host

Browse source
This commit is contained in:
Dante Ruiz 2016-12-16 21:45:53 +00:00
parent f7df9a64b2
commit 8f36090884
3 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,28 +98,26 @@ WebTablet = function (url, width, dpi, location, clientOnly) {
this.createWebEntity(url); this.createWebEntity(url);
this.homeButtonEntity = Entities.addEntity({ this.homeButtonEntity = Entities.addEntity({
name: "homeButton", name: "homeButton",
type: "Sphere", type: "Sphere",
localPosition: {x: 0, y: HOME_BUTTON_Y_OFFSET, z: 0}, 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: Script.resolvePath("../tablet-ui/HomeButton.js")
}, clientOnly); }, clientOnly);
setEntityCustomData('grabbableKey', this.homeButtonEntity, {wantsTrigger: true});
setEntityCustomData('grabbableKey', this.homeButtonEntity, {wantsTrigger: true});
this.receive = function (channel, senderID, senderUUID, localOnly) { this.receive = function (channel, senderID, senderUUID, localOnly) {
if (_this.homeButtonEntity == senderID) { if (_this.homeButtonEntity == senderID) {
if (_this.clicked) { if (_this.clicked) {
Entities.editEntity(_this.homeButtonEntity, {color: {red: 0, green: 255, blue: 255}}); Entities.editEntity(_this.homeButtonEntity, {color: {red: 0, green: 255, blue: 255}});
_this.clicked = false; _this.clicked = false;
} else { } else {
Entities.editEntity(_this.homeButtonEntity, {color: {red: 255, green: 255, blue: 0}}); Entities.editEntity(_this.homeButtonEntity, {color: {red: 255, green: 255, blue: 0}});
_this.clicked = true; _this.clicked = true;
} }
} }
} }

32
scripts/system/tablet-ui/HomeButton.js Normal file
View file

@ -0,0 +1,32 @@
//
// HomeButton.js
//
// Created by Dante Ruiz on 12/6/2016
// Copyright 2016 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
(function(){
_this = this;
this.preload = function(entityID) {
print(entityID);
this.entityID = entityID;
}
this.clickDownOnEntity = function(entityID, mouseEvent) {
Messages.sendLocalMessage("home", _this.entityID);
}
this.startNearTrigger = function() {
Messages.sendLocalMessage("home", _this.entityID);
}
this.startFarTrigger = function() {
Messages.sendLocalMessage("home", _this.entityID);
}
});

4
scripts/system/tablet-ui/tabletUI.js
View file

@ -24,7 +24,7 @@
tabletShown = true; tabletShown = true;
print("show tablet-ui"); print("show tablet-ui");
UIWebTablet = new WebTablet("qml/hifi/tablet/Tablet.qml", null, null, tabletLocation); UIWebTablet = new WebTablet("qml/hifi/tablet/Tablet.qml", null, null, tabletLocation);
UIWebTablet.register(); UIWebTablet.register();
HMD.tabletID = UIWebTablet.webEntityID; HMD.tabletID = UIWebTablet.webEntityID;
var setUpTabletUI = function() { var setUpTabletUI = function() {
@ -49,7 +49,7 @@
} }
tabletLocation = UIWebTablet.getLocation(); tabletLocation = UIWebTablet.getLocation();
UIWebTablet.unregister(); UIWebTablet.unregister();
UIWebTablet.destroy(); UIWebTablet.destroy();
UIWebTablet = null; UIWebTablet = null;
HMD.tabletID = null; HMD.tabletID = null;