|
@@ -62598,7 +62598,10 @@
|
|
|
});
|
|
|
}
|
|
|
watch() {
|
|
|
- if (!this.videoActive) return viewer.dispatchEvent('monitorError');
|
|
|
+ if (!this.videoActive) {
|
|
|
+ console.log('monitorError src:', this.video.src);
|
|
|
+ return viewer.dispatchEvent('monitorError');
|
|
|
+ }
|
|
|
var camera = viewer.mainViewport.camera;
|
|
|
this.updateAspect();
|
|
|
this.isWatching = true;
|
|
@@ -75807,10 +75810,11 @@
|
|
|
data = Potree.Common.CloneObject(data); //避免使用后更改数据又被使用
|
|
|
var matrix = data.object.parent ? data.object.parent.matrixWorld.clone().invert().multiply(data.matrixWorld) : data.matrixWorld;
|
|
|
matrix.decompose(data.object.position, data.object.quaternion, data.object.scale);
|
|
|
- data.object.boundCenter.copy(data.boundCenter);
|
|
|
data.object.dispatchEvent('changeByHistory');
|
|
|
data.object.dispatchEvent('transformChanged');
|
|
|
+ this.getBoundCenter(data.object);
|
|
|
viewer.dispatchEvent('content_changed');
|
|
|
+
|
|
|
//回退到上一次编辑的全局位置
|
|
|
return true;
|
|
|
}
|
|
@@ -75818,8 +75822,7 @@
|
|
|
getData: object => {
|
|
|
return {
|
|
|
object,
|
|
|
- matrixWorld: object.matrixWorld.clone(),
|
|
|
- boundCenter: object.boundCenter.clone()
|
|
|
+ matrixWorld: object.matrixWorld.clone()
|
|
|
};
|
|
|
}
|
|
|
});
|
|
@@ -76469,7 +76472,7 @@
|
|
|
model.rotateMatrix = new Matrix4().makeRotationFromEuler(model.rotation).multiply(model.rot1MatrixInvert);
|
|
|
model.transformMatrix.multiplyMatrices(model.matrix, model.posRot1MatrixInvert);
|
|
|
model.panos.forEach(e => e.transformByPointcloud());
|
|
|
- model.bound = model.boundingBox.clone().applyMatrix4(model.matrixWorld);
|
|
|
+ //model.bound = model.boundingBox.clone().applyMatrix4(model.matrixWorld)
|
|
|
}
|
|
|
if (model.panos) {
|
|
|
model.transformInvMatrix.copy(model.transformMatrix).invert();
|