|
@@ -42171,7 +42171,6 @@
|
|
*/
|
|
*/
|
|
|
|
|
|
var texLoader$7 = new TextureLoader();
|
|
var texLoader$7 = new TextureLoader();
|
|
- var markerMats$1;
|
|
|
|
var labelSizeInfo$1 = {
|
|
var labelSizeInfo$1 = {
|
|
width2d: 180
|
|
width2d: 180
|
|
}; //稍微小点防止字体模糊
|
|
}; //稍微小点防止字体模糊
|
|
@@ -42193,36 +42192,37 @@
|
|
};
|
|
};
|
|
var planeGeo$2 = new PlaneBufferGeometry(1, 1);
|
|
var planeGeo$2 = new PlaneBufferGeometry(1, 1);
|
|
var voidGeometry = new BufferGeometry();
|
|
var voidGeometry = new BufferGeometry();
|
|
- var getMarkerMat = function () {
|
|
|
|
- var mats;
|
|
|
|
- return function (name) {
|
|
|
|
- if (!mats) {
|
|
|
|
- mats = {
|
|
|
|
- default: new DepthBasicMaterial($.extend({}, depthProps, {
|
|
|
|
- transparent: true,
|
|
|
|
- map: texLoader$7.load(Potree.resourcePath + '/textures/dot_n.png')
|
|
|
|
- })),
|
|
|
|
- drag: new MeshBasicMaterial({
|
|
|
|
- transparent: true,
|
|
|
|
- map: texLoader$7.load(Potree.resourcePath + '/textures/dot_s.png')
|
|
|
|
- }),
|
|
|
|
- delete: new MeshBasicMaterial({
|
|
|
|
- transparent: true,
|
|
|
|
- map: texLoader$7.load(Potree.resourcePath + '/textures/dot_r.png')
|
|
|
|
- }),
|
|
|
|
- adding: new MeshBasicMaterial({
|
|
|
|
- transparent: true,
|
|
|
|
- opacity: 0.3,
|
|
|
|
- map: texLoader$7.load(Potree.resourcePath + '/textures/dot_n.png')
|
|
|
|
- })
|
|
|
|
- };
|
|
|
|
- for (var i in mats) {
|
|
|
|
- mats[i].map.anisotropy = 4;
|
|
|
|
- }
|
|
|
|
|
|
+ var markerMats$1;
|
|
|
|
+ var getMarkerMat = function getMarkerMat(name) {
|
|
|
|
+ if (!markerMats$1) {
|
|
|
|
+ markerMats$1 = {
|
|
|
|
+ default: new DepthBasicMaterial($.extend({}, depthProps, {
|
|
|
|
+ transparent: true,
|
|
|
|
+ map: texLoader$7.load(Potree.resourcePath + '/textures/dot_n.png')
|
|
|
|
+ })),
|
|
|
|
+ drag: new DepthBasicMaterial({
|
|
|
|
+ transparent: true,
|
|
|
|
+ useDepth: false,
|
|
|
|
+ map: texLoader$7.load(Potree.resourcePath + '/textures/dot_s.png')
|
|
|
|
+ }),
|
|
|
|
+ delete: new DepthBasicMaterial({
|
|
|
|
+ transparent: true,
|
|
|
|
+ useDepth: false,
|
|
|
|
+ map: texLoader$7.load(Potree.resourcePath + '/textures/dot_r.png')
|
|
|
|
+ }),
|
|
|
|
+ adding: new DepthBasicMaterial({
|
|
|
|
+ transparent: true,
|
|
|
|
+ opacity: 0.3,
|
|
|
|
+ useDepth: false,
|
|
|
|
+ map: texLoader$7.load(Potree.resourcePath + '/textures/dot_n.png')
|
|
|
|
+ })
|
|
|
|
+ };
|
|
|
|
+ for (var i in markerMats$1) {
|
|
|
|
+ markerMats$1[i].map.anisotropy = 4;
|
|
}
|
|
}
|
|
- return mats[name];
|
|
|
|
- };
|
|
|
|
- }();
|
|
|
|
|
|
+ }
|
|
|
|
+ return markerMats$1[name];
|
|
|
|
+ };
|
|
var getMeshQuaInPath = lineDir => {
|
|
var getMeshQuaInPath = lineDir => {
|
|
var quaBase = new Quaternion().setFromEuler(new Euler(-Math.PI / 2, 0, Math.PI / 2));
|
|
var quaBase = new Quaternion().setFromEuler(new Euler(-Math.PI / 2, 0, Math.PI / 2));
|
|
return math.getQuaFromPosAim(new Vector3(), lineDir).multiply(quaBase);
|
|
return math.getQuaFromPosAim(new Vector3(), lineDir).multiply(quaBase);
|
|
@@ -42232,6 +42232,7 @@
|
|
return function (path) {
|
|
return function (path) {
|
|
if (!endCap) {
|
|
if (!endCap) {
|
|
map = texLoader$7.load(Potree.resourcePath + '/textures/whiteCircle.png');
|
|
map = texLoader$7.load(Potree.resourcePath + '/textures/whiteCircle.png');
|
|
|
|
+ map.anisotropy = 3;
|
|
map.repeat.set(0.5, 1);
|
|
map.repeat.set(0.5, 1);
|
|
//map.magFilter = THREE.NearestFilter
|
|
//map.magFilter = THREE.NearestFilter
|
|
var mesh = new Mesh(planeGeo$2);
|
|
var mesh = new Mesh(planeGeo$2);
|
|
@@ -42437,7 +42438,7 @@
|
|
this.hideArrowUntilUpdate();
|
|
this.hideArrowUntilUpdate();
|
|
this.dispatchEvent('changed');
|
|
this.dispatchEvent('changed');
|
|
} else {
|
|
} else {
|
|
- //this.isNew || viewer.measuringTool.isAdding || viewer.focusOnObject(this, 'measure') //正在添加测量线时不要focus其他线(容易误触)
|
|
|
|
|
|
+ this.isNew || viewer.measuringTool.isAdding || this.dispatchEvent('click'); //viewer.focusOnObject(this, 'measure') //正在添加测量线时不要focus其他线(容易误触)
|
|
}
|
|
}
|
|
});
|
|
});
|
|
};
|
|
};
|
|
@@ -42757,6 +42758,12 @@
|
|
this.editEnable = !!state;
|
|
this.editEnable = !!state;
|
|
this.markers.forEach(e => Potree.Utils.updateVisible(e, 'editEnable', this.editEnable));
|
|
this.markers.forEach(e => Potree.Utils.updateVisible(e, 'editEnable', this.editEnable));
|
|
this.endCaps.forEach((e, i) => Potree.Utils.updateVisible(e, 'editEnable', !this.editEnable));
|
|
this.endCaps.forEach((e, i) => Potree.Utils.updateVisible(e, 'editEnable', !this.editEnable));
|
|
|
|
+ if (markerMats$1) {
|
|
|
|
+ //因为marker材质每条path都共用,所以isOfficial时请保证只有一条在编辑
|
|
|
|
+ for (var i in markerMats$1) {
|
|
|
|
+ markerMats$1[i].fadeFar = this.fadeFar;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if (!state) {
|
|
if (!state) {
|
|
this.updateEndCaps();
|
|
this.updateEndCaps();
|
|
/* viewer.dispatchEvent({
|
|
/* viewer.dispatchEvent({
|
|
@@ -42952,12 +42959,18 @@
|
|
//消失距离
|
|
//消失距离
|
|
this.traverse(e => {
|
|
this.traverse(e => {
|
|
var _e$material;
|
|
var _e$material;
|
|
- if (e.name == 'marker') return; //因为marker材质共用的所以不改。因此正式编辑时(有marker时)别设置消失距离。
|
|
|
|
|
|
+ //if(e.name == 'marker')return //因为marker材质共用的所以不改。因此正式编辑时(有marker时)别设置消失距离。
|
|
if ((_e$material = e.material) !== null && _e$material !== void 0 && (_e$material = _e$material.uniforms) !== null && _e$material !== void 0 && _e$material.fadeFar) {
|
|
if ((_e$material = e.material) !== null && _e$material !== void 0 && (_e$material = _e$material.uniforms) !== null && _e$material !== void 0 && _e$material.fadeFar) {
|
|
e.material.fadeFar = far;
|
|
e.material.fadeFar = far;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
this.fadeFar = far;
|
|
this.fadeFar = far;
|
|
|
|
+ if (markerMats$1) {
|
|
|
|
+ //因为marker材质每条path都共用,所以isOfficial时请保证只有一条在编辑
|
|
|
|
+ for (var i in markerMats$1) {
|
|
|
|
+ markerMats$1[i].fadeFar = this.fadeFar;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
viewer.dispatchEvent('content_changed');
|
|
viewer.dispatchEvent('content_changed');
|
|
}
|
|
}
|
|
dispose() {
|
|
dispose() {
|
|
@@ -42976,7 +42989,7 @@
|
|
var map = texLoader$7.load(Potree.resourcePath + '/textures/arrow.png');
|
|
var map = texLoader$7.load(Potree.resourcePath + '/textures/arrow.png');
|
|
//map.anisotropy = 2
|
|
//map.anisotropy = 2
|
|
map.generateMipmaps = false;
|
|
map.generateMipmaps = false;
|
|
- map.minFilter = LinearFilter; //防止边缘黑边
|
|
|
|
|
|
+ map.minFilter = LinearFilter; //防止边缘黑边, 但会造成锯齿
|
|
|
|
|
|
var material = new DepthBasicMaterial(Object.assign({}, depthProps, {
|
|
var material = new DepthBasicMaterial(Object.assign({}, depthProps, {
|
|
map,
|
|
map,
|