From 2314ab36243321da82ca11c97e2ad8de31a82323 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 30 Oct 2014 18:05:40 -0700 Subject: [PATCH] Removed unused variable, fixed painting materials on heightfields with greater resolution. --- libraries/metavoxels/src/MetavoxelMessages.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/metavoxels/src/MetavoxelMessages.cpp b/libraries/metavoxels/src/MetavoxelMessages.cpp index 4c6611f4bd..c9c2d32b7e 100644 --- a/libraries/metavoxels/src/MetavoxelMessages.cpp +++ b/libraries/metavoxels/src/MetavoxelMessages.cpp @@ -445,7 +445,8 @@ PaintHeightfieldMaterialEditVisitor::PaintHeightfieldMaterialEditVisitor(const g _material(material), _color(color) { - glm::vec3 extents(_radius, _radius, _radius); + const float LARGE_EXTENT = 100000.0f; + glm::vec3 extents(_radius, LARGE_EXTENT, _radius); _bounds = Box(_position - extents, _position + extents); } @@ -520,7 +521,6 @@ int PaintHeightfieldMaterialEditVisitor::visit(MetavoxelInfo& info) { uchar* lineDest = (uchar*)contents.data() + (int)z * size + (int)startX; float squaredRadius = scaledRadius * scaledRadius; bool changed = false; - QHash counts; for (float endZ = qMin(end.z, (float)highest); z <= endZ; z += 1.0f) { uchar* dest = lineDest; for (float x = startX; x <= endX; x += 1.0f, dest++) {