Merge pull request #458 from potree/compression

Compression

Author: m-schuetz

.vscode/launch.json

@@ -22,7 +22,7 @@
 				// "D:/dev/pointclouds/riegl/retz.laz",
 				// "D:/dev/pointclouds/pix4d/eclepens.las",
 				// "D:/dev/pointclouds/pix4d/matterhorn.laz",
-				"D:/dev/pointclouds/archpro/heidentor.las",
+				// "D:/dev/pointclouds/archpro/heidentor.las",
 				// "D:/dev/pointclouds/hg_v2_clip.las",
 				// "D:/dev/pointclouds/CA13",
 
@@ -38,7 +38,7 @@
 				// "D:/temp/crashreport/3dbuildings_walls_azimuth.laz",
 				// "-o", "D:/temp/crashreport2/converted",
 
-				// "D:/dev/pointclouds/CA13/ot_35120B4122C_1.laz",
+				"D:/dev/pointclouds/CA13/ot_35120B4122C_1.laz",
 				// "D:/dev/pointclouds/CA13/ot_35120B4121D_1.laz",
 				// "D:/dev/pointclouds/CA13/ot_35120B4301B_1.laz",
 				// "D:/dev/pointclouds/CA13/ot_35120B4301D_1.laz",
@@ -48,6 +48,8 @@
 				// "D:/dev/pointclouds/CA13/ot_35120B4302D_1.laz",
 				// "D:/dev/pointclouds/CA13/ot_35120B4302A_1.laz",
 
+				// "D:/temp/C_25ez1.laz",
+
 				// "F:/pointclouds/AHN3/files/C_25ez1.laz",
 				// "F:/pointclouds/AHN3/files/C_25gn1.laz",
 				// "F:/pointclouds/AHN3/files/C_25bz1.laz",
@@ -57,6 +59,8 @@
 				// "F:/pointclouds/AHN3/files/C_25dn2.laz",
 				// "F:/pointclouds/AHN3/files/C_25gn2.laz",
 
+				// "D:/temp/compression/C_05DN2.LAZ",
+
 				// "D:/dev/pointclouds/tuwien_baugeschichte/candi Banyunibo",
 
 
@@ -66,14 +70,15 @@
 				// "D:/temp/Bargello10Mtest.las",
 
 
+				// "D:/dev/pointclouds/testdata/Bargello10Mtest.las",
 				// "D:/dev/pointclouds/testdata/crash.las",
 				// "D:/dev/pointclouds/testdata/eclepens.laz",
 				// "D:/dev/pointclouds/testdata/Grab15.laz",
 				// "D:/dev/pointclouds/testdata/heidentor.las",
 				// "D:/dev/pointclouds/testdata/lion.laz",
 				// "D:/dev/pointclouds/testdata/3dbuildings_walls_azimuth.laz",
 
-				"-o", "D:/temp/converted",
+				"-o", "D:/temp/converted_brotli",
 				// "-o", "F:/temp/CA13",
 				// "-o", "F:/temp/affandi",
 				// "-o", "C:/dev/workspaces/potree/develop/test/converted",
@@ -95,10 +100,12 @@
 				// "--flags", "no-chunking", "keep-chunks",
 				// "--flags", "keep-chunks",
 				// "--keep-chunks", 
-				"--generate-page", "heidentor",
+				// "--generate-page", "heidentor",
 				// "-m", "poisson", // ["poisson", "poisson_average", "random"]
 				// "--chunkMethod", "SKIP" // [LASZIP, LAS_CUSTOM, SKIP]
 				// "--attributes", "rgb", "Dip (degrees)", "Dip direction (degrees)", "NormalX", "NormalY", "NormalZ",
+				"--attributes" , "rgb", "intensity", "classification", "mjpmie",
+				"--encoding", "BROTLI",
 			],
 			"stopAtEntry": false,
 			"cwd": "${workspaceFolder}",

.vscode/settings.json

@@ -75,7 +75,11 @@
 		"xutility": "cpp",
 		"random": "cpp",
 		"hash_map": "cpp",
-		"set": "cpp"
+		"set": "cpp",
+		"condition_variable": "cpp",
+		"regex": "cpp",
+		"stack": "cpp",
+		"variant": "cpp"
 	},
 	"files.trimTrailingWhitespace": false,
 	"editor.fontSize": 28,

CMakeLists.txt

@@ -7,10 +7,6 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
 
-set(LASZIP_DIR "${PROJECT_SOURCE_DIR}/Converter/libs/laszip")
-
-add_subdirectory(${LASZIP_DIR})
-
 #message(${PROJECT_SOURCE_DIR})
 
 set(HEADER_FILES  
@@ -42,8 +38,16 @@ add_executable(PotreeConverter
 	${HEADER_FILES}
 )
 
+set(LASZIP_DIR "${PROJECT_SOURCE_DIR}/Converter/libs/laszip")
+add_subdirectory(${LASZIP_DIR})
 target_link_libraries(PotreeConverter laszip)
 
+set(BROTLI_DIR "${PROJECT_SOURCE_DIR}/Converter/libs/brotli")
+add_subdirectory(${BROTLI_DIR})
+target_link_libraries(PotreeConverter brotlienc-static)
+target_link_libraries(PotreeConverter brotlidec-static)
+
+
 target_include_directories(PotreeConverter PRIVATE "./Converter/include")
 target_include_directories(PotreeConverter PRIVATE "./Converter/modules")
 target_include_directories(PotreeConverter PRIVATE "./Converter/libs")
@@ -79,6 +83,12 @@ add_custom_command(
 		${LASZIP_DIR}/COPYING
 		$<TARGET_FILE_DIR:${PROJECT_NAME}>/licenses/license_laszip.txt)
 
+add_custom_command(
+	TARGET PotreeConverter POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy
+		${BROTLI_DIR}/LICENSE
+		$<TARGET_FILE_DIR:${PROJECT_NAME}>/licenses/license_brotli.txt)
+
 add_custom_command(
 	TARGET PotreeConverter POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy