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

fix notications scaling

Browse source
This commit is contained in:
danteruiz 2019-03-12 17:18:15 -07:00
parent 88da09c2ab
commit 1e354fb280
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/system/notifications.js
View file

@ -203,7 +203,7 @@
// Notification plane positions // Notification plane positions
noticeY = -sensorScaleFactor * (y * NOTIFICATION_3D_SCALE + 0.5 * noticeHeight); noticeY = -sensorScaleFactor * (y * NOTIFICATION_3D_SCALE + 0.5 * noticeHeight);
notificationPosition = { x: 0, y: noticeY, z: 0 }; notificationPosition = { x: 0, y: noticeY, z: 0 };
buttonPosition = { x: 0.5 * sensorScaleFactor * (noticeWidth - NOTIFICATION_3D_BUTTON_WIDTH), y: noticeY, z: 0.001 }; buttonPosition = { x: sensorScaleFactor * (noticeWidth - NOTIFICATION_3D_BUTTON_WIDTH), y: noticeY, z: 0.001 };
// Rotate plane // Rotate plane
notificationOrientation = Quat.fromPitchYawRollDegrees(NOTIFICATIONS_3D_PITCH, notificationOrientation = Quat.fromPitchYawRollDegrees(NOTIFICATIONS_3D_PITCH,
@ -241,7 +241,7 @@
noticeWidth = notice.width * NOTIFICATION_3D_SCALE + NOTIFICATION_3D_BUTTON_WIDTH; noticeWidth = notice.width * NOTIFICATION_3D_SCALE + NOTIFICATION_3D_BUTTON_WIDTH;
noticeHeight = notice.height * NOTIFICATION_3D_SCALE; noticeHeight = notice.height * NOTIFICATION_3D_SCALE;
notice.size = { x: noticeWidth, y: noticeHeight }; notice.size = { x: noticeWidth * sensorScaleFactor, y: noticeHeight * sensorScaleFactor };
positions = calculate3DOverlayPositions(noticeWidth, noticeHeight, notice.y); positions = calculate3DOverlayPositions(noticeWidth, noticeHeight, notice.y);
@ -249,8 +249,8 @@
notice.parentJointIndex = -2; notice.parentJointIndex = -2;
if (!image) { if (!image) {
notice.topMargin = 0.75 * notice.topMargin * NOTIFICATION_3D_SCALE; notice.topMargin = 0.75 * notice.topMargin * NOTIFICATION_3D_SCALE * sensorScaleFactor;
notice.leftMargin = 2 * notice.leftMargin * NOTIFICATION_3D_SCALE; notice.leftMargin = 2 * notice.leftMargin * NOTIFICATION_3D_SCALE * sensorScaleFactor;
notice.bottomMargin = 0; notice.bottomMargin = 0;
notice.rightMargin = 0; notice.rightMargin = 0;
notice.lineHeight = 10.0 * (fontSize * sensorScaleFactor / 12.0) * NOTIFICATION_3D_SCALE; notice.lineHeight = 10.0 * (fontSize * sensorScaleFactor / 12.0) * NOTIFICATION_3D_SCALE;
@ -267,14 +267,15 @@
button.isFacingAvatar = false; button.isFacingAvatar = false;
button.parentID = MyAvatar.sessionUUID; button.parentID = MyAvatar.sessionUUID;
button.parentJointIndex = -2; button.parentJointIndex = -2;
button.visible = false;
buttons.push((Overlays.addOverlay("image3d", button))); buttons.push((Overlays.addOverlay("image3d", button)));
overlay3DDetails.push({ overlay3DDetails.push({
notificationOrientation: positions.notificationOrientation, notificationOrientation: positions.notificationOrientation,
notificationPosition: positions.notificationPosition, notificationPosition: positions.notificationPosition,
buttonPosition: positions.buttonPosition, buttonPosition: positions.buttonPosition,
width: noticeWidth, width: noticeWidth * sensorScaleFactor,
height: noticeHeight height: noticeHeight * sensorScaleFactor
}); });