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.
11396 Commits
21 Branches
19 Tags
70 MiB
Tree: 2f778f249e
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2f778f249e'
${ noResults }
magnum/src/Magnum/MeshTools/CompileLines.cpp

91 lines
5.1 KiB
Raw Normal View History Unescape

MeshTools: initial utility for compiling a mesh for the line shader. Currently just the bare minimum, more features such as handling multiple contiguous strips and loops inside a single mesh or an overlapping layout will come later.
4 years ago
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
Here we go again.
1 year ago
2020, 2021, 2022, 2023, 2024, 2025
It's October already?!
2 years ago
Vladimír Vondruš <mosra@centrum.cz>
MeshTools: initial utility for compiling a mesh for the line shader. Currently just the bare minimum, more features such as handling multiple contiguous strips and loops inside a single mesh or an overlapping layout will come later.
4 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.
*/
#include "CompileLines.h"
MeshTools: make generateLines() public. This is unfortunately a breaking change to compileLines(), which now takes the output of generateLines() instead of a line mesh. There's a new assertion that'll blow up if the code is used the previous way, sorry for the breakage. What's however very useful about this change is that now it's possible to take those generated line meshes and concatenate() them together, achieving what's otherwise not implemented yet, such as drawing several disconnected line strips or loops together. It's all still partially private (the custom mesh attribute names are) and I'm marking both APIs as experimental now to hint that it's not in the final form/functionality yet. In particular, the data layout optimizations described in the shader docs aren't used by these tools yet, and if/once the line-specific vertex attributes become builtin, compileLines() will not need to exist anymore as compile() will handle that directly.
3 years ago
#include <Corrade/Containers/Optional.h>
MeshTools: initial utility for compiling a mesh for the line shader. Currently just the bare minimum, more features such as handling multiple contiguous strips and loops inside a single mesh or an overlapping layout will come later.
4 years ago
#include "Magnum/GL/Buffer.h"
#include "Magnum/GL/Mesh.h"
#include "Magnum/MeshTools/Compile.h"
MeshTools: make generateLines() public. This is unfortunately a breaking change to compileLines(), which now takes the output of generateLines() instead of a line mesh. There's a new assertion that'll blow up if the code is used the previous way, sorry for the breakage. What's however very useful about this change is that now it's possible to take those generated line meshes and concatenate() them together, achieving what's otherwise not implemented yet, such as drawing several disconnected line strips or loops together. It's all still partially private (the custom mesh attribute names are) and I'm marking both APIs as experimental now to hint that it's not in the final form/functionality yet. In particular, the data layout optimizations described in the shader docs aren't used by these tools yet, and if/once the line-specific vertex attributes become builtin, compileLines() will not need to exist anymore as compile() will handle that directly.
3 years ago
#include "Magnum/MeshTools/GenerateLines.h"
MeshTools: initial utility for compiling a mesh for the line shader. Currently just the bare minimum, more features such as handling multiple contiguous strips and loops inside a single mesh or an overlapping layout will come later.
4 years ago
/* This header is included only privately and doesn't introduce any linker
dependency (taking just the PreviousPosition, NextPosition and Annotation
attribute typedefs), thus it's completely safe to not link to the Shaders
library */
#include "Magnum/Shaders/LineGL.h"
namespace Magnum { namespace MeshTools {
MeshTools: make generateLines() public. This is unfortunately a breaking change to compileLines(), which now takes the output of generateLines() instead of a line mesh. There's a new assertion that'll blow up if the code is used the previous way, sorry for the breakage. What's however very useful about this change is that now it's possible to take those generated line meshes and concatenate() them together, achieving what's otherwise not implemented yet, such as drawing several disconnected line strips or loops together. It's all still partially private (the custom mesh attribute names are) and I'm marking both APIs as experimental now to hint that it's not in the final form/functionality yet. In particular, the data layout optimizations described in the shader docs aren't used by these tools yet, and if/once the line-specific vertex attributes become builtin, compileLines() will not need to exist anymore as compile() will handle that directly.
3 years ago
GL::Mesh compileLines(const Trade::MeshData& mesh) {
/* The assertion checks might be a bit excessive but the custom attributes
*may* conflict with some other user-defined ones so better rule that out
as much as possible */
CORRADE_ASSERT(
mesh.primitive() == MeshPrimitive::Triangles &&
mesh.hasAttribute(Implementation::LineMeshAttributePreviousPosition) &&
mesh.hasAttribute(Implementation::LineMeshAttributeNextPosition) &&
mesh.hasAttribute(Implementation::LineMeshAttributeAnnotation),
"MeshTools::compileLines(): the mesh wasn't produced with generateLines()", GL::Mesh{});
MeshTools: initial utility for compiling a mesh for the line shader. Currently just the bare minimum, more features such as handling multiple contiguous strips and loops inside a single mesh or an overlapping layout will come later.
4 years ago
/* Upload the buffers, bind the line-specific attributes manually */
GL::Buffer indices{GL::Buffer::TargetHint::ElementArray, mesh.indexData()};
GL::Buffer vertices{GL::Buffer::TargetHint::Array, mesh.vertexData()};
Use Utility::move() and swap() instead of STL almost everywhere. Partially needed to avoid build breakages because Corrade itself switched as well, partially because a cleanup is always good. Done except for (STL-heavy) code that's deprecated or SceneGraph-related APIs that are still quite full of STL as well.
3 years ago
GL::Mesh out = compile(mesh, Utility::move(indices), vertices);
MeshTools: initial utility for compiling a mesh for the line shader. Currently just the bare minimum, more features such as handling multiple contiguous strips and loops inside a single mesh or an overlapping layout will come later.
4 years ago
/* Warn about attributes that are conflicting with line-specific attributes
and thus will get overwritten */
static_assert(Shaders::GenericGL3D::TextureCoordinates::Location == UnsignedInt(Shaders::LineGL3D::Annotation::Location), "");
static_assert(Shaders::GenericGL3D::Tangent::Location == UnsignedInt(Shaders::LineGL3D::PreviousPosition::Location), "");
static_assert(Shaders::GenericGL3D::Normal::Location == UnsignedInt(Shaders::LineGL3D::NextPosition::Location), "");
MeshTools: make generateLines() public. This is unfortunately a breaking change to compileLines(), which now takes the output of generateLines() instead of a line mesh. There's a new assertion that'll blow up if the code is used the previous way, sorry for the breakage. What's however very useful about this change is that now it's possible to take those generated line meshes and concatenate() them together, achieving what's otherwise not implemented yet, such as drawing several disconnected line strips or loops together. It's all still partially private (the custom mesh attribute names are) and I'm marking both APIs as experimental now to hint that it's not in the final form/functionality yet. In particular, the data layout optimizations described in the shader docs aren't used by these tools yet, and if/once the line-specific vertex attributes become builtin, compileLines() will not need to exist anymore as compile() will handle that directly.
3 years ago
if(const Containers::Optional<UnsignedInt> id = mesh.findAttributeId(Trade::MeshAttribute::TextureCoordinates))
Warning{} << "MeshTools::compileLines():" << mesh.attributeName(*id) << "conflicts with line annotation attribute, ignoring";
if(const Containers::Optional<UnsignedInt> id = mesh.findAttributeId(Trade::MeshAttribute::Tangent))
Warning{} << "MeshTools::compileLines():" << mesh.attributeName(*id) << "conflicts with line previous position attribute, ignoring";
if(const Containers::Optional<UnsignedInt> id = mesh.findAttributeId(Trade::MeshAttribute::Normal))
Warning{} << "MeshTools::compileLines():" << mesh.attributeName(*id) << "conflicts with line next position attribute, ignoring";
MeshTools: initial utility for compiling a mesh for the line shader. Currently just the bare minimum, more features such as handling multiple contiguous strips and loops inside a single mesh or an overlapping layout will come later.
4 years ago
/* PreviousPosition / NextPosition are bound to the same location in both
2D and 3D, using the 3D variant so it can be trimmed to just two
components in 2D (which wouldn't be possible the other way around) */
out.addVertexBuffer(vertices,
MeshTools: make generateLines() public. This is unfortunately a breaking change to compileLines(), which now takes the output of generateLines() instead of a line mesh. There's a new assertion that'll blow up if the code is used the previous way, sorry for the breakage. What's however very useful about this change is that now it's possible to take those generated line meshes and concatenate() them together, achieving what's otherwise not implemented yet, such as drawing several disconnected line strips or loops together. It's all still partially private (the custom mesh attribute names are) and I'm marking both APIs as experimental now to hint that it's not in the final form/functionality yet. In particular, the data layout optimizations described in the shader docs aren't used by these tools yet, and if/once the line-specific vertex attributes become builtin, compileLines() will not need to exist anymore as compile() will handle that directly.
3 years ago
mesh.attributeOffset(Implementation::LineMeshAttributePreviousPosition),
mesh.attributeStride(Implementation::LineMeshAttributePreviousPosition),
GL::DynamicAttribute{Shaders::LineGL3D::PreviousPosition{}, mesh.attributeFormat(Implementation::LineMeshAttributePreviousPosition)});
MeshTools: initial utility for compiling a mesh for the line shader. Currently just the bare minimum, more features such as handling multiple contiguous strips and loops inside a single mesh or an overlapping layout will come later.
4 years ago
out.addVertexBuffer(vertices,
MeshTools: make generateLines() public. This is unfortunately a breaking change to compileLines(), which now takes the output of generateLines() instead of a line mesh. There's a new assertion that'll blow up if the code is used the previous way, sorry for the breakage. What's however very useful about this change is that now it's possible to take those generated line meshes and concatenate() them together, achieving what's otherwise not implemented yet, such as drawing several disconnected line strips or loops together. It's all still partially private (the custom mesh attribute names are) and I'm marking both APIs as experimental now to hint that it's not in the final form/functionality yet. In particular, the data layout optimizations described in the shader docs aren't used by these tools yet, and if/once the line-specific vertex attributes become builtin, compileLines() will not need to exist anymore as compile() will handle that directly.
3 years ago
mesh.attributeOffset(Implementation::LineMeshAttributeNextPosition),
mesh.attributeStride(Implementation::LineMeshAttributeNextPosition),
GL::DynamicAttribute{Shaders::LineGL3D::NextPosition{}, mesh.attributeFormat(Implementation::LineMeshAttributeNextPosition)});
Use Utility::move() and swap() instead of STL almost everywhere. Partially needed to avoid build breakages because Corrade itself switched as well, partially because a cleanup is always good. Done except for (STL-heavy) code that's deprecated or SceneGraph-related APIs that are still quite full of STL as well.
3 years ago
out.addVertexBuffer(Utility::move(vertices),
MeshTools: make generateLines() public. This is unfortunately a breaking change to compileLines(), which now takes the output of generateLines() instead of a line mesh. There's a new assertion that'll blow up if the code is used the previous way, sorry for the breakage. What's however very useful about this change is that now it's possible to take those generated line meshes and concatenate() them together, achieving what's otherwise not implemented yet, such as drawing several disconnected line strips or loops together. It's all still partially private (the custom mesh attribute names are) and I'm marking both APIs as experimental now to hint that it's not in the final form/functionality yet. In particular, the data layout optimizations described in the shader docs aren't used by these tools yet, and if/once the line-specific vertex attributes become builtin, compileLines() will not need to exist anymore as compile() will handle that directly.
3 years ago
mesh.attributeOffset(Implementation::LineMeshAttributeAnnotation),
mesh.attributeStride(Implementation::LineMeshAttributeAnnotation),
GL::DynamicAttribute{Shaders::LineGL3D::Annotation{}, mesh.attributeFormat(Implementation::LineMeshAttributeAnnotation)});
MeshTools: initial utility for compiling a mesh for the line shader. Currently just the bare minimum, more features such as handling multiple contiguous strips and loops inside a single mesh or an overlapping layout will come later.
4 years ago
return out;
}
}}