Merge pull request #268 from potree/develop

Develop
potree · Aug 17, 2017 · bfffefb · bfffefb
2 parents 0c8d084 + cf204ce
commit bfffefb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 18 deletions.
diff --git a/PotreeConverter/include/PotreeWriter.h b/PotreeConverter/include/PotreeWriter.h
@@ -6,6 +6,7 @@
 #include <string>
 #include <thread>
 #include <vector>
+#include <functional>
 
 #include "AABB.h"
 #include "SparseGrid.h"

diff --git 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<string>();
 	a.edlEnabled = args.has("edl-enabled");
 	a.showSkybox = args.has("show-skybox");
-	a.material = args.get("material").as<string>();
+	a.material = args.get("material").as<string>("RGB");
 
-	vector<string> validMaterialNames = {"RGB", "ELEVATION", "INTENSITY", "INTENSITY_GRADIENT", "RETURN_NUMBER", "SOURCE", "LEVEL_OF_DETAIL"};
+	vector<string> 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;

diff --git 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: