From 925cfc9b23a21f4721c467e319c18e8e583d6489 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Fri, 10 Aug 2018 16:45:27 +0200 Subject: [PATCH 1/2] Set a max focus distance value of 14km to not lose the edit handles by far-clipping --- scripts/system/libraries/entityCameraTool.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/system/libraries/entityCameraTool.js b/scripts/system/libraries/entityCameraTool.js index f554f45722..01030c9d7d 100644 --- a/scripts/system/libraries/entityCameraTool.js +++ b/scripts/system/libraries/entityCameraTool.js @@ -28,7 +28,7 @@ var FOCUS_MIN_ZOOM = 0.5; var ZOOM_SCALING = 0.02; var MIN_ZOOM_DISTANCE = 0.01; -var MAX_ZOOM_DISTANCE = 200; +var MAX_ZOOM_DISTANCE = 14000; var MODE_INACTIVE = 'inactive'; var MODE_ORBIT = 'orbit'; @@ -255,14 +255,6 @@ CameraManager = function() { that.updateCamera(); } - that.getZoomPercentage = function() { - return (that.zoomDistance - MIN_ZOOM_DISTANCE) / MAX_ZOOM_DISTANCE; - } - - that.setZoomPercentage = function(pct) { - that.targetZoomDistance = pct * (MAX_ZOOM_DISTANCE - MIN_ZOOM_DISTANCE); - } - that.pan = function(offset) { var up = Quat.getUp(Camera.getOrientation()); var right = Quat.getRight(Camera.getOrientation()); From f26188d5b8e193470d5e2ef904c1323852469075 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Sat, 11 Aug 2018 01:54:13 +0200 Subject: [PATCH 2/2] added comment for limit choice --- scripts/system/libraries/entityCameraTool.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/system/libraries/entityCameraTool.js b/scripts/system/libraries/entityCameraTool.js index 01030c9d7d..ebaeb1acb5 100644 --- a/scripts/system/libraries/entityCameraTool.js +++ b/scripts/system/libraries/entityCameraTool.js @@ -28,6 +28,8 @@ var FOCUS_MIN_ZOOM = 0.5; var ZOOM_SCALING = 0.02; var MIN_ZOOM_DISTANCE = 0.01; + +// The maximum usable zoom level is somewhere around 14km, further than that the edit handles will fade-out. (FIXME: MS17493) var MAX_ZOOM_DISTANCE = 14000; var MODE_INACTIVE = 'inactive';