diff --git a/include/PolyVox/PagedVolume.h b/include/PolyVox/PagedVolume.h index 39f6d115..38f19b3a 100644 --- a/include/PolyVox/PagedVolume.h +++ b/include/PolyVox/PagedVolume.h @@ -197,8 +197,6 @@ namespace PolyVox Sampler(PagedVolume* volume); ~Sampler(); - /// \deprecated - POLYVOX_DEPRECATED VoxelType getSubSampledVoxel(uint8_t uLevel) const; inline VoxelType getVoxel(void) const; void setPosition(const Vector3DInt32& v3dNewPos); diff --git a/include/PolyVox/PagedVolumeSampler.inl b/include/PolyVox/PagedVolumeSampler.inl index 511f37d3..cbe899a0 100644 --- a/include/PolyVox/PagedVolumeSampler.inl +++ b/include/PolyVox/PagedVolumeSampler.inl @@ -56,44 +56,6 @@ namespace PolyVox { } - template - VoxelType PagedVolume::Sampler::getSubSampledVoxel(uint8_t uLevel) const - { - if(uLevel == 0) - { - return getVoxel(); - } - else if(uLevel == 1) - { - VoxelType tValue = getVoxel(); - tValue = (std::min)(tValue, peekVoxel1px0py0pz()); - tValue = (std::min)(tValue, peekVoxel0px1py0pz()); - tValue = (std::min)(tValue, peekVoxel1px1py0pz()); - tValue = (std::min)(tValue, peekVoxel0px0py1pz()); - tValue = (std::min)(tValue, peekVoxel1px0py1pz()); - tValue = (std::min)(tValue, peekVoxel0px1py1pz()); - tValue = (std::min)(tValue, peekVoxel1px1py1pz()); - return tValue; - } - else - { - const uint8_t uSize = 1 << uLevel; - - VoxelType tValue = (std::numeric_limits::max)(); - for(uint8_t z = 0; z < uSize; ++z) - { - for(uint8_t y = 0; y < uSize; ++y) - { - for(uint8_t x = 0; x < uSize; ++x) - { - tValue = (std::min)(tValue, this->mVolume->getVoxel(this->mXPosInVolume + x, this->mYPosInVolume + y, this->mZPosInVolume + z)); - } - } - } - return tValue; - } - } - template VoxelType PagedVolume::Sampler::getVoxel(void) const { diff --git a/include/PolyVox/Vector.h b/include/PolyVox/Vector.h index 63a76472..2182e049 100644 --- a/include/PolyVox/Vector.h +++ b/include/PolyVox/Vector.h @@ -91,8 +91,6 @@ namespace PolyVox bool operator==(const Vector& rhs) const; /// Inequality Operator. bool operator!=(const Vector& rhs) const; - /// Comparison Operator. - POLYVOX_DEPRECATED bool operator<(const Vector& rhs) const; /// Addition and Assignment Operator. Vector& operator+=(const Vector &rhs); /// Subtraction and Assignment Operator. diff --git a/include/PolyVox/Vector.inl b/include/PolyVox/Vector.inl index 562c0fca..2dd1b85a 100644 --- a/include/PolyVox/Vector.inl +++ b/include/PolyVox/Vector.inl @@ -183,29 +183,7 @@ namespace PolyVox inline bool Vector::operator!=(const Vector &rhs) const { return !(*this == rhs); //Just call equality operator and invert the result. - } - - /** - * Checks whether this vector is less than the parameter. The metric is - * meaningless but it allows Vectors to me used as key in sdt::map, etc. - * This function is deprecated. You should specify a seperate comparator to the std:map if you need one. - * \param rhs The Vector to compare to. - * \return true if this is less than the parameter - * \see operator!= - * \deprecated - */ - template - inline bool Vector::operator<(const Vector &rhs) const - { - for(uint32_t ct = 0; ct < Size; ++ct) - { - if (m_tElements[ct] < rhs.m_tElements[ct]) - return true; - if (rhs.m_tElements[ct] < m_tElements[ct]) - return false; - } - return false; - } + } /** * Addition operator adds corresponding elements of the two Vectors. diff --git a/tests/TestVolumeSubclass.cpp b/tests/TestVolumeSubclass.cpp index 0cccb3a2..a26a77a7 100644 --- a/tests/TestVolumeSubclass.cpp +++ b/tests/TestVolumeSubclass.cpp @@ -114,9 +114,6 @@ public: /// Calculates approximatly how many bytes of memory the volume is currently using. uint32_t calculateSizeInBytes(void) { return 0; } - /// Deprecated - I don't think we should expose this function? Let us know if you disagree... - //void resize(const Region& regValidRegion); - private: Array<3, VoxelType> mVolumeData; };