From 662189159d824635805ba4838f1bfac74d8b7552 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 20 Oct 2014 12:09:33 -0700 Subject: [PATCH] Fix for Xcode warning. --- libraries/metavoxels/src/MetavoxelData.cpp | 8 ++++---- libraries/metavoxels/src/MetavoxelData.h | 8 ++++---- libraries/metavoxels/src/MetavoxelMessages.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/metavoxels/src/MetavoxelData.cpp b/libraries/metavoxels/src/MetavoxelData.cpp index 43c2969192..5b00c6531f 100644 --- a/libraries/metavoxels/src/MetavoxelData.cpp +++ b/libraries/metavoxels/src/MetavoxelData.cpp @@ -2053,11 +2053,11 @@ bool Spanner::hasOwnMaterials() const { return false; } -QRgb Spanner::getColor(const glm::vec3& point) { +QRgb Spanner::getColorAt(const glm::vec3& point) { return 0; } -int Spanner::getMaterial(const glm::vec3& point) { +int Spanner::getMaterialAt(const glm::vec3& point) { return 0; } @@ -2410,7 +2410,7 @@ bool Heightfield::hasOwnMaterials() const { return true; } -QRgb Heightfield::getColor(const glm::vec3& point) { +QRgb Heightfield::getColorAt(const glm::vec3& point) { glm::vec3 relative = (point - getBounds().minimum) / _increment; glm::vec3 floors = glm::floor(relative); glm::vec3 ceils = glm::ceil(relative); @@ -2439,7 +2439,7 @@ QRgb Heightfield::getColor(const glm::vec3& point) { return qRgb(interpolatedColor.r, interpolatedColor.g, interpolatedColor.b); } -int Heightfield::getMaterial(const glm::vec3& point) { +int Heightfield::getMaterialAt(const glm::vec3& point) { glm::vec3 relative = (point - getBounds().minimum) / _increment; const uchar* src = (const uchar*)_material.constData(); return src[(int)glm::round(relative.z) * _width + (int)glm::round(relative.x)]; diff --git a/libraries/metavoxels/src/MetavoxelData.h b/libraries/metavoxels/src/MetavoxelData.h index 4866331e26..8a240b9d7b 100644 --- a/libraries/metavoxels/src/MetavoxelData.h +++ b/libraries/metavoxels/src/MetavoxelData.h @@ -654,10 +654,10 @@ public: virtual bool contains(const glm::vec3& point); /// Retrieves the color at the specified point. - virtual QRgb getColor(const glm::vec3& point); + virtual QRgb getColorAt(const glm::vec3& point); /// Retrieves the material at the specified point. - virtual int getMaterial(const glm::vec3& point); + virtual int getMaterialAt(const glm::vec3& point); /// Retrieves a reference to the list of materials. virtual QVector& getMaterials(); @@ -878,8 +878,8 @@ public: virtual bool hasOwnColors() const; virtual bool hasOwnMaterials() const; - virtual QRgb getColor(const glm::vec3& point); - virtual int getMaterial(const glm::vec3& point); + virtual QRgb getColorAt(const glm::vec3& point); + virtual int getMaterialAt(const glm::vec3& point); virtual QVector& getMaterials(); virtual bool contains(const glm::vec3& point); diff --git a/libraries/metavoxels/src/MetavoxelMessages.cpp b/libraries/metavoxels/src/MetavoxelMessages.cpp index 0106636732..17379a930f 100644 --- a/libraries/metavoxels/src/MetavoxelMessages.cpp +++ b/libraries/metavoxels/src/MetavoxelMessages.cpp @@ -714,7 +714,7 @@ int VoxelMaterialSpannerEditVisitor::visit(MetavoxelInfo& info) { position.x = info.minimum.x + minX * step; for (QRgb* destX = destY, *endX = destX + sizeX; destX != endX; destX++, position.x += step) { if (_spanner->contains(position)) { - *destX = _spanner->getColor(position); + *destX = _spanner->getColorAt(position); } } } @@ -856,7 +856,7 @@ int VoxelMaterialSpannerEditVisitor::visit(MetavoxelInfo& info) { position.x = info.minimum.x + minX * step; for (uchar* destX = destY, *endX = destX + sizeX; destX != endX; destX++, position.x += step) { if (_spanner->contains(position)) { - int material = _spanner->getMaterial(position); + int material = _spanner->getMaterialAt(position); if (material != 0) { int& mapping = materialMap[material]; if (mapping == 0) {