Merge branch 'dev' of http://192.168.0.115:3000/bill/traffic-laser into dev

public/static/lib/potree/potree.js

@@ -138539,7 +138539,9 @@ ENDSEC
 	                bound = boundingBox.applyMatrix4(inv);
 	                scale = 1.0;//0.9; 
 	            }
-	            
+	            if(o.boundScale){
+	                scale = o.boundScale;
+	            }
 	            boundSize = bound.getSize(new Vector3);
 	            
 	            {

src/sdk/laser/core/enter.js

@@ -125,7 +125,7 @@ var enter = ({
                 viewer.updateModelBound()//viewer.boundNeedUpdate = true   //范围还没旋转
             }
              
-            viewer.focusOnObject({boundingBox: viewer.bound.boundingBox},'boundingBox',0)
+            viewer.focusOnObject({boundingBox: viewer.bound.boundingBox},'boundingBox',0,{dontChangeCamDir:1, boundScale:0.8})
 
              //{boundingBox:bound},'boundingBox',800, {dontChangeCamDir:true}
         }