Remove end caps of cone/cylinder curve

small cleanup for spheres

Author: johguenther

CHANGELOG.md

@@ -24,6 +24,8 @@ Version History
     -   Find geometry lights after first empty instance
     -   Segfault when `numPrimitives()` is called before `commit()`
     -   Initialization of OpenGL on OSX
+    -   `OSP_DISJOINT` curves had disks at the end of the first and last
+        cone/cylinder
 
 ### Changes in v3.2.0:
 

modules/cpu/geometry/Curves.cpp

@@ -189,6 +189,12 @@ void Curves::createEmbreeGeometry()
     setEmbreeGeometryBuffer(
         embreeGeometry, RTC_BUFFER_TYPE_VERTEX_ATTRIBUTE, texcoordData, 1);
   }
+  capData.clear();
+  if (curveType == OSP_DISJOINT) {
+    // disable caps to get always open cones/cylinders
+    capData.resize(numPrimitives(), RTC_CURVE_FLAG_NEIGHBOR_LEFT | RTC_CURVE_FLAG_NEIGHBOR_RIGHT);
+    setEmbreeGeometryBuffer(embreeGeometry, RTC_BUFFER_TYPE_FLAGS, capData);
+  }
 
   rtcCommitGeometry(embreeGeometry);
 }

modules/cpu/geometry/Curves.h

@@ -28,6 +28,7 @@ struct OSPRAY_SDK_INTERFACE Curves
   Ref<const DataT<vec4f>> tangentData;
   Ref<const DataT<vec4f>> colorData;
   Ref<const DataT<vec2f>> texcoordData;
+  std::vector<uint8_t> capData;
 
   RTCGeometryType embreeCurveType{(RTCGeometryType)-1};
 

modules/cpu/geometry/SpheresShared.h

@@ -15,11 +15,10 @@ struct Spheres
   Data1D sphere;
   Data1D texcoord;
   Data1D normalData;
-  float global_radius;
   OSPSphereType sphereType;
 
 #ifdef __cplusplus
-  Spheres() : global_radius(.01f)
+  Spheres()
   {
     super.type = GEOMETRY_TYPE_SPHERES;
   }

test_image_data/baseline/TestScenesGeometry_Curves.test_scenes_15.png.md5

@@ -1 +1 @@
-1fe1248c860675a236275d280f209d69
+d808e1c19a981c996076630d6d84987c

test_image_data/baseline/TestScenesGeometry_Curves.test_scenes_16.png.md5

@@ -1 +1 @@
-e7023c32188855a556bf2b140a4790e8
+574c40e72117c607c8ce503f0ff9dd92

test_image_data/baseline/TestScenesGeometry_Curves.test_scenes_17.png.md5

@@ -1 +1 @@
-701ee56ee7ea7ec7210d44a35684e484
+48bb96453c5151afba3ccf877986704a