Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 01:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for tablets in third-person HMD mode.

Browse source
This commit is contained in:
Anthony J. Thibault 2017-01-31 18:00:18 -08:00
parent cf855391af
commit c147b9bec0
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -198,6 +198,11 @@ WebTablet = function (url, width, dpi, hand, clientOnly) {
_this.geometryChanged(geometry); _this.geometryChanged(geometry);
}; };
Window.geometryChanged.connect(this.myGeometryChanged); Window.geometryChanged.connect(this.myGeometryChanged);
this.myCameraModeChanged = function(newMode) {
_this.cameraModeChanged(newMode);
};
Camera.modeUpdated.connect(this.myCameraModeChanged);
}; };
WebTablet.prototype.setHomeButtonTexture = function() { WebTablet.prototype.setHomeButtonTexture = function() {
@ -228,6 +233,7 @@ WebTablet.prototype.destroy = function () {
Controller.mouseReleaseEvent.disconnect(this.myMouseReleaseEvent); Controller.mouseReleaseEvent.disconnect(this.myMouseReleaseEvent);
Window.geometryChanged.disconnect(this.myGeometryChanged); Window.geometryChanged.disconnect(this.myGeometryChanged);
Camera.modeUpdated.disconnect(this.myCameraModeChanged);
}; };
WebTablet.prototype.geometryChanged = function (geometry) { WebTablet.prototype.geometryChanged = function (geometry) {
@ -370,6 +376,19 @@ WebTablet.prototype.mousePressEvent = function (event) {
} }
}; };
WebTablet.prototype.cameraModeChanged = function (newMode) {
// reposition the tablet, after a small delay.
// This allows HMD.position to reflect the new camera mode.
var self = this;
Script.setTimeout(function () {
var NO_HANDS = -1;
var tabletProperties = {};
// compute position, rotation & parentJointIndex of the tablet
self.calculateTabletAttachmentProperties(NO_HANDS, tabletProperties);
Entities.editEntity(self.tabletEntityID, tabletProperties);
}, 10);
};
function rayIntersectPlane(planePosition, planeNormal, rayStart, rayDirection) { function rayIntersectPlane(planePosition, planeNormal, rayStart, rayDirection) {
var rayDirectionDotPlaneNormal = Vec3.dot(rayDirection, planeNormal); var rayDirectionDotPlaneNormal = Vec3.dot(rayDirection, planeNormal);
if (rayDirectionDotPlaneNormal > 0.00001 || rayDirectionDotPlaneNormal < -0.00001) { if (rayDirectionDotPlaneNormal > 0.00001 || rayDirectionDotPlaneNormal < -0.00001) {