Skip to content

Commit 23fe618

Browse files
authored
Merge pull request #458 from potree/compression
Compression
2 parents 0b03057 + 0f4344a commit 23fe618

File tree

128 files changed

+41711
-854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+41711
-854
lines changed

.vscode/launch.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// "D:/dev/pointclouds/riegl/retz.laz",
2323
// "D:/dev/pointclouds/pix4d/eclepens.las",
2424
// "D:/dev/pointclouds/pix4d/matterhorn.laz",
25-
"D:/dev/pointclouds/archpro/heidentor.las",
25+
// "D:/dev/pointclouds/archpro/heidentor.las",
2626
// "D:/dev/pointclouds/hg_v2_clip.las",
2727
// "D:/dev/pointclouds/CA13",
2828

@@ -38,7 +38,7 @@
3838
// "D:/temp/crashreport/3dbuildings_walls_azimuth.laz",
3939
// "-o", "D:/temp/crashreport2/converted",
4040

41-
// "D:/dev/pointclouds/CA13/ot_35120B4122C_1.laz",
41+
"D:/dev/pointclouds/CA13/ot_35120B4122C_1.laz",
4242
// "D:/dev/pointclouds/CA13/ot_35120B4121D_1.laz",
4343
// "D:/dev/pointclouds/CA13/ot_35120B4301B_1.laz",
4444
// "D:/dev/pointclouds/CA13/ot_35120B4301D_1.laz",
@@ -48,6 +48,8 @@
4848
// "D:/dev/pointclouds/CA13/ot_35120B4302D_1.laz",
4949
// "D:/dev/pointclouds/CA13/ot_35120B4302A_1.laz",
5050

51+
// "D:/temp/C_25ez1.laz",
52+
5153
// "F:/pointclouds/AHN3/files/C_25ez1.laz",
5254
// "F:/pointclouds/AHN3/files/C_25gn1.laz",
5355
// "F:/pointclouds/AHN3/files/C_25bz1.laz",
@@ -57,6 +59,8 @@
5759
// "F:/pointclouds/AHN3/files/C_25dn2.laz",
5860
// "F:/pointclouds/AHN3/files/C_25gn2.laz",
5961

62+
// "D:/temp/compression/C_05DN2.LAZ",
63+
6064
// "D:/dev/pointclouds/tuwien_baugeschichte/candi Banyunibo",
6165

6266

@@ -66,14 +70,15 @@
6670
// "D:/temp/Bargello10Mtest.las",
6771

6872

73+
// "D:/dev/pointclouds/testdata/Bargello10Mtest.las",
6974
// "D:/dev/pointclouds/testdata/crash.las",
7075
// "D:/dev/pointclouds/testdata/eclepens.laz",
7176
// "D:/dev/pointclouds/testdata/Grab15.laz",
7277
// "D:/dev/pointclouds/testdata/heidentor.las",
7378
// "D:/dev/pointclouds/testdata/lion.laz",
7479
// "D:/dev/pointclouds/testdata/3dbuildings_walls_azimuth.laz",
7580

76-
"-o", "D:/temp/converted",
81+
"-o", "D:/temp/converted_brotli",
7782
// "-o", "F:/temp/CA13",
7883
// "-o", "F:/temp/affandi",
7984
// "-o", "C:/dev/workspaces/potree/develop/test/converted",
@@ -95,10 +100,12 @@
95100
// "--flags", "no-chunking", "keep-chunks",
96101
// "--flags", "keep-chunks",
97102
// "--keep-chunks",
98-
"--generate-page", "heidentor",
103+
// "--generate-page", "heidentor",
99104
// "-m", "poisson", // ["poisson", "poisson_average", "random"]
100105
// "--chunkMethod", "SKIP" // [LASZIP, LAS_CUSTOM, SKIP]
101106
// "--attributes", "rgb", "Dip (degrees)", "Dip direction (degrees)", "NormalX", "NormalY", "NormalZ",
107+
"--attributes" , "rgb", "intensity", "classification", "mjpmie",
108+
"--encoding", "BROTLI",
102109
],
103110
"stopAtEntry": false,
104111
"cwd": "${workspaceFolder}",

.vscode/settings.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,11 @@
7575
"xutility": "cpp",
7676
"random": "cpp",
7777
"hash_map": "cpp",
78-
"set": "cpp"
78+
"set": "cpp",
79+
"condition_variable": "cpp",
80+
"regex": "cpp",
81+
"stack": "cpp",
82+
"variant": "cpp"
7983
},
8084
"files.trimTrailingWhitespace": false,
8185
"editor.fontSize": 28,

CMakeLists.txt

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ set(CMAKE_CXX_STANDARD 20)
77
set(CMAKE_CXX_STANDARD_REQUIRED True)
88
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
99

10-
set(LASZIP_DIR "${PROJECT_SOURCE_DIR}/Converter/libs/laszip")
11-
12-
add_subdirectory(${LASZIP_DIR})
13-
1410
#message(${PROJECT_SOURCE_DIR})
1511

1612
set(HEADER_FILES
@@ -42,8 +38,16 @@ add_executable(PotreeConverter
4238
${HEADER_FILES}
4339
)
4440

41+
set(LASZIP_DIR "${PROJECT_SOURCE_DIR}/Converter/libs/laszip")
42+
add_subdirectory(${LASZIP_DIR})
4543
target_link_libraries(PotreeConverter laszip)
4644

45+
set(BROTLI_DIR "${PROJECT_SOURCE_DIR}/Converter/libs/brotli")
46+
add_subdirectory(${BROTLI_DIR})
47+
target_link_libraries(PotreeConverter brotlienc-static)
48+
target_link_libraries(PotreeConverter brotlidec-static)
49+
50+
4751
target_include_directories(PotreeConverter PRIVATE "./Converter/include")
4852
target_include_directories(PotreeConverter PRIVATE "./Converter/modules")
4953
target_include_directories(PotreeConverter PRIVATE "./Converter/libs")
@@ -79,6 +83,12 @@ add_custom_command(
7983
${LASZIP_DIR}/COPYING
8084
$<TARGET_FILE_DIR:${PROJECT_NAME}>/licenses/license_laszip.txt)
8185

86+
add_custom_command(
87+
TARGET PotreeConverter POST_BUILD
88+
COMMAND ${CMAKE_COMMAND} -E copy
89+
${BROTLI_DIR}/LICENSE
90+
$<TARGET_FILE_DIR:${PROJECT_NAME}>/licenses/license_brotli.txt)
91+
8292
add_custom_command(
8393
TARGET PotreeConverter POST_BUILD
8494
COMMAND ${CMAKE_COMMAND} -E copy

0 commit comments

Comments
 (0)