switch to combined color/opacity array on tf1D volumes in tsdVolumeViewer

Author: jeffamstutz

tsd/apps/interactive/volume_viewer/tsdVolumeViewer.cpp

@@ -54,25 +54,23 @@ class Application : public BaseApplication
                                        m = manipulator,
                                        tf = tfeditor,
                                        core = core]() {
-      auto colorArray = core->tsd.ctx.createArray(ANARI_FLOAT32_VEC3, 256);
-      auto opacityArray = core->tsd.ctx.createArray(ANARI_FLOAT32, 256);
+      auto colorMapArray = core->tsd.ctx.createArray(ANARI_FLOAT32_VEC4, 256);
 
       tsd::VolumeRef volume;
 
       if (!g_filename.empty()) {
         volume = tsd::import_volume(
-            core->tsd.ctx, g_filename.c_str(), colorArray, opacityArray);
+            core->tsd.ctx, g_filename.c_str(), colorMapArray);
       }
 
       if (!volume) {
         if (!g_filename.empty())
           tsd::logWarning("unable to load volume from file, using placeholder");
 
-        auto tx1 =
-            core->tsd.ctx.insertChildTransformNode(core->tsd.ctx.defaultLayer()->root());
+        auto tx1 = core->tsd.ctx.insertChildTransformNode(
+            core->tsd.ctx.defaultLayer()->root());
 
-        volume = tsd::generate_noiseVolume(
-            core->tsd.ctx, tx1, colorArray, opacityArray);
+        volume = tsd::generate_noiseVolume(core->tsd.ctx, tx1, colorMapArray);
       }
 
       core->tsd.selectedObject = volume.data();
@@ -90,7 +88,8 @@ class Application : public BaseApplication
         light->setName("mainLight");
         light->setParameter("direction", tsd::float2(0.f, 240.f));
 
-        core->tsd.ctx.defaultLayer()->insert_first_child(core->tsd.ctx.defaultLayer()->root(),
+        core->tsd.ctx.defaultLayer()->insert_first_child(
+            core->tsd.ctx.defaultLayer()->root(),
             tsd::utility::Any(ANARI_LIGHT, light.index()));
       }
 
@@ -102,18 +101,9 @@ class Application : public BaseApplication
 
       tf->setUpdateCallback([=](const tsd::float2 &valueRange,
                                 const std::vector<tsd::float4> &co) mutable {
-        auto *colors = colorArray->mapAs<tsd::float3>();
-        auto *opacities = opacityArray->mapAs<float>();
-        std::transform(co.begin(), co.end(), colors, [](const tsd::float4 &v) {
-          return tsd::float3(v.x, v.y, v.z);
-        });
-        std::transform(
-            co.begin(), co.end(), opacities, [](const tsd::float4 &v) {
-              return v.w;
-            });
-        colorArray->unmap();
-        opacityArray->unmap();
-
+        auto *colorMap = colorMapArray->mapAs<tsd::float4>();
+        std::copy(co.begin(), co.end(), colorMap);
+        colorMapArray->unmap();
         volume->setParameter("valueRange", ANARI_FLOAT32_BOX1, &valueRange);
       });
     });

tsd/src/tsd/authoring/importers.hpp

@@ -24,7 +24,7 @@ SpatialFieldRef import_NVDB(Context &ctx, const char *filename);
 VolumeRef import_volume(Context &ctx,
     const char *filename,
     ArrayRef colors,
-    ArrayRef opacities);
+    ArrayRef opacities = {});
 
 // clang-format on
 

tsd/src/tsd/authoring/importers/import_volume.cpp

@@ -46,7 +46,8 @@ VolumeRef import_volume(Context &ctx,
   volume->setName(fileOf(filepath).c_str());
   volume->setParameterObject("value", *field);
   volume->setParameterObject("color", *colorArray);
-  volume->setParameterObject("opacity", *opacityArray);
+  if (opacityArray)
+    volume->setParameterObject("opacity", *opacityArray);
   volume->setParameter("valueRange", ANARI_FLOAT32_BOX1, &valueRange);
 
   return volume;

tsd/src/tsd/authoring/procedural/generate_noiseVolume.cpp

@@ -44,7 +44,7 @@ VolumeRef generate_noiseVolume(Context &ctx,
       location, tokens::volume::transferFunction1D);
   volume->setName("noise_volume");
 
-  if (!(colorArray && opacityArray)) {
+  if (!colorArray) {
     colorArray = ctx.createArray(ANARI_FLOAT32_VEC3, 3);
     opacityArray = ctx.createArray(ANARI_FLOAT32, 2);
 
@@ -60,11 +60,13 @@ VolumeRef generate_noiseVolume(Context &ctx,
 
     colorArray->setData(colors.data());
     opacityArray->setData(opacities.data());
+  } else {
+    volume->setParameterObject("color"_t, *colorArray);
+    if (opacityArray)
+      volume->setParameterObject("opacity"_t, *opacityArray);
   }
 
   volume->setParameterObject("value"_t, *field);
-  volume->setParameterObject("color"_t, *colorArray);
-  volume->setParameterObject("opacity"_t, *opacityArray);
 
   return volume;
 }