claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated glm and gli to recent versions (Fixes #267)

Browse source
This commit is contained in:
saschawillems 2017-01-21 21:30:08 +01:00
parent 509bbf9a03
commit ed8e8410b3
387 changed files with 28558 additions and 31255 deletions
Download patch file Download diff file Expand all files Collapse all files

86
external/gli/gli/texture2d.hpp vendored
View file

@ -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 2d textures.
/// @file gli/texture2d.hpp
/// @date 2010-01-09 / 2015-08-29
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////
#pragma once
@ -33,56 +8,59 @@
namespace gli
{
/// texture2D
class texture2D : public texture
/// 2d texture
class texture2d : public texture
{
public:
typedef dim2_t dim_type;
typedef vec2 texcoord_type;
typedef extent2d extent_type;
public:
/// Create an empty texture 2D.
texture2D();
texture2d();
/// Create a texture2D and allocate a new storage.
explicit texture2D(
/// Create a texture2d and allocate a new storage_linear.
texture2d(
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 texture2D and allocate a new storage with a complete mipmap chain.
explicit texture2D(
/// Create a texture2d and allocate a new storage_linear with a complete mipmap chain.
texture2d(
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 texture2D view with an existing storage.
explicit texture2D(
texture const & Texture);
/// Create a texture2d view with an existing storage_linear.
explicit texture2d(
texture const& Texture);
/// Create a texture2D view with an existing storage.
explicit texture2D(
texture const & Texture,
/// Create a texture2d view with an existing storage_linear.
texture2d(
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 texture2D view, reference a subset of an existing texture2D instance.
explicit texture2D(
texture2D const & Texture,
/// Create a texture2d view, reference a subset of an existing texture2d instance.
texture2d(
texture2d 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 and height.
dim_type dimensions() const;
extent_type extent(size_type Level = 0) const;
template <typename genType>
genType fetch(texture2D::dim_type const & TexelCoord, texture2D::size_type Level);
/// 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;
template <typename genType>
void write(texture2D::dim_type const & TexelCoord, texture2D::size_type Level, genType const & Color);
/// 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