Merge branch 'v1.2.0-ga' of http://192.168.0.115:3000/bill/fuse-code into v1.2.0-ga

public/lib/potree/potree.js

@@ -62241,6 +62241,19 @@
 	      side: DoubleSide,
 	      depthTest: false
 	    });
+
+	    /* this.normalMat = new DepthBasicMaterial({ --- 需要像测量线那样渲染
+	        color: new THREE.Color(0x00c8af),
+	        transparent: true,
+	        opacity: 0.1,
+	        side: THREE.DoubleSide,
+	        useDepth:true,
+	        clipDistance : 5,//消失距离    
+	        occlusionDistance: 1,//变为backColor距离 
+	        maxOcclusionFactor:0.9,
+	        maxClipFactor:1
+	    }) */
+
 	    // 监控视频材质
 	    this.videoMat = new BasicMaterial({
 	      map: new VideoTexture(this.video),

src/sdk/cover/index.js

@@ -1005,7 +1005,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 })
                 let lastState = {}
                 model.addEventListener('transformChanged', (e) => {
-                    let msg = {byControl:!!e.byControl}  //byControl代表是手动用控制轴修改 
+                    let msg = {byControl:!!e.byControl}  //byControl代表是手动用控制轴修改 动画文件要改帧
                     if (!lastState.position || !model.position.equals(lastState.position)) {
                         lastState.position = msg.position = model.position.clone()
                         //console.log('change pos', model.name, model.position.toArray())
@@ -1123,7 +1123,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                     
                     MergeEditor.moveBoundCenterTo(model, pos3d)  //使模型中心的xy在鼠标所在位置
                      
-                    model.dispatchEvent("position_changed") 
+                    model.dispatchEvent({type:"position_changed", byControl:true}) 
                 },
 
                 changeShow(show) {
@@ -1177,7 +1177,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                     }else{
                         model && model.position.copy(pos)
                     }
-                    model.dispatchEvent({ type: 'position_changed' })
+                    model.dispatchEvent({ type: 'position_changed'/* , byControl:true */})
                 },
                 changeRotation(rot) {//校准取消时执行 
                     //console.log('changeRotation', model.name, rot.x, rot.y, rot.z)
@@ -1187,7 +1187,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                     }else{ */
                         model && model.rotation.setFromVector3(rot)
                     //} 
-                    model.dispatchEvent({ type: 'rotation_changed' , by2d:true})
+                    model.dispatchEvent({ type: 'rotation_changed' , by2d:true/* , byControl:true */})
                 },
                 getModelPose(){
                     return {