Skip to content

Commit

Permalink
refactor: rewrite point cloud buffer parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
@haakonflatval-cognite
haakonflatval-cognite committed May 25, 2022
1 parent a08e4f8 commit f5f8aeb
Showing 1 changed file with 72 additions and 84 deletions.
156 changes: 72 additions & 84 deletions viewer/packages/pointclouds/src/potree-three-loader/loading/EptBinaryLoader.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,93 +36,81 @@ export class EptBinaryLoader implements ILoader {
if (node.loaded) return;

const fullFileName = node.fileName() + this.extension();
return this._dataLoader.getBinaryFile(node.baseUrl(), fullFileName).then(data => this.parse(node, data));
const data = await this._dataLoader.getBinaryFile(node.baseUrl(), fullFileName);
return this.parse(node, data);
}

parse(node: PointCloudEptGeometryNode, data: ArrayBuffer): Promise<void> {
return EptBinaryLoader.WORKER_POOL.getWorker().then(
autoTerminatingWorker =>
new Promise<void>(res => {
autoTerminatingWorker.worker.onmessage = function (e: { data: ParsedEptData }) {
const g = new THREE.BufferGeometry();
const numPoints = e.data.numPoints;

const position = new Float32Array(e.data.position);
g.setAttribute('position', new THREE.BufferAttribute(position, 3));

const indices = new Uint8Array(e.data.indices);
g.setAttribute('indices', new THREE.BufferAttribute(indices, 4));

if (e.data.color) {
const color = new Uint8Array(e.data.color);
g.setAttribute('color', new THREE.BufferAttribute(color, 4, true));
}
if (e.data.intensity) {
const intensity = new Float32Array(e.data.intensity);
g.setAttribute('intensity', new THREE.BufferAttribute(intensity, 1));
}
if (e.data.classification) {
const classification = new Uint8Array(e.data.classification);
g.setAttribute('classification', new THREE.BufferAttribute(classification, 1));
}
if (e.data.returnNumber) {
const returnNumber = new Uint8Array(e.data.returnNumber);
g.setAttribute('return number', new THREE.BufferAttribute(returnNumber, 1));
}
if (e.data.numberOfReturns) {
const numberOfReturns = new Uint8Array(e.data.numberOfReturns);
g.setAttribute('number of returns', new THREE.BufferAttribute(numberOfReturns, 1));
}
if (e.data.pointSourceId) {
const pointSourceId = new Uint16Array(e.data.pointSourceId);
g.setAttribute('source id', new THREE.BufferAttribute(pointSourceId, 1));
}
if (e.data.objectId) {
const objectId = new Uint16Array(e.data.objectId);
g.setAttribute('objectId', new THREE.BufferAttribute(objectId, 1));
}

g.attributes.indices.normalized = true;

const tightBoundingBox = new THREE.Box3(
new THREE.Vector3().fromArray(e.data.tightBoundingBox.min),
new THREE.Vector3().fromArray(e.data.tightBoundingBox.max)
);

node.doneLoading(g, tightBoundingBox, numPoints, new THREE.Vector3(...e.data.mean));

EptBinaryLoader.WORKER_POOL.releaseWorker(autoTerminatingWorker);
res();
};

const toArray = (v: THREE.Vector3): [number, number, number] => [v.x, v.y, v.z];
const eptData: EptInputData = {
buffer: data,
schema: node.ept.schema,
scale: node.ept.eptScale,
offset: node.ept.eptOffset,
mins: toArray(node.key.b.min)
};

if (this._styledObjectInfo) {
const offsetVec = node.boundingBox.min;

const objectMessage: ObjectsCommand = {
type: 'objects',
objects: this._styledObjectInfo.styledObjects,
pointOffset: [offsetVec.x, offsetVec.y, offsetVec.z] as [number, number, number]
};

autoTerminatingWorker.worker.postMessage(objectMessage);
}
async parse(node: PointCloudEptGeometryNode, data: ArrayBuffer): Promise<void> {
const autoTerminatingWorker = await EptBinaryLoader.WORKER_POOL.getWorker();

return new Promise<void>(res => {
autoTerminatingWorker.worker.onmessage = function (e: { data: ParsedEptData }) {
const g = new THREE.BufferGeometry();
const numPoints = e.data.numPoints;

const parseMessage: ParseCommand = {
type: 'parse',
data: eptData
};
function addAttributeIfPresent<TypedArray extends ArrayLike<number>>(
typedArrayConstructor: { new (data: ArrayBuffer): TypedArray },
name: string,
componentCount: number,
data?: ArrayBuffer,
normalized: boolean = false): void {

autoTerminatingWorker.worker.postMessage(parseMessage, [parseMessage.data.buffer]);
})
);
if (data) {
const typedArray = new typedArrayConstructor(data);
g.setAttribute(name, new THREE.BufferAttribute(typedArray, componentCount, normalized));
}
}

addAttributeIfPresent<Float32Array>(Float32Array, 'position', 3, e.data.position);
addAttributeIfPresent<Uint8Array>(Uint8Array, 'indices', 4, e.data.indices);
addAttributeIfPresent<Uint8Array>(Uint8Array, 'color', 4, e.data.color, true);
addAttributeIfPresent<Float32Array>(Float32Array, 'intensity', 1, e.data.intensity);
addAttributeIfPresent<Uint8Array>(Uint8Array, 'classification', 1, e.data.classification);
addAttributeIfPresent<Uint8Array>(Uint8Array, 'return number', 1, e.data.returnNumber);
addAttributeIfPresent<Uint8Array>(Uint8Array, 'number of returns', 1, e.data.numberOfReturns);
addAttributeIfPresent<Uint16Array>(Uint16Array, 'source id', 1, e.data.pointSourceId);
addAttributeIfPresent<Uint16Array>(Uint16Array, 'objectId', 1, e.data.objectId);

g.attributes.indices.normalized = true;

const tightBoundingBox = new THREE.Box3(
new THREE.Vector3().fromArray(e.data.tightBoundingBox.min),
new THREE.Vector3().fromArray(e.data.tightBoundingBox.max)
);

node.doneLoading(g, tightBoundingBox, numPoints, new THREE.Vector3(...e.data.mean));

EptBinaryLoader.WORKER_POOL.releaseWorker(autoTerminatingWorker);
res();
};

const toArray = (v: THREE.Vector3): [number, number, number] => [v.x, v.y, v.z];
const eptData: EptInputData = {
buffer: data,
schema: node.ept.schema,
scale: node.ept.eptScale,
offset: node.ept.eptOffset,
mins: toArray(node.key.b.min)
};

if (this._styledObjectInfo) {
const offsetVec = node.boundingBox.min;

const objectMessage: ObjectsCommand = {
type: 'objects',
objects: this._styledObjectInfo.styledObjects,
pointOffset: [offsetVec.x, offsetVec.y, offsetVec.z] as [number, number, number]
};

autoTerminatingWorker.worker.postMessage(objectMessage);
}

const parseMessage: ParseCommand = {
type: 'parse',
data: eptData
};

autoTerminatingWorker.worker.postMessage(parseMessage, [parseMessage.data.buffer]);
});
}
}

0 comments on commit f5f8aeb

Please sign in to comment.