xzw 5 maanden geleden
bovenliggende
commit
437a83c6a5
3 gewijzigde bestanden met toevoegingen van 5489 en 1925 verwijderingen
  1. 5474 1917
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 14 7
      src/sdk/cover/index.js

File diff suppressed because it is too large
+ 5474 - 1917
public/lib/potree/potree.js


File diff suppressed because it is too large
+ 1 - 1
public/lib/potree/potree.js.map


+ 14 - 7
src/sdk/cover/index.js

@@ -15,6 +15,7 @@ const ModelTypes = {
     5 : {name:'深光点云' },
     6 : {name:'深光mesh',panos4dkk:true, rot90:true},//3dtiles
     7 : {name:'圆周率相机' },//圆周率相机场景
+    8 : {name:'动画模型'}
 }
 let cesAspect , cesImageryProvider
 
@@ -1358,6 +1359,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 pause(){
                     AnimationEditor.pause()
                 },
+                setCurrentTime(s){// 设置当前时间, 单位为秒
+                    AnimationEditor.at(s)
+                }, 
                 addAnimationModel(data){// 添加动画模型
                    /*  title: string;   模型名称
                       url: string;     模型路径
@@ -1371,10 +1375,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                     let prop = {
                         url: data.url,
                         title: data.title, 
+                        fromType: 8, 
                     }
-                    MergeEditor.addTitleForModel(model)
+                    
                     let modelFuns = sdk.addModel(prop)
-                     
+                    
                      
                     let visibleRange 
                     let updateVisiByRange = ()=>{//可见范围
@@ -1386,8 +1391,12 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                         }
                         Potree.Utils.updateVisible(model,'outOfVisiRange', visi) 
                     } 
-                    model.addEventListener('transformChanged',updateVisiByRange)
                     
+                    modelFuns.bus.on('loadDone',()=>{
+                        MergeEditor.addTitleForModel(model)
+                        model.addEventListener('transformChanged',updateVisiByRange)
+                        model.result_ = result
+                    }) 
                     
                     
                     let result = Object.assign(modelFuns, { 
@@ -1509,9 +1518,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                                 position: model.position.clone()
                             } 
                         },
-                        setCurrentTime(s){// 设置当前时间, 单位为秒
-                            AnimationEditor.at(s)
-                        }, 
+                        
                         
                         getCurrentSubtitlePixel({width , height}){// 获取当前模型旁白出现的适合位置,传入旁边dom的宽高,返回像素位置
                             let bound = model.boundingBox 
@@ -1547,7 +1554,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                             return {x,y}
                         }, 
                     })
-                    model.result_ = result
+                    
                     return result