Skip to content

[Core] Support generic drawing of edges and quads #5852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alxbilger wants to merge 3 commits into
base: master
Choose a base branch
from
+136 −5
Open

[Core] Support generic drawing of edges and quads #5852

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3460237
[Core] Support generic drawing of edges and quads
alxbilger Jan 7, 2026
6ace873
integrate edges and quads in DrawMesh
alxbilger Jan 7, 2026
259c45a
Merge branch 'master' into edgesquads
hugtalbot Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 136 additions & 5 deletions Sofa/framework/Core/src/sofa/core/visual/DrawMesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,58 @@ struct BaseDrawMesh
template<class ElementType>
struct DrawElementMesh{};

template<>
struct SOFA_CORE_API DrawElementMesh<sofa::geometry::Edge>
: public BaseDrawMesh<DrawElementMesh<sofa::geometry::Edge>, 2>
{
using ElementType = sofa::geometry::Edge;
friend BaseDrawMesh;
static constexpr ColorContainer defaultColors {
sofa::type::RGBAColor::lime(),
sofa::type::RGBAColor::silver()
};

private:
template<class PositionContainer, class IndicesContainer>
void doDraw(
sofa::helper::visual::DrawTool* drawTool,
const PositionContainer& position,
sofa::core::topology::BaseMeshTopology* topology,
const IndicesContainer& elementIndices,
const ColorContainer& colors)
{
if (!topology)
return;

const auto& elements = topology->getEdges();

const auto size = elementIndices.size() * sofa::geometry::Edge::NumberOfNodes;
for ( auto& p : renderedPoints)
{
p.resize(size);
}

std::array<std::size_t, NumberColors> renderedPointId {};
for (auto i : elementIndices)
{
const auto& element = elements[i];

const auto center = this->elementCenter(position, element);

for (std::size_t j = 0; j < sofa::geometry::Edge::NumberOfNodes; ++j)
{
const auto p = this->applyElementSpace(position[element[j]], center);
renderedPoints[i % NumberColors][renderedPointId[i%NumberColors]++] = sofa::type::toVec3(p);
}
}

for (std::size_t j = 0; j < NumberColors; ++j)
{
drawTool->drawLines(renderedPoints[j], 2.f, colors[j]);
}
}
};

template<>
struct SOFA_CORE_API DrawElementMesh<sofa::geometry::Triangle>
: public BaseDrawMesh<DrawElementMesh<sofa::geometry::Triangle>, 3>
Expand Down Expand Up @@ -194,6 +246,59 @@ struct SOFA_CORE_API DrawElementMesh<sofa::geometry::Triangle>
}
};


template<>
struct SOFA_CORE_API DrawElementMesh<sofa::geometry::Quad>
: public BaseDrawMesh<DrawElementMesh<sofa::geometry::Quad>, 2>
{
using ElementType = sofa::geometry::Quad;
friend BaseDrawMesh;
static constexpr ColorContainer defaultColors {
sofa::type::RGBAColor::green(),
sofa::type::RGBAColor::orange()
};

private:
template<class PositionContainer, class IndicesContainer>
void doDraw(
sofa::helper::visual::DrawTool* drawTool,
const PositionContainer& position,
sofa::core::topology::BaseMeshTopology* topology,
const IndicesContainer& elementIndices,
const ColorContainer& colors)
{
if (!topology)
return;

const auto& elements = topology->getQuads();

const auto size = elementIndices.size() * sofa::geometry::Quad::NumberOfNodes;
for ( auto& p : renderedPoints)
{
p.resize(size);
}

std::array<std::size_t, NumberColors> renderedPointId {};
for (auto i : elementIndices)
{
const auto& element = elements[i];

const auto center = this->elementCenter(position, element);

for (std::size_t j = 0; j < sofa::geometry::Quad::NumberOfNodes; ++j)
{
const auto p = this->applyElementSpace(position[element[j]], center);
renderedPoints[i % NumberColors][renderedPointId[i%NumberColors]++] = sofa::type::toVec3(p);
}
}

for (std::size_t j = 0; j < NumberColors; ++j)
{
drawTool->drawQuads(renderedPoints[j], colors[j]);
}
}
};

template<>
struct SOFA_CORE_API DrawElementMesh<sofa::geometry::Tetrahedron>
: public BaseDrawMesh<DrawElementMesh<sofa::geometry::Tetrahedron>, 4>
Expand Down Expand Up @@ -338,10 +443,17 @@ class SOFA_CORE_API DrawMesh

void setElementSpace(SReal elementSpace);

template<class PositionContainer>
void drawLine(sofa::helper::visual::DrawTool* drawTool, const PositionContainer& position, sofa::core::topology::BaseMeshTopology* topology)
{
drawElements<sofa::geometry::Edge>(drawTool, position, topology);
}

template<class PositionContainer>
void drawSurface(sofa::helper::visual::DrawTool* drawTool, const PositionContainer& position, sofa::core::topology::BaseMeshTopology* topology)
{
drawElements<sofa::geometry::Triangle>(drawTool, position, topology);
drawElements<sofa::geometry::Quad>(drawTool, position, topology);
}

template<class PositionContainer>
Expand All @@ -359,19 +471,38 @@ class SOFA_CORE_API DrawMesh
return;
}

const auto hasTetra = topology && !topology->getTetrahedra().empty();
const auto hasHexa = topology && !topology->getHexahedra().empty();
const auto hasTriangles = !topology->getTriangles().empty();
const auto hasQuads = !topology->getQuads().empty();

const auto hasSurfaceElements = hasTriangles || hasQuads;

const auto hasTetra = !topology->getTetrahedra().empty();
const auto hasHexa = !topology->getHexahedra().empty();

const bool hasVolumeElements = hasTetra || hasHexa;

if (!hasTetra && !hasHexa)
if (!hasSurfaceElements && !hasVolumeElements)
{
drawSurface(drawTool, position, topology);
drawLine(drawTool, position, topology);
}
else
{
if (!hasVolumeElements)
{
drawSurface(drawTool, position, topology);
}
else
{
drawVolume(drawTool, position, topology);
}
}
drawVolume(drawTool, position, topology);
}

private:
std::tuple<
DrawElementMesh<sofa::geometry::Edge>,
DrawElementMesh<sofa::geometry::Triangle>,
DrawElementMesh<sofa::geometry::Quad>,
DrawElementMesh<sofa::geometry::Tetrahedron>,
DrawElementMesh<sofa::geometry::Hexahedron>
> m_meshes;
Expand Down
Loading