ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Added convenience functions for feeding Textures with Images.

vectorfields
Vladimír Vondruš 15 years ago
parent
40441b39e2
commit
d6b4cbb466
2 changed files with 152 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 142
      src/CubeMapTexture.h
  2. 24
      src/Texture.h

142
src/CubeMapTexture.h
Unescape View File

@ -55,120 +55,234 @@ class CubeMapTexture: public Texture2D {
inline CubeMapTexture(GLint layer = 0): Texture2D(layer, GL_TEXTURE_CUBE_MAP) {}
protected:
/** @brief Deleted. Use setDataPositiveX() and others instead. */
/** @brief Deleted. Use @ref setDataPositiveX(GLint, InternalFormat, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*) "setDataPositiveX()" and others instead. */
template<class T> inline void setData(GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) = delete;
/** @brief Deleted. Use setSubDataPositiveX() and others instead. */
/** @brief Deleted. Use @ref setDataPositiveX(GLint, InternalFormat, const Image<Dimensions>*) "setDataPositiveX()" and others instead. */
void setData(GLint mipLevel, InternalFormat internalFormat, const Image<Dimensions>* image) = delete;
/** @brief Deleted. Use @ref setSubDataPositiveX(GLint, const Math::Vector<GLsizei, Dimensions>&, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*) "setSubDataPositiveX()" and others instead. */
template<class T> inline void setSubData(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) = delete;
/** @brief Deleted. Use @ref setSubDataPositiveX(GLint, const Math::Vector<GLsizei, Dimensions>&, const Image<Dimensions>*) "setSubDataPositiveX()" and others instead. */
void setSubData(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Image<Dimensions>* image) = delete;
/**
* @brief Set texture data for positive X
*
* @copydetails Texture::setData()
* @copydetails Texture::setData(GLint, InternalFormat, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setDataPositiveX(GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setData(GL_TEXTURE_CUBE_MAP_POSITIVE_X, mipLevel, internalFormat, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture data for positive X
*
* @copydetails Texture::setData(GLint, InternalFormat, const Image<Dimensions>*)
*/
inline void setDataPositiveX(GLint mipLevel, InternalFormat internalFormat, const Image<Dimensions>* image) {
setData(GL_TEXTURE_CUBE_MAP_POSITIVE_X, mipLevel, internalFormat, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture subdata for positive X
*
* @copydetails Texture::setSubData()
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setSubDataPositiveX(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setSubData(GL_TEXTURE_CUBE_MAP_POSITIVE_X, mipLevel, offset, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture subdata for positive X
*
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Image<Dimensions>*)
*/
inline void setSubDataPositiveX(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Image<Dimensions>* image) {
setSubData(GL_TEXTURE_CUBE_MAP_POSITIVE_X, mipLevel, offset, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture data for negative X
*
* @copydetails Texture::setData()
* @copydetails Texture::setData(GLint, InternalFormat, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setDataNegativeX(GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setData(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, mipLevel, internalFormat, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture data for negative X
*
* @copydetails Texture::setData(GLint, InternalFormat, const Image<Dimensions>*)
*/
inline void setDataNegativeX(GLint mipLevel, InternalFormat internalFormat, const Image<Dimensions>* image) {
setData(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, mipLevel, internalFormat, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture subdata for negative X
*
* @copydetails Texture::setSubData()
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setSubDataNegativeX(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setSubData(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, mipLevel, offset, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture subdata for negative X
*
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Image<Dimensions>*)
*/
inline void setSubDataNegativeX(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Image<Dimensions>* image) {
setSubData(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, mipLevel, offset, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture data for positive Y
*
* @copydetails Texture::setData()
* @copydetails Texture::setData(GLint, InternalFormat, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setDataPositiveY(GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setData(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, mipLevel, internalFormat, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture data for positive Y
*
* @copydetails Texture::setData(GLint, InternalFormat, const Image<Dimensions>*)
*/
inline void setDataPositiveY(GLint mipLevel, InternalFormat internalFormat, const Image<Dimensions>* image) {
setData(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, mipLevel, internalFormat, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture subdata for positive Y
*
* @copydetails Texture::setSubData()
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setSubDataPositiveY(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setSubData(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, mipLevel, offset, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture subdata for positive Y
*
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Image<Dimensions>*)
*/
inline void setSubDataPositiveY(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Image<Dimensions>* image) {
setSubData(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, mipLevel, offset, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture data for negative Y
*
* @copydetails Texture::setData()
* @copydetails Texture::setData(GLint, InternalFormat, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setDataNegativeY(GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setData(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, mipLevel, internalFormat, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture data for negative Y
*
* @copydetails Texture::setData(GLint, InternalFormat, const Image<Dimensions>*)
*/
inline void setDataNegativeY(GLint mipLevel, InternalFormat internalFormat, const Image<Dimensions>* image) {
setData(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, mipLevel, internalFormat, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture subdata for negative Y
*
* @copydetails Texture::setSubData()
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setSubDataNegativeY(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setSubData(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, mipLevel, offset, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture subdata for negative Y
*
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Image<Dimensions>*)
*/
inline void setSubDataNegativeY(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Image<Dimensions>* image) {
setSubData(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, mipLevel, offset, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture data for positive Z
*
* @copydetails Texture::setData()
* @copydetails Texture::setData(GLint, InternalFormat, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setDataPositiveZ(GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setData(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, mipLevel, internalFormat, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture data for positive Z
*
* @copydetails Texture::setData(GLint, InternalFormat, const Image<Dimensions>*)
*/
inline void setDataPositiveZ(GLint mipLevel, InternalFormat internalFormat, const Image<Dimensions>* image) {
setData(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, mipLevel, internalFormat, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture subdata for positive Z
*
* @copydetails Texture::setSubData()
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setSubDataPositiveZ(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setSubData(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, mipLevel, offset, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture subdata for positive Z
*
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Image<Dimensions>*)
*/
inline void setSubDataPositiveZ(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Image<Dimensions>* image) {
setSubData(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, mipLevel, offset, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture data for negative Z
*
* @copydetails Texture::setData()
* @copydetails Texture::setData(GLint, InternalFormat, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setDataNegativeZ(GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setData(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, mipLevel, internalFormat, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture data for negative Z
*
* @copydetails Texture::setData(GLint, InternalFormat, const Image<Dimensions>*)
*/
inline void setDataNegativeZ(GLint mipLevel, InternalFormat internalFormat, const Image<Dimensions>* image) {
setData(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, mipLevel, internalFormat, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
/**
* @brief Set texture subdata for negative Z
*
* @copydetails Texture::setSubData()
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*)
*/
template<class T> inline void setSubDataNegativeZ(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) {
setSubData(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, mipLevel, offset, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
}
/**
* @brief Set texture subdata for negative Z
*
* @copydetails Texture::setSubData(GLint, const Math::Vector<GLsizei, Dimensions>&, const Image<Dimensions>*)
*/
inline void setSubDataNegativeZ(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Image<Dimensions>* image) {
setSubData(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, mipLevel, offset, image->dimensions(), image->colorFormat(), image->type(), image->data());
}
private:
void setData(GLenum target, GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, GLenum type, const void* data) {
bind();

24
src/Texture.h
Unescape View File

@ -91,6 +91,18 @@ template<size_t dimensions> class Texture: public AbstractTexture {
unbind();
}
/**
* @brief Set texture data
* @param mipLevel Mip level
* @param internalFormat Internal texture format
* @param image Image
*/
inline void setData(GLint mipLevel, InternalFormat internalFormat, const Image<Dimensions>* image) {
bind();
DataHelper<dimensions>::set(target, mipLevel, internalFormat, image->dimensions(), image->colorFormat(), image->type(), image->data());
unbind();
}
/**
* @brief Set texture subdata
* @param mipLevel Mip level
@ -105,6 +117,18 @@ template<size_t dimensions> class Texture: public AbstractTexture {
DataHelper<dimensions>::setSub(target, mipLevel, offset, _dimensions, colorFormat, TypeTraits<typename TypeTraits<T>::TextureType>::glType(), data);
unbind();
}
/**
* @brief Set texture subdata
* @param mipLevel Mip level
* @param offset Offset where to put data in the texture
* @param image Image
*/
inline void setSubData(GLint mipLevel, const Math::Vector<GLsizei, Dimensions>& offset, const Image<Dimensions>* image) {
bind();
DataHelper<dimensions>::setSub(target, mipLevel, offset, image->dimensions(), image->colorFormat(), image->type(), image->data());
unbind();
}
};
/** @brief One-dimensional texture */

Write Preview
Loading…
Cancel
Save