Merge pull request #226 from potree/develop

Develop

PotreeConverter/include/BINPointWriter.hpp

@@ -23,8 +23,6 @@ namespace Potree{
 class BINPointWriter : public PointWriter{
 
 public:
-	string file;
-	int numPoints;
 	PointAttributes attributes;
 	ofstream *writer;
 	AABB aabb;

PotreeConverter/include/CloudJS.hpp

@@ -53,6 +53,7 @@ class CloudJS{
 	double scale;
 	int hierarchyStepSize = -1;
 	long long numAccepted = 0;
+	string projection = "";
 
 	CloudJS() = default;
 
@@ -70,8 +71,16 @@ class CloudJS{
 		Value &vScale = d["scale"];
 		Value &vHierarchyStepSize = d["hierarchyStepSize"];
 
+
+
 		version = vVersion.GetString();
 		octreeDir = vOctreeDir.GetString();
+
+		if(d.HasMember("projection")){
+			Value &vProjection = d["projection"];
+			projection = vProjection.GetString();
+		}
+
 		numAccepted = vPoints.GetInt64();
 		boundingBox = AABB(
 			Vector3<double>(vBoundingBox["lx"].GetDouble(), vBoundingBox["ly"].GetDouble(), vBoundingBox["lz"].GetDouble()),
@@ -114,6 +123,7 @@ class CloudJS{
 
 		Value version(this->version.c_str(), (rapidjson::SizeType)this->version.size());
 		Value octreeDir("data");
+		Value projection(this->projection.c_str(), (rapidjson::SizeType)this->projection.size());
 		Value boundingBox(rapidjson::kObjectType);
 		{
 			//Value min(rapidjson::kArrayType);
@@ -179,6 +189,7 @@ class CloudJS{
 
 		d.AddMember("version", version, d.GetAllocator());
 		d.AddMember("octreeDir", octreeDir, d.GetAllocator());
+		d.AddMember("projection", projection, d.GetAllocator());
 		d.AddMember("points", (uint64_t)numAccepted, d.GetAllocator());
 		d.AddMember("boundingBox", boundingBox, d.GetAllocator());
 		d.AddMember("tightBoundingBox", tightBoundingBox, d.GetAllocator());

PotreeConverter/include/LASPointReader.h

@@ -54,7 +54,7 @@ class LIBLASReader{
 		laszip_BOOL request_reader = 1;
 		laszip_request_compatibility_mode(laszip_reader, request_reader);
 
-		{// read first 1000 points to find if color is 1 or 2 bytes
+		{// read first x points to find if color is 1 or 2 bytes
 			laszip_BOOL is_compressed = boost::iends_with(path, ".laz") ? 1 : 0;
 			laszip_open_reader(laszip_reader, path.c_str(), &is_compressed);
 
@@ -65,7 +65,7 @@ class LIBLASReader{
 			laszip_get_point_pointer(laszip_reader, &point);
 
 			colorScale = 1;
-			for(int i = 0; i < 1000 && i < npoints; i++){
+			for(int i = 0; i < 100000 && i < npoints; i++){
 				laszip_read_point(laszip_reader);
 
 				auto r = point->rgb[0];
@@ -75,9 +75,7 @@ class LIBLASReader{
 				if(r > 255 || g > 255 || b > 255){
 					colorScale = 256;
 					break;
-				}
-
-				i++;
+				};
 			}
 		}
 

PotreeConverter/include/LASPointWriter.hpp

@@ -23,8 +23,6 @@ namespace Potree{
 class LASPointWriter : public PointWriter{
 
 public:
-	string file;
-	int numPoints = 0;
 	AABB aabb;
 	laszip_POINTER writer = NULL;
 	laszip_header header;
@@ -51,6 +49,9 @@ class LASPointWriter : public PointWriter{
 		header.max_x = aabb.max.x;
 		header.max_y = aabb.max.y;
 		header.max_z = aabb.max.z;
+		header.x_offset = aabb.min.x;
+		header.y_offset = aabb.min.y;
+		header.z_offset = aabb.min.z;
 		header.x_scale_factor = scale;
 		header.y_scale_factor = scale;
 		header.z_scale_factor = scale;

PotreeConverter/include/PointWriter.hpp

@@ -15,7 +15,7 @@ class PointWriter{
 
 public:
 	string file;
-	int numPoints;
+	int numPoints = 0;
 
 	virtual ~PointWriter(){};
 

PotreeConverter/include/PotreeConverter.h

@@ -46,6 +46,14 @@ class PotreeConverter{
 	vector<double> aabbValues;
 	string pageName = "";
 	StoreOption storeOption = StoreOption::ABORT_IF_EXISTS;
+	string projection = "";
+	bool sourceListingOnly = false;
+	ConversionQuality quality = ConversionQuality::DEFAULT;
+	string title = "PotreeViewer";
+	string description = "";
+	bool edlEnabled = false;
+	bool showSkybox = false;
+	string material = "RGB";
 
 	PotreeConverter(string workDir, vector<string> sources);
 

PotreeConverter/include/PotreeWriter.h

@@ -112,11 +112,13 @@ class PotreeWriter{
 	vector<Point> store;
 	thread storeThread;
 	int pointsInMemory = 0;
+	string projection = "";
+	ConversionQuality quality = ConversionQuality::DEFAULT;
 
 
-	PotreeWriter(string workDir);
+	PotreeWriter(string workDir, ConversionQuality quality);
 
-	PotreeWriter(string workDir, AABB aabb, float spacing, int maxDepth, double scale, OutputFormat outputFormat, PointAttributes pointAttributes);
+	PotreeWriter(string workDir, AABB aabb, float spacing, int maxDepth, double scale, OutputFormat outputFormat, PointAttributes pointAttributes, ConversionQuality quality);
 
 	~PotreeWriter(){
 		close();
@@ -138,7 +140,10 @@ class PotreeWriter{
 		flush();
 	}
 
+	void setProjection(string projection);
+
 	void loadStateFromDisk();
+
 private:
 
 };

PotreeConverter/include/SparseGrid.h

@@ -42,8 +42,12 @@ class SparseGrid : public unordered_map<long long, GridCell*>{
 
 	bool isDistant(const Vector3<double> &p, GridCell *cell);
 
+	bool isDistant(const Vector3<double> &p, GridCell *cell, float &squaredSpacing);
+
 	bool willBeAccepted(const Vector3<double> &p);
 
+	bool willBeAccepted(const Vector3<double> &p, float &squaredSpacing);
+
 	bool add(Vector3<double> &p);
 
 	void addWithoutCheck(Vector3<double> &p);

PotreeConverter/include/definitions.hpp

@@ -16,6 +16,12 @@ enum class StoreOption{
 	INCREMENTAL
 };
 
+enum class ConversionQuality{
+	FAST,
+	DEFAULT,
+	NICE
+};
+
 }
 
 #endif

PotreeConverter/include/stuff.h

@@ -105,6 +105,8 @@ bool copyDir(fs::path source, fs::path destination);
 
 float psign(float value);
 
+string getExecutablePath();
+
 }
 
 #endif