Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 19:56:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding fix for tablet screen y offset

Browse source
This commit is contained in:
Wayne Chen 2018-05-31 16:07:52 -07:00 committed by Dante Ruiz
parent aa19794a94
commit c18c2358d6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/libraries/utils.js
View file

@ -32,7 +32,7 @@ if (!Function.prototype.bind) {
if (this.prototype) { if (this.prototype) {
// Function.prototype doesn't have a prototype property // Function.prototype doesn't have a prototype property
fNOP.prototype = this.prototype; fNOP.prototype = this.prototype;
} }
fBound.prototype = new fNOP(); fBound.prototype = new fNOP();
@ -381,6 +381,7 @@ resizeTablet = function (width, newParentJointIndex, sensorToWorldScaleOverride)
sensorScaleOffsetOverride = 1 / sensorScaleFactor; sensorScaleOffsetOverride = 1 / sensorScaleFactor;
} }
// will need to be recaclulated if dimensions of fbx model change. // will need to be recaclulated if dimensions of fbx model change.
var TABLET_NATURAL_DIMENSIONS = {x: 32.083, y: 48.553, z: 2.269}; var TABLET_NATURAL_DIMENSIONS = {x: 32.083, y: 48.553, z: 2.269};
var DEFAULT_DPI = 31; var DEFAULT_DPI = 31;
@ -401,8 +402,7 @@ resizeTablet = function (width, newParentJointIndex, sensorToWorldScaleOverride)
// update webOverlay // update webOverlay
var RAYPICK_OFFSET = 0.0007; // Sufficient for raypick to reliably intersect tablet screen before tablet model. var RAYPICK_OFFSET = 0.0007; // Sufficient for raypick to reliably intersect tablet screen before tablet model.
var WEB_ENTITY_Z_OFFSET = (tabletDepth / 2.0) * sensorScaleOffsetOverride + RAYPICK_OFFSET; var WEB_ENTITY_Z_OFFSET = (tabletDepth / 2.0) * sensorScaleOffsetOverride + RAYPICK_OFFSET;
var WEB_ENTITY_Y_OFFSET = 1 * tabletScaleFactor; var WEB_ENTITY_Y_OFFSET = 1 * tabletScaleFactor * sensorScaleOffsetOverride;
print(WEB_ENTITY_Y_OFFSET);
var screenWidth = 0.9275 * tabletWidth; var screenWidth = 0.9275 * tabletWidth;
var screenHeight = 0.8983 * tabletHeight; var screenHeight = 0.8983 * tabletHeight;
var landscape = Tablet.getTablet("com.highfidelity.interface.tablet.system").landscape; var landscape = Tablet.getTablet("com.highfidelity.interface.tablet.system").landscape;