This commit is contained in:
Ingela Rossing
2019-09-24 17:12:59 +02:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ asset.require('./static_server')
local guiCustomization = asset.require('customization/gui')
-- Select which commit hashes to use for the frontend and backend
local frontendHash = "785d6fe3416b2e30bed0a04313ef61b0e2729645"
local frontendHash = "7f464f7ede73b0e9edd1869eeb90465a5194dd29"
local dataProvider = "data.openspaceproject.com/files/webgui"
local frontend = asset.syncedResource({
+2 -2
View File
@@ -1372,7 +1372,7 @@ void TouchInteraction::step(double dt) {
#ifdef TOUCH_DEBUG_PROPERTIES
LINFO(fmt::format(
"{}: Zoom In Limit should be larger than anchor center to surface, setting it to {}",
_loggerCat, zoomInBounds);
_loggerCat, zoomInBounds));
#endif
_zoomInLimit.setValue(zoomInBounds);
}
@@ -1396,7 +1396,7 @@ void TouchInteraction::step(double dt) {
bool willNewPositionViolateZoomOutLimit = (newPosDistance >= _zoomOutLimit.value());
bool willNewPositionViolateZoomInLimit = (newPosDistance < _zoomInLimit.value());
if(!willNewPositionViolateZoomInLimit && !willNewPositionViolateZoomOutLimit){
if (!willNewPositionViolateZoomInLimit && !willNewPositionViolateZoomOutLimit){
camPos += zoomDistanceIncrement;
}
else if (currentPosViolatingZoomOutLimit) {