|
@@ -4594,11 +4594,15 @@
|
|
|
replaceAll: function replaceAll(str, f, e) {
|
|
|
//f全部替换成e
|
|
|
|
|
|
- /* if(str.replaceAll ) return str.replaceAll(f, e)
|
|
|
- else{ */
|
|
|
- var reg = new RegExp(f, "g"); //创建正则RegExp对象
|
|
|
- return str.replace(reg, e); //str.split(f).join(e);
|
|
|
- //}
|
|
|
+ if (str.replaceAll) return str.replaceAll(f, e);else {
|
|
|
+ var escapeRegExp = string => {
|
|
|
+ return string.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
|
|
|
+ };
|
|
|
+ return str.replace(new RegExp(escapeRegExp(f), 'g'), e);
|
|
|
+
|
|
|
+ /* var reg = new RegExp(f, "g"); //创建正则RegExp对象 这个没法转换'('
|
|
|
+ return str.replace(reg, e); //str.split(f).join(e); */
|
|
|
+ }
|
|
|
},
|
|
|
dealURL(url) {
|
|
|
var urlNew = this.replaceAll(url, "\\+", "%2B"); // 浏览器似乎不支持访问带+的地址
|
|
@@ -56131,7 +56135,7 @@
|
|
|
var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
|
var viewer = this.viewer;
|
|
|
var camera = params.camera ? params.camera : viewer.scene.getActiveCamera();
|
|
|
- var rtEDL = (Potree.settings.pointEnableRT && Potree.settings.displayMode == 'showPointCloud' || Potree.settings.displayMode == 'showPanos' && viewer.images360.currentPano.pointcloud.hasDepthTex || viewer.useEDL) && Features.EXT_DEPTH.isSupported() && camera.type != "OrthographicCamera" && !params.dontRenderRtEDL && (params.rtEDL || this.getRtEDL(params.viewport)); // 平面相机不用depthTex直接打开depthTest?且不使用edl
|
|
|
+ var rtEDL = (Potree.settings.pointEnableRT && Potree.settings.displayMode == 'showPointCloud' || Potree.settings.displayMode == 'showPanos' /* && viewer.images360.currentPano.pointcloud.hasDepthTex */ || viewer.useEDL) && Features.EXT_DEPTH.isSupported() && camera.type != "OrthographicCamera" && !params.dontRenderRtEDL && (params.rtEDL || this.getRtEDL(params.viewport)); // 平面相机不用depthTex直接打开depthTest?且不使用edl
|
|
|
var useEDL = viewer.useEDL && rtEDL && Potree.settings.displayMode != 'showPanos';
|
|
|
var target = params.target || null;
|
|
|
var resolution = rtEDL && Potree.settings.useRTPoint ? new Vector2(rtEDL.width, rtEDL.height) : params.target ? new Vector2(params.target.width, params.target.height) : params.viewport ? params.viewport.resolution2 : this.viewer.renderer.getSize(new Vector2()); //截图时需要用target的大小
|