Upgrade laszip.net (fixes# 9), fix Int packed negative values issue for batch processing (now min Y/Z bound is used to keep all points above 0), #BUILD

Author: unitycoder

MainWindow.xaml.cs

@@ -26,7 +26,7 @@ namespace PointCloudConverter
 {
     public partial class MainWindow : Window
     {
-        static readonly string version = "11.02.2024";
+        static readonly string version = "24.02.2024";
         static readonly string appname = "PointCloud Converter - " + version;
         static readonly string rootFolder = AppDomain.CurrentDomain.BaseDirectory;
 
@@ -271,6 +271,10 @@ static void ParseFile(ImportSettings importSettings, int fileIndex)
                     // offset cloud to be near 0,0,0
                     importSettings.offsetX = bounds.minX;
                     importSettings.offsetY = bounds.minY;
+                }
+                // NOW smallest Y offset and largest X,Z is used (to fix INT packing negative value issue)
+                if (bounds.minZ < importSettings.offsetZ)
+                {
                     importSettings.offsetZ = bounds.minZ;
                 }
             }
@@ -280,14 +284,13 @@ static void ParseFile(ImportSettings importSettings, int fileIndex)
                 importSettings.offsetY = importSettings.manualOffsetY;
                 importSettings.offsetZ = importSettings.manualOffsetZ;
             }
-            else
+            else // neither
             {
                 importSettings.offsetX = 0;
                 importSettings.offsetY = 0;
                 importSettings.offsetZ = 0;
             }
 
-
             var writerRes = importSettings.writer.InitWriter(importSettings, pointCount);
             if (writerRes == false)
             {

Readers/LAZ.cs

@@ -8,51 +8,55 @@
 // (c) of C# port 2014-2017 by Shinta [email protected]
 
 using PointCloudConverter.Structs;
-using laszip.net;
 using System;
+using LASzip.Net;
 
 namespace PointCloudConverter.Readers
 {
     public class LAZ : IReader
     {
-        laszip_dll lazReader = new laszip_dll();
-        bool compressed = false;
-        bool importRGB = true;
-        bool importIntensity = false;
+        //laszip_dll lazReader = new laszip_dll();
+        laszip lazReader = new laszip();
+
+        bool compressedLAZ = false;
+        //bool importRGB = true;
+        //bool importIntensity = false;
         bool customIntensityRange = false;
 
         bool IReader.InitReader(ImportSettings importSettings, int fileIndex)
         {
             // TODO check errors
             var file = importSettings.inputFiles[fileIndex];
-            importRGB = importSettings.importRGB;
-            importIntensity = importSettings.importIntensity;
+            //importRGB = importSettings.importRGB;
+            //importIntensity = importSettings.importIntensity;
             customIntensityRange = importSettings.useCustomIntensityRange;
-            lazReader.laszip_open_reader(file, ref compressed);
+            lazReader.open_reader(file, out compressedLAZ);
             return true;
         }
 
         Bounds IReader.GetBounds()
         {
             var b = new Bounds();
-
             // get original bounds from file
             b.minX = (float)lazReader.header.min_x;
             b.maxX = (float)lazReader.header.max_x;
             b.minY = (float)lazReader.header.min_y;
             b.maxY = (float)lazReader.header.max_y;
             b.minZ = (float)lazReader.header.min_z;
             b.maxZ = (float)lazReader.header.max_z;
-
             return b;
         }
 
         int IReader.GetPointCount()
         {
-            return (int)lazReader.header.number_of_point_records;
+            long count = 0;
+            lazReader.get_point_count(out count);
+            // check alternative point counts
+            if (count == 0) count = (int)lazReader.header.extended_number_of_point_records;
+            if (count == 0) count = lazReader.header.number_of_point_records;
+            return (int)count;
         }
 
-
         Color IReader.GetRGB()
         {
             var c = new Color();
@@ -105,22 +109,22 @@ Float3 IReader.GetXYZ()
             f.hasError = false;
 
             // Read point
-            lazReader.laszip_read_point();
+            lazReader.read_point();
 
             // check for received errors
-            var err = lazReader.laszip_get_error();
-            if (err != null)
+            var err = lazReader.get_error();
+            if (err == null)
             {
                 Console.ForegroundColor = ConsoleColor.Red;
-                Console.WriteLine("Failed to read until end of file, partial data is kept.");
+                Console.WriteLine("Failed to read until end of file?");
                 Console.WriteLine("ErrorCode: " + err);
                 Console.ForegroundColor = ConsoleColor.White;
                 f.hasError = true;
             }
 
             // Get precision coordinates
             var coordArray = new double[3];
-            lazReader.laszip_get_coordinates(coordArray);
+            lazReader.get_coordinates(coordArray);
             f.x = coordArray[0];
             f.y = coordArray[1];
             f.z = coordArray[2];
@@ -130,7 +134,7 @@ Float3 IReader.GetXYZ()
 
         void IReader.Close()
         {
-            lazReader.laszip_close_reader();
+            lazReader.close_reader();
         }
     } // class
 } // namespace

Writers/PCROOT.cs

@@ -48,6 +48,7 @@ bool IWriter.InitWriter(ImportSettings _importSettings, int _pointCount)
             nodeR.Clear();
             nodeG.Clear();
             nodeB.Clear();
+            nodeIntensity.Clear();
 
             bsPoints = null;
             writerPoints = null;