|
@@ -21950,12 +21950,16 @@
|
|
|
var material = pointcloud.material;
|
|
|
pointcloud.datasetData = dataset;
|
|
|
pointcloud.hasDepthTex = dataset && Potree.settings.useDepthTex && !!dataset.has_depth;
|
|
|
+ pointcloud.initialPosition = pointcloud.position.clone();
|
|
|
+ pointcloud.pos1MatrixInvert = new Matrix4().setPosition(pointcloud.initialPosition).invert();
|
|
|
material.minSize = config.minSize;
|
|
|
material.maxSize = config.maxSize;
|
|
|
material.pointSizeType = config.pointSizeType; //Potree.PointSizeType[config.pointSizeType]//Potree.PointSizeType.ADAPTIVE;//FIXED
|
|
|
pointcloud.changePointSize(config.realPointSize); //material.size = config.pointSize;
|
|
|
pointcloud.changePointOpacity(1);
|
|
|
- dataset && (transformPointcloud(pointcloud, dataset), pointcloud.hasLonLat = true);
|
|
|
+
|
|
|
+ //dataset && (transformPointcloud(pointcloud, dataset), pointcloud.hasLonLat = true)
|
|
|
+
|
|
|
material.shape = Potree.PointShape.SQUARE;
|
|
|
color && (pointcloud.color = pointcloud.material.color = color);
|
|
|
pointcloud.timeStamp = timeStamp;
|
|
@@ -22281,8 +22285,6 @@
|
|
|
pointcloud.position.set(0, 0, 0);
|
|
|
}
|
|
|
}
|
|
|
- pointcloud.initialPosition = pointcloud.position.clone();
|
|
|
- pointcloud.pos1MatrixInvert = new Matrix4().setPosition(pointcloud.initialPosition).invert();
|
|
|
if (Potree.settings.mergeType2 && pointcloud.datasetData) {
|
|
|
Potree.loadPanos(pointcloud.datasetData.id, data => {
|
|
|
viewer.images360.addPanoData(data, pointcloud);
|
|
@@ -38953,16 +38955,16 @@
|
|
|
var color = new Color(1, 1, 1);
|
|
|
var transform = this.transform;
|
|
|
if (transform === null) {
|
|
|
- transform = {
|
|
|
- forward: v => v
|
|
|
- };
|
|
|
+ transform = v => {
|
|
|
+ v;
|
|
|
+ }; //{forward: (v) => v};
|
|
|
}
|
|
|
if (geometry.type === "Point") {
|
|
|
var sg = new SphereGeometry(1, 18, 18);
|
|
|
var sm = new MeshNormalMaterial();
|
|
|
var s = new Mesh(sg, sm);
|
|
|
var [long, lat] = geometry.coordinates;
|
|
|
- var pos = transform.forward([long, lat]);
|
|
|
+ var pos = transform /* .forward */([long, lat]);
|
|
|
s.position.set(...pos, 20);
|
|
|
s.scale.set(10, 10, 10);
|
|
|
return s;
|
|
@@ -38971,7 +38973,7 @@
|
|
|
var min = new Vector3(Infinity, Infinity, Infinity);
|
|
|
for (var i = 0; i < geometry.coordinates.length; i++) {
|
|
|
var [_long, _lat] = geometry.coordinates[i];
|
|
|
- var _pos = transform.forward([_long, _lat]);
|
|
|
+ var _pos = transform /* .forward */([_long, _lat]);
|
|
|
min.x = Math.min(min.x, _pos[0]);
|
|
|
min.y = Math.min(min.y, _pos[1]);
|
|
|
min.z = Math.min(min.z, 20);
|
|
@@ -39030,7 +39032,7 @@
|
|
|
var _min2 = new Vector3(Infinity, Infinity, Infinity);
|
|
|
for (var _i3 = 0; _i3 < pc.length; _i3++) {
|
|
|
var [_long2, _lat2] = pc[_i3];
|
|
|
- var _pos2 = transform.forward([_long2, _lat2]);
|
|
|
+ var _pos2 = transform /* .forward */([_long2, _lat2]);
|
|
|
_min2.x = Math.min(_min2.x, _pos2[0]);
|
|
|
_min2.y = Math.min(_min2.y, _pos2[1]);
|
|
|
_min2.z = Math.min(_min2.z, 20);
|
|
@@ -85977,7 +85979,12 @@
|
|
|
}, fileInfo);
|
|
|
} else if (fileInfo.fileType == 'shp') {
|
|
|
if (viewer.transform) {
|
|
|
- loaders.shapeLoader.transform = viewer.transform.lonlatToLocal;
|
|
|
+ loaders.shapeLoader.transform = v => {
|
|
|
+ var a = viewer.transform.lonlatTo4550.inverse(v);
|
|
|
+ return viewer.transform.lonlatToLocal.forward(a);
|
|
|
+ };
|
|
|
+
|
|
|
+ //viewer.transform.lonlatToLocal;
|
|
|
}
|
|
|
var shp = await loaders.shapeLoader.load(fileInfo.url, fileInfo.color);
|
|
|
var shpModel = shp.node;
|