fixed laz support and las/laz header update

Author: m-schuetz

PotreeConverter/include/LASPointReader.h

@@ -43,6 +43,19 @@ class LIBLASReader{
 		stream.close();
 	}
 
+	AABB getAABB(){
+		AABB aabb;
+
+		const liblas::Header &header = reader.GetHeader();
+
+		Vector3<double> min = Vector3<double>(header.GetMinX(), header.GetMinY(), header.GetMinZ());
+		Vector3<double> max = Vector3<double>(header.GetMaxX(), header.GetMaxY(), header.GetMaxZ());
+		aabb.update(min);
+		aabb.update(max);
+
+		return aabb;
+	}
+
 };
 
 

PotreeConverter/include/LASPointWriter.hpp

@@ -7,13 +7,15 @@
 #include <fstream>
 
 #include "liblas\liblas.hpp"
+#include <boost/algorithm/string/predicate.hpp>
 
 #include "AABB.h"
 #include "PointWriter.hpp"
 
 using std::string;
 using std::fstream;
 using std::ios;
+using boost::algorithm::iends_with;
 
 class LASPointWriter : public PointWriter{
 
@@ -35,9 +37,14 @@ class LASPointWriter : public PointWriter{
 		header->SetMin(aabb.min.x, aabb.min.y, aabb.min.z);
 		header->SetMax(aabb.max.x, aabb.max.y, aabb.max.z);
 		header->SetScale(0.01, 0.01, 0.01);
+		header->SetPointRecordsCount(53);
+
+		if(iends_with(file, ".laz")){
+			header->SetCompressed(true);
+		}
 
 		stream = new fstream(file, ios::out | ios::binary);
-		 writer = new liblas::Writer(*stream, *header);
+		writer = new liblas::Writer(*stream, *header);
 
 
 		//LASheader header;
@@ -63,16 +70,22 @@ class LASPointWriter : public PointWriter{
 	void write(const Point &point);
 
 	void close(){
-		header->SetPointRecordsCount(numPoints);
-
-		writer->SetHeader(*header);
-		writer->WriteHeader();
 
-		stream->close();
+		// close stream
 		delete writer;
+		stream->close();
 		delete stream;
 		writer = NULL;
 		stream = NULL;
+		
+		// update point count
+		stream = new fstream(file, ios::out | ios::binary | ios::in );
+		stream->seekp(107);
+		stream->write(reinterpret_cast<const char*>(&numPoints), 4);
+		stream->close();
+		delete stream;
+		stream = NULL;
+
 	}
 
 };

PotreeConverter/src/LASPointReader.cpp

@@ -44,17 +44,13 @@ LASPointReader::LASPointReader(string path){
 	for(int i = 0; i < files.size(); i++){
 		string file = files[i];
 
-		reader = new LIBLASReader(file);
+		LIBLASReader aabbReader(file);
+		AABB lAABB = aabbReader.getAABB();
+		
+		aabb.update(lAABB.min);
+		aabb.update(lAABB.max);
 
-		liblas::Header header = reader->reader.GetHeader();
-
-		Vector3<double> min = Vector3<double>(header.GetMinX(), header.GetMinY(), header.GetMinZ());
-		Vector3<double> max = Vector3<double>(header.GetMaxX(), header.GetMaxY(), header.GetMaxZ());
-		aabb.update(min);
-		aabb.update(max);
-
-		reader->close();
-		delete reader;
+		aabbReader.close();
 	}
 
 	// open first file
@@ -99,7 +95,7 @@ bool LASPointReader::readNextPoint(){
 }
 
 Point LASPointReader::getPoint(){
-	liblas::Point lp = reader->reader.GetPoint();
+	const liblas::Point &lp = reader->reader.GetPoint();
 	Point p(lp.GetX(), lp.GetY(), lp.GetZ());
 
 	p.intensity = lp.GetIntensity();

PotreeConverter/src/LASPointWriter.cpp

@@ -8,12 +8,12 @@ using std::vector;
 
 void LASPointWriter::write(const Point &point){
 	liblas::Point lp;
+	lp.SetHeader(header);
 
-	lp.SetX(point.x / header->GetScaleX());
-	lp.SetY(point.y / header->GetScaleY());
-	lp.SetZ(point.z / header->GetScaleZ());
+	lp.SetX(point.x);
+	lp.SetY(point.y);
+	lp.SetZ(point.z);
 
-	
 	vector<uint8_t> &data = lp.GetData();
 
 	unsigned short pr = point.r * 256;
@@ -25,10 +25,10 @@ void LASPointWriter::write(const Point &point){
 	{ // TODO lp.SetColor did not work, do this instead. check for bugs?
 		data[20] = reinterpret_cast<unsigned char*>(&pr)[0];
 		data[21] = reinterpret_cast<unsigned char*>(&pr)[1];
-
+	
 		data[22] = reinterpret_cast<unsigned char*>(&pg)[0];
 		data[23] = reinterpret_cast<unsigned char*>(&pg)[1];
-
+	
 		data[24] = reinterpret_cast<unsigned char*>(&pb)[0];
 		data[25] = reinterpret_cast<unsigned char*>(&pb)[1];
 	}

PotreeConverter/src/PotreeConverter.cpp

@@ -162,7 +162,7 @@ void PotreeConverter::convert(){
 				auto end = high_resolution_clock::now();
 				long duration = duration_cast<milliseconds>(end-start).count();
 				cout << "duration: " << (duration / 1000.0f) << "s" << endl;
-
+				//return;
 			}
 		}
 		writer.flush();

build/PotreeConverter/PotreeConverter.vcxproj

@@ -141,7 +141,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)/../PotreeConverter/include;C:/dev/lib/boost_1_55_0;$(LASLIB_INCLUDE_DIR);$(LASZIP_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)/../PotreeConverter/include;C:/dev/lib/boost_1_55_0;C:\dev\lib\liblas\libLAS-1.7.0\include;$(LASZIP_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -171,7 +171,7 @@
     </Midl>
     <Link>
       <AdditionalOptions> /machine:x64 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;C:\Boost\lib\libboost_system-vc110-mt-gd-1_55.lib;C:\Boost\lib\libboost_thread-vc110-mt-gd-1_55.lib;C:\Boost\lib\libboost_filesystem-vc110-mt-gd-1_55.lib;C:\Boost\lib\libboost_program_options-vc110-mt-gd-1_55.lib;C:\dev\lib\lastools\x64\DebugDLL\laslib.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;C:\Boost\lib\libboost_system-vc110-mt-gd-1_55.lib;C:\Boost\lib\libboost_thread-vc110-mt-gd-1_55.lib;C:\Boost\lib\libboost_filesystem-vc110-mt-gd-1_55.lib;C:\Boost\lib\libboost_program_options-vc110-mt-gd-1_55.lib;$(LASLIB_LIBRARY_DIR)\laslib.lib;C:\dev\lib\liblas\libLAS-1.7.0\build\bin\Debug\liblas.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ImportLibrary>C:/dev/workspaces/PotreeConverter/PotreeConverter_develop/build/PotreeConverter/Debug/PotreeConverter.lib</ImportLibrary>

build/PotreeConverter/PotreeConverter.vcxproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArguments>C:\dev\pointclouds\mschuetz\lion_takanawa.las -s 0.5 -l 1</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>C:\dev\pointclouds\mschuetz\lion_takanawa.las -s 0.3 -l 3 --output-format LAZ</LocalDebuggerCommandArguments>
     <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>

testcases.txt

@@ -0,0 +1,7 @@
+.\PotreeConverter.exe C:\dev\pointclouds\mschuetz\lion_takanawa.las -o C:\dev\pointclouds\test\lion\las_bin -s 0.15 -l 3 --output-format BINARY
+.\PotreeConverter.exe C:\dev\pointclouds\mschuetz\lion_takanawa.las -o C:\dev\pointclouds\test\lion\las_las -s 0.15 -l 3 --output-format LAS
+.\PotreeConverter.exe C:\dev\pointclouds\mschuetz\lion_takanawa.las -o C:\dev\pointclouds\test\lion\las_laz -s 0.15 -l 3 --output-format LAZ
+
+.\PotreeConverter.exe C:\dev\pointclouds\mschuetz\lion_takanawa.ply -o C:\dev\pointclouds\test\lion\ply_bin -s 0.15 -l 3 --output-format BINARY
+.\PotreeConverter.exe C:\dev\pointclouds\mschuetz\lion_takanawa.ply -o C:\dev\pointclouds\test\lion\ply_las -s 0.15 -l 3 --output-format LAS
+.\PotreeConverter.exe C:\dev\pointclouds\mschuetz\lion_takanawa.ply -o C:\dev\pointclouds\test\lion\ply_laz -s 0.15 -l 3 --output-format LAZ