fixed mac warnings and typos

.github/workflows/ci.yml

@@ -21,9 +21,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          # Disable MacOS for now - we do not yet officially support it and we need to invest a bit
-          # more efforts into investigating broken LAZ files written by Helios on MacOS.
-          # - macos-latest
+          - macos-latest
           - windows-latest
         python:
           - "3.8"
@@ -37,6 +35,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install Git
+        if: runner.os == 'macOS'
+        run: |
+          brew update
+          brew install git
+
       - name: Create Helios dev environment
         uses: conda-incubator/setup-miniconda@v2
         with:
@@ -45,12 +49,15 @@ jobs:
           activate-environment: helios-dev
           environment-file: environment-dev.yml
           python-version: ${{ matrix.python }}
+          miniconda-version: "latest"
 
       - name: Install Helios
         run: |
           python -m pip install -v .
       
       - name: Run tests
+        if: runner.os != 'macOS' # Skip tests on macOS for now 
+        #because of a bug in laz files
         run: |
           python -m pytest -m exe
           python -m pytest -m pyh

src/adt/exprtree/IExprTreeNode.h

@@ -20,7 +20,7 @@ class IExprTreeNode : public IBinaryTreeNode {
 public:
     // ***  CONSTRUCTION / DESTRUCTION  *** //
     // ************************************ //
-    virtual ~IExprTreeNode() = default;
+    ~IExprTreeNode() override = default;
 
     // ***  EXPRESSION TREE NODE INTERFACE *** //
     // *************************************** //

src/adt/kdtree/AxisSAHKDTreeFactory.h

@@ -50,7 +50,7 @@ using SAHKDTreeFactory::co;
         double const cl=1,
         double const co=1
     );
-    virtual ~AxisSAHKDTreeFactory() = default;
+    ~AxisSAHKDTreeFactory() override = default;
 
     // ***  CLONE  *** //
     // *************** //

src/adt/kdtree/AxisSAHKDTreeGeometricStrategy.h

@@ -41,7 +41,7 @@ class AxisSAHKDTreeGeometricStrategy : public SAHKDTreeGeometricStrategy {
         SAHKDTreeGeometricStrategy(kdtf),
         asahkdtf(kdtf)
     {}
-    virtual ~AxisSAHKDTreeGeometricStrategy() = default;
+    ~AxisSAHKDTreeGeometricStrategy() override = default;
 
     // ***  CLONE  *** //
     // *************** //

src/adt/kdtree/FastSAHKDTreeFactory.h

@@ -80,7 +80,7 @@ using SAHKDTreeFactory::co;
         double const cl=1,
         double const co=1
     );
-    virtual ~FastSAHKDTreeFactory () = default;
+    ~FastSAHKDTreeFactory () override = default;
 
     // ***  CLONE  *** //
     // *************** //

src/adt/kdtree/FastSAHKDTreeGeometricStrategy.h

