Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -1154,11 +1154,11 @@ const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mo · 1153 unmodified lines | |||
| 1154 | (_mouseVoxel.z + _mouseVoxel.s / 2.f) * TREE_SCALE); | 1154 | (_mouseVoxel.z + _mouseVoxel.s / 2.f) * TREE_SCALE); |
| 1155 | } | 1155 | } |
| 1156 | 1156 | ||
| 1157 | const float NUDGE_PRECISION_LIMIT = 1 / pow(2.0, 12.0); | 1157 | const float NUDGE_PRECISION_MIN = 1 / pow(2.0, 12.0); |
| 1158 | 1158 | ||
| 1159 | void Application::decreaseVoxelSize() { | 1159 | void Application::decreaseVoxelSize() { |
| 1160 | if (_nudgeStarted) { | 1160 | if (_nudgeStarted) { |
| 1161 | if (_mouseVoxelScale >= NUDGE_PRECISION_LIMIT) { | 1161 | if (_mouseVoxelScale >= NUDGE_PRECISION_MIN) { |
| 1162 | _mouseVoxelScale /= 2; | 1162 | _mouseVoxelScale /= 2; |
| 1163 | } | 1163 | } |
| 1164 | } else { | 1164 | } else { |
| @@ -1167,7 +1167,13 @@ void Application::decreaseVoxelSize() { · 2 unmodified lines | |||
| 1167 | } | 1167 | } |
| 1168 | 1168 | ||
| 1169 | void Application::increaseVoxelSize() { | 1169 | void Application::increaseVoxelSize() { |
| 1170 | _mouseVoxelScale *= 2; | 1170 | if (_nudgeStarted) { |
| 1171 | if (_mouseVoxelScale < _nudgeVoxel.s) { | ||
| 1172 | _mouseVoxelScale *= 2; | ||
| 1173 | } | ||
| 1174 | } else { | ||
| 1175 | _mouseVoxelScale *= 2; | ||
| 1176 | } | ||
| 1171 | } | 1177 | } |
| 1172 | 1178 | ||
| 1173 | const int MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE = 1500; | 1179 | const int MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE = 1500; |