Updated glm and gli to recent versions (Fixes #267)
This commit is contained in:
parent
509bbf9a03
commit
ed8e8410b3
387 changed files with 28558 additions and 31255 deletions
81
external/gli/gli/texture3d.hpp
vendored
81
external/gli/gli/texture3d.hpp
vendored
|
|
@ -1,30 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////////////
|
||||
/// OpenGL Image (gli.g-truc.net)
|
||||
///
|
||||
/// Copyright (c) 2008 - 2015 G-Truc Creation (www.g-truc.net)
|
||||
/// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
/// of this software and associated documentation files (the "Software"), to deal
|
||||
/// in the Software without restriction, including without limitation the rights
|
||||
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
/// copies of the Software, and to permit persons to whom the Software is
|
||||
/// furnished to do so, subject to the following conditions:
|
||||
///
|
||||
/// The above copyright notice and this permission notice shall be included in
|
||||
/// all copies or substantial portions of the Software.
|
||||
///
|
||||
/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
/// THE SOFTWARE.
|
||||
///
|
||||
/// @ref core
|
||||
/// @brief Include to use 3d textures.
|
||||
/// @file gli/texture3d.hpp
|
||||
/// @date 2010-01-09 / 2013-01-11
|
||||
/// @author Christophe Riccio
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#pragma once
|
||||
|
||||
|
|
@ -33,50 +8,60 @@
|
|||
|
||||
namespace gli
|
||||
{
|
||||
/// texture3D
|
||||
class texture3D : public texture
|
||||
/// 3d texture
|
||||
class texture3d : public texture
|
||||
{
|
||||
public:
|
||||
typedef dim3_t dim_type;
|
||||
typedef vec3 texcoord_type;
|
||||
typedef extent3d extent_type;
|
||||
|
||||
public:
|
||||
/// Create an empty texture 3D
|
||||
texture3D();
|
||||
texture3d();
|
||||
|
||||
/// Create a texture3D and allocate a new storage
|
||||
explicit texture3D(
|
||||
/// Create a texture3d and allocate a new storage_linear
|
||||
texture3d(
|
||||
format_type Format,
|
||||
dim_type const & Dimensions,
|
||||
size_type Levels);
|
||||
extent_type const& Extent,
|
||||
size_type Levels,
|
||||
swizzles_type const& Swizzles = swizzles_type(SWIZZLE_RED, SWIZZLE_GREEN, SWIZZLE_BLUE, SWIZZLE_ALPHA));
|
||||
|
||||
/// Create a texture3D and allocate a new storage with a complete mipmap chain
|
||||
explicit texture3D(
|
||||
/// Create a texture3d and allocate a new storage_linear with a complete mipmap chain
|
||||
texture3d(
|
||||
format_type Format,
|
||||
dim_type const & Dimensions);
|
||||
extent_type const& Extent,
|
||||
swizzles_type const& Swizzles = swizzles_type(SWIZZLE_RED, SWIZZLE_GREEN, SWIZZLE_BLUE, SWIZZLE_ALPHA));
|
||||
|
||||
/// Create a texture3D view with an existing storage
|
||||
explicit texture3D(
|
||||
/// Create a texture3d view with an existing storage_linear
|
||||
explicit texture3d(
|
||||
texture const & Texture);
|
||||
|
||||
/// Create a texture3D view with an existing storage
|
||||
explicit texture3D(
|
||||
texture const & Texture,
|
||||
/// Create a texture3d view with an existing storage_linear
|
||||
texture3d(
|
||||
texture const& Texture,
|
||||
format_type Format,
|
||||
size_type BaseLayer, size_type MaxLayer,
|
||||
size_type BaseFace, size_type MaxFace,
|
||||
size_type BaseLevel, size_type MaxLevel);
|
||||
size_type BaseLevel, size_type MaxLevel,
|
||||
swizzles_type const& Swizzles = swizzles_type(SWIZZLE_RED, SWIZZLE_GREEN, SWIZZLE_BLUE, SWIZZLE_ALPHA));
|
||||
|
||||
/// Create a texture3D view, reference a subset of an existing texture3D instance
|
||||
explicit texture3D(
|
||||
texture3D const & Texture,
|
||||
/// Create a texture3d view, reference a subset of an existing texture3d instance
|
||||
texture3d(
|
||||
texture3d const & Texture,
|
||||
size_type BaseLevel, size_type MaxLevel);
|
||||
|
||||
/// Create a view of the image identified by Level in the mipmap chain of the texture
|
||||
image operator[](size_type Level) const;
|
||||
|
||||
/// Return the dimensions of a texture instance: width, height and depth
|
||||
dim_type dimensions() const;
|
||||
extent_type extent(size_type Level = 0) const;
|
||||
|
||||
/// Fetch a texel from a texture. The texture format must be uncompressed.
|
||||
template <typename gen_type>
|
||||
gen_type load(extent_type const& TexelCoord, size_type Level) const;
|
||||
|
||||
/// Write a texel to a texture. The texture format must be uncompressed.
|
||||
template <typename gen_type>
|
||||
void store(extent_type const& TexelCoord, size_type Level, gen_type const& Texel);
|
||||
};
|
||||
}//namespace gli
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue