|
@@ -9,6 +9,9 @@ export const enter = (dom, isLocal) => {
|
|
//Potree.fileServer = axios
|
|
//Potree.fileServer = axios
|
|
Potree.settings.libsUrl = '../lib/'
|
|
Potree.settings.libsUrl = '../lib/'
|
|
|
|
|
|
|
|
+ const tagLimitDis = 8;
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
let {THREE} = Potree.mergeEditStart(dom)
|
|
let {THREE} = Potree.mergeEditStart(dom)
|
|
let MergeEditor = viewer.modules.MergeEditor
|
|
let MergeEditor = viewer.modules.MergeEditor
|
|
@@ -87,7 +90,9 @@ export const enter = (dom, isLocal) => {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- getScreenByPosition(pos3d, modelId){//通过模型局部坐标获取屏幕坐标
|
|
|
|
|
|
+ getScreenByPosition(pos3d, modelId/* , disToCameraLimit */){//通过模型局部坐标获取屏幕坐标
|
|
|
|
+
|
|
|
|
+
|
|
let isLocal = modelId != void 0
|
|
let isLocal = modelId != void 0
|
|
pos3d = new THREE.Vector3().copy(pos3d)
|
|
pos3d = new THREE.Vector3().copy(pos3d)
|
|
let worldPos = isLocal ? Potree.Utils.datasetPosTransform({ fromDataset: true, datasetId: modelId, position:pos3d}) : pos3d
|
|
let worldPos = isLocal ? Potree.Utils.datasetPosTransform({ fromDataset: true, datasetId: modelId, position:pos3d}) : pos3d
|
|
@@ -95,6 +100,9 @@ export const enter = (dom, isLocal) => {
|
|
var viewport = viewer.mainViewport
|
|
var viewport = viewer.mainViewport
|
|
var camera = viewport.camera
|
|
var camera = viewport.camera
|
|
var dom = viewer.renderArea
|
|
var dom = viewer.renderArea
|
|
|
|
+ if(tagLimitDis != void 0){
|
|
|
|
+ if(camera.position.distanceTo(worldPos) < tagLimitDis)return false
|
|
|
|
+ }
|
|
//console.log('getScreenByPoint ' + pos3d.toArray())
|
|
//console.log('getScreenByPoint ' + pos3d.toArray())
|
|
return Potree.Utils.getPos2d(worldPos, camera, dom, viewport)
|
|
return Potree.Utils.getPos2d(worldPos, camera, dom, viewport)
|
|
},
|
|
},
|
|
@@ -337,6 +345,8 @@ export const enter = (dom, isLocal) => {
|
|
props.isFirstLoad = props.bottom == void 0 //在编辑时用户添加的
|
|
props.isFirstLoad = props.bottom == void 0 //在编辑时用户添加的
|
|
if(props.opacity == void 0) props.opacity = 1
|
|
if(props.opacity == void 0) props.opacity = 1
|
|
props.scale /= 100
|
|
props.scale /= 100
|
|
|
|
+ props.unlit = true
|
|
|
|
+
|
|
|
|
|
|
if(!props.isFirstLoad){
|
|
if(!props.isFirstLoad){
|
|
if(autoLoads.length == 0){ //首次加载
|
|
if(autoLoads.length == 0){ //首次加载
|
|
@@ -445,8 +455,8 @@ export const enter = (dom, isLocal) => {
|
|
let result = {
|
|
let result = {
|
|
bus,
|
|
bus,
|
|
changeShow(show){
|
|
changeShow(show){
|
|
- if(model){
|
|
|
|
- viewer.updateVisible(model, 'changeShow', show)
|
|
|
|
|
|
+ if(model){
|
|
|
|
+ viewer.updateVisible(model, 'changeShow', show)
|
|
}
|
|
}
|
|
},
|
|
},
|
|
changeSelect(state){
|
|
changeSelect(state){
|
|
@@ -455,6 +465,7 @@ export const enter = (dom, isLocal) => {
|
|
if(state && viewer.inputHandler.selection[0]){
|
|
if(state && viewer.inputHandler.selection[0]){
|
|
MergeEditor.transformControls.attach(model) //viewer.transformObject(model); //交换
|
|
MergeEditor.transformControls.attach(model) //viewer.transformObject(model); //交换
|
|
}
|
|
}
|
|
|
|
+ console.log(props.id, show)
|
|
}
|
|
}
|
|
},
|
|
},
|
|
changeScale(s){
|
|
changeScale(s){
|