ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
7902 Commits
21 Branches
19 Tags
70 MiB
Tree: 511d0c1b27
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '511d0c1b27'
${ noResults }
magnum/src/Magnum/Shaders/Generic.h

499 lines
15 KiB
Raw Normal View History Unescape

Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
#ifndef Magnum_Shaders_GenericShader_h
#define Magnum_Shaders_GenericShader_h
/*
This file is part of Magnum.
Updated copyright year.
7 years ago
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Happy new year too.
12 years ago
Vladimír Vondruš <mosra@centrum.cz>
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
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.
*/
/** @file
* @brief Struct @ref Magnum::Shaders::Generic, typedef @ref Magnum::Shaders::Generic2D, @ref Magnum::Shaders::Generic3D
*/
Split the OpenGL layer out, pt 20: adapted Shaders.
8 years ago
#include "Magnum/GL/Attribute.h"
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
Shaders: fix missing include.
7 years ago
#ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h>
#endif
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
namespace Magnum { namespace Shaders {
/**
Shaders: removed autolink-preventing % noise.
12 years ago
@brief Generic shader definition
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
Shaders: define reasonable uniform defaults for all shaders. Plus a bit of cleanup / fixing broken English.
8 years ago
Definitions common for majority of shaders in the @ref Shaders namespace,
Shaders: support object ID output in Flat and Phong.
7 years ago
allowing mesh or a framebuffer configured for a generic shader to be used with
any of them. See @ref shaders-generic for more information.
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
@section Shaders-Generic-allocation Attribute allocation
The attribute locations are allocated like shown below, with various tradeoffs
as GPUs commonly support only 16 attribtes at most, while the mandated minimum
on OpenGL ES2 and WebGL 1 being only 8. Some locations are only reserved for
future use, with no attribute definition implemented yet.
@m_class{m-row m-container-inflate}
@parblock
@m_class{m-fullwidth}
<table>
<tr>
<th>\#</th>
<th>Attribute</th>
<th>Alternative</th>
<th>Alternative 2</th>
</tr>
<tr>
<td>0</td>
<td colspan="3">
@ref Position
</td>
</tr>
<tr>
<td>1</td>
<td colspan="3">
@ref TextureCoordinates
* *Reserved* --- third component for a layer
</td>
</tr>
<tr>
<td>2</td>
<td colspan="3">
@ref Color3 / @ref Color4 (per-vertex or instanced)
</td>
</tr>
<tr>
<td>3</td>
<td>
@ref Tangent / @ref Tangent4
</td>
<td>
@ref Tangent
</td>
<td>
* *Reserved* --- TBN as a @ref Magnum::Quaternion "Quaternion"
</td>
</tr>
<tr>
<td>4</td>
<td>
@ref ObjectId (instanced)
* *Reserved* --- additional components could \n
represent material ID and other indices, which \n
could then be used to fetch additional \n
per-instance properties that wouldn't fit into \n
vertex attributes.
</td>
<td colspan="2">
@ref Bitangent
Provided only as a convenience for models that \n
don't encode bitangent orientation in the last \n
component of @ref Tangent4. If a model needs \n
both bitangents and object ID for instancing, \n
@ref Tangent4 has to be used.
</td>
</tr>
<tr>
<td>5</td>
<td colspan="3">
@ref Normal
</td>
</tr>
<tr>
<td>6</td>
<td colspan="3">
* *Reserved* --- vertex weights
</td>
</tr>
<tr>
<td>7</td>
<td colspan="3">
* *Reserved* --- bone indices
</td>
</tr>
<tr>
<td>8</td>
<td rowspan="4">
@ref TransformationMatrix (instanced)
</td>
<td rowspan="2" colspan="2">
* *Reserved* --- instanced @ref Magnum::DualQuaternion "DualQuaternion" \n transformation for positions and normals
</td>
</tr>
<tr>
<td>9</td>
</tr>
<tr>
<td>10</td>
<td colspan="2">
* *Reserved* --- 2nd vertex weights
</td>
</tr>
<tr>
<td>11</td>
<td colspan="2">
* *Reserved* --- 2nd bone indices
</td>
</tr>
<tr>
<td>12</td>
<td rowspan="3">
@ref NormalMatrix (instanced)
</td>
<td colspan="2">
* *Reserved* --- instanced scale for positions
</td>
</tr>
<tr>
<td>13</td>
<td rowspan="2">
* *Reserved* --- instanced texture \n
rotation and scale
</td>
<td>
* *Reserved* --- 2nd vertex colors
</td>
</tr>
<tr>
<td>14</td>
<td>
* *Reserved* --- 3rd texture coords
</td>
</tr>
<tr>
<td>15</td>
<td>
@ref TextureOffset (instanced)
* *Reserved* --- third component for a layer
</td>
<td>
* *Reserved* --- a single component \n
representing instanced texture layer \n
index, UVs being the same always
</td>
<td>
* *Reserved* --- 2nd texture coords
</td>
</tr>
</table>
@endparblock
The three alternative allocations can be mixed freely as long as the locations
don't conflict --- so it's possible to have for example a mesh with two sets of
texture coordinates, weights and colors, as each of those occupies a different
attribute range; but instancing then has to be done using smaller types as full
matrices would occupy the locations used by the secondary sets. Additional
guarantees of the above:
- @ref Tangent, @ref Bitangent and @ref Normal is in consecutive locations to
allow those being passed as a single TBN @ref Magnum::Matrix3x3 "Matrix3x3"
attribute as well.
- @ref Normal and TBN represented as a quaternion use different locations in
order to allow a mesh to contain both
- Similarly, texture rotation/scale and offset is in consecutive locations to
allow passing a single @ref Matrix3 attribute there.
- Tnstanced texture transformation is available if and only if there's
exactly one set of texture coordinates (as the additional sets would need
additional transformations as well).
Note that while custom shaders don't have to follow the above, it's recommended
to so. If the custom shader diverges from predefined locations of common
attributes, meshes configured for the builtin shaders (for example with
@ref MeshTools::compile()) won't work with it and the mesh attribute
configuration has to be done manually.
Shaders: there's never enough documentation. Each shader now has sample image, example mesh configuration and example rendering setup. Also properly documented all attribute types and made introductory chapter for whole Shaders namespace.
11 years ago
@see @ref shaders, @ref Generic2D, @ref Generic3D
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
*/
#ifndef DOXYGEN_GENERATING_OUTPUT
template<UnsignedInt> struct Generic;
#else
template<UnsignedInt dimensions> struct Generic {
Shaders: have a definition for the generic color attribute.
7 years ago
/* Keep consistent with generic.glsl and the real definitions below */
Shaders: support object ID output in Flat and Phong.
7 years ago
enum: UnsignedInt {
/**
* Color shader output. Present always, expects three- or
* four-component floating-point or normalized buffer attachment.
*/
ColorOutput = 0,
#ifndef MAGNUM_TARGET_GLES2
/**
* Object ID shader output. Expects a single-component unsigned
* integral attachment.
* @requires_gles30 Object ID output requires integer buffer
* attachments, which are not available in OpenGL ES 2.0 or
* WebGL 1.0.
*/
ObjectIdOutput = 1
#endif
};
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
/**
* @brief Vertex position
*
Doxygen. Doxygen IS BROKEN BEYOND REPAIR. I introduced *strong* enum with values, in a subnamespace, that have the same name as completely unrelated typedefs. Guess what?! It breaks ALL LINKS TO THOSE TYPEDEFS! **EVERYWHERE!!!**
8 years ago
* @ref Magnum::Vector2 "Vector2" in 2D and @ref Magnum::Vector3 "Vector3"
Trade: a reworked MeshData class. With API analogous to the (relatively) new AnimationData -- with one buffer containing all index data and one buffer containing all vertex data, both meant to be uploaded as-is to the GPU. This will eventually replace MeshData2D and MeshData3D, backwards compatibility and wiring up to other APIs will be done in follow-up commits.
7 years ago
* in 3D. Corresponds to @ref Trade::MeshAttribute::Position.
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
*/
Split the OpenGL layer out, pt 20: adapted Shaders.
8 years ago
typedef GL::Attribute<0, T> Position;
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
Shaders: there's never enough documentation. Each shader now has sample image, example mesh configuration and example rendering setup. Also properly documented all attribute types and made introductory chapter for whole Shaders namespace.
11 years ago
/**
* @brief 2D texture coordinates
*
Trade: a reworked MeshData class. With API analogous to the (relatively) new AnimationData -- with one buffer containing all index data and one buffer containing all vertex data, both meant to be uploaded as-is to the GPU. This will eventually replace MeshData2D and MeshData3D, backwards compatibility and wiring up to other APIs will be done in follow-up commits.
7 years ago
* @ref Magnum::Vector2 "Vector2". Corresponds to
* @ref Trade::MeshAttribute::TextureCoordinates.
Shaders: there's never enough documentation. Each shader now has sample image, example mesh configuration and example rendering setup. Also properly documented all attribute types and made introductory chapter for whole Shaders namespace.
11 years ago
*/
Split the OpenGL layer out, pt 20: adapted Shaders.
8 years ago
typedef GL::Attribute<1, Vector2> TextureCoordinates;
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
/**
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
* @brief Three-component vertex color
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
*
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
* @ref Magnum::Color3. Use either this or the @ref Color4 attribute.
* Corresponds to @ref Trade::MeshAttribute::Color.
*/
typedef GL::Attribute<2, Magnum::Color3> Color3;
/**
* @brief Four-component vertex color
*
* @ref Magnum::Color4. Use either this or the @ref Color3 attribute.
* Corresponds to @ref Trade::MeshAttribute::Color.
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
*/
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
typedef GL::Attribute<2, Magnum::Color4> Color4;
Shaders: make VertexColor generic attribute.
11 years ago
Shaders: added Tangent generic vertex attribute.
7 years ago
/**
* @brief Vertex tangent
doc: label deprecated APIs and stuff new since 2019.10 with version info. Should make new things more discoverable, avoid confusion when a documented API isn't there and reduce the need for maintaining multiple separate versions of the docs.
7 years ago
* @m_since{2019,10}
Shaders: added Tangent generic vertex attribute.
7 years ago
*
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
* @ref Magnum::Vector3 "Vector3", defined only in 3D. Use either this or
* the @ref Tangent4 attribute. Corresponds to
* @ref Trade::MeshAttribute::Tangent.
Shaders: added Tangent generic vertex attribute.
7 years ago
*/
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
typedef GL::Attribute<3, Vector3> Tangent;
Shaders: added Tangent generic vertex attribute.
7 years ago
Shaders: make VertexColor generic attribute.
11 years ago
/**
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
* @brief Vertex tangent with a bitangent sign
* @m_since_latest
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
*
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
* @ref Magnum::Vector4 "Vector4", defined only in 3D. The last component
* is a sign value (@cpp -1.0f @ce or @cpp +1.0f @ce) defining handedness
* of the tangent basis. Reconstructing the @ref Bitangent attribute can be
* then done like this:
*
* @snippet MagnumTrade.cpp MeshAttribute-bitangent-from-tangent
*
* Use either this or the @ref Tangent attribute. Corresponds to
* @ref Trade::MeshAttribute::Tangent.
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
*/
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
typedef GL::Attribute<3, Vector4> Tangent4;
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
/**
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
* @brief Vertex bitangent
* @m_since_latest
Shaders: make VertexColor generic attribute.
11 years ago
*
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
* @ref Magnum::Vector3 "Vector3", defined only in 3D. For better storage
* efficiency, the bitangent can be also reconstructed from the normal and
* tangent, see @ref Tangent4 for more information. Corresponds to
* @ref Trade::MeshAttribute::Bitangent.
*
* This attribute conflicts with @ref ObjectId, if you want to use both
* instanced object ID and bitangents, you need to reconstruct them from
* @ref Tangent4 instead.
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
*/
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
typedef GL::Attribute<4, Vector3> Bitangent;
#ifndef MAGNUM_TARGET_GLES2
/**
* @brief (Instanced) object ID
* @m_since_latest
*
* @ref Magnum::UnsignedInt "UnsignedInt". Corresponds to
* @ref Trade::MeshAttribute::ObjectId.
*
* This attribute conflicts with @ref Bitangent, if you want to use both
* instanced object ID and bitangents, you need to reconstruct them from
* @ref Tangent4 instead.
*
* @requires_gles30 Object ID output requires integer attributes, which are
* not available in OpenGL ES 2.0 or WebGL 1.0.
*/
typedef GL::Attribute<4, UnsignedInt> ObjectId;
#endif
/* Index 4 also used by MeshVisualizer::VertexIndex (reusing ObjectId). Not
making it generic yet, as its use case is limited to a single shader,
and even there it's just a fallback for platforms w/o gl_VertexID. */
/**
* @brief Vertex normal
*
* @ref Magnum::Vector3 "Vector3", defined only in 3D. Corresponds to
* @ref Trade::MeshAttribute::Normal.
*/
typedef GL::Attribute<5, Vector3> Normal;
/* 6, 7 reserved for vertex weights / bone IDs */
/**
* @brief (Instanced) transformation matrix
* @m_since_latest
*
* @ref Magnum::Matrix3 "Matrix3" in 2D and @ref Magnum::Matrix4 "Matrix4"
* in 3D. Currently doesn't have a corresponding @ref Trade::MeshAttribute.
Shaders: be sure to list required extensions in generic attribs. Those aren't needed when the attributes are not used non-instanced, but that's extremely unlikely.
6 years ago
* @requires_gl33 Extension @gl_extension{ARB,instanced_arrays}
* @requires_gles30 Extension @gl_extension{ANGLE,instanced_arrays},
* @gl_extension{EXT,instanced_arrays} or
* @gl_extension{NV,instanced_arrays} in OpenGL ES 2.0.
* @requires_webgl20 Extension @webgl_extension{ANGLE,instanced_arrays}
* in WebGL 1.0.
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
*/
typedef GL::Attribute<8, T> TransformationMatrix;
/* 9, 10, 11 occupied by TransformationMatrix */
/**
* @brief (Instanced) normal matrix
* @m_since_latest
*
* @ref Magnum::Matrix3 "Matrix3x3", defined only in 3D. Currently doesn't
* have a corresponding @ref Trade::MeshAttribute.
Shaders: be sure to list required extensions in generic attribs. Those aren't needed when the attributes are not used non-instanced, but that's extremely unlikely.
6 years ago
* @requires_gl33 Extension @gl_extension{ARB,instanced_arrays}
* @requires_gles30 Extension @gl_extension{ANGLE,instanced_arrays},
* @gl_extension{EXT,instanced_arrays} or
* @gl_extension{NV,instanced_arrays} in OpenGL ES 2.0.
* @requires_webgl20 Extension @webgl_extension{ANGLE,instanced_arrays}
* in WebGL 1.0.
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
*/
typedef GL::Attribute<12, Matrix3x3> NormalMatrix;
/* 13, 14 occupied by NormalMatrix */
/**
* @brief (Instanced) texture offset
* @m_since_latest
*
* @ref Magnum::Vector2 "Vector2". Currently doesn't have a corresponding
* @ref Trade::MeshAttribute.
Shaders: be sure to list required extensions in generic attribs. Those aren't needed when the attributes are not used non-instanced, but that's extremely unlikely.
6 years ago
* @requires_gl33 Extension @gl_extension{ARB,instanced_arrays}
* @requires_gles30 Extension @gl_extension{ANGLE,instanced_arrays},
* @gl_extension{EXT,instanced_arrays} or
* @gl_extension{NV,instanced_arrays} in OpenGL ES 2.0.
* @requires_webgl20 Extension @webgl_extension{ANGLE,instanced_arrays}
* in WebGL 1.0.
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
*/
typedef GL::Attribute<15, Vector2> TextureOffset;
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @brief Vertex color
doc: label deprecated APIs and stuff new since 2019.10 with version info. Should make new things more discoverable, avoid confusion when a documented API isn't there and reduce the need for maintaining multiple separate versions of the docs.
7 years ago
* @m_deprecated_since{2018,10} Use @ref Color3 or @ref Color4 instead.
Shaders: make VertexColor generic attribute.
11 years ago
*/
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
struct Color: GL::Attribute<3, Magnum::Color4> {
Shaders: ability to use RGBA colors with VertexColor shader. It was just RGB before. In order to avoid breaking current code, the attribute now requires explicit specification of number of components. If building with deprecated APIs enabled, there is an additional deprecated constructor that defaults to RGB so the current code should keep working as-is.
9 years ago
/**
* @brief Constructor
* @param components Component count
* @param dataType Type of passed data
* @param dataOptions Data options
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
*
doc: label deprecated APIs and stuff new since 2019.10 with version info. Should make new things more discoverable, avoid confusion when a documented API isn't there and reduce the need for maintaining multiple separate versions of the docs.
7 years ago
* @m_deprecated_since{2018,10} Use @ref Color3 or @ref Color4 instead.
Shaders: ability to use RGBA colors with VertexColor shader. It was just RGB before. In order to avoid breaking current code, the attribute now requires explicit specification of number of components. If building with deprecated APIs enabled, there is an additional deprecated constructor that defaults to RGB so the current code should keep working as-is.
9 years ago
*/
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
CORRADE_DEPRECATED("use Color3 or Color4 instead") constexpr explicit Color(Components components, DataType dataType = DataType::Float, DataOptions dataOptions = {});
Shaders: ability to use RGBA colors with VertexColor shader. It was just RGB before. In order to avoid breaking current code, the attribute now requires explicit specification of number of components. If building with deprecated APIs enabled, there is an additional deprecated constructor that defaults to RGB so the current code should keep working as-is.
9 years ago
Shaders: documentation update for the new theme. Also made the shader image background transparent to better fit in the docs and updated the images to match site colors.
8 years ago
/** @brief @copybrief Color(Components, DataType, DataOptions)
doc: label deprecated APIs and stuff new since 2019.10 with version info. Should make new things more discoverable, avoid confusion when a documented API isn't there and reduce the need for maintaining multiple separate versions of the docs.
7 years ago
* @m_deprecated_since{2018,10} Use @ref Color3 or @ref Color4 instead.
Shaders: ability to use RGBA colors with VertexColor shader. It was just RGB before. In order to avoid breaking current code, the attribute now requires explicit specification of number of components. If building with deprecated APIs enabled, there is an additional deprecated constructor that defaults to RGB so the current code should keep working as-is.
9 years ago
*/
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
CORRADE_DEPRECATED("use Color3 or Color4 instead") constexpr explicit Color(DataType dataType = DataType::Float, DataOptions dataOptions = {});
Shaders: ability to use RGBA colors with VertexColor shader. It was just RGB before. In order to avoid breaking current code, the attribute now requires explicit specification of number of components. If building with deprecated APIs enabled, there is an additional deprecated constructor that defaults to RGB so the current code should keep working as-is.
9 years ago
};
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
#endif
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
};
#endif
Shaders: removed autolink-preventing % noise.
12 years ago
/** @brief Generic 2D shader definition */
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
typedef Generic<2> Generic2D;
Shaders: removed autolink-preventing % noise.
12 years ago
/** @brief Generic 3D shader definition */
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
typedef Generic<3> Generic3D;
#ifndef DOXYGEN_GENERATING_OUTPUT
struct BaseGeneric {
Shaders: support object ID output in Flat and Phong.
7 years ago
enum: UnsignedInt {
ColorOutput = 0,
#ifndef MAGNUM_TARGET_GLES2
ObjectIdOutput = 1
#endif
};
Split the OpenGL layer out, pt 20: adapted Shaders.
8 years ago
typedef GL::Attribute<1, Vector2> TextureCoordinates;
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
typedef GL::Attribute<2, Magnum::Color3> Color3;
typedef GL::Attribute<2, Magnum::Color4> Color4;
#ifndef MAGNUM_TARGET_GLES2
typedef GL::Attribute<4, UnsignedInt> ObjectId;
#endif
typedef GL::Attribute<15, Vector2> TextureOffset;
Shaders: ability to use RGBA colors with VertexColor shader. It was just RGB before. In order to avoid breaking current code, the attribute now requires explicit specification of number of components. If building with deprecated APIs enabled, there is an additional deprecated constructor that defaults to RGB so the current code should keep working as-is.
9 years ago
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
#ifdef MAGNUM_BUILD_DEPRECATED
struct Color: GL::Attribute<3, Magnum::Color4> {
CORRADE_DEPRECATED("use Color3 or Color4 instead") constexpr explicit Color(Components components, DataType dataType = DataType::Float, DataOptions dataOptions = DataOptions()): Attribute<3, Magnum::Color4>{components, dataType, dataOptions} {}
Shaders: ability to use RGBA colors with VertexColor shader. It was just RGB before. In order to avoid breaking current code, the attribute now requires explicit specification of number of components. If building with deprecated APIs enabled, there is an additional deprecated constructor that defaults to RGB so the current code should keep working as-is.
9 years ago
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
CORRADE_DEPRECATED("use Color3 or Color4 instead") constexpr explicit Color(DataType dataType = DataType::Float, DataOptions dataOptions = DataOptions()): Attribute<3, Magnum::Color4>{Components::Three, dataType, dataOptions} {}
Shaders: ability to use RGBA colors with VertexColor shader. It was just RGB before. In order to avoid breaking current code, the attribute now requires explicit specification of number of components. If building with deprecated APIs enabled, there is an additional deprecated constructor that defaults to RGB so the current code should keep working as-is.
9 years ago
};
Shaders: more convenient VertexColor::Color[34] attribute specifiers. Much easier to write (and explain!) than Shaders::VertexColor2D::Color{ Shaders::VertexColor2D::Color::Components::Three}. Ugh. Why again it took me *years* to realize?
8 years ago
#endif
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
};
template<> struct Generic<2>: BaseGeneric {
Split the OpenGL layer out, pt 20: adapted Shaders.
8 years ago
typedef GL::Attribute<0, Vector2> Position;
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
/* 1, 2 used by TextureCoordinates and Color */
typedef GL::Attribute<8, Matrix3> TransformationMatrix;
/* 9, 10 occupied by TransformationMatrix */
/* 15 used by TextureOffset */
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
};
template<> struct Generic<3>: BaseGeneric {
Split the OpenGL layer out, pt 20: adapted Shaders.
8 years ago
typedef GL::Attribute<0, Vector3> Position;
Shaders: rethink generic attribute allocation from scratch. This adds binormals, object IDs and instanced transformation, but has to break existing locations in order to provide new guarantees.
6 years ago
/* 1, 2 used by TextureCoordinates and Color */
typedef GL::Attribute<3, Vector3> Tangent;
typedef GL::Attribute<3, Vector4> Tangent4;
typedef GL::Attribute<4, Vector3> Bitangent; /* also ObjectId */
typedef GL::Attribute<5, Vector3> Normal;
/* 6, 7 reserved for vertex weights / bone IDs */
typedef GL::Attribute<8, Matrix4> TransformationMatrix;
/* 9, 10, 11 occupied by TransformationMatrix */
typedef GL::Attribute<12, Matrix3x3> NormalMatrix;
/* 13, 14 occupied by NormalMatrix */
/* 15 used by TextureOffset */
Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.
13 years ago
};
#endif
}}
#endif