fix argument parsing; allow drag&drop of las files into binary; copy …

…json license to build
potree · Aug 24, 2020 · 9df10f4 · 9df10f4
1 parent 7ca5abc
commit 9df10f4
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 331 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,6 +67,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
+		${PROJECT_SOURCE_DIR}/Converter/libs/json/LICENSE
+		$<TARGET_FILE_DIR:${PROJECT_NAME}>/licenses/license_json.txt)
+
 add_custom_command(
 	TARGET PotreeConverter POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy

diff --git a/Converter/Converter.sln b/Converter/Converter.sln
diff --git a/Converter/Converter.vcxproj b/Converter/Converter.vcxproj
diff --git a/Converter/Converter.vcxproj.filters b/Converter/Converter.vcxproj.filters
diff --git a/Converter/libs/arguments/Arguments.hpp b/Converter/libs/arguments/Arguments.hpp
@@ -284,13 +284,16 @@ class Arguments {
 	AValue get(string name) {
 		Argument *arg = getArgument(name);
 
+		vector<string> values;
+
 		for (auto entry : map) {
 			if (arg->is(entry.first)) {
-				return AValue(entry.second);
+				values.insert(values.end(), entry.second.begin(), entry.second.end());
+				//return AValue(entry.second);
 			}
 		}
 
-		return AValue({});
+		return AValue(values);
 	}