@@ -41,7 +41,7 @@ class FastSAHKDTreeGeometricStrategy : public SAHKDTreeGeometricStrategy {
         SAHKDTreeGeometricStrategy(kdtf),
         fsahkdtf(kdtf)
     {}
-    virtual ~FastSAHKDTreeGeometricStrategy() = default;
+    ~FastSAHKDTreeGeometricStrategy() override = default;
 
     // ***  CLONE  *** //
     // *************** //

src/adt/kdtree/FastSAHKDTreeRecountSubTask.h

@@ -75,7 +75,7 @@ class FastSAHKDTreeRecountSubTask : public SharedSubTask{
         cForward(cForward),
         cBackward(cBackward)
     {}
-    virtual ~FastSAHKDTreeRecountSubTask() = default;
+    ~FastSAHKDTreeRecountSubTask() override = default;
 
     // ***  RUNNABLE SHARED TASK  *** //
     // ****************************** //

src/adt/kdtree/KDTreeNode.h

@@ -72,7 +72,7 @@ class KDTreeNode : public LightKDTreeNode{
 	/**
 	 * @brief Destructor for KDTreeNode
 	 */
-    virtual ~KDTreeNode() = default;
+    ~KDTreeNode() override = default;
 
 	// ***  ASSIGNMENT OPERATORS  *** //
 	// ****************************** //

src/adt/kdtree/LightKDTreeNode.h

@@ -100,7 +100,7 @@ class LightKDTreeNode : public IBinaryTreeNode {
     /**
 	 * @brief Destructor for LightKDTreeNode
 	 */
-    virtual ~LightKDTreeNode() {
+    ~LightKDTreeNode() override {
         delete left;
         delete right;
     }

src/adt/kdtree/MultiThreadKDTreeFactory.h

@@ -146,7 +146,7 @@ class MultiThreadKDTreeFactory : public SimpleKDTreeFactory{
         size_t const numJobs=2,
         size_t const geomJobs=2
     );
-    virtual ~MultiThreadKDTreeFactory() = default;
+    ~MultiThreadKDTreeFactory() override = default;
 
     // ***  CLONE  *** //
     // *************** //

src/adt/kdtree/MultiThreadSAHKDTreeFactory.h

@@ -73,7 +73,7 @@ using MultiThreadKDTreeFactory::kdtf;
         size_t const numJobs=2,
         size_t const geomJobs=2
     );
-    virtual ~MultiThreadSAHKDTreeFactory() = default;
+    ~MultiThreadSAHKDTreeFactory() override = default;
 
     // ***  CLONE  *** //
     // *************** //

src/adt/kdtree/SAHKDTreeComputeLossNodesSubTask.h

@@ -110,7 +110,7 @@ class SAHKDTreeComputeLossNodesSubTask : public SharedSubTask{
         partialSplitPos(partialSplitPos),
         splitLoss(splitLoss)
     {}
-    virtual ~SAHKDTreeComputeLossNodesSubTask() {}
+    ~SAHKDTreeComputeLossNodesSubTask() override {}
 
     // ***  RUNNABLE SHARED TASK  *** //
     // ****************************** //

src/adt/kdtree/SAHKDTreeFactory.h

@@ -262,7 +262,7 @@ class SAHKDTreeFactory : public SimpleKDTreeFactory{
         double const cl=1,
         double const co=1
     );
-    virtual ~SAHKDTreeFactory() = default;
+    ~SAHKDTreeFactory() override = default;
 
     // ***  CLONE  *** //
     // *************** //

src/adt/kdtree/SAHKDTreeGeometricStrategy.h

@@ -41,7 +41,7 @@ class SAHKDTreeGeometricStrategy : public SimpleKDTreeGeometricStrategy{
         SimpleKDTreeGeometricStrategy(kdtf),
         sahkdtf(kdtf)
     {}
-    virtual ~SAHKDTreeGeometricStrategy() = default;
+    ~SAHKDTreeGeometricStrategy() override = default;
 
     // ***  CLONE  *** //
     // *************** //

src/adt/kdtree/SimpleKDTreeBuildChildrenNodesSubTask.h

@@ -79,7 +79,7 @@ class SimpleKDTreeBuildChildrenNodesSubTask : public SharedSubTask{
         setChild(setChild),
         buildRecursive(buildRecursive)
     {}
-    virtual ~SimpleKDTreeBuildChildrenNodesSubTask() {}
+    ~SimpleKDTreeBuildChildrenNodesSubTask() override {}
 
     // ***  RUNNABLE SHARED TASK  *** //
     // ****************************** //

src/adt/kdtree/SimpleKDTreeComputeRootNodeBoundariesSubTask.h

@@ -107,7 +107,7 @@ class SimpleKDTreeComputeRootNodeBoundariesSubTask : public SharedSubTask {
         bx(bx), by(by), bz(bz),
         onRootBoundariesDigestPrimitive(onRootBoundariesDigestPrimitive)
     {}
-    virtual ~SimpleKDTreeComputeRootNodeBoundariesSubTask() {}
+    ~SimpleKDTreeComputeRootNodeBoundariesSubTask() override {}
 
     // ***  RUNNABLE SHARED TASK  *** //
     // ****************************** //

src/adt/kdtree/SimpleKDTreeFactory.h

@@ -82,7 +82,7 @@ class SimpleKDTreeFactory : public KDTreeFactory{
      *  function as member attribute
      */
     SimpleKDTreeFactory();
-    virtual ~SimpleKDTreeFactory() = default;
+    ~SimpleKDTreeFactory() override = default;
 
     // ***  CLONE  *** //
     // *************** //

src/adt/kdtree/SimpleKDTreePopulateSplitsSubTask.h

@@ -93,7 +93,7 @@ class SimpleKDTreePopulateSplitsSubTask : public SharedSubTask{
         endPrimitive(endPrimitive),
         onPopulateSplitsDigestPrimitive(onPopulateSplitsDigestPrimitive)
     {}
-    virtual ~SimpleKDTreePopulateSplitsSubTask() {}
+    ~SimpleKDTreePopulateSplitsSubTask() override {}
 
     // ***  RUNNABLE SHARED TASK  *** //
     // ****************************** //

src/alg/raycast/GroveKDTreeRaycaster.h

@@ -55,7 +55,7 @@ class GroveKDTreeRaycaster :
      *  resource that doesnt make sense after the time-of-live of the raycaster
      *  has finished
      */
-    virtual ~GroveKDTreeRaycaster() = default;
+    ~GroveKDTreeRaycaster() override = default;
 
     // ***  RAYCASTING METHODS  *** //
     // **************************** //

src/alg/raycast/KDGroveRaycaster.h

@@ -33,7 +33,7 @@ class KDGroveRaycaster : public Raycaster{
      * @param grove The KDGrove for the ray casting
      */
     KDGroveRaycaster(std::shared_ptr<KDGrove> grove) : grove(grove) {}
-    virtual ~KDGroveRaycaster() = default;
+    ~KDGroveRaycaster() override = default;
 
     // ***  RAYCASTING METHODS  *** //
     // **************************** //

src/alg/raycast/KDTreeRaycaster.h

@@ -101,7 +101,7 @@ class KDTreeRaycasterSearch{
 	 * @param root Root node of the KDTree
 	 */
 	KDTreeRaycaster(std::shared_ptr<LightKDTreeNode> root) : root(root) {}
-    virtual ~KDTreeRaycaster() = default;
+    ~KDTreeRaycaster() override = default;
 
 	// ***  RAYCASTING METHODS  *** //
 	// **************************** //

src/alg/raycast/RaycasterGroveTree.h

@@ -23,7 +23,7 @@ class RaycasterGroveTree : Raycaster{
 public:
     // ***  CONSTRUCTION / DESTRUCTION  *** //
     // ************************************ //
-    virtual ~RaycasterGroveTree() = default;
+    ~RaycasterGroveTree() override = default;
 
 
     // ***  GROVE DYNAMIC TREE METHODS  *** //

src/assetloading/EggAsset.h

@@ -23,7 +23,7 @@ class EggAsset : public Asset{
      * @brief Default constructor for EggAsset
      */
     EggAsset() : Asset() {}
-    virtual ~EggAsset() = default;
+    ~EggAsset() override = default;
 
     // ***  EGG METHODS  *** //
     // ********************* //

src/assetloading/ScenePart.cpp

@@ -20,7 +20,7 @@ ScenePart::ScenePart(ScenePart const &sp, bool const shallowPrimitives) {
   this->mOrigin = glm::dvec3(sp.mOrigin);
   this->mRotation = Rotation(sp.mRotation);
   this->mScale = sp.mScale;
-  this->forceOnGround = forceOnGround;
+  this->forceOnGround = sp.forceOnGround;
   this->mCrs = nullptr; // TODO Copy this too
   this->mEnv = nullptr; // TODO Copy this too
 

src/assetloading/VoxelFileParser.cpp

@@ -64,21 +64,23 @@ std::vector<DetailedVoxel *> VoxelFileParser::bruteParseDetailed(
     double voxelHalfSize = voxelSize / 2.0;
     const char * sep = separator.c_str();
     char format1[4096];
-    sprintf(
+    snprintf(
         format1,
+        sizeof(format1),
         "%s%s%s%s%s",
         "%zu",sep,"%zu",sep,"%zu"
     );
     char format2[4096];
-    sprintf(
+    snprintf(
         format2,
+        sizeof(format2),
         "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
         "%lf",sep,"%lf",sep,"%lf",sep,"%lf",sep,
         "%lf",sep,"%lf",sep,"%lf",sep,"%lf",sep,
         "%d",sep,"%d",sep,"%lf",sep,"%lf",sep,"%lf"
     );
     char format3[4096];
-    sprintf(format3, "%s%s", "%lf", sep);
+    snprintf(format3, sizeof(format3), "%s%s", "%lf", sep);
     DetailedVoxel *dv;
     for(std::string line : lines){
         dv = parseDetailedVoxelLine(

src/assetloading/geometryfilter/GeoTiffFileLoader.h

@@ -91,7 +91,7 @@ class GeoTiffFileLoader : public AbstractGeometryFilter {
 	/**
 	 * @see AbstractGeometryFilter::run
 	 */
-	ScenePart* run();
+	ScenePart* run() override;
 
 	// ***  METHODS  *** //
 	// ***************** //

src/assetloading/geometryfilter/NullGeometryFilter.h

@@ -29,6 +29,6 @@ class NullGeometryFilter : public AbstractGeometryFilter{
     /**
      * @see AbstractGeometryFilter::run
      */
-    ScenePart *run();
+    ScenePart *run() override;
 
 };

src/assetloading/geometryfilter/RotateFilter.h

@@ -33,5 +33,5 @@ class RotateFilter : public AbstractGeometryFilter {
 	/**
 	 * @see AbstractGeometryFilter::run
 	 */
-	ScenePart* run();
+	ScenePart* run() override;
 };

src/assetloading/geometryfilter/TranslateFilter.h

@@ -34,5 +34,5 @@ class TranslateFilter : public AbstractGeometryFilter {
     /**
      * @see AbstractGeometryFilter::run
      */
-	ScenePart* run();
+	ScenePart* run() override;
 };

src/assetloading/geometryfilter/WavefrontObjFileLoader.h

@@ -27,7 +27,7 @@ class WavefrontObjFileLoader : public AbstractGeometryFilter {
   /**
    * @see AbstractGeometryFilter::run
    */
-  ScenePart *run();
+  ScenePart *run() override;
 
   /**
    * @brief Load a vertice from a given line

src/assetloading/geometryfilter/XYZPointCloudFileLoader.h

@@ -354,6 +354,6 @@ class XYZPointCloudFileLoader : public AbstractGeometryFilter {
     /**
      * @see AbstractGeometryFilter::run
      */
-	ScenePart* run();
+	ScenePart* run() override;
 
 };

src/filems/read/comps/BufferedLineFileReader.h

@@ -43,7 +43,7 @@ class BufferedLineFileReader : public LineFileReader{
         lrs(ifs, this->maxCharsPerLine),
         bufferSize(bufferSize)
     {makeBufferedStrategy();}
-    virtual ~BufferedLineFileReader() = default;
+    ~BufferedLineFileReader() override = default;
 
 protected:
     // ***  INNER METHODS  *** //

src/filems/read/exceptions/EndOfReadingException.h

@@ -23,7 +23,7 @@ class EndOfReadingException : public HeliosException{
     EndOfReadingException(std::string const &msg = "End of reading exception"):
         HeliosException(msg)
     {}
-    virtual ~EndOfReadingException() = default;
+    ~EndOfReadingException() override = default;
 };
 
 }}

src/filems/serialization/SerialSceneWrapper.h

@@ -84,7 +84,7 @@ class SerialSceneWrapper : public Asset {
         sceneType(sceneType),
         scene(scene)
     {}
-    virtual ~SerialSceneWrapper() = default;
+    ~SerialSceneWrapper() override = default;
 
     // ***  READ / WRITE  *** //
     // ********************** //

src/filems/write/comps/Las14SyncFileMeasurementWriter.h

@@ -45,7 +45,7 @@ class Las14SyncFileMeasurementWriter : public LasSyncFileMeasurementWriter
             false // Prevent parent from creating LAS writer
         )
     {};
-    virtual ~Las14SyncFileMeasurementWriter() = default;
+    ~Las14SyncFileMeasurementWriter() override = default;
 
     // ***  CREATE WRITER  *** //
     // *********************** //

src/filems/write/core/BaseFullWaveformWriter.h

@@ -91,11 +91,11 @@ class BaseFullWaveformWriter : public HeliosWriter<WriteArgs ...>{
      * @return The path to the output file
      * @see filems::BaseFullWaveformWriter::getOutputPath
      */
-    fs::path getOutputFilePath() const {return fs::path(getOutputPath());}
+    fs::path getOutputFilePath() const override {return fs::path(getOutputPath());}
     /**
      * @see filems::BaseFullWaveformWriter::getOutputFilePath
      */
-    string getOutputPath() const {return sfw->getPath();}
+    string getOutputPath() const override {return sfw->getPath();}
 };
 
 #include <filems/write/core/BaseFullWaveformWriter.tpp>

src/filems/write/core/MultiVectorialMeasurementWriter.h

@@ -25,7 +25,7 @@ class MultiVectorialMeasurementWriter : public VectorialMeasurementWriter{
     MultiVectorialMeasurementWriter() :
         VectorialMeasurementWriter()
     {}
-    virtual ~MultiVectorialMeasurementWriter() = default;
+    ~MultiVectorialMeasurementWriter() override = default;
 
     // ***   M E T H O D S   *** //
     // ************************* //

src/filems/write/strategies/ZipFullWaveformWriteStrategy.h

@@ -38,7 +38,7 @@ class ZipFullWaveformWriteStrategy : public DirectFullWaveformWriteStrategy{
         DirectFullWaveformWriteStrategy(ofs),
         oa(oa)
     {}
-    virtual ~ZipFullWaveformWriteStrategy() = default;
+    ~ZipFullWaveformWriteStrategy() override = default;
 
     // ***  WRITE STRATEGY INTERFACE *** //
     // ********************************* //