xzw 2 years ago
parent
commit
57a97f7215

+ 2 - 1
src/Potree.js

@@ -73,7 +73,8 @@ export * from "./utils/SpotLightHelper.js";
 export * from "./utils/TransformationToolNew.js";
 export * from "./utils/Volume.js";
 export * from "./utils/VolumeTool.js"; 
-export * from "./custom/viewer/ExtendViewer.js"; 
+//export * from "./custom/viewer/ExtendViewer.js"; 
+export * from "./custom/viewer/ViewerNew.js"; 
 export * from "./viewer/ExtendScene.js";
 export * from "./viewer/HierarchicalSlider.js";
 

+ 1 - 1
src/custom/modules/Particles/ParticleEditor.js

@@ -68,7 +68,7 @@ let getHandleMat = function(type){
 
 let ParticleEditor = {
     
-    bus: THREE.EventDispatcher,
+    bus: new THREE.EventDispatcher,
     particleGroup : new THREE.Object3D ,
     curveGroup:new THREE.Object3D ,
     init:function(){

+ 4 - 7
src/custom/modules/panoEdit/panoEditor.js

@@ -952,7 +952,7 @@ class PanoEditor extends THREE.EventDispatcher{
                
             let drag = ()=>{
                 if(this.activeViewName == 'mainView' && this.tranMode == 'translate'){
-                    this.transformControls.dispatchEvent('dragging')
+                    this.transformControls.dispatchEvent('dragging')//触发拖拽
                     return
                 }
                 if(this.tranMode != 'translate')return
@@ -962,9 +962,7 @@ class PanoEditor extends THREE.EventDispatcher{
             }
             circle.addEventListener('drag', drag)
                                  
-            /* circle.addEventListener('drop', ()=>{ 
-         
-            }) */     
+                
             
             circle.addEventListener('mouseover', ()=>{ 
                 this.hoverPano(pano,true) 
@@ -1136,11 +1134,10 @@ class PanoEditor extends THREE.EventDispatcher{
     }
     
     getPanoRtkState(pano){
-        //'normal'  'rtk_on'  'rtk_off'  
-        
         return pano.panosData.has_rtk ? pano.rtkState ? 'rtk_on' : 'rtk_off' : 'normal'
     } 
-    changePanoRtkState(pano,state){ 
+    
+    setPanoRtkState(pano,state){ 
         pano.rtkState = state 
         pano.circle.material = circleMats[(this.selectedPano == pano ? 'selected' : 'default') + '_'+ this.getPanoRtkState(pano) ]
     }

+ 1 - 2
src/custom/note.txt

@@ -10,8 +10,7 @@ start.js除了通过引用shim文件来修改Potree, 也可在此文件修改,
 ------------------------
 问题:
 
-PointAttributes.js 为什么不改也可以?
-
+ 
 
 ----
 因为viewer太复杂了就去掉了所有和sidebar有关的代码(没完全继承原先的viewer的函数)。也就是说不支持非official的情况(no sidebar)。需要用这个测试的需要换分支。

+ 11 - 69
src/custom/potree.shim.js

@@ -23,6 +23,7 @@ import {PointCloudOctreeGeometry, PointCloudOctreeGeometryNode} from '../PointCl
 import {Shaders} from "../../build/shaders/shaders.js";  
  
 
+KeyCodes.BACKSPACE = 8
 
 
 {//defines:
@@ -146,6 +147,7 @@ import {Shaders} from "../../build/shaders/shaders.js";
 }
 
 
+
 Utils.loadSkybox = function(path) {
     let parent = new THREE.Object3D("skybox_root");
 
@@ -321,8 +323,6 @@ Utils.getMousePointCloudIntersection = function(viewport, mouse, pointer, camera
     
 };
 
-
-
 Utils.pixelsArrayToDataUrl = function(pixels, width, height, compressRatio = 0.7) {
     let canvas = document.createElement('canvas');
     canvas.width = width;
@@ -357,7 +357,6 @@ Utils.pixelsArrayToDataUrl = function(pixels, width, height, compressRatio = 0.7
     return dataURL;
 }
 
-
 Utils.renderTargetToDataUrl = function(renderTarget, width, height, renderer, compressRatio = 0.7){
     let pixelCount = width * height;
     let buffer = new Uint8Array(4 * pixelCount);
@@ -443,7 +442,6 @@ Utils.computePointcloudsBound = function(pointclouds){
     return {boundSize, center, boundingBox}
 }
 
-
 Utils.convertScreenPositionToNDC = function(pointer, mouse, width, height) { 
     return pointer = pointer || new THREE.Vector2,
         pointer.x = mouse.x / width * 2 - 1,
@@ -687,10 +685,8 @@ BinaryLoader.prototype.load = function(node){//解析点云
 
 PointAttribute.RGBA_PACKED = new PointAttribute("rgba", PointAttributeTypes.DATA_TYPE_INT8, 4);
 PointAttribute.COLOR_PACKED = PointAttribute.RGBA_PACKED;
-PointAttribute.INTENSITY = new PointAttribute("intensity", PointAttributeTypes.DATA_TYPE_UINT16, 1);
-
-PointAttribute.CLASSIFICATION = new PointAttribute("classification", PointAttributeTypes.DATA_TYPE_UINT8, 1);
-
+PointAttribute.INTENSITY = new PointAttribute("intensity", PointAttributeTypes.DATA_TYPE_UINT16, 1); 
+PointAttribute.CLASSIFICATION = new PointAttribute("classification", PointAttributeTypes.DATA_TYPE_UINT8, 1); 
 PointAttribute.GPS_TIME = new PointAttribute("gps-time", PointAttributeTypes.DATA_TYPE_DOUBLE, 1);
 
 ProfileWindow.prototype.initTHREE = function(){
@@ -737,7 +733,7 @@ ProfileWindow.prototype.initTHREE = function(){
     this.viewerPickSphere = new THREE.Mesh(sg, sm);
 }
 
-
+//Potree_update_visibility
 Potree.updatePointClouds =  function(pointclouds,camera, areaSize /* renderer */){
  
 	for (let pointcloud of pointclouds) {
@@ -768,8 +764,7 @@ Potree.updatePointClouds =  function(pointclouds,camera, areaSize /* renderer */
 	return result;
 };
 
-
-
+ 
 Potree.updateVisibilityStructures = function(pointclouds, camera, areaSize) {
 	let frustums = [];
 	let camObjPositions = [];
@@ -1156,55 +1151,7 @@ Potree.updateVisibility = function(pointclouds, camera, areaSize){
 	};
 };
 
-KeyCodes.BACKSPACE = 8
-
-PointCloudMaterial.prototype.updateShaderSource = function(){
-    let vs = Shaders['pointcloud_new.vs']; //改
-    let fs = Shaders['pointcloud_new.fs']; //改
-    let definesString = this.getDefines();
-
-    let vsVersionIndex = vs.indexOf("#version ");
-    let fsVersionIndex = fs.indexOf("#version ");
-
-    if(vsVersionIndex >= 0){
-        vs = vs.replace(/(#version .*)/, `$1\n${definesString}`)
-    }else{
-        vs = `${definesString}\n${vs}`;
-    }
-
-    if(fsVersionIndex >= 0){
-        fs = fs.replace(/(#version .*)/, `$1\n${definesString}`)
-    }else{
-        fs = `${definesString}\n${fs}`;
-    }
-
-    this.vertexShader = vs;
-    this.fragmentShader = fs;
-
-    if (this.opacity === 1.0 && !this.useFilterByNormal) {//add useFilterByNormal
-        this.blending = THREE.NoBlending;
-        this.transparent = false;
-        this.depthTest = true;
-        this.depthWrite = true;
-        this.depthFunc = THREE.LessEqualDepth;
-    } else if (  (this.opacity < 1.0 ||this.useFilterByNormal) &&   !this.useEDL) {//add useFilterByNormal
-        this.blending = THREE.AdditiveBlending;
-        this.transparent = true;
-        this.depthTest = false;
-        this.depthWrite = true;
-        this.depthFunc = THREE.AlwaysDepth;
-    }
-
-    if (this.weighted) {
-        this.blending = THREE.AdditiveBlending;
-        this.transparent = true;
-        this.depthTest = true;
-        this.depthWrite = false;
-    }
-
-    this.needsUpdate = true;
-}
-
+ 
 
 {//HQSplatRenderer
     let oldInit = HQSplatRenderer.prototype.init;
@@ -1478,16 +1425,13 @@ PointCloudMaterial.prototype.updateShaderSource = function(){
 		viewer.dispatchEvent({type: "render.pass.end",viewer: viewer});
         viewer.renderer.setRenderTarget(null) 
 	}
-    
-    
-    
-    
+     
 }
 
     
     
 
-
+//PointCloudOctreeGeometry.js
 PointCloudOctreeGeometryNode.prototype.loadHierachyThenPoints = function(pointcloud){
     let node = this;
 
@@ -1593,10 +1537,6 @@ PointCloudOctreeGeometryNode.prototype.loadHierachyThenPoints = function(pointcl
         } 
     }
 } 
-
-Object.assign( PointCloudOctreeGeometry.prototype, THREE.EventDispatcher.prototype );
-
-
  
 PointCloudOctreeGeometryNode.prototype.traverse = function(t, e){//add from navvis 25.js
     void 0 === e && (e = !0);
@@ -1609,6 +1549,8 @@ PointCloudOctreeGeometryNode.prototype.traverse = function(t, e){//add from navv
     }
 }
 
+Object.assign( PointCloudOctreeGeometry.prototype, THREE.EventDispatcher.prototype );
+
 LRU.prototype.freeMemory = function(){
     if (this.elements <= 1) {
         return;

+ 7 - 7
src/custom/start.js

@@ -24,7 +24,7 @@ export function start(dom, mapDom, number ){ //t-Zvd3w0m
     
      
     
-    let viewer = new Potree.ExtendViewer(dom , mapDom);
+    let viewer = new Potree.Viewer(dom , mapDom);
     
     let Alignment = viewer.modules.Alignment
     
@@ -37,7 +37,7 @@ export function start(dom, mapDom, number ){ //t-Zvd3w0m
     
     
     if(!Potree.settings.isOfficial){ 
-        /* viewer.loadGUI(() => {
+        viewer.loadGUI(() => {
             viewer.setLanguage('en');
             //$("#menu_appearance").next().show();
             $("#menu_tools").next().show();
@@ -45,7 +45,7 @@ export function start(dom, mapDom, number ){ //t-Zvd3w0m
             $("#siteModel").show();
             //$("#alignment").show();
             viewer.toggleSidebar();
-        }); */
+        }); 
         Potree.settings.sizeFitToLevel = true//当type为衰减模式时自动根据level调节大小。每长一级,大小就除以2
     }
 
@@ -340,7 +340,7 @@ export function panoEditStart(dom, number, fileServer){
     Potree.settings.sizeFitToLevel = true//当type为衰减模式时自动根据level调节大小。每长一级,大小就除以2
     
     
-    let viewer = new Potree.ExtendViewer(dom); 
+    let viewer = new Potree.Viewer(dom); 
     let Alignment = viewer.modules.Alignment
 	viewer.setEDLEnabled(false);
     viewer.setFOV(Potree.config.view.fov); 
@@ -348,13 +348,13 @@ export function panoEditStart(dom, number, fileServer){
     let datasetLoaded = 0;
   
     if(!Potree.settings.isOfficial){ 
-        /* viewer.loadGUI(() => {
+        viewer.loadGUI(() => {
             viewer.setLanguage('en'); 
             $("#menu_tools").next().show();
             $("#panos").show();
             $("#alignment").show(); 
             viewer.toggleSidebar();
-        }); */
+        }); 
         Potree.settings.sizeFitToLevel = true 
     }
     
@@ -483,7 +483,7 @@ export function mergeEditStart(dom){
    
     
     
-    let viewer = new Potree.ExtendViewer(dom );
+    let viewer = new Potree.Viewer(dom );
    
     let Alignment = viewer.modules.Alignment
      

+ 3 - 324
src/custom/three.shim.js

@@ -1,15 +1,7 @@
 import * as THREE from "../../libs/three.js/build/three.module.js";
 
-!function() {
-    if ("performance"in window == 0 && (window.performance = {}),
-    "now"in window.performance == 0) {
-        var e = Date.now();
-        performance.timing && performance.timing.navigationStart && (e = performance.timing.navigationStart),
-        window.performance.now = function() {
-            return Date.now() - e
-        }
-    }
-}(),
+
+
 THREE.WebGLRenderer.prototype.paramThreeToGL = function(e) {
     var t, i = this.extensions, r = this.getContext();//context;
     if (e === THREE.RepeatWrapping)
@@ -246,317 +238,4 @@ THREE.Object3D.prototype.traverse = function ( callback ) {
 
 
 
-
-
-
-/* ,
-
-THREE.WebGLState = function(e, t, i) {
-    var r = this
-      , o = new THREE.Vector4
-      , a = e.getParameter(e.MAX_VERTEX_ATTRIBS)
-      , s = new Uint8Array(a)
-      , l = new Uint8Array(a)
-      , c = new Uint8Array(a)
-      , h = {}
-      , u = null
-      , d = null
-      , p = null
-      , f = null
-      , g = null
-      , m = null
-      , v = null
-      , A = null
-      , y = !1
-      , C = null
-      , I = null
-      , E = null
-      , b = null
-      , w = null
-      , _ = null
-      , T = null
-      , x = null
-      , S = null
-      , M = null
-      , R = null
-      , P = null
-      , O = null
-      , L = null
-      , D = null
-      , N = e.getParameter(e.MAX_TEXTURE_IMAGE_UNITS)
-      , B = void 0
-      , F = {}
-      , V = new THREE.Vector4
-      , U = null
-      , k = null
-      , H = new THREE.Vector4
-      , G = new THREE.Vector4;
-    this.init = function() {
-        this.clearColor(0, 0, 0, 1),
-        this.clearDepth(1),
-        this.clearStencil(0),
-        this.enable(e.DEPTH_TEST),
-        e.depthFunc(e.LEQUAL),
-        e.frontFace(e.CCW),
-        e.cullFace(e.BACK),
-        this.enable(e.CULL_FACE),
-        this.enable(e.BLEND),
-        e.blendEquation(e.FUNC_ADD),
-        e.blendFunc(e.SRC_ALPHA, e.ONE_MINUS_SRC_ALPHA)
-    }
-    ,
-    this.initAttributes = function() {
-        for (var e = 0, t = s.length; e < t; e++)
-            s[e] = 0
-    }
-    ,
-    this.enableAttribute = function(i) {
-        if (s[i] = 1,
-        0 === l[i] && (e.enableVertexAttribArray(i),
-        l[i] = 1),
-        0 !== c[i]) {
-            var n = t.get("ANGLE_instanced_arrays");
-            n.vertexAttribDivisorANGLE(i, 0),
-            c[i] = 0
-        }
-    }
-    ,
-    this.enableAttributeAndDivisor = function(t, i, n) {
-        s[t] = 1,
-        0 === l[t] && (e.enableVertexAttribArray(t),
-        l[t] = 1),
-        c[t] !== i && (n.vertexAttribDivisorANGLE(t, i),
-        c[t] = i)
-    }
-    ,
-    this.disableUnusedAttributes = function() {
-        for (var t = 0, i = l.length; t < i; t++)
-            l[t] !== s[t] && (e.disableVertexAttribArray(t),
-            l[t] = 0)
-    }
-    ,
-    this.enable = function(t) {
-        h[t] !== !0 && (e.enable(t),
-        h[t] = !0)
-    }
-    ,
-    this.disable = function(t) {
-        h[t] !== !1 && (e.disable(t),
-        h[t] = !1)
-    }
-    ,
-    this.getCompressedTextureFormats = function() {
-        if (null === u && (u = [],
-        t.get("WEBGL_compressed_texture_pvrtc") || t.get("WEBGL_compressed_texture_s3tc") || t.get("WEBGL_compressed_texture_etc1")))
-            for (var i = e.getParameter(e.COMPRESSED_TEXTURE_FORMATS), n = 0; n < i.length; n++)
-                u.push(i[n]);
-        return u
-    }
-    ,
-    this.setBlending = function(t, r, o, a, s, l, c, h) {
-        t === THREE.NoBlending ? this.disable(e.BLEND) : this.enable(e.BLEND),
-        t === d && h === y || (t === THREE.AdditiveBlending ? h ? (e.blendEquationSeparate(e.FUNC_ADD, e.FUNC_ADD),
-        e.blendFuncSeparate(e.ONE, e.ONE, e.ONE, e.ONE)) : (e.blendEquation(e.FUNC_ADD),
-        e.blendFunc(e.SRC_ALPHA, e.ONE)) : t === THREE.SubtractiveBlending ? h ? (e.blendEquationSeparate(e.FUNC_ADD, e.FUNC_ADD),
-        e.blendFuncSeparate(e.ZERO, e.ZERO, e.ONE_MINUS_SRC_COLOR, e.ONE_MINUS_SRC_ALPHA)) : (e.blendEquation(e.FUNC_ADD),
-        e.blendFunc(e.ZERO, e.ONE_MINUS_SRC_COLOR)) : t === THREE.MultiplyBlending ? h ? (e.blendEquationSeparate(e.FUNC_ADD, e.FUNC_ADD),
-        e.blendFuncSeparate(e.ZERO, e.ZERO, e.SRC_COLOR, e.SRC_ALPHA)) : (e.blendEquation(e.FUNC_ADD),
-        e.blendFunc(e.ZERO, e.SRC_COLOR)) : h ? (e.blendEquationSeparate(e.FUNC_ADD, e.FUNC_ADD),
-        e.blendFuncSeparate(e.ONE, e.ONE_MINUS_SRC_ALPHA, e.ONE, e.ONE_MINUS_SRC_ALPHA)) : (e.blendEquationSeparate(e.FUNC_ADD, e.FUNC_ADD),
-        e.blendFuncSeparate(e.SRC_ALPHA, e.ONE_MINUS_SRC_ALPHA, e.ONE, e.ONE_MINUS_SRC_ALPHA)),
-        d = t,
-        y = h),
-        t === THREE.CustomBlending ? (s = s || r,
-        l = l || o,
-        c = c || a,
-        r === p && s === m || (e.blendEquationSeparate(i(r), i(s)),
-        p = r,
-        m = s),
-        o === f && a === g && l === v && c === A || (e.blendFuncSeparate(i(o), i(a), i(l), i(c)),
-        f = o,
-        g = a,
-        v = l,
-        A = c)) : (p = null,
-        f = null,
-        g = null,
-        m = null,
-        v = null,
-        A = null)
-    }
-    ,
-    this.setDepthFunc = function(t) {
-        if (C !== t) {
-            if (t)
-                switch (t) {
-                case THREE.NeverDepth:
-                    e.depthFunc(e.NEVER);
-                    break;
-                case THREE.AlwaysDepth:
-                    e.depthFunc(e.ALWAYS);
-                    break;
-                case THREE.LessDepth:
-                    e.depthFunc(e.LESS);
-                    break;
-                case THREE.LessEqualDepth:
-                    e.depthFunc(e.LEQUAL);
-                    break;
-                case THREE.EqualDepth:
-                    e.depthFunc(e.EQUAL);
-                    break;
-                case THREE.GreaterEqualDepth:
-                    e.depthFunc(e.GEQUAL);
-                    break;
-                case THREE.GreaterDepth:
-                    e.depthFunc(e.GREATER);
-                    break;
-                case THREE.NotEqualDepth:
-                    e.depthFunc(e.NOTEQUAL);
-                    break;
-                default:
-                    e.depthFunc(e.LEQUAL)
-                }
-            else
-                e.depthFunc(e.LEQUAL);
-            C = t
-        }
-    }
-    ,
-    this.setDepthTest = function(t) {
-        t ? this.enable(e.DEPTH_TEST) : this.disable(e.DEPTH_TEST)
-    }
-    ,
-    this.setDepthWrite = function(t) {
-        I !== t && (e.depthMask(t),
-        I = t)
-    }
-    ,
-    this.setColorWrite = function(t) {
-        E !== t && (e.colorMask(t, t, t, t),
-        E = t)
-    }
-    ,
-    this.setStencilFunc = function(t, i, n) {
-        w === t && _ === i && T === n || (e.stencilFunc(t, i, n),
-        w = t,
-        _ = i,
-        T = n)
-    }
-    ,
-    this.setStencilOp = function(t, i, n) {
-        x === t && S === i && M === n || (e.stencilOp(t, i, n),
-        x = t,
-        S = i,
-        M = n)
-    }
-    ,
-    this.setStencilTest = function(t) {
-        t ? this.enable(e.STENCIL_TEST) : this.disable(e.STENCIL_TEST)
-    }
-    ,
-    this.setStencilWrite = function(t) {
-        b !== t && (e.stencilMask(t),
-        b = t)
-    }
-    ,
-    this.setFlipSided = function(t) {
-        R !== t && (t ? e.frontFace(e.CW) : e.frontFace(e.CCW),
-        R = t)
-    }
-    ,
-    this.setLineWidth = function(t) {
-        t !== P && (e.lineWidth(t),
-        P = t)
-    }
-    ,
-    this.setPolygonOffset = function(t, i, n) {
-        t ? this.enable(e.POLYGON_OFFSET_FILL) : this.disable(e.POLYGON_OFFSET_FILL),
-        !t || O === i && L === n || (e.polygonOffset(i, n),
-        O = i,
-        L = n)
-    }
-    ,
-    this.getScissorTest = function() {
-        return D
-    }
-    ,
-    this.setScissorTest = function(t) {
-        D = t,
-        t ? this.enable(e.SCISSOR_TEST) : this.disable(e.SCISSOR_TEST)
-    }
-    ,
-    this.activeTexture = function(t) {
-        void 0 === t && (t = e.TEXTURE0 + N - 1),
-        B !== t && (e.activeTexture(t),
-        B = t)
-    }
-    ,
-    this.bindTexture = function(t, i) {
-        void 0 === B && r.activeTexture();
-        var n = F[B];
-        void 0 === n && (n = {
-            type: void 0,
-            texture: void 0
-        },
-        F[B] = n),
-        n.type === t && n.texture === i || (e.bindTexture(t, i),
-        n.type = t,
-        n.texture = i)
-    }
-    ,
-    this.compressedTexImage2D = function() {
-        try {
-            e.compressedTexImage2D.apply(e, arguments)
-        } catch (e) {
-            console.error(e)
-        }
-    }
-    ,
-    this.texImage2D = function() {
-        try {
-            e.texImage2D.apply(e, arguments)
-        } catch (e) {
-            console.error(e)
-        }
-    }
-    ,
-    this.clearColor = function(t, i, n, r) {
-        o.set(t, i, n, r),
-        V.equals(o) === !1 && (e.clearColor(t, i, n, r),
-        V.copy(o))
-    }
-    ,
-    this.clearDepth = function(t) {
-        U !== t && (e.clearDepth(t),
-        U = t)
-    }
-    ,
-    this.clearStencil = function(t) {
-        k !== t && (e.clearStencil(t),
-        k = t)
-    }
-    ,
-    this.scissor = function(t) {
-        H.equals(t) === !1 && (e.scissor(t.x, t.y, t.z, t.w),
-        H.copy(t))
-    }
-    ,
-    this.viewport = function(t) {
-        G.equals(t) === !1 && (e.viewport(t.x, t.y, t.z, t.w),
-        G.copy(t))
-    }
-    ,
-    this.reset = function() {
-        for (var t = 0; t < l.length; t++)
-            1 === l[t] && (e.disableVertexAttribArray(t),
-            l[t] = 0);
-        h = {},
-        u = null,
-        B = void 0,
-        F = {},
-        d = null,
-        E = null,
-        I = null,
-        b = null,
-        R = null
-    }
-} */
+ 

File diff suppressed because it is too large
+ 0 - 5160
src/custom/viewer/ExtendViewer - 原始.js


+ 4 - 4
src/navigation/FirstPersonControlsNew.js

@@ -190,9 +190,9 @@ export class FirstPersonControls extends THREE.EventDispatcher {
                     let Alignment = window.viewer.modules.Alignment
                     let MergeEditor = window.viewer.modules.MergeEditor
                     let handleState = Alignment.handleState
-                    
+                    //右键平移视图、左键操作点云 
                     let a = e.buttons === Buttons.LEFT && viewport.alignment && handleState && viewport.alignment[handleState] 
-                    if(Potree.settings.editType == 'pano'){//右键平移视图、左键操作点云 
+                    if(Potree.settings.editType == 'pano'){
                         let PanoEditor = window.viewer.modules.PanoEditor
                              
                         if(a && PanoEditor.selectedPano){
@@ -208,7 +208,7 @@ export class FirstPersonControls extends THREE.EventDispatcher {
                             } 
                         }
                         
-                        if(!pointclouds && e.buttons === Buttons.LEFT && viewport.rotateSide){
+                        if(!pointclouds && e.buttons === Buttons.LEFT && viewport.rotateSide){//侧视图
                             return PanoEditor.rotateSideCamera(-e.drag.pointerDelta.x)
                         }
                     }else if(Potree.settings.editType == 'merge'){ 
@@ -217,7 +217,7 @@ export class FirstPersonControls extends THREE.EventDispatcher {
                         }  
                     
                     }else{ 
-                        /* if(Alignment.selectedClouds && Alignment.selectedClouds.length){
+                        /* if(Alignment.selectedClouds && Alignment.selectedClouds.length){//多个点云
                             pointclouds = a && e.drag.intersectStart.pointclouds && Common.getMixedSet(Alignment.selectedClouds, e.drag.intersectStart.pointclouds).length && Alignment.selectedClouds
                             
                         }else{ */

+ 1 - 1
src/viewer/HQSplatRenderer.js

@@ -7,7 +7,7 @@ import {PointShape} from "../defines.js";
 import {SphereVolume} from "../utils/Volume.js";
 import {Utils} from "../utils.js";
 
-
+//在potree.shim中修改。。official中用不到
 export class HQSplatRenderer{
 	
 	constructor(viewer){

+ 7 - 7
src/viewer/sidebarNew.js

@@ -2,20 +2,20 @@
 import * as THREE from "../../libs/three.js/build/three.module.js";
 import {GeoJSONExporter} from "../exporter/GeoJSONExporter.js"
 import {DXFExporter} from "../exporter/DXFExporter.js"
-import {Volume, SphereVolume} from "../objects/tool/Volume.js"
-import {PolygonClipVolume} from "../objects/tool/PolygonClipVolume.js"
+import {Volume, SphereVolume} from "../utils/Volume.js"
+import {PolygonClipVolume} from "../utils/PolygonClipVolume.js"
 import {PropertiesPanel} from "./PropertyPanels/PropertiesPanel.js"
 import {PointCloudTree} from "../PointCloudTree.js"
-import {Profile} from "../objects/tool/Profile.js"
-import {Measure} from "../objects/tool/Measure.js"
+import {Profile} from "../utils/Profile.js"
+import {Measure} from "../custom/objects/tool/Measure.js"
 import {Annotation} from "../Annotation.js"
 import {CameraMode, ClipTask, ClipMethod} from "../defines.js"
-import {ScreenBoxSelectTool} from "../objects/tool/ScreenBoxSelectTool.js"
+import {ScreenBoxSelectTool} from "../utils/ScreenBoxSelectTool.js"
 import {Utils} from "../utils.js"
-import {CameraAnimation} from "../modules/CameraAnimation/CameraAnimation.js"
+import {CameraAnimation} from "../custom/modules/CameraAnimation/CameraAnimation.js"
 import {HierarchicalSlider} from "./HierarchicalSlider.js"
 import {OrientedImage} from "../modules/OrientedImages/OrientedImages.js";
-import {Images360} from "../modules/Images360/Images360.js";
+import {Images360} from "../custom/modules/panos/Images360.js";
  
 import JSON5 from "../../libs/json5-2.1.3/json5.mjs";