|
@@ -42274,6 +42274,7 @@
|
|
this.updateDatasetBelong(index); //获取dataset_point
|
|
this.updateDatasetBelong(index); //获取dataset_point
|
|
viewer.measuringTool.history.afterChange(this);
|
|
viewer.measuringTool.history.afterChange(this);
|
|
this.updateEdge();
|
|
this.updateEdge();
|
|
|
|
+ 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 || viewer.focusOnObject(this, 'measure') //正在添加测量线时不要focus其他线(容易误触)
|
|
@@ -42368,7 +42369,9 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
setPathWidth(w) {
|
|
setPathWidth(w) {
|
|
- this.halfPathWidth = w / 2;
|
|
|
|
|
|
+ var v = w / 2;
|
|
|
|
+ if (this.halfPathWidth == v) return;
|
|
|
|
+ this.halfPathWidth = v;
|
|
this.markers.forEach(e => setMarkerScale(e, this.halfPathWidth));
|
|
this.markers.forEach(e => setMarkerScale(e, this.halfPathWidth));
|
|
this.updateEdge();
|
|
this.updateEdge();
|
|
viewer.dispatchEvent('content_changed');
|
|
viewer.dispatchEvent('content_changed');
|
|
@@ -42473,6 +42476,7 @@
|
|
//viewer.measuringTool.history.beforeChange(this)
|
|
//viewer.measuringTool.history.beforeChange(this)
|
|
var _index = this.markers.indexOf(marker);
|
|
var _index = this.markers.indexOf(marker);
|
|
this.removeMarker(_index);
|
|
this.removeMarker(_index);
|
|
|
|
+ this.hideArrowUntilUpdate();
|
|
//viewer.measuringTool.history.afterChange(this)
|
|
//viewer.measuringTool.history.afterChange(this)
|
|
this.dispatchEvent('changed');
|
|
this.dispatchEvent('changed');
|
|
} else {
|
|
} else {
|
|
@@ -42759,7 +42763,7 @@
|
|
});
|
|
});
|
|
var waitAdd = [];
|
|
var waitAdd = [];
|
|
var minDisSq = Infinity;
|
|
var minDisSq = Infinity;
|
|
- var quaBase = new Quaternion().setFromEuler(new Euler(-Math.PI / 2, 0, (this.reverse ? -1 : 1) * Math.PI / 2));
|
|
|
|
|
|
+ var quaBase = new Quaternion().setFromEuler(new Euler(-Math.PI / 2, 0, Math.PI / 2));
|
|
var startTime = performance.now();
|
|
var startTime = performance.now();
|
|
var lines = [];
|
|
var lines = [];
|
|
paths.forEach(path => {
|
|
paths.forEach(path => {
|
|
@@ -42838,7 +42842,7 @@
|
|
var scaleMatrix = scaleMap.get(e.lineInfo.path);
|
|
var scaleMatrix = scaleMap.get(e.lineInfo.path);
|
|
if (!scaleMatrix) {
|
|
if (!scaleMatrix) {
|
|
var s = e.lineInfo.path.halfPathWidth * 1.6;
|
|
var s = e.lineInfo.path.halfPathWidth * 1.6;
|
|
- scaleMatrix = new Matrix4().scale(new Vector3(s, s, s));
|
|
|
|
|
|
+ scaleMatrix = new Matrix4().scale(new Vector3((e.lineInfo.path.reverse ? -1 : 1) * s, s, s));
|
|
scaleMap.set(e.lineInfo.path, scaleMatrix);
|
|
scaleMap.set(e.lineInfo.path, scaleMatrix);
|
|
}
|
|
}
|
|
var qua = math.getQuaFromPosAim(new Vector3(), e.lineInfo.dir).multiply(quaBase);
|
|
var qua = math.getQuaFromPosAim(new Vector3(), e.lineInfo.dir).multiply(quaBase);
|
|
@@ -56450,7 +56454,7 @@
|
|
var group = new Object3D();
|
|
var group = new Object3D();
|
|
this.spot = new Mesh(planeGeo$3, new DepthBasicMaterial(Object.assign({}, depthMatProp, {
|
|
this.spot = new Mesh(planeGeo$3, new DepthBasicMaterial(Object.assign({}, depthMatProp, {
|
|
transparent: true,
|
|
transparent: true,
|
|
- map: texLoader$8.load(Potree.resourcePath + '/textures/spot_default.png')
|
|
|
|
|
|
+ map: texLoader$8.load(o.spotUrl || Potree.resourcePath + '/textures/spot_default.png')
|
|
})));
|
|
})));
|
|
this.spot.scale.set(defaultSpotScale, defaultSpotScale, defaultSpotScale);
|
|
this.spot.scale.set(defaultSpotScale, defaultSpotScale, defaultSpotScale);
|
|
this.spot.renderOrder = renderOrders$1.spot;
|
|
this.spot.renderOrder = renderOrders$1.spot;
|
|
@@ -80257,6 +80261,7 @@
|
|
window.addEventListener('blur',()=>{
|
|
window.addEventListener('blur',()=>{
|
|
console.log('blur',window.winIndex)
|
|
console.log('blur',window.winIndex)
|
|
}) */
|
|
}) */
|
|
|
|
+ Cache.enabled = true; //这样不会重复网络请求相同的图
|
|
|
|
|
|
class Viewer$1 extends ViewerBase {
|
|
class Viewer$1 extends ViewerBase {
|
|
constructor(domElement, mapArea_) {
|
|
constructor(domElement, mapArea_) {
|