|
@@ -898,9 +898,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
let bus = props.bus = mitt()
|
|
|
//console.log('--addModel',props)
|
|
|
props.isFirstLoad = isLocal ? props.bottom == void 0 : (props.isDynamicAdded || props.mode == 'single') // 在编辑时用户添加的 或 展示单个模型 (props.mode='single'模型展示页, props.mode='many'融合页)
|
|
|
- if (props.opacity == void 0) props.opacity = 1
|
|
|
+ if (props.opacity == void 0) props.opacity = 100
|
|
|
//if (props.type == 'obj') props.type = 'glb'
|
|
|
- props.scale /= 100
|
|
|
+ props.scale && (props.scale /= 100)
|
|
|
|
|
|
let getBaseRotation = () => {
|
|
|
if(ModelTypes[props.fromType]?.rot90 && props.type != 'obj'){
|
|
@@ -1010,10 +1010,10 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
}
|
|
|
if(ModelTypes[props.fromType].panos4dkk){
|
|
|
Potree.load4dkkPanos(props.raw.num, model, getBaseRotation(), () => {
|
|
|
- bus.emit('loadDone')
|
|
|
+ bus.emit('loadDone',model)
|
|
|
}, props.fromType == 0 ? '2k' : '4k' ) //看看场景是2k
|
|
|
} else {
|
|
|
- bus.emit('loadDone')
|
|
|
+ bus.emit('loadDone',model)
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1369,13 +1369,14 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
fontSize: number; 名称字体大小
|
|
|
globalVisibility: boolean; 是否全局可视
|
|
|
visibilityRange: number; */
|
|
|
-
|
|
|
+ console.log('添加动画文件',data)
|
|
|
|
|
|
let model
|
|
|
let prop = {
|
|
|
url: data.url,
|
|
|
title: data.title,
|
|
|
- fromType: 8, raw:{},
|
|
|
+ fromType: 8, raw:{},
|
|
|
+ type:'glb', id:data.id
|
|
|
}
|
|
|
|
|
|
let modelFuns = sdk.addModel(prop)
|
|
@@ -1392,7 +1393,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
Potree.Utils.updateVisible(model,'outOfVisiRange', visi)
|
|
|
}
|
|
|
|
|
|
- modelFuns.bus.on('loadDone',()=>{
|
|
|
+ modelFuns.bus.on('loadDone',(model_)=>{
|
|
|
+ model = model_
|
|
|
MergeEditor.addTitleForModel(model)
|
|
|
model.addEventListener('transformChanged',updateVisiByRange)
|
|
|
model.result_ = result
|