|
@@ -115110,17 +115110,7 @@ ENDSEC
|
|
|
pointDensity: Potree.settings.pointDensity,
|
|
|
};
|
|
|
Potree.settings.pointDensity = 'fourViewports'; //强制降低点云质量
|
|
|
- /* viewer.scene.pointclouds.forEach(e=>{
|
|
|
- e.material.activeAttributeName = "color"
|
|
|
- e.material.useFilterByNormal = true
|
|
|
- }) */
|
|
|
- //取消outline,改点云颜色为和outline一样的颜色
|
|
|
- /* if(this.selected && this.selected.isPointcloud){
|
|
|
- this.showModelOutline(this.selected, false)
|
|
|
- this.selected.material.activeAttributeName = "color"
|
|
|
- this.selected.material.color = viewer.outlinePass.visibleEdgeColor
|
|
|
- } */
|
|
|
-
|
|
|
+
|
|
|
|
|
|
viewer.setControls(viewer.fpControls);
|
|
|
|
|
@@ -151276,13 +151266,7 @@ ENDSEC
|
|
|
|
|
|
if(!this.visible || this.paused )return
|
|
|
|
|
|
-
|
|
|
- /* if(this.outlinePass.selectedObjects.length){
|
|
|
- this.clear()
|
|
|
- this.composer.render(this.scene.scene, this.mainViewport.camera );
|
|
|
- return;
|
|
|
- } */
|
|
|
-
|
|
|
+
|
|
|
let pRenderer = this.getPRenderer();
|
|
|
let viewports = params_.viewports || this.viewports;
|
|
|
|
|
@@ -151343,48 +151327,32 @@ ENDSEC
|
|
|
}
|
|
|
|
|
|
viewer.dispatchEvent({type: "render.begin", viewer: viewer, viewport:view, params });
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+ view.beforeRender && view.beforeRender();
|
|
|
|
|
|
if(view.render){
|
|
|
view.render($.extend({}, params, {
|
|
|
renderer:this.renderer, clear:this.clear.bind(this), resize:null,
|
|
|
- /* renderOverlay: this.renderOverlay.bind(this), */ force:!view.noPointcloud //如果要渲染点云,必须也一直渲染地图,否则地图会被覆盖(点云目前未能获取是否改变,也可能有其他动态物体,所以还是一直渲染的好)
|
|
|
+ force:!view.noPointcloud //如果要渲染点云,必须也一直渲染地图,否则地图会被覆盖(点云目前未能获取是否改变,也可能有其他动态物体,所以还是一直渲染的好)
|
|
|
}));
|
|
|
}else {
|
|
|
this.clear(params);
|
|
|
pRenderer.clearTargets(params);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
this.renderBG(view);
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
if(Potree.settings.notAdditiveBlending){
|
|
|
params.renderBeforeCloud = true;
|
|
|
this.renderOverlay1(params); //先渲染不透明的model
|
|
|
- //view.render || this.renderOverlay(params)
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- if(!view.noPointcloud ){
|
|
|
- //if(!params.target){
|
|
|
- //params.width = width; params.height = height;
|
|
|
- //}
|
|
|
- if(view.render){
|
|
|
- params.noBG = true;
|
|
|
- }
|
|
|
-
|
|
|
- view.beforeRender && view.beforeRender();
|
|
|
-
|
|
|
- this.updateViewPointcloud(params.camera, view.resolution, true);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- pRenderer.render(params);
|
|
|
+
|
|
|
+
|
|
|
+ if(!view.noPointcloud ){
|
|
|
+ this.updateViewPointcloud(params.camera, view.resolution, true);
|
|
|
+
|
|
|
+ pRenderer.render(params); //渲染点云
|
|
|
|
|
|
}
|
|
|
|