Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 10:49:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tablet ending upside down if it expands into other grabbing hand

Browse source
This commit is contained in:
David Rowe 2018-09-09 12:07:33 +12:00
parent baf1e80445
commit 1faef9db8c
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/miniTablet.js
View file

@ -265,6 +265,7 @@
localPosition: Vec3.multiply(MyAvatar.scale, MINI_POSITIONS[hand]), localPosition: Vec3.multiply(MyAvatar.scale, MINI_POSITIONS[hand]),
localRotation: MINI_ROTATIONS[hand], localRotation: MINI_ROTATIONS[hand],
dimensions: Vec3.multiply(initialScale, MINI_DIMENSIONS), dimensions: Vec3.multiply(initialScale, MINI_DIMENSIONS),
grabbable: true,
visible: true visible: true
}); });
Overlays.editOverlay(miniUIOverlay, { Overlays.editOverlay(miniUIOverlay, {
@ -320,6 +321,11 @@
miniInitialWidth = MINI_DIMENSIONS.x; miniInitialWidth = MINI_DIMENSIONS.x;
miniTargetWidth = getTabletWidthFromSettings(); miniTargetWidth = getTabletWidthFromSettings();
miniTargetLocalRotation = Quat.multiply(miniExpandLocalRotation, miniExpandDeltaRotation); miniTargetLocalRotation = Quat.multiply(miniExpandLocalRotation, miniExpandDeltaRotation);
// Don't let other hand grab while expanding.
Overlays.editOverlay(miniOverlay, {
grabbable: false
});
} }
function sizeAboutHandles(scaleFactor) { function sizeAboutHandles(scaleFactor) {