From 3fee9843fec4e1a60b581e12aa62e35303e4d7c9 Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 25 Jul 2017 23:13:26 +0300 Subject: [PATCH 1/3] Update PotreeConverter '--help' options --- README.md | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 98e5657c..aa88c29e 100644 --- a/README.md +++ b/README.md @@ -105,21 +105,32 @@ Options: ``` --h [ --help ] prints usage --p [ --generate-page ] arg Generates a ready to use web page with the given name. --o [ --outdir ] arg output directory --s [ --spacing ] arg Distance between points at root level. Distance halves each level. --d [ --spacing-by-diagonal-fraction ] arg - Maximum number of points on the diagonal in the first level (sets spacing). spacing = diagonal / value --l [ --levels ] arg Number of levels that will be generated. 0: only root, 1: root and its children, ... --f [ --input-format ] arg Input format. xyz: cartesian coordinates as floats, rgb: colors as numbers, i: intensity as number ---output-format arg Output format can be BINARY, LAS or LAZ. Default is BINARY --a [ --output-attributes ] arg can be any combination of RGB, INTENSITY, CLASSIFICATION and NORMAL. Default is RGB. ---scale arg Scale of the X, Y, Z coordinate in LAS and LAZ files. ---aabb arg Bounding cube as "minX minY minZ maxX maxY maxZ". If not provided it is automatically computed ---incremental Add new points to existing conversion ---overwrite Replace existing conversion at target directory ---source arg Source file. Can be LAS, LAZ, PTX or PLY +$ PotreeConverter -h + -i [ --source ] input files + -h [ --help ] prints usage + -p [ --generate-page ] Generates a ready to use web page with the given name. + -o [ --outdir ] output directory + -s [ --spacing ] Distance between points at root level. Distance halves each level. + -d [ --spacing-by-diagonal-fraction ] Maximum number of points on the diagonal in the first level (sets spacing). spacing = diagonal value + -l [ --levels ] Number of levels that will be generated. 0: only root, 1: root and its children, ... + -f [ --input-format ] Input format. xyz: cartesian coordinates as floats, rgb: colors as numbers, i: intensity as number + --color-range + --intensity-range + --output-format Output format can be BINARY, LAS or LAZ. Default is BINARY + -a [ --output-attributes ] can be any combination of RGB, INTENSITY and CLASSIFICATION. Default is RGB. + --scale Scale of the X, Y, Z coordinate in LAS and LAZ files. + --aabb Bounding cube as "minX minY minZ maxX maxY maxZ". If not provided it is automatically computed + --incremental Add new points to existing conversion + --overwrite Replace existing conversion at target directory + --source-listing-only Create a sources.json but no octree. + --projection Specify projection in proj4 format. + --list-of-files A text file containing a list of files to be converted. + --source Source file. Can be LAS, LAZ, PTX or PLY + --title Page title + --description Description to be shown in the page. + --edl-enabled Enable Eye-Dome-Lighting. + --show-skybox + --material RGB, ELEVATION, INTENSITY, INTENSITY_GRADIENT, RETURN_NUMBER, SOURCE, LEVEL_OF_DETAIL ``` Examples: From 2bffb33cdf0cc060390df402a6b80f06c51c3f2c Mon Sep 17 00:00:00 2001 From: m-schuetz Date: Tue, 15 Aug 2017 17:49:14 +0200 Subject: [PATCH 2/3] set -a to RGB by default --- PotreeConverter/src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PotreeConverter/src/main.cpp b/PotreeConverter/src/main.cpp index 8cd505b3..6e4fad3a 100644 --- a/PotreeConverter/src/main.cpp +++ b/PotreeConverter/src/main.cpp @@ -91,7 +91,7 @@ PotreeArguments parseArguments(int argc, char **argv){ args.addArgument("description", "Description to be shown in the page."); args.addArgument("edl-enabled", "Enable Eye-Dome-Lighting."); args.addArgument("show-skybox", ""); - args.addArgument("material", "RGB, ELEVATION, INTENSITY, INTENSITY_GRADIENT, RETURN_NUMBER, SOURCE, LEVEL_OF_DETAIL"); + args.addArgument("material", "RGB, ELEVATION, INTENSITY, INTENSITY_GRADIENT, CLASSIFICATION, RETURN_NUMBER, SOURCE, LEVEL_OF_DETAIL"); PotreeArguments a; @@ -211,9 +211,9 @@ PotreeArguments parseArguments(int argc, char **argv){ a.description = args.get("description").as(); a.edlEnabled = args.has("edl-enabled"); a.showSkybox = args.has("show-skybox"); - a.material = args.get("material").as(); + a.material = args.get("material").as("RGB"); - vector validMaterialNames = {"RGB", "ELEVATION", "INTENSITY", "INTENSITY_GRADIENT", "RETURN_NUMBER", "SOURCE", "LEVEL_OF_DETAIL"}; + vector validMaterialNames = {"RGB", "ELEVATION", "INTENSITY", "INTENSITY_GRADIENT", "CLASSIFICATION", "RETURN_NUMBER", "SOURCE", "LEVEL_OF_DETAIL"}; if(std::find(validMaterialNames.begin(), validMaterialNames.end(), a.material) == validMaterialNames.end()){ cout << args.usage(); cout << endl; From a29cdd7b3468965fc8de1d2d18534cda5455346b Mon Sep 17 00:00:00 2001 From: Frederick Date: Thu, 17 Aug 2017 08:21:33 +0200 Subject: [PATCH 3/3] Add include --- PotreeConverter/include/PotreeWriter.h | 1 + 1 file changed, 1 insertion(+) diff --git a/PotreeConverter/include/PotreeWriter.h b/PotreeConverter/include/PotreeWriter.h index c2e3c608..4867b7e2 100644 --- a/PotreeConverter/include/PotreeWriter.h +++ b/PotreeConverter/include/PotreeWriter.h @@ -6,6 +6,7 @@ #include #include #include +#include #include "AABB.h" #include "SparseGrid.h"