Skip to content

Commit

Permalink
update page template to potree 1.4RC
Browse files Browse the repository at this point in the history
  • Loading branch information
m-schuetz committed Dec 17, 2015
1 parent 0a0ed37 commit ad452cf
Show file tree
Hide file tree
Showing 85 changed files with 226,602 additions and 8,550 deletions.
2 changes: 0 additions & 2 deletions PotreeConverter/include/BINPointWriter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ namespace Potree{
class BINPointWriter : public PointWriter{

public:
string file;
int numPoints;
PointAttributes attributes;
ofstream *writer;
AABB aabb;
Expand Down
11 changes: 11 additions & 0 deletions PotreeConverter/include/CloudJS.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class CloudJS{
double scale;
int hierarchyStepSize = -1;
long long numAccepted = 0;
string projection = "";

CloudJS() = default;

Expand All @@ -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()),
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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());
Expand Down
2 changes: 2 additions & 0 deletions PotreeConverter/include/PotreeConverter.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class PotreeConverter{
vector<double> aabbValues;
string pageName = "";
StoreOption storeOption = StoreOption::ABORT_IF_EXISTS;
string projection = "";
bool sourceListingOnly = false;

PotreeConverter(string workDir, vector<string> sources);

Expand Down
6 changes: 5 additions & 1 deletion PotreeConverter/include/PotreeWriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class PWNode{
bool addCalledSinceLastFlush = false;
PotreeWriter *potreeWriter;
vector<Point> cache;
int storeLimit = 2'000;
int storeLimit = 20'000;
vector<Point> store;
bool isInMemory = true;

Expand Down Expand Up @@ -112,6 +112,7 @@ class PotreeWriter{
vector<Point> store;
thread storeThread;
int pointsInMemory = 0;
string projection = "";


PotreeWriter(string workDir);
Expand All @@ -138,7 +139,10 @@ class PotreeWriter{
flush();
}

void setProjection(string projection);

void loadStateFromDisk();

private:

};
Expand Down
62 changes: 0 additions & 62 deletions PotreeConverter/resources/page_template/LICENSE

This file was deleted.

55 changes: 0 additions & 55 deletions PotreeConverter/resources/page_template/README.md

This file was deleted.

Loading

0 comments on commit ad452cf

Please sign in to comment.