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

Rotate the mini tablet as it expands

Browse source
This commit is contained in:
David Rowe 2018-08-23 13:06:28 +12:00
parent 335eb98bb7
commit b6e4a22db7
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
scripts/system/miniTablet.js
View file

@ -79,6 +79,7 @@
{ x: 0.5, y: -0.75, z: 0 }, { x: 0.5, y: -0.75, z: 0 },
{ x: -0.5, y: -0.75, z: 0 } { x: -0.5, y: -0.75, z: 0 }
], ],
PROXY_EXPAND_DELTA_ROTATION = Quat.fromVec3Degrees({ x: -45, y: 0, z: 0 }),
proxyExpandHand, proxyExpandHand,
proxyExpandLocalPosition, proxyExpandLocalPosition,
proxyExpandLocalRotation = Quat.IDENTITY, proxyExpandLocalRotation = Quat.IDENTITY,
@ -88,6 +89,7 @@
proxyExpandStart, proxyExpandStart,
proxyInitialWidth, proxyInitialWidth,
proxyTargetWidth, proxyTargetWidth,
proxyTargetLocalRotation,
// EventBridge // EventBridge
READY_MESSAGE = "ready", // Engine <== Dialog READY_MESSAGE = "ready", // Engine <== Dialog
@ -321,19 +323,28 @@
function sizeUIAboutHandles(scaleFactor) { function sizeUIAboutHandles(scaleFactor) {
// Scale UI and move per handles. // Scale UI and move per handles.
var tabletScaleFactor = avatarScale * (1 + scaleFactor * (proxyTargetWidth - proxyInitialWidth) / proxyInitialWidth);
var dimensions = Vec3.multiply(tabletScaleFactor, PROXY_DIMENSIONS);
var localRotation = Quat.mix(proxyExpandLocalRotation, proxyTargetLocalRotation, scaleFactor);
var localPosition =
Vec3.sum(proxyExpandLocalPosition,
Vec3.multiplyQbyV(proxyExpandLocalRotation,
Vec3.multiply(-tabletScaleFactor,
Vec3.multiplyVbyV(PROXY_EXPAND_HANDLES[proxyExpandHand], PROXY_DIMENSIONS)))
);
localPosition = Vec3.sum(localPosition,
Vec3.multiplyQbyV(proxyExpandLocalRotation, { x: 0, y: 0.5 * -dimensions.y, z: 0 }));
localPosition = Vec3.sum(localPosition,
Vec3.multiplyQbyV(localRotation, { x: 0, y: 0.5 * dimensions.y, z: 0 }));
Overlays.editOverlay(proxyOverlay, { Overlays.editOverlay(proxyOverlay, {
localPosition: localPosition: localPosition,
Vec3.sum(proxyExpandLocalPosition, localRotation: localRotation,
Vec3.multiplyQbyV(proxyExpandLocalRotation, dimensions: dimensions
Vec3.multiply(-scaleFactor,
Vec3.multiplyVbyV(PROXY_EXPAND_HANDLES[proxyExpandHand], PROXY_DIMENSIONS)))
),
dimensions: Vec3.multiply(scaleFactor, PROXY_DIMENSIONS)
}); });
Overlays.editOverlay(proxyUIOverlay, { Overlays.editOverlay(proxyUIOverlay, {
localPosition: Vec3.multiply(scaleFactor, PROXY_UI_LOCAL_POSITION), localPosition: Vec3.multiply(tabletScaleFactor, PROXY_UI_LOCAL_POSITION),
dimensions: Vec3.multiply(scaleFactor, PROXY_UI_DIMENSIONS), dimensions: Vec3.multiply(tabletScaleFactor, PROXY_UI_DIMENSIONS),
dpi: PROXY_UI_DPI / scaleFactor dpi: PROXY_UI_DPI / tabletScaleFactor
}); });
} }
@ -504,9 +515,8 @@
function expandProxy() { function expandProxy() {
var scaleFactor = (Date.now() - proxyExpandStart) / PROXY_EXPAND_DURATION; var scaleFactor = (Date.now() - proxyExpandStart) / PROXY_EXPAND_DURATION;
var tabletScaleFactor = avatarScale * (1 + scaleFactor * (proxyTargetWidth - proxyInitialWidth) / proxyInitialWidth);
if (scaleFactor < 1) { if (scaleFactor < 1) {
sizeUIAboutHandles(tabletScaleFactor); sizeUIAboutHandles(scaleFactor);
proxyExpandTimer = Script.setTimeout(expandProxy, PROXY_EXPAND_TIMEOUT); proxyExpandTimer = Script.setTimeout(expandProxy, PROXY_EXPAND_TIMEOUT);
return; return;
} }
@ -526,6 +536,7 @@
// Start expanding. // Start expanding.
proxyInitialWidth = PROXY_DIMENSIONS.x; proxyInitialWidth = PROXY_DIMENSIONS.x;
proxyTargetWidth = getTabletWidthFromSettings(); proxyTargetWidth = getTabletWidthFromSettings();
proxyTargetLocalRotation = Quat.multiply(proxyExpandLocalRotation, PROXY_EXPAND_DELTA_ROTATION);
proxyExpandStart = Date.now(); proxyExpandStart = Date.now();
proxyExpandTimer = Script.setTimeout(expandProxy, PROXY_EXPAND_TIMEOUT); proxyExpandTimer = Script.setTimeout(expandProxy, PROXY_EXPAND_TIMEOUT);
} }