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

merge from upstream

Browse source
This commit is contained in:
Seth Alves 2016-12-20 08:43:19 -08:00
commit d8ee4d86b0
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -4070,7 +4070,6 @@ void Application::setKeyboardFocusOverlay(unsigned int overlayID) {
if (overlayType == Web3DOverlay::TYPE && isVisible) {
auto overlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlays().getOverlay(overlayID));
overlay->setProxyWindow(_window->windowHandle());
if (_keyboardMouseDevice->isActive()) {
_keyboardMouseDevice->pluginFocusOutEvent();
}

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

@ -78,16 +78,16 @@ WebTablet = function (url, width, dpi, location, clientOnly) {
this.tabletEntityID = Entities.addEntity(tabletProperties, clientOnly);
var WEB_OVERLAY_Z_OFFSET = -0.01;
var HOME_BUTTON_Y_OFFSET = -0.32;
var webOverlayRotation = Quat.multiply(spawnInfo.rotation, Quat.angleAxis(180, Y_AXIS));
var webOverlayPosition = Vec3.sum(spawnInfo.position, Vec3.multiply(WEB_OVERLAY_Z_OFFSET, Quat.getFront(webOverlayRotation)));
var WEB_ENTITY_Z_OFFSET = -0.01;
if (this.webOverlayID) {
Overlays.deleteOverlay(this.webOverlayID);
}
this.webOverlayID = Overlays.addOverlay("web3d", {
name: "WebTablet Web",
url: url,
position: webOverlayPosition,
rotation: webOverlayRotation,
localPosition: { x: 0, y: 0, z: WEB_ENTITY_Z_OFFSET },
localRotation: Quat.angleAxis(180, Y_AXIS),
resolution: { x: 480, y: 640 },
dpi: DPI,
color: { red: 255, green: 255, blue: 255 },
@ -96,6 +96,7 @@ WebTablet = function (url, width, dpi, location, clientOnly) {
parentJointIndex: -1
});
var HOME_BUTTON_Y_OFFSET = -0.32;
this.homeButtonEntity = Entities.addEntity({
name: "homeButton",
type: "Sphere",