Samples: Automatic updates to public repository

Remember to do the following:
    1. Ensure that modified/deleted/new files are correct
    2. Make this commit message relevant for the changes
    3. Force push
    4. Delete branch after PR is merged

If this commit is an update from one SDK version to another,
make sure to create a release tag for previous version.

README.md

@@ -40,18 +40,14 @@ from the camera can be used.
 
   - **Camera**
       - **Basic**
-          - [Capture](https://github.com/zivid/zivid-cpp-samples/tree/master/source/Camera/Basic/Capture/Capture.cpp) - Capture point clouds, with color, from the Zivid camera.
-          - [Capture2D](https://github.com/zivid/zivid-cpp-samples/tree/master/source/Camera/Basic/Capture2D/Capture2D.cpp) - Capture 2D images from the Zivid camera.
-          - [CaptureAssistant](https://github.com/zivid/zivid-cpp-samples/tree/master/source/Camera/Basic/CaptureAssistant/CaptureAssistant.cpp) - Capture Assistant to capture point clouds, with color,
-            from the Zivid camera.
+          - [Capture](https://github.com/zivid/zivid-cpp-samples/tree/master/source/Camera/Basic/Capture/Capture.cpp) - Capture colored point cloud, save 2D image, save 3D ZDF,
+            and export PLY, using the Zivid camera.
           - [CaptureFromFileCamera](https://github.com/zivid/zivid-cpp-samples/tree/master/source/Camera/Basic/CaptureFromFileCamera/CaptureFromFileCamera.cpp) - Capture point clouds, with color, with the Zivid file
             camera.
-          - [CaptureHDR](https://github.com/zivid/zivid-cpp-samples/tree/master/source/Camera/Basic/CaptureHDR/CaptureHDR.cpp) - Capture HDR point clouds, with color, from the Zivid
-            camera.
           - [CaptureHDRCompleteSettings](https://github.com/zivid/zivid-cpp-samples/tree/master/source/Camera/Basic/CaptureHDRCompleteSettings/CaptureHDRCompleteSettings.cpp) - Capture point clouds, with color, from the Zivid camera
             with fully configured settings.
-          - [CaptureWithSettingsFromYML](https://github.com/zivid/zivid-cpp-samples/tree/master/source/Camera/Basic/CaptureWithSettingsFromYML/CaptureWithSettingsFromYML.cpp) - Capture point clouds, with color, from the Zivid camera,
-            with settings from YML file.
+          - [CaptureWithSettingsFromYML](https://github.com/zivid/zivid-cpp-samples/tree/master/source/Camera/Basic/CaptureWithSettingsFromYML/CaptureWithSettingsFromYML.cpp) - Capture images and point clouds, with or without color,
+            from the Zivid camera with settings from YML file.
       - **Advanced**
           - [AllocateMemoryForPointCloudData](https://github.com/zivid/zivid-cpp-samples/tree/master/source/Camera/Advanced/AllocateMemoryForPointCloudData/AllocateMemoryForPointCloudData.cpp) - Two methods to copy point cloud data from GPU memory to
             CPU memory, to be consumed by OpenCV.

source/Applications/PointCloudTutorial.md

@@ -55,10 +55,10 @@ compute device memory) and the capture and camera information.
 When you capture with Zivid, you get a frame in return.
 
 ([go to
-source](https://github.com/zivid/zivid-cpp-samples/tree/master//source/Camera/Basic/Capture/Capture.cpp#L22))
+source](https://github.com/zivid/zivid-cpp-samples/tree/master//source/Camera/Basic/Capture/Capture.cpp#L25))
 
 ``` sourceCode cpp
-const auto frame = camera.capture(settings);
+const auto frame = camera.capture2D3D(settings);
 ```
 
 Check

source/CMakeLists.txt

@@ -22,11 +22,8 @@ option(USE_HALCON "Enable samples which depend on Halcon" OFF)
 
 set(SAMPLES
     Camera/Basic/Capture
-    Camera/Basic/Capture2D
-    Camera/Basic/CaptureAssistant
     Camera/Basic/CaptureFromFileCamera
     Camera/Basic/CaptureWithSettingsFromYML
-    Camera/Basic/CaptureHDR
     Camera/Basic/CaptureHDRCompleteSettings
     Camera/Advanced/Capture2DAnd3D
     Camera/Advanced/CaptureHDRLoop

source/Camera/Basic/Capture/Capture.cpp

@@ -1,5 +1,5 @@
 /*
-Capture point clouds, with color, from the Zivid camera.
+Capture colored point cloud, save 2D image, save 3D ZDF, and export PLY, using the Zivid camera.
 */
 
 #include <Zivid/Zivid.h>
@@ -16,10 +16,18 @@ int main()
         auto camera = zivid.connectCamera();
 
         std::cout << "Creating default capture settings" << std::endl;
-        const auto settings = Zivid::Settings(Zivid::Settings::Acquisitions{ Zivid::Settings::Acquisition{} });
+        const auto settings = Zivid::Settings(
+            Zivid::Settings::Acquisitions{ Zivid::Settings::Acquisition{} },
+            Zivid::Settings::Color(
+                Zivid::Settings2D(Zivid::Settings2D::Acquisitions{ Zivid::Settings2D::Acquisition{} })));
 
         std::cout << "Capturing frame" << std::endl;
-        const auto frame = camera.capture(settings);
+        const auto frame = camera.capture2D3D(settings);
+
+        const auto imageRGBA = frame.frame2D().value().imageRGBA();
+        const auto imageFile = "ImageRGB.png";
+        std::cout << "Saving 2D color image (linear RGB color space) to file: " << imageFile << std::endl;
+        imageRGBA.save(imageFile);
 
         const auto dataFile = "Frame.zdf";
         std::cout << "Saving frame to file: " << dataFile << std::endl;

source/Camera/Basic/CaptureFromFileCamera/CaptureFromFileCamera.cpp

@@ -34,23 +34,28 @@ int main(int argc, char **argv)
         Zivid::Application zivid;
 
         const auto fileCamera =
-            userInput ? fileCameraPath : std::string(ZIVID_SAMPLE_DATA_DIR) + "/FileCameraZivid2M70.zfc";
+            userInput ? fileCameraPath : std::string(ZIVID_SAMPLE_DATA_DIR) + "/FileCameraZivid2PlusMR60.zfc";
 
         std::cout << "Creating virtual camera using file: " << fileCamera << std::endl;
         auto camera = zivid.createFileCamera(fileCamera);
 
         std::cout << "Configuring settings" << std::endl;
-        const auto settings = Zivid::Settings{ Zivid::Settings::Acquisitions{ Zivid::Settings::Acquisition{} },
-                                               Zivid::Settings::Processing::Filters::Smoothing::Gaussian::Enabled::yes,
-                                               Zivid::Settings::Processing::Filters::Smoothing::Gaussian::Sigma{ 1.5 },
-                                               Zivid::Settings::Processing::Filters::Reflection::Removal::Enabled::yes,
-                                               Zivid::Settings::Processing::Filters::Reflection::Removal::Mode::global,
-                                               Zivid::Settings::Processing::Color::Balance::Red{ 1 },
-                                               Zivid::Settings::Processing::Color::Balance::Green{ 1 },
-                                               Zivid::Settings::Processing::Color::Balance::Blue{ 1 } };
+        Zivid::Settings settings{
+            Zivid::Settings::Acquisitions{ Zivid::Settings::Acquisition{} },
+            Zivid::Settings::Processing::Filters::Smoothing::Gaussian::Enabled::yes,
+            Zivid::Settings::Processing::Filters::Smoothing::Gaussian::Sigma{ 1.5 },
+            Zivid::Settings::Processing::Filters::Reflection::Removal::Enabled::yes,
+            Zivid::Settings::Processing::Filters::Reflection::Removal::Mode::global,
+        };
+        Zivid::Settings2D settings2D{ Zivid::Settings2D::Acquisitions{ Zivid::Settings2D::Acquisition{} },
+                                      Zivid::Settings2D::Processing::Color::Balance::Red{ 1 },
+                                      Zivid::Settings2D::Processing::Color::Balance::Green{ 1 },
+                                      Zivid::Settings2D::Processing::Color::Balance::Blue{ 1 } };
+
+        settings.color() = Zivid::Settings::Color{ settings2D };
 
         std::cout << "Capturing frame" << std::endl;
-        const auto frame = camera.capture(settings);
+        const auto frame = camera.capture2D3D(settings);
 
         const auto dataFile = "Frame.zdf";
         std::cout << "Saving frame to file: " << dataFile << std::endl;