Sfoglia il codice sorgente

fix: 更换transform tool

xzw 3 anni fa
parent
commit
95d583337e
3 ha cambiato i file con 1887 aggiunte e 42 eliminazioni
  1. 1872 33
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 14 8
      src/sdk/cover/index.js

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


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


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

@@ -412,8 +412,8 @@ export const enter = (dom, isLocal) => {
             
             let onError = function ( xhr ) {
                 bus.emit('loadError', xhr)
-                spliceFromArr(model,false)
                 console.log('loadError!!!!!!!!!',  props.url, props.size, xhr) 
+                spliceFromArr(model,false)
             }
             
             if(props.type == "glb"){////////////////////////////test
@@ -449,7 +449,7 @@ export const enter = (dom, isLocal) => {
                     if(model){
                         MergeEditor.selectModel(model, state, true, true)
                         if(state && viewer.inputHandler.selection[0]){
-                            viewer.transformObject(model); //交换
+                            MergeEditor.transformControls.attach(model) //viewer.transformObject(model); //交换
                         }
                     }
                 },
@@ -477,24 +477,30 @@ export const enter = (dom, isLocal) => {
                 },
                 enterRotateMode(){
                     if(model){
-                        viewer.transformObject(model);
+                        MergeEditor.transformControls.attach(model)
+                        MergeEditor.transformControls.mode = 'rotate'
+                        /* viewer.transformObject(model);
                         viewer.transformationTool.setModeEnable('rotation',true)
-                        viewer.transformationTool.setModeEnable('translation',false)
+                        viewer.transformationTool.setModeEnable('translation',false) */
                     }
                 }, 
                 enterMoveMode(){
                     if(model){
-                        viewer.transformObject(model);
+                        
+                        MergeEditor.transformControls.attach(model)
+                        MergeEditor.transformControls.mode = 'translate'
+                        /* viewer.transformObject(model);
                         viewer.transformationTool.setModeEnable('rotation',false)
-                        viewer.transformationTool.setModeEnable('translation',true)
+                        viewer.transformationTool.setModeEnable('translation',true) */
                     }
                 },
                 leaveTransform(){ 
-                    viewer.transformObject(null); 
+                    //viewer.transformObject(null); 
+                    MergeEditor.transformControls.detach()
                 },
                  
                 destroy(){
-                    MergeEditor.removeModel(model) 
+                    model && MergeEditor.removeModel(model) 
                 }
                  
             }