support visible parameter on volume and surface objects

Author: jeffamstutz

src/devices/helide/surface/Surface.cpp

@@ -13,6 +13,7 @@ void Surface::commitParameters()
   m_id = getParam<uint32_t>("id", ~0u);
   m_geometry = getParamObject<Geometry>("geometry");
   m_material = getParamObject<Material>("material");
+  m_visible = getParam<bool>("visible", true);
 }
 
 void Surface::finalize()
@@ -43,6 +44,11 @@ bool Surface::isValid() const
   }
 }
 
+bool Surface::isVisible() const
+{
+  return m_visible;
+}
+
 const Geometry *Surface::geometry() const
 {
   return m_geometry.ptr;

src/devices/helide/surface/Surface.h

@@ -19,6 +19,7 @@ struct Surface : public Object
   void finalize() override;
   void markFinalized() override;
   bool isValid() const override;
+  bool isVisible() const;
 
   uint32_t id() const;
   const Geometry *geometry() const;
@@ -33,6 +34,7 @@ struct Surface : public Object
 
  private:
   uint32_t m_id{~0u};
+  bool m_visible{true};
   helium::IntrusivePtr<Geometry> m_geometry;
   helium::IntrusivePtr<Material> m_material;
 };

src/devices/helide/volume/Volume.cpp

@@ -20,6 +20,12 @@ Volume *Volume::createInstance(std::string_view subtype, HelideGlobalState *s)
 void Volume::commitParameters()
 {
   m_id = getParam<uint32_t>("id", ~0u);
+  m_visible = getParam<bool>("visible", true);
+}
+
+bool Volume::isVisible() const
+{
+  return m_visible;
 }
 
 } // namespace helide

src/devices/helide/volume/Volume.h

@@ -14,6 +14,7 @@ struct Volume : public Object
   static Volume *createInstance(std::string_view subtype, HelideGlobalState *d);
 
   void commitParameters() override;
+  bool isVisible() const;
 
   uint32_t id() const;
 
@@ -26,6 +27,7 @@ struct Volume : public Object
 
   private:
   uint32_t m_id{~0u};
+  bool m_visible{true};
 };
 
 // Inlined definitions ////////////////////////////////////////////////////////

src/devices/helide/world/Group.cpp

@@ -16,8 +16,11 @@ Group::~Group()
   cleanup();
 }
 
-bool Group::getProperty(
-    const std::string_view &name, ANARIDataType type, void *ptr, uint64_t size, uint32_t flags)
+bool Group::getProperty(const std::string_view &name,
+    ANARIDataType type,
+    void *ptr,
+    uint64_t size,
+    uint32_t flags)
 {
   if (name == "bounds" && type == ANARI_FLOAT32_BOX3) {
     if (flags & ANARI_WAIT) {
@@ -26,7 +29,7 @@ bool Group::getProperty(
     }
     auto bounds = getEmbreeSceneBounds(m_embreeScene);
     for (auto *v : volumes()) {
-      if (v->isValid())
+      if (v && v->isValid() && v->isVisible())
         bounds.extend(v->bounds());
     }
     std::memcpy(ptr, &bounds, sizeof(bounds));
@@ -76,7 +79,7 @@ void Group::intersectVolumes(VolumeRay &ray, const mat4 &invMat) const
   box1 t = ray.t;
 
   for (auto *v : volumes()) {
-    if (!v->isValid())
+    if (!v || !v->isValid() || !v->isVisible())
       continue;
     const float3 org = xfmPoint(invMat, ray.org);
     const float3 dir = xfmVec(invMat, ray.dir);
@@ -118,29 +121,33 @@ void Group::embreeSceneConstruct()
   rtcReleaseScene(m_embreeScene);
   m_embreeScene = rtcNewScene(deviceState()->embreeDevice);
 
+  m_surfaces.clear();
+
   if (m_surfaceData) {
     uint32_t id = 0;
     std::for_each(m_surfaceData->handlesBegin(),
         m_surfaceData->handlesEnd(),
         [&](auto *o) {
           auto *s = (Surface *)o;
-          if (s && s->isValid()) {
+          if (s && s->isValid() && s->isVisible()) {
             m_surfaces.push_back(s);
             rtcAttachGeometryByID(
                 m_embreeScene, s->geometry()->embreeGeometry(), id++);
-          } else {
+          } else if (!s || !s->isValid()) {
             reportMessage(ANARI_SEVERITY_DEBUG,
                 "helide::Group rejecting invalid surface(%p) in building BLS",
                 s);
-            auto *g = s->geometry();
-            if (!g || !g->isValid()) {
-              reportMessage(
-                  ANARI_SEVERITY_DEBUG, "    helide::Geometry is invalid");
-            }
-            auto *m = s->material();
-            if (!m || !m->isValid()) {
-              reportMessage(
-                  ANARI_SEVERITY_DEBUG, "    helide::Material is invalid");
+            if (s) {
+              auto *g = s->geometry();
+              if (!g || !g->isValid()) {
+                reportMessage(
+                    ANARI_SEVERITY_DEBUG, "    helide::Geometry is invalid");
+              }
+              auto *m = s->material();
+              if (!m || !m->isValid()) {
+                reportMessage(
+                    ANARI_SEVERITY_DEBUG, "    helide::Material is invalid");
+              }
             }
           }
         });