Browse Source

Inlined functions.

pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
10b8eda20a
  1. 4
      src/CubeMapTexture.h
  2. 6
      src/Trade/ImageData.h

4
src/CubeMapTexture.h

@ -102,12 +102,12 @@ class CubeMapTexture: public Texture2D {
}
private:
void setData(Coordinate coordinate, GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, Type type, const void* data) {
inline void setData(Coordinate coordinate, GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, Type type, const void* data) {
bind();
DataHelper<Dimensions>::set(static_cast<Target>(coordinate), mipLevel, internalFormat, _dimensions, colorFormat, type, data);
}
void setSubData(Coordinate coordinate, GLint mipLevel, const Math::Vector<GLint, Dimensions>& offset, const Math::Vector<GLsizei, Dimensions>& dimensions, ColorFormat colorFormat, Type type, const void* data) {
inline void setSubData(Coordinate coordinate, GLint mipLevel, const Math::Vector<GLint, Dimensions>& offset, const Math::Vector<GLsizei, Dimensions>& dimensions, ColorFormat colorFormat, Type type, const void* data) {
bind();
DataHelper<Dimensions>::setSub(static_cast<Target>(coordinate), mipLevel, offset, dimensions, colorFormat, type, data);
}

6
src/Trade/ImageData.h

@ -48,10 +48,10 @@ template<size_t imageDimensions> class ImageData {
* @attention Note that the image data are not copied on construction,
* but they are deleted on class destruction.
*/
template<class T> ImageData(const Math::Vector<GLsizei, Dimensions>& dimensions, AbstractTexture::ColorFormat colorFormat, const T* data): _dimensions(dimensions), _colorFormat(colorFormat), _type(TypeTraits<typename TypeTraits<T>::TextureType>::glType()), _data(reinterpret_cast<const char*>(data)) {}
template<class T> inline ImageData(const Math::Vector<GLsizei, Dimensions>& dimensions, AbstractTexture::ColorFormat colorFormat, const T* data): _dimensions(dimensions), _colorFormat(colorFormat), _type(TypeTraits<typename TypeTraits<T>::TextureType>::glType()), _data(reinterpret_cast<const char*>(data)) {}
/** @brief Destructor */
virtual ~ImageData() { delete[] _data; }
inline virtual ~ImageData() { delete[] _data; }
/** @brief %Image dimensions */
inline const Math::Vector<GLsizei, Dimensions>& dimensions() const { return _dimensions; }
@ -60,7 +60,7 @@ template<size_t imageDimensions> class ImageData {
inline AbstractTexture::ColorFormat colorFormat() const { return _colorFormat; }
/** @brief Data type */
Type type() const { return _type; }
inline Type type() const { return _type; }
/** @brief Pointer to raw data */
inline const void* data() const { return _data; }

Loading…
Cancel
Save