|
@@ -106,15 +106,21 @@ export const enter = (dom) => {
|
|
return { position, target }
|
|
return { position, target }
|
|
},
|
|
},
|
|
comeTo(o = {}) {
|
|
comeTo(o = {}) {
|
|
- //飞到某个点
|
|
|
|
|
|
+ //飞到某个点
|
|
|
|
+ if(o.modelId){
|
|
|
|
+ ['position','target'].forEach(e=>{
|
|
|
|
+ if(o[e]){
|
|
|
|
+ o[e] = Potree.Utils.datasetPosTransform({ fromDataset: true, datasetId: o.modelId, position:o[e]})
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+
|
|
if(o.distance){
|
|
if(o.distance){
|
|
let position = o.target || o.position
|
|
let position = o.target || o.position
|
|
return viewer.focusOnObject({ position, distance:o.distance }, 'tag').promise
|
|
return viewer.focusOnObject({ position, distance:o.distance }, 'tag').promise
|
|
}
|
|
}
|
|
let deferred = $.Deferred()
|
|
let deferred = $.Deferred()
|
|
- if(o.modelId){
|
|
|
|
- o.position = Potree.Utils.datasetPosTransform({ fromDataset: true, datasetId: o.modelId, position:o.position})
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
viewer.scene.view.setView($.extend({},o, {
|
|
viewer.scene.view.setView($.extend({},o, {
|
|
duration: o.dur,
|
|
duration: o.dur,
|
|
callback:()=>{
|
|
callback:()=>{
|
|
@@ -244,11 +250,11 @@ export const enter = (dom) => {
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
|
|
- enterSceneGuide(data){//导览
|
|
|
|
-
|
|
|
|
|
|
+ enterSceneGuide(pathArr){//导览
|
|
|
|
+
|
|
console.log(data)
|
|
console.log(data)
|
|
|
|
|
|
- /* type SceneGuidePath = {
|
|
|
|
|
|
+ /* type SceneGuidec = {
|
|
position: {x,y,z}
|
|
position: {x,y,z}
|
|
target: {x,y,z}
|
|
target: {x,y,z}
|
|
time: number
|
|
time: number
|