|
@@ -63154,7 +63154,7 @@ void main() {
|
|
|
return (new Vector3).copy(o.position).applyMatrix4(tranMatrix)
|
|
|
}else {
|
|
|
if(o.datasetId != void 0){
|
|
|
- console.error(`datasetPosTransform找不到datasetId为${o.datasetId}的数据集,请检查(热点?测量线?)数据`);
|
|
|
+ console.error(`datasetPosTransform找不到datasetId为${o.datasetId}的数据集或模型,请检查数据, 模型未创建或删除`);
|
|
|
//很可能是旧的热点,需要删除
|
|
|
}
|
|
|
}
|
|
@@ -84272,9 +84272,9 @@ void main() {
|
|
|
};
|
|
|
|
|
|
let scroll = (e) => {
|
|
|
- if(!this.enabled)return
|
|
|
+ if(!this.enabled || !e.hoverViewport)return
|
|
|
this.setCurrentViewport(e);
|
|
|
-
|
|
|
+
|
|
|
|
|
|
e.camera = e.hoverViewport.camera;
|
|
|
dolly(e);
|
|
@@ -117502,7 +117502,15 @@ ENDSEC
|
|
|
let angle = math.getAngle(dragInfo.lastVec, vec, 'z');
|
|
|
dragInfo.lastVec = vec;
|
|
|
|
|
|
- this.selected.rotation.z += angle;
|
|
|
+ //this.selected.rotation.z += angle //局部
|
|
|
+
|
|
|
+
|
|
|
+ /* object.quaternion.copy( .setFromAxisAngle( new THREE.Vector3(0,0,1), angle ) );
|
|
|
+ object.quaternion.multiply( quaternionStart ).normalize(); */
|
|
|
+ let diffQua = new Quaternion().setFromAxisAngle( new Vector3(0,0,1), angle );
|
|
|
+ this.selected.quaternion.premultiply(diffQua); //世界
|
|
|
+
|
|
|
+
|
|
|
this.selected.dispatchEvent("rotation_changed");
|
|
|
}
|
|
|
|