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

Fix the view snap when user starts zooming

Browse source
This commit is contained in:
Gabriel Calero 2018-04-05 15:35:08 -03:00
parent c26ae3592c
commit 36bc5f8416
1 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
scripts/system/+android/radar.js
View file

@ -21,7 +21,8 @@ function printd(str) {
}
var radar = false;
var radarHeight = MyAvatar.position.y + 10; // camera position (absolute y)
var RADAR_HEIGHT_INIT_DELTA = 10;
var radarHeight = MyAvatar.position.y + RADAR_HEIGHT_INIT_DELTA; // camera position (absolute y)
var tablet;
var RADAR_CAMERA_OFFSET = -1; // 1 meter below the avatar
@ -386,6 +387,7 @@ function pinchUpdate(event) {
radarHeight -= pinchIncrement;
}
}
Camera.position = {
x: Camera.position.x,
y:radarHeight,
@ -655,6 +657,7 @@ function Teleporter() {
return;
}
Camera.position = Vec3.sum(Camera.position, {
x : xDelta,
y : 0,
@ -1301,11 +1304,12 @@ function startRadar() {
saveAllOthersAvatarsData();
Camera.mode = "independent";
Camera.position = Vec3.sum(MyAvatar.position, {
x : 0,
y : radarHeight,
z : 0
});
Camera.position = {
x : MyAvatar.position.x,
y : radarHeight,
z : MyAvatar.position.z
};
Camera.orientation = Quat.fromPitchYawRollDegrees(-90, 0, 0);
radar = true;
@ -1394,15 +1398,25 @@ function connectRadarModeEvents() {
Controller.keyPressEvent.connect(keyPressEvent);
Controller.mousePressEvent.connect(mousePress); // single click/touch
Controller.touchUpdateEvent.connect(touchUpdate);
Window.domainChanged.connect(domainChanged);
MyAvatar.positionGoneTo.connect(positionGoneTo);
}
function positionGoneTo() {
Camera.position = Vec3.sum(MyAvatar.position, {
x : 0,
function domainChanged() {
radarHeight = MyAvatar.position.y + RADAR_HEIGHT_INIT_DELTA;
Camera.position = {
x : MyAvatar.position.x,
y : radarHeight,
z : 0
});
z : MyAvatar.position.z
};
}
function positionGoneTo() {
Camera.position = {
x : MyAvatar.position.x,
y : radarHeight,
z : MyAvatar.position.z
};
}
function disconnectRadarModeEvents() {
@ -1411,6 +1425,7 @@ function disconnectRadarModeEvents() {
Controller.mousePressEvent.disconnect(mousePress);
Controller.touchUpdateEvent.disconnect(touchUpdate);
MyAvatar.positionGoneTo.disconnect(positionGoneTo);
Window.domainChanged.disconnect(domainChanged);
}
function init() {