From 937ac2f64a543aa2dd48ee48ca4775e13d31a6c8 Mon Sep 17 00:00:00 2001 From: albertoesmp Date: Wed, 29 May 2024 21:41:07 +0200 Subject: [PATCH] Solved issue with AABB-only scenes. AABB::getForPrimitives now considers bounding boxes instead of vertices. --- src/main/helios_version.cpp | 2 +- src/scanner/detector/FullWaveformPulseRunnable.cpp | 2 +- src/scene/primitives/AABB.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/helios_version.cpp b/src/main/helios_version.cpp index c3afc8062..0ccf85e91 100644 --- a/src/main/helios_version.cpp +++ b/src/main/helios_version.cpp @@ -4,7 +4,7 @@ const char * HELIOS_VERSION = "1.3.0"; -const char * HELIOS_GIT_HASH = "147f1e94"; +const char * HELIOS_GIT_HASH = "508f2033"; const char * getHeliosVersion(){ return HELIOS_VERSION; diff --git a/src/scanner/detector/FullWaveformPulseRunnable.cpp b/src/scanner/detector/FullWaveformPulseRunnable.cpp index 4d0e73fcc..4951317ab 100644 --- a/src/scanner/detector/FullWaveformPulseRunnable.cpp +++ b/src/scanner/detector/FullWaveformPulseRunnable.cpp @@ -194,7 +194,7 @@ void FullWaveformPulseRunnable::handleSubray( ); subraySimRecord[5] = (rayDirection[0] < 0) == (subrayDirection[0] < 0); subraySimRecord[6] = (tMinMax.size()<1) ? 0 : tMinMax[0]; - subraySimRecord[7] = (tMinMax.size()<1) ? 0 : tMinMax[1]; + subraySimRecord[7] = (tMinMax.size()<2) ? 0 : tMinMax[1]; subraySimRecord[8] = subrayDirection.x; subraySimRecord[9] = subrayDirection.y; subraySimRecord[10] = subrayDirection.z; diff --git a/src/scene/primitives/AABB.cpp b/src/scene/primitives/AABB.cpp index 8154d7a14..2a8f91ec5 100644 --- a/src/scene/primitives/AABB.cpp +++ b/src/scene/primitives/AABB.cpp @@ -51,8 +51,8 @@ shared_ptr AABB::getForPrimitives(std::vector & primitives) { double maxZ = numeric_limits::lowest(); for (Primitive *p : primitives) { - Vertex *v = p->getVertices(); - size_t const numVertices = p->getNumVertices(); + Vertex *v = p->getFullVertices(); + size_t const numVertices = p->getNumFullVertices(); for(size_t i = 0 ; i < numVertices ; ++i){ double const vx = v[i].pos.x; double const vy = v[i].pos.y;