Browse Source

Removed deprecated *Mesh::set*{Range,Count}() functions.

pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
fa0e518185
  1. 33
      src/Magnum/Mesh.h
  2. 42
      src/Magnum/MeshView.h

33
src/Magnum/Mesh.h

@ -616,39 +616,6 @@ class MAGNUM_EXPORT Mesh: public AbstractObject {
return *this;
}
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @copybrief count()
* @deprecated Use @ref count() instead.
*/
CORRADE_DEPRECATED("use count() instead") Int vertexCount() const {
return isIndexed() ? 0 : count();
}
/**
* @copybrief setCount()
* @deprecated Use @ref setCount() instead.
*/
CORRADE_DEPRECATED("use setCount() instead") Mesh& setVertexCount(Int count) {
if(!isIndexed()) setCount(count);
return *this;
}
/**
* @copybrief count()
* @deprecated Use @ref count() instead.
*/
CORRADE_DEPRECATED("use count() instead") Int indexCount() const {
return count();
}
/**
* @copybrief setCount()
* @deprecated Use @ref setCount() instead.
*/
CORRADE_DEPRECATED("use setCount() instead") Mesh& setIndexCount(Int count) { return setCount(count); }
#endif
/** @brief Instance count */
Int instanceCount() const { return _instanceCount; }

42
src/Magnum/MeshView.h

@ -136,19 +136,6 @@ class MAGNUM_EXPORT MeshView {
return *this;
}
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @brief Set vertex range
* @param first First vertex
* @param count Vertex count
*
* @deprecated Use @ref setCount() and @ref setBaseVertex() instead.
*/
CORRADE_DEPRECATED("use setCount() and setBaseVertex() instead") MeshView& setVertexRange(Int first, Int count) {
return setCount(count), setBaseVertex(first);
}
#endif
/**
* @brief Set index range
* @param first First vertex
@ -166,22 +153,6 @@ class MAGNUM_EXPORT MeshView {
/* MinGW/MSVC needs inline also here to avoid linkage conflicts */
inline MeshView& setIndexRange(Int first, UnsignedInt start, UnsignedInt end);
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @brief Set index range
* @param first First index
* @param count Index count
* @param start Minimum array index contained in the buffer
* @param end Maximum array index contained in the buffer
*
* @deprecated Use @ref setCount() and
* @ref setIndexRange(Int, UnsignedInt, UnsignedInt) instead.
*/
CORRADE_DEPRECATED("use setCount() and setIndexRange(Int, UnsignedInt, UnsignedInt) instead") MeshView& setIndexRange(Int first, Int count, UnsignedInt start, UnsignedInt end) {
return setCount(count), setIndexRange(first, start, end);
}
#endif
/**
* @brief Set index range
* @param first First index
@ -193,19 +164,6 @@ class MAGNUM_EXPORT MeshView {
*/
MeshView& setIndexRange(Int first);
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @brief Set index range
* @param first First index
* @param count Index count
*
* @deprecated Use @ref setCount() and @ref setIndexRange(Int) instead.
*/
CORRADE_DEPRECATED("use setCount() and setIndexRange(Int) instead") MeshView& setIndexRange(Int first, Int count) {
return setCount(count), setIndexRange(first);
}
#endif
/** @brief Instance count */
Int instanceCount() const { return _instanceCount; }

Loading…
Cancel
Save