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.
3306 Commits
21 Branches
19 Tags
70 MiB
Tree: 98f7dbb61b
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '98f7dbb61b'
${ noResults }
magnum/src/Magnum/TextureTools/DistanceField.cpp

206 lines
6.7 KiB
Raw Normal View History Unescape

TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
/*
This file is part of Magnum.
Happy new year too.
12 years ago
Copyright © 2010, 2011, 2012, 2013, 2014
Vladimír Vondruš <mosra@centrum.cz>
Relicensing to MIT/Expat license, part 3: source files. Added license header also to shader sources. Hopefully it won't harm compilation times too much.
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.
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
*/
Making includes absolute, part 5: absolute includes everywhere. The only places where they aren't absolute are: - when header is included from corresponding source file - when including headers which are not part of final installation (e.g. test-specific configuration, headers from Implementation/)
12 years ago
#include "DistanceField.h"
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
Making includes absolute, part 4: using absolute includes for Corrade. Also adapted to some Corrade renames.
12 years ago
#include <Corrade/Utility/Resource.h>
Extract Buffer::Usage enum out of Buffer class. Buffer usage is used as parameter in many functions, e.g. in *Framebuffer::read() and *Texture::image(), but they are rather seldom used and including whole Buffer.h file just for one enum is just overkill. The old Buffer::Usage is now alias to BufferUsage, it is marked as deprecated and will be removed in future release.
13 years ago
Making includes absolute, part 5: absolute includes everywhere. The only places where they aren't absolute are: - when header is included from corresponding source file - when including headers which are not part of final installation (e.g. test-specific configuration, headers from Implementation/)
12 years ago
#include "Magnum/Math/Range.h"
#include "Magnum/AbstractShaderProgram.h"
#include "Magnum/Buffer.h"
#include "Magnum/Context.h"
#include "Magnum/Extensions.h"
#include "Magnum/Framebuffer.h"
#include "Magnum/Mesh.h"
#include "Magnum/Shader.h"
#include "Magnum/Texture.h"
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
namespace Magnum { namespace TextureTools {
namespace {
class DistanceFieldShader: public AbstractShaderProgram {
public:
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
typedef Attribute<0, Vector2> Position;
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
explicit DistanceFieldShader();
Reducing pointer chasings, part 1: method chaining via references. Makes some cases less consistent (and some convenience shortcuts impossible), but goes well with the attitude "don't use pointer when it can't be null".
13 years ago
DistanceFieldShader& setRadius(Int radius) {
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
setUniform(radiusUniform, radius);
Reducing pointer chasings, part 1: method chaining via references. Makes some cases less consistent (and some convenience shortcuts impossible), but goes well with the attitude "don't use pointer when it can't be null".
13 years ago
return *this;
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
}
Reducing pointer chasings, part 1: method chaining via references. Makes some cases less consistent (and some convenience shortcuts impossible), but goes well with the attitude "don't use pointer when it can't be null".
13 years ago
DistanceFieldShader& setScaling(const Vector2& scaling) {
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
setUniform(scalingUniform, scaling);
Reducing pointer chasings, part 1: method chaining via references. Makes some cases less consistent (and some convenience shortcuts impossible), but goes well with the attitude "don't use pointer when it can't be null".
13 years ago
return *this;
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
}
Reducing pointer chasings, part 1: method chaining via references. Makes some cases less consistent (and some convenience shortcuts impossible), but goes well with the attitude "don't use pointer when it can't be null".
13 years ago
DistanceFieldShader& setImageSizeInverted(const Vector2& size) {
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
setUniform(imageSizeInvertedUniform, size);
Reducing pointer chasings, part 1: method chaining via references. Makes some cases less consistent (and some convenience shortcuts impossible), but goes well with the attitude "don't use pointer when it can't be null".
13 years ago
return *this;
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
}
Use functions to bind textures to shader rather than *Texture::bind(). Why did I do this: * It is more clean, shorter and nice looking with method chaining, i.e. instead of: shader.setColor(...) .setOtherParam(5); texture1.bind(MyShader::Texture1Layer); texture2.bind(MyShader::Texture2Layer); We now have this: shader.setColor(...) .setOtherParam(5) .setTexture1(texture1) .setTexture2(texture2); * It is now also clear which texture type is expected, the layer constant did not say anything about type. * Also it is possible to use new features (multi bind, bindless textures etc.) while preserving the same public API. The only potential disadvantage is that the textures don't stay bound like uniform values do, but this become a non-issue with bindless textures. As usual, the old way is now deprecated and will be removed in some future release.
12 years ago
DistanceFieldShader& setTexture(Texture2D& texture) {
texture.bind(TextureLayer);
return *this;
}
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
private:
Use functions to bind textures to shader rather than *Texture::bind(). Why did I do this: * It is more clean, shorter and nice looking with method chaining, i.e. instead of: shader.setColor(...) .setOtherParam(5); texture1.bind(MyShader::Texture1Layer); texture2.bind(MyShader::Texture2Layer); We now have this: shader.setColor(...) .setOtherParam(5) .setTexture1(texture1) .setTexture2(texture2); * It is now also clear which texture type is expected, the layer constant did not say anything about type. * Also it is possible to use new features (multi bind, bindless textures etc.) while preserving the same public API. The only potential disadvantage is that the textures don't stay bound like uniform values do, but this become a non-issue with bindless textures. As usual, the old way is now deprecated and will be removed in some future release.
12 years ago
enum: Int { TextureLayer = 8 };
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
Int radiusUniform,
scalingUniform,
imageSizeInvertedUniform;
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
};
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
DistanceFieldShader::DistanceFieldShader(): radiusUniform(0), scalingUniform(1) {
Bring whole Corrade namespace into Magnum namespace. These projects are tightly interconnected anyway, this means a lot less typing (yay!).
13 years ago
Utility::Resource rs("MagnumTextureTools");
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
#ifndef MAGNUM_TARGET_GLES
const Version v = Context::current()->supportedVersion({Version::GL320, Version::GL300, Version::GL210});
#else
const Version v = Context::current()->supportedVersion({Version::GLES300, Version::GLES200});
#endif
Shader vert(v, Shader::Type::Vertex);
vert.addSource(rs.get("compatibility.glsl"))
Shaders: make GLSL code for fullscreen triangle reusable. Now you can just add the file and call `fullScreenTriangle()`.
13 years ago
.addSource(rs.get("FullScreenTriangle.glsl"))
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
.addSource(rs.get("DistanceFieldShader.vert"));
Reworked and cleaned up shader classes. Removed unneeded member variables, removed wrong assertions and wrong documentation (most of the state they were fobidding is actually valid). Retrieving shader log with full length, properly printing non-error messages to debug output. Each shader must now be compiled explicitly using compile(), which is slightly better for the user as it is possible to check compile status instead of having it weirdly hidden inside attachShader(). link() now also returns linking status.
13 years ago
CORRADE_INTERNAL_ASSERT_OUTPUT(vert.compile());
attachShader(vert);
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
Shader frag(v, Shader::Type::Fragment);
Reworked and cleaned up shader classes. Removed unneeded member variables, removed wrong assertions and wrong documentation (most of the state they were fobidding is actually valid). Retrieving shader log with full length, properly printing non-error messages to debug output. Each shader must now be compiled explicitly using compile(), which is slightly better for the user as it is possible to check compile status instead of having it weirdly hidden inside attachShader(). link() now also returns linking status.
13 years ago
frag.addSource(rs.get("compatibility.glsl"))
.addSource(rs.get("DistanceFieldShader.frag"));
CORRADE_INTERNAL_ASSERT_OUTPUT(frag.compile());
attachShader(frag);
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
/* Older GLSL doesn't have gl_VertexID, vertices must be supplied explicitly */
#ifndef MAGNUM_TARGET_GLES
if(!Context::current()->isVersionSupported(Version::GL300))
#else
if(!Context::current()->isVersionSupported(Version::GLES300))
#endif
{
bindAttributeLocation(Position::Location, "position");
}
Reworked and cleaned up shader classes. Removed unneeded member variables, removed wrong assertions and wrong documentation (most of the state they were fobidding is actually valid). Retrieving shader log with full length, properly printing non-error messages to debug output. Each shader must now be compiled explicitly using compile(), which is slightly better for the user as it is possible to check compile status instead of having it weirdly hidden inside attachShader(). link() now also returns linking status.
13 years ago
CORRADE_INTERNAL_ASSERT_OUTPUT(link());
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
#ifndef MAGNUM_TARGET_GLES
if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::explicit_uniform_location>())
#endif
{
radiusUniform = uniformLocation("radius");
scalingUniform = uniformLocation("scaling");
#ifndef MAGNUM_TARGET_GLES
if(!Context::current()->isVersionSupported(Version::GL300))
#else
if(!Context::current()->isVersionSupported(Version::GLES300))
#endif
{
imageSizeInvertedUniform = uniformLocation("imageSizeInverted");
}
}
#ifndef MAGNUM_TARGET_GLES
if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shading_language_420pack>())
#endif
{
setUniform(uniformLocation("textureData"), TextureLayer);
}
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
}
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
}
#ifndef MAGNUM_TARGET_GLES
Using Range2D instead of Rectangle everywhere. Encourages vectorization and generic usage even more. Some functions were rewritten to make use of the new features, resulting in shorter and more readable code. This also fixes the annoying naming collision with WINAPI Rectangle() function. The old Rectangle is now subclass of Range2D, is marked as deprecated and will be removed in future release.
13 years ago
void distanceField(Texture2D& input, Texture2D& output, const Range2Di& rectangle, const Int radius, const Vector2i&)
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
#else
Using Range2D instead of Rectangle everywhere. Encourages vectorization and generic usage even more. Some functions were rewritten to make use of the new features, resulting in shorter and more readable code. This also fixes the annoying naming collision with WINAPI Rectangle() function. The old Rectangle is now subclass of Range2D, is marked as deprecated and will be removed in future release.
13 years ago
void distanceField(Texture2D& input, Texture2D& output, const Range2Di& rectangle, const Int radius, const Vector2i& imageSize)
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
#endif
{
#ifndef MAGNUM_TARGET_GLES
MAGNUM_ASSERT_EXTENSION_SUPPORTED(Extensions::GL::ARB::framebuffer_object);
#endif
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
Added some TODOs.
13 years ago
/** @todo Disable depth test, blending and then enable it back (if was previously) */
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
#ifndef MAGNUM_TARGET_GLES
Reducing pointer chasings, part 3f: less pointer passing in TextureTools.
13 years ago
Vector2i imageSize = input.imageSize(0);
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
#endif
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
Framebuffer framebuffer(rectangle);
Better texture attaching in Framebuffer. The previous way was half-working at best, as it handled array textures improperly. Now there is overload for each texture type. The old way with attachTexture*D() is marked as deprecated and will be removed in future release.
12 years ago
framebuffer.attachTexture(Framebuffer::ColorAttachment(0), output, 0);
Moved framebuffer-related enums out of AbstractFramebuffer. Removes another trivial choice issue.
13 years ago
framebuffer.bind(FramebufferTarget::Draw);
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
framebuffer.clear(FramebufferClear::Color);
const Framebuffer::Status status = framebuffer.checkStatus(FramebufferTarget::Draw);
if(status != Framebuffer::Status::Complete) {
Error() << "TextureTools::distanceField(): cannot render to given output texture, unexpected framebuffer status"
<< status;
return;
}
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
DistanceFieldShader shader;
shader.setRadius(radius)
Use functions to bind textures to shader rather than *Texture::bind(). Why did I do this: * It is more clean, shorter and nice looking with method chaining, i.e. instead of: shader.setColor(...) .setOtherParam(5); texture1.bind(MyShader::Texture1Layer); texture2.bind(MyShader::Texture2Layer); We now have this: shader.setColor(...) .setOtherParam(5) .setTexture1(texture1) .setTexture2(texture2); * It is now also clear which texture type is expected, the layer constant did not say anything about type. * Also it is possible to use new features (multi bind, bindless textures etc.) while preserving the same public API. The only potential disadvantage is that the textures don't stay bound like uniform values do, but this become a non-issue with bindless textures. As usual, the old way is now deprecated and will be removed in some future release.
12 years ago
.setScaling(Vector2(imageSize)/Vector2(rectangle.size()))
.setTexture(input);
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
#ifndef MAGNUM_TARGET_GLES
if(!Context::current()->isVersionSupported(Version::GL300))
#else
if(!Context::current()->isVersionSupported(Version::GLES300))
#endif
{
Math: improve integer/float Vector multiplication and division. Operators that are part of Vector are operating only with the same type as Vector itself, operators for multiplying/dividing integral vectors with floating-point numbers and vectors are now out-of-class and enabled only for integer vectors. It allows better control (e.g. multiplying integer and floating-point vector will _always_ result in floating-point one). Thoroughly tested integer/FP operations and also reworked and tested operator and funciton reimplementations in subclasses, both for value correctness and result type correctness.
13 years ago
shader.setImageSizeInverted(1.0f/Vector2(imageSize));
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
}
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
Mesh mesh;
Extracted Primitive enum from Mesh to MeshPrimitive. Because we can't forward-declare class members we would need to include whole Mesh (along with all OpenGL headers and other stuff) just to use Primitive enum. The old Mesh::Primitive is now alias to new one, is marked as deprecated and will be removed in future release.
13 years ago
mesh.setPrimitive(MeshPrimitive::Triangles)
Reducing pointer chasings, part 1: method chaining via references. Makes some cases less consistent (and some convenience shortcuts impossible), but goes well with the attitude "don't use pointer when it can't be null".
13 years ago
.setVertexCount(3);
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
/* Older GLSL doesn't have gl_VertexID, vertices must be supplied explicitly */
Buffer buffer;
#ifndef MAGNUM_TARGET_GLES
if(!Context::current()->isVersionSupported(Version::GL300))
#else
if(!Context::current()->isVersionSupported(Version::GLES300))
#endif
{
constexpr Vector2 triangle[] = {
Vector2(-1.0, 1.0),
Vector2(-1.0, -3.0),
Vector2( 3.0, 1.0)
};
Extract Buffer::Usage enum out of Buffer class. Buffer usage is used as parameter in many functions, e.g. in *Framebuffer::read() and *Texture::image(), but they are rather seldom used and including whole Buffer.h file just for one enum is just overkill. The old Buffer::Usage is now alias to BufferUsage, it is marked as deprecated and will be removed in future release.
13 years ago
buffer.setData(triangle, BufferUsage::StaticDraw);
Renamed Mesh::addInterleavedVertexBuffer() to addVertexBuffer(). Obvious change after previous commit, there is no other function alternative to distinguish it from.
13 years ago
mesh.addVertexBuffer(buffer, 0, DistanceFieldShader::Position());
TextureTools: ported distanceField() to OpenGL 2.1 and OpenGL ES. * Older GLSL doesn't have texelFetch() and related things, working around it by using classical texture() and normalized floating-point coordinates. But that needs to have Texture::imageSize() passed, which is not available in OpenGL ES, thus the user must specify it explicitly there. On desktop OpenGL that parameter is ignored. * Older GLSL doesn't have gl_VertexID, thus vertex buffer must be created and vertex data passed expliticly. * GLSL ES 2.0 doesn't have one-component texture format and TextureFormat::Luminance probably isn't renderable anywhere, thus TextureFormat::RGB should be used, although it is inefficient. * Checking for framebuffer completeness, if not complete, nothing is done. * Re-eabled building of TextureTools library in all ES PKGBUILDs.
13 years ago
}
/* Draw the mesh */
Explicitly passing shader to Mesh*::draw(). Previously the API didn't encourage the user to set up and activate shader before drawing the meshes, leading to unintuitive behavior: // Can I just call draw() or do I have to fully understand the // meaning of the universe before? mesh.draw(); Now the draw() needs the shader passed explicitly as parameter, which should hint that the shader must be set up somehow: // Right, so this needs just a shader and that's all. Expecting this // I fortunately *did* configure all the uniforms before this call. mesh.draw(shader); It is also possible to pass the shader as rvalue, in case the drawing is just a one-off thing and is already fully configured. mesh.draw(MyShader{}); As usual, the original API is kept, is marked as deprecated and will be removed in some future release.
12 years ago
mesh.draw(shader);
TextureTools: initial rude implementation of distance field computation. Not yet ported anywhere else than GL >= 3.3 with some GL 4.3 features. Still, this closes #3.
13 years ago
}
}}