Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-27 00:09:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9460 from druiz17/touchUp

Browse source 
Tablet button clickable in desktop mode && correct icons for switch
This commit is contained in:
Seth Alves 2017-01-20 12:58:41 -08:00 committed by GitHub
commit 2f08972578
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/system/hmd.js
View file

@ -42,6 +42,17 @@ var button;
var desktopOnlyViews = ['Mirror', 'Independent Mode', 'Entity Mode']; var desktopOnlyViews = ['Mirror', 'Independent Mode', 'Entity Mode'];
function onHmdChanged(isHmd) { function onHmdChanged(isHmd) {
//TODO change button icon when the hmd changes //TODO change button icon when the hmd changes
if (isHmd) {
button.editProperties({
icon: "icons/tablet-icons/switch-a.svg",
text: "DESKTOP"
});
} else {
button.editProperties({
icon: "icons/tablet-icons/switch-i.svg",
text: "VR"
});
}
desktopOnlyViews.forEach(function (view) { desktopOnlyViews.forEach(function (view) {
Menu.setMenuEnabled("View>" + view, !isHmd); Menu.setMenuEnabled("View>" + view, !isHmd);
}); });

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

@ -204,7 +204,7 @@ WebTablet.prototype.getOverlayObject = function () {
WebTablet.prototype.destroy = function () { WebTablet.prototype.destroy = function () {
Overlays.deleteOverlay(this.webOverlayID); Overlays.deleteOverlay(this.webOverlayID);
Entities.deleteEntity(this.tabletEntityID); Entities.deleteEntity(this.tabletEntityID);
Overlays.deleteEntity(this.homeButtonEntity); Overlays.deleteOverlay(this.homeButtonEntity);
HMD.displayModeChanged.disconnect(this.myOnHmdChanged); HMD.displayModeChanged.disconnect(this.myOnHmdChanged);
if (!HMD.active) { if (!HMD.active) {
@ -319,7 +319,10 @@ WebTablet.prototype.mousePressEvent = function (event) {
var entityPickResults = Entities.findRayIntersection(pickRay, true); // non-accurate picking var entityPickResults = Entities.findRayIntersection(pickRay, true); // non-accurate picking
if (entityPickResults.intersects && entityPickResults.entityID === this.tabletEntityID) { if (entityPickResults.intersects && entityPickResults.entityID === this.tabletEntityID) {
var overlayPickResults = Overlays.findRayIntersection(pickRay); var overlayPickResults = Overlays.findRayIntersection(pickRay);
if (!overlayPickResults.intersects || !overlayPickResults.overlayID === this.webOverlayID) { if (overlayPickResults.intersects && overlayPickResults.overlayID === HMD.homeButtonID) {
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
tablet.gotoHomeScreen();
} else if (!overlayPickResults.intersects || !overlayPickResults.overlayID === this.webOverlayID) {
this.dragging = true; this.dragging = true;
var invCameraXform = new Xform(Camera.orientation, Camera.position).inv(); var invCameraXform = new Xform(Camera.orientation, Camera.position).inv();
this.initialLocalIntersectionPoint = invCameraXform.xformPoint(entityPickResults.intersection); this.initialLocalIntersectionPoint = invCameraXform.xformPoint(entityPickResults.intersection);