Cleanup ANARI_TYPEFOR_SPECIALIZATION

[PR comments]

Author: tarcila

devices/rtx/device/optix_visrtx.h

@@ -145,6 +145,8 @@ constexpr int ATTRIBUTE_VALUES = 4;
   }
 
 VISRTX_ANARI_TYPEFOR_SPECIALIZATION(visrtx::box1, ANARI_FLOAT32_BOX1);
+VISRTX_ANARI_TYPEFOR_SPECIALIZATION(visrtx::box2, ANARI_FLOAT32_BOX2);
+VISRTX_ANARI_TYPEFOR_SPECIALIZATION(visrtx::box3, ANARI_FLOAT32_BOX3);
 
 namespace visrtx {
 

devices/rtx/device/spatial_field/NvdbRegularField.cpp

@@ -35,7 +35,7 @@
 
 // anari
 #include <anari/anari_cpp/Traits.h>
-#include <anari/frontend/anari_enums.h>
+#include "utility/AnariTypeHelpers.h"
 
 // nanovdb
 #include <nanovdb/NanoVDB.h>
@@ -44,8 +44,6 @@
 #include <glm/ext/vector_float3.hpp>
 #include <glm/gtx/component_wise.hpp>
 
-VISRTX_ANARI_TYPEFOR_SPECIALIZATION(visrtx::box3, ANARI_FLOAT32_BOX3);
-
 namespace visrtx {
 
 // NvdbRegularField definitions /////////////////////////////////////////

devices/rtx/device/spatial_field/StructuredRegularField.cpp

@@ -33,20 +33,18 @@
 
 #include "gpu/gpu_decl.h"
 #include "gpu/shadingState.h"
-#include "utility/AnariTypeHelpers.h"
 
 // anari
 #include <anari/anari_cpp/Traits.h>
-#include <anari/frontend/anari_enums.h>
+#include "utility/AnariTypeHelpers.h"
+
 // std
 #include <algorithm>
 #include <limits>
 #include <vector>
 // glm
 #include <glm/gtx/component_wise.hpp>
 
-VISRTX_ANARI_TYPEFOR_SPECIALIZATION(visrtx::box3, ANARI_FLOAT32_BOX3);
-
 namespace visrtx {
 
 // Helper functions ///////////////////////////////////////////////////////////

tsd/src/tsd/core/TSDMath.hpp

@@ -138,3 +138,9 @@ using mat4 = float4x4;
 namespace math = core::math;
 
 } // namespace tsd
+
+namespace anari {
+// box1 is already exposed by helium.
+ANARI_TYPEFOR_SPECIALIZATION(tsd::core::math::box2, ANARI_FLOAT32_BOX2);
+ANARI_TYPEFOR_SPECIALIZATION(tsd::core::math::box3, ANARI_FLOAT32_BOX3);
+} // namespace anari

tsd/src/tsd/core/scene/objects/SpatialField.cpp

@@ -13,10 +13,6 @@
 // std
 #include <optional>
 
-namespace anari {
-  ANARI_TYPEFOR_SPECIALIZATION(tsd::math::box3, ANARI_FLOAT32_BOX3);
-}
-
 namespace tsd::core {
 
 SpatialField::SpatialField(Token stype) : Object(ANARI_SPATIAL_FIELD, stype)
@@ -44,8 +40,8 @@ SpatialField::SpatialField(Token stype) : Object(ANARI_SPATIAL_FIELD, stype)
     addParameter("roi")
         .setDescription("ROI box in object space")
         .setValue(tsd::math::box3(
-            tsd::math::float3(-INFINITY, -INFINITY, -INFINITY),
-            tsd::math::float3(INFINITY, INFINITY, INFINITY)));
+            tsd::math::float3(-math::inf, -math::inf, -math::inf),
+            tsd::math::float3(math::inf, math::inf, math::inf)));
   } else if (stype == tokens::spatial_field::amr) {
     addParameter("gridOrigin")
         .setValue(tsd::math::float3(0.f, 0.f, 0.f))
@@ -85,8 +81,8 @@ SpatialField::SpatialField(Token stype) : Object(ANARI_SPATIAL_FIELD, stype)
     addParameter("roi")
         .setDescription("ROI box in object space")
         .setValue(tsd::math::box3(
-            tsd::math::float3(-INFINITY, -INFINITY, -INFINITY),
-            tsd::math::float3(INFINITY, INFINITY, INFINITY)));
+            tsd::math::float3(-math::inf, -math::inf, -math::inf),
+            tsd::math::float3(math::inf, math::inf, math::inf)));
   }
 }
 

tsd/src/tsd/io/importers/import_SILO.cpp

@@ -27,10 +27,6 @@
 #endif
 #endif
 
-namespace anari {
-  ANARI_TYPEFOR_SPECIALIZATION(tsd::math::box3, ANARI_FLOAT32_BOX3);
-} // namespace anari
-
 namespace tsd::io {
 
 using namespace tsd::core;