|
@@ -10,10 +10,10 @@ export const enter = (dom) => {
|
|
|
Potree.settings.libsUrl = '../lib/'
|
|
|
|
|
|
|
|
|
- Potree.mergeEditStart(dom)
|
|
|
+ let {THREE} = Potree.mergeEditStart(dom)
|
|
|
let MergeEditor = viewer.modules.MergeEditor
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
let getPositionByScreen = (pos2d, mustModelId )=>{//通过屏幕坐标获取真实坐标 . mustModelId: 如果指定了模型,modelId必须为mustModelId才有效
|
|
@@ -39,15 +39,16 @@ export const enter = (dom) => {
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
- if (pos2d && pos2d.inDrag) {
|
|
|
-
|
|
|
+ if (pos2d && pos2d.inDrag) {
|
|
|
reGet()
|
|
|
} else {
|
|
|
intersect = Handler.intersect
|
|
|
- modelId = intersect.pointcloud ? intersect.pointcloud.dataset_id : intersect.object.dataset_id
|
|
|
- if(mustModelId != void 0 && modelId != mustModelId){
|
|
|
- reGet()
|
|
|
- }
|
|
|
+ if(intersect){
|
|
|
+ modelId = intersect.pointcloud ? intersect.pointcloud.dataset_id : intersect.object.dataset_id
|
|
|
+ if(mustModelId != void 0 && modelId != mustModelId){
|
|
|
+ reGet()
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (intersect && intersect.location) {
|
|
@@ -180,7 +181,9 @@ export const enter = (dom) => {
|
|
|
viewer.transformationTool.setModeEnable('translation',true)
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+ destroy(){
|
|
|
+ MergeEditor.removeModel(model)
|
|
|
+ }
|
|
|
/* leaveRotateMode(){
|
|
|
|
|
|
} */
|