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

Size and position according to avatar scale

Browse source
This commit is contained in:
David Rowe 2018-08-10 12:51:06 +12:00
parent 0aa42d70d6
commit b240a4248d
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/system/tabletRezzer.js
View file

@ -56,6 +56,7 @@
updateTimer = null, updateTimer = null,
UPDATE_INTERVAL = 250, UPDATE_INTERVAL = 250,
HIFI_OBJECT_MANIPULATION_CHANNEL = "Hifi-Object-Manipulation", HIFI_OBJECT_MANIPULATION_CHANNEL = "Hifi-Object-Manipulation",
avatarScale = 1,
LEFT_HAND = 0, LEFT_HAND = 0,
RIGHT_HAND = 1, RIGHT_HAND = 1,
@ -115,9 +116,10 @@
proxyOverlay = Overlays.addOverlay("cube", { proxyOverlay = Overlays.addOverlay("cube", {
parentID: MyAvatar.SELF_ID, parentID: MyAvatar.SELF_ID,
parentJointIndex: handJointIndex(proxyHand), parentJointIndex: handJointIndex(proxyHand),
localPosition: proxyHand === LEFT_HAND ? TABLET_PROXY_POSITION_LEFT_HAND : TABLET_PROXY_POSITION_RIGHT_HAND, localPosition: Vec3.multiply(avatarScale,
proxyHand === LEFT_HAND ? TABLET_PROXY_POSITION_LEFT_HAND : TABLET_PROXY_POSITION_RIGHT_HAND),
localRotation: proxyHand === LEFT_HAND ? TABLET_PROXY_ROTATION_LEFT_HAND : TABLET_PROXY_ROTATION_RIGHT_HAND, localRotation: proxyHand === LEFT_HAND ? TABLET_PROXY_ROTATION_LEFT_HAND : TABLET_PROXY_ROTATION_RIGHT_HAND,
dimensions: TABLET_PROXY_DIMENSIONS, dimensions: Vec3.multiply(avatarScale, TABLET_PROXY_DIMENSIONS),
solid: true, solid: true,
grabbable: true, grabbable: true,
displayInFront: true, displayInFront: true,
@ -130,7 +132,7 @@
if (scaleFactor < 1) { if (scaleFactor < 1) {
Overlays.editOverlay(proxyOverlay, { Overlays.editOverlay(proxyOverlay, {
dimensions: Vec3.multiply( dimensions: Vec3.multiply(
1 + scaleFactor * (proxyTargetWidth - proxyInitialWidth) / proxyInitialWidth, avatarScale * (1 + scaleFactor * (proxyTargetWidth - proxyInitialWidth) / proxyInitialWidth),
TABLET_PROXY_DIMENSIONS) TABLET_PROXY_DIMENSIONS)
}); });
proxyExpandTimer = Script.setTimeout(expandProxy, PROXY_EXPAND_TIMEOUT); proxyExpandTimer = Script.setTimeout(expandProxy, PROXY_EXPAND_TIMEOUT);
@ -282,6 +284,12 @@
updateTimer = Script.setTimeout(update, UPDATE_INTERVAL); updateTimer = Script.setTimeout(update, UPDATE_INTERVAL);
} }
function onScaleChanged() {
avatarScale = MyAvatar.scale;
// Clamp scale in order to work around M17434.
avatarScale = Math.max(MyAvatar.getDomainMinScale(), Math.min(MyAvatar.getDomainMaxScale(), avatarScale));
}
function onMessageReceived(channel, data, senderID, localOnly) { function onMessageReceived(channel, data, senderID, localOnly) {
var message; var message;
@ -327,6 +335,8 @@
// #region Start-up and tear-down ========================================================================================== // #region Start-up and tear-down ==========================================================================================
function setUp() { function setUp() {
MyAvatar.scaleChanged.connect(onScaleChanged);
Messages.subscribe(HIFI_OBJECT_MANIPULATION_CHANNEL); Messages.subscribe(HIFI_OBJECT_MANIPULATION_CHANNEL);
Messages.messageReceived.connect(onMessageReceived); Messages.messageReceived.connect(onMessageReceived);
@ -343,6 +353,8 @@
Messages.messageReceived.disconnect(onMessageReceived); Messages.messageReceived.disconnect(onMessageReceived);
Messages.unsubscribe(HIFI_OBJECT_MANIPULATION_CHANNEL); Messages.unsubscribe(HIFI_OBJECT_MANIPULATION_CHANNEL);
MyAvatar.scaleChanged.disconnect(onScaleChanged);
HMD.displayModeChanged.disconnect(onMountedChanged); HMD.displayModeChanged.disconnect(onMountedChanged);
HMD.mountedChanged.disconnect(onMountedChanged); HMD.mountedChanged.disconnect(onMountedChanged);
if (updateTimer !== null) { if (updateTimer !== null) {