Skip to content
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

[VolumetricRendering] Fix crashes in batch mode #4436

Merged
merged 2 commits into from
Jan 17, 2024
Merged

[VolumetricRendering] Fix crashes in batch mode #4436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9148fa
workaround when using volumetricrendering in batch mode
fredroy Jan 15, 2024
b5cf52e
fix and clean computebbox
fredroy Jan 16, 2024
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
22 changes: 13 additions & 9 deletions applications/plugins/VolumetricRendering/src/VolumetricRendering/OglTetrahedralModel.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,13 @@ void OglTetrahedralModel<DataTypes>::initVisual()
template<class DataTypes>
void OglTetrahedralModel<DataTypes>::updateVisual()
{
// Workaround if updateVisual() is called without an opengl context
const auto* vparams = core::visual::VisualParams::defaultInstance();
if (!vparams->isSupported(core::visual::API_OpenGL))
{
return;
}

if ((modified && !m_positions.getValue().empty())
|| useTopology)
{
Expand Down Expand Up @@ -320,24 +327,21 @@ void OglTetrahedralModel<DataTypes>::drawTransparent(const core::visual::VisualP
template<class DataTypes>
void OglTetrahedralModel<DataTypes>::computeBBox(const core::ExecParams * params, bool /* onlyVisible */)
{
if (m_topology)
const type::vector<Coord>& position = m_positions.getValue();

if (m_topology && position.size() > 0)
{
const core::topology::BaseMeshTopology::SeqTetrahedra& vec = m_topology->getTetrahedra();
core::topology::BaseMeshTopology::SeqTetrahedra::const_iterator it;
Coord v;
const type::vector<Coord>& position = m_positions.getValue();
const SReal max_real = std::numeric_limits<SReal>::max();
const SReal min_real = std::numeric_limits<SReal>::min();
const SReal min_real = std::numeric_limits<SReal>::lowest();

SReal maxBBox[3] = { min_real,min_real,min_real };
SReal minBBox[3] = { max_real,max_real,max_real };

for (it = vec.begin(); it != vec.end(); it++)
for(const auto& tetra : m_topology->getTetrahedra())
{
for (unsigned int i = 0; i< 4; i++)
{
v = position[(*it)[i]];
//v = x[(*it)[i]];
const auto& v = position[tetra[i]];

if (minBBox[0] > v[0]) minBBox[0] = v[0];
if (minBBox[1] > v[1]) minBBox[1] = v[1];
Expand Down
7 changes: 7 additions & 0 deletions applications/plugins/VolumetricRendering/src/VolumetricRendering/OglVolumetricModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,13 @@ void OglVolumetricModel::initVisual()

void OglVolumetricModel::updateVisual()
{
// Workaround if updateVisual() is called without an opengl context
const auto* vparams = core::visual::VisualParams::defaultInstance();
if (!vparams->isSupported(core::visual::API_OpenGL))
{
return;
}

if (b_modified || d_tetrahedra.isDirty() || d_hexahedra.isDirty() || m_positions.isDirty())
{
//if(b_useTopology)
Expand Down
Loading