From 67bbcc4d9ba0e0cfca187aafcae78097f06ab0cd Mon Sep 17 00:00:00 2001 From: LionTurtle Date: Fri, 13 Sep 2013 14:08:21 -0700 Subject: [PATCH] Put upper bound on increasing nudge precision (i.e. making the nudge less precise). --- interface/src/Application.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a81dbb8b62..298eddcec9 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1154,11 +1154,11 @@ const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mo (_mouseVoxel.z + _mouseVoxel.s / 2.f) * TREE_SCALE); } -const float NUDGE_PRECISION_LIMIT = 1 / pow(2.0, 12.0); +const float NUDGE_PRECISION_MIN = 1 / pow(2.0, 12.0); void Application::decreaseVoxelSize() { if (_nudgeStarted) { - if (_mouseVoxelScale >= NUDGE_PRECISION_LIMIT) { + if (_mouseVoxelScale >= NUDGE_PRECISION_MIN) { _mouseVoxelScale /= 2; } } else { @@ -1167,7 +1167,13 @@ void Application::decreaseVoxelSize() { } void Application::increaseVoxelSize() { - _mouseVoxelScale *= 2; + if (_nudgeStarted) { + if (_mouseVoxelScale < _nudgeVoxel.s) { + _mouseVoxelScale *= 2; + } + } else { + _mouseVoxelScale *= 2; + } } const int MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE = 1500;