sceneBuffer更改为MSAA

Author: pp123pp

src/Material/MeshNormalGlsl3Material.ts

@@ -150,7 +150,7 @@ class TileMaterial extends ShaderMaterial {
         this.vertexShader = vertexShader;
         this.fragmentShader = fragmentShader;
         this.defines.TEXTURE_UNITS = shaderSetOptions.numberOfDayTextures;
-        this.glslVersion = GLSL3;
+        // this.glslVersion = GLSL3;
         this.defines.APPLY_GAMMA = '';
 
         // this.side = DoubleSide;
@@ -273,10 +273,6 @@ class TileMaterial extends ShaderMaterial {
         #include <common>
         #include <packing>
         #include <logdepthbuf_pars_fragment>
-        
-        layout(location = 0) out vec4 gColor;
-        layout(location = 1) out vec4 gDepth;
-        layout(location = 2) out vec4 gNormal;
 
         in vec3 v_textureCoordinates;
         in vec2 vHighPrecisionZW;
@@ -390,18 +386,13 @@ class TileMaterial extends ShaderMaterial {
         
         void main(void){
             #include <logdepthbuf_fragment>
-        
-            float fragCoordZ = 0.5 * vHighPrecisionZW[0] / vHighPrecisionZW[1] + 0.5;
-
             
-            gColor = computeDayColor(u_initialColor, clamp(v_textureCoordinates, 0.0, 1.0));
-            gDepth = packDepthToRGBA( fragCoordZ );
-            gNormal = vec4(1.0);
+            gl_FragColor = computeDayColor(u_initialColor, clamp(v_textureCoordinates, 0.0, 1.0));
 
             #if defined( TONE_MAPPING )
-                gColor.rgb = toneMapping( gColor.rgb );
+                gl_FragColor.rgb = toneMapping( gl_FragColor.rgb );
             #endif
-                gColor = linearToOutputTexel( gColor );
+                gl_FragColor = linearToOutputTexel( gl_FragColor );
         }
         `;
 

src/Material/TileMaterial.ts

@@ -1 +1 @@
-export { MeshNormalGlsl3Material } from './MeshNormalGlsl3Material';
+export { TileMaterial } from './TileMaterial';

src/Material/materials.ts

@@ -17,12 +17,11 @@ import { getTimestamp } from '@/Core/getTimestamp';
 import { HeadingPitchRange } from '@/Core/HeadingPitchRange';
 import { HeadingPitchRoll } from '@/Core/HeadingPitchRoll';
 import { IntersectionTests } from '@/Core/IntersectionTests';
-import { MapMode2D } from '@/Core/MapMode2D';
 import { Ray } from '@/Core/Ray';
 import { Rectangle } from '@/Core/Rectangle';
 import { SceneMode } from '@/Core/SceneMode';
 import { Transforms } from '@/Core/Transforms';
-import { MathUtils, Matrix4, Raycaster, Vector2, Vector3 } from 'three';
+import { MathUtils, Matrix4, Raycaster, Vector2 } from 'three';
 import { OrthographicFrustumCamera } from './OrthographicFrustumCamera';
 import { PerspectiveFrustumCamera, PerspectiveFrustumCameraParameters } from './PerspectiveFrustumCamera';
 import { Scene } from './Scene';

src/Scene/Camera.ts

@@ -1,5 +1,5 @@
 import { Cartesian2 } from '@/Core/Cartesian2';
-import { FloatType, NearestFilter, Texture, WebGLMultipleRenderTargets } from 'three';
+import { RGBFormat, Texture, WebGLMultisampleRenderTarget } from 'three';
 import { generateUUID } from 'three/src/math/MathUtils';
 import { ContextLimits } from './ContextLimits';
 import { Scene } from './Scene';
@@ -9,7 +9,7 @@ class Context {
     public cache: any;
     protected _id: string;
     drawingBufferHeight: Cartesian2;
-    sceneFrameBuffer: WebGLMultipleRenderTargets;
+    sceneFrameBuffer: WebGLMultisampleRenderTarget;
     constructor (scene: Scene) {
         this.scene = scene;
 
@@ -19,28 +19,11 @@ class Context {
 
         this.drawingBufferHeight = new Cartesian2();
 
-        // this.webglMultipleRenderTarget = new WebGLMultipleRenderTargets
-
         const bufferSize = scene.drawingBufferSize;
 
-        // 保存场景的渲染结果，这里输出三和buffer，color, depth, normal
-        const sceneFrameBuffer = new WebGLMultipleRenderTargets(bufferSize.width, bufferSize.height, 3);
-
-        for (let i = 0, il = sceneFrameBuffer.texture.length; i < il; i++) {
-            sceneFrameBuffer.texture[i].minFilter = NearestFilter;
-            sceneFrameBuffer.texture[i].magFilter = NearestFilter;
-            sceneFrameBuffer.texture[i].type = FloatType;
-        }
-
-        // debugger;
-        // sceneFrameBuffer.texture[0].encoding = scene.renderer.outputEncoding;
-
-        sceneFrameBuffer.texture[0].name = 'color';
-        sceneFrameBuffer.texture[1].name = 'depth';
-        sceneFrameBuffer.texture[2].name = 'normal';
-
-        // (sceneFrameBuffer.texture as any).isTexture = true;
-        // (sceneFrameBuffer.texture as any).encoding = scene.renderer.outputEncoding;
+        const sceneFrameBuffer = new WebGLMultisampleRenderTarget(bufferSize.width, bufferSize.height, {
+            format: RGBFormat
+        });
 
         this.sceneFrameBuffer = sceneFrameBuffer;
 

src/Scene/Context.ts

@@ -1,7 +1,7 @@
 import { RGBShiftMaterial } from '@/Material/Pass/RGBShiftMaterial';
-import { ShaderPass } from '@/Renderer/ShaderPass';
 import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer';
 import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass';
+import { ShaderPass } from 'three/examples/jsm/postprocessing/ShaderPass';
 import { Scene } from './Scene';
 
 class EffectComposerCollection {
@@ -17,7 +17,7 @@ class EffectComposerCollection {
 
         const effect2 = new ShaderPass(new RGBShiftMaterial());
         effect2.uniforms.amount.value = 0.0015;
-        this.mainEffectComposer.addPass(effect2);
+        // this.mainEffectComposer.addPass(effect2);
     }
 
     setSize (container: Element): void {

src/Scene/EffectComposerCollection.ts

@@ -1,7 +1,5 @@
-import { Cartesian2 } from '@/Core/Cartesian2';
 import { Cartesian3 } from '@/Core/Cartesian3';
 import { Cartographic } from '@/Core/Cartographic';
-import { CesiumMath } from '@/Core/CesiumMath';
 import { CesiumMatrix4 } from '@/Core/CesiumMatrix4';
 import { CesiumQuaternion } from '@/Core/CesiumQuaternion';
 import { CullingVolume } from '@/Core/CullingVolume';
@@ -10,7 +8,6 @@ import { defined } from '@/Core/defined';
 import { DeveloperError } from '@/Core/DeveloperError';
 import { GeographicProjection } from '@/Core/GeographicProjection';
 import { PerspectiveOffCenterFrustum } from '@/Core/PerspectiveOffCenterFrustum';
-import { Ray } from '@/Core/Ray';
 import { SceneMode } from '@/Core/SceneMode';
 import { Frustum, MathUtils, Matrix4, PerspectiveCamera, Quaternion, Vector3 } from 'three';
 import { Scene } from './Scene';

src/Scene/PerspectiveFrustumCamera.ts

@@ -1,43 +1,31 @@
 
+import { Cartesian2 } from '@/Core/Cartesian2';
+import { Cartesian3 } from '@/Core/Cartesian3';
+import { defined } from '@/Core/defined';
+import { RequestScheduler } from '@/Core/RequestScheduler';
+import { TweenCollection } from '@/Core/TweenCollection';
+import * as THREE from 'three';
+import { GLSL3, LinearToneMapping, Mesh, Raycaster, ShaderMaterial, SphereBufferGeometry, sRGBEncoding, Vector2 } from 'three';
+import { CesiumColor } from '../Core/CesiumColor';
 import { incrementWrap } from '../Core/CesiumMath';
 import { defaultValue } from '../Core/defaultValue';
 import { Event } from '../Core/Event';
+import { GeographicProjection } from '../Core/GeographicProjection';
 import { SceneMode } from '../Core/SceneMode';
-import * as THREE from 'three';
-import { ACESFilmicToneMapping, GLSL3, LinearToneMapping, Mesh, Raycaster, ShaderMaterial, SphereBufferGeometry, sRGBEncoding, Vector2, WebGLRenderer, WebGLRendererParameters } from 'three';
+import { ComputeEngine } from '../Renderer/ComputeEngine';
 import { Camera } from './Camera';
-// import { Camera } from './CameraCopy';
 import { Context } from './Context';
+import { EffectComposerCollection } from './EffectComposerCollection';
 import { FrameState, PassesInterface } from './FrameState';
-import { RenderStateParameters } from './MapRenderer';
-
-import { Pass } from './../Renderer/Pass';
-import { PerspectiveFrustumCamera } from './PerspectiveFrustumCamera';
-import { CesiumColor } from '../Core/CesiumColor';
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
-import { GeographicProjection } from '../Core/GeographicProjection';
 import { Globe } from './Globe';
-import { ComputeEngine } from '../Renderer/ComputeEngine';
-import { ComputeCommand } from '../Renderer/ComputeCommand';
-import { PrimitiveCollection } from './PrimitiveCollection';
-import { defined } from '@/Core/defined';
 import { ImageryLayerCollection } from './ImageryLayerCollection';
+import { MapRenderer, RenderStateParameters } from './MapRenderer';
+import { PerspectiveFrustumCamera } from './PerspectiveFrustumCamera';
+import { Picking } from './Picking';
+import { PrimitiveCollection } from './PrimitiveCollection';
 import { RenderCollection } from './RenderCollection';
-import { RequestScheduler } from '@/Core/RequestScheduler';
 import { ScreenSpaceCameraController } from './ScreenSpaceCameraController';
-import { TweenCollection } from '@/Core/TweenCollection';
-import { Cartesian2 } from '@/Core/Cartesian2';
-import { Cartesian3 } from '@/Core/Cartesian3';
-import { EffectComposerCollection } from './EffectComposerCollection';
-import { PickDepth } from './PickDepth';
-import { Picking } from './Picking';
 import { SkyBox } from './SkyBox';
-import { MapRenderer } from '@/Renderer/MapRenderer';
-
-const raycaster = new Raycaster();
-const mouse = new Vector2();
-
-const pickEarth = new Mesh(new SphereBufferGeometry(6378137, 32, 32));
 
 interface SceneOptions {
     renderState?: RenderStateParameters;

src/Scene/Scene.ts

@@ -4,12 +4,9 @@ import { fragmentIn, varyingExp, vertexOut } from './ShaderReplace';
 
 const cube = ShaderLib.cube;
 
-// console.log(ShaderChunk.envmap_fragment);
+console.log(ShaderLib.cube.fragmentShader);
 
 const fragmentShader = `
-layout(location = 0) out vec4 gColor;
-layout(location = 1) out vec4 gDepth;
-layout(location = 2) out vec4 gNormal;
 
 #include <envmap_common_pars_fragment>
 uniform float opacity;
@@ -19,14 +16,10 @@ varying vec3 vWorldDirection;
 void main() {
     vec3 vReflect = vWorldDirection;
     ${envmap_fragment}
-    gColor = envColor;
-    gColor.a *= opacity;
-    gNormal = vec4( 1.0);
-    gDepth = vec4(1.0);
-    #if defined( TONE_MAPPING )
-        gColor.rgb = toneMapping( gColor.rgb );
-    #endif
-        gColor = linearToOutputTexel( gColor );
+    gl_FragColor = envColor;
+    gl_FragColor.a *= opacity;
+    #include <tonemapping_fragment>
+    #include <encodings_fragment>
     
 }`;
 cube.vertexShader = cube.vertexShader.replace(varyingExp, vertexOut);