@xeokit/xeokit-sdk 2.6.91-renderers-refactor-v9 → 2.6.92

package/src/viewer/scene/webgl/Renderer.js

@@ -5,27 +5,14 @@ import {WEBGL_INFO} from '../webglInfo.js';
 import {Map} from "../utils/Map.js";
 import {PickResult} from "./PickResult.js";
 import {OcclusionTester} from "./occlusion/OcclusionTester.js";
+import {SAOOcclusionRenderer} from "./sao/SAOOcclusionRenderer.js";
 import {createRTCViewMat} from "../math/rtcCoords.js";
-import {RenderBuffer} from "./RenderBuffer.js";
+import {SAODepthLimitedBlurRenderer} from "./sao/SAODepthLimitedBlurRenderer.js";
+import {RenderBufferManager} from "./RenderBufferManager.js";
 import {getExtension} from "./getExtension.js";
-import {createProgramVariablesState} from "./WebGLRenderer.js";
-import {ArrayBuf} from "./ArrayBuf.js";
-
-const OCCLUSION_TEST_MODE = false;
 
 const vec3_0 = math.vec3([0,0,0]);
 
-const iota = (n) => { const ret = [ ]; for (let i = 0; i < n; ++i) ret.push(i); return ret; };
-
-const bitShiftScreenZ = math.vec4([1.0 / (256.0 * 256.0 * 256.0 * 256.0), 1.0 / (256.0 * 256.0 * 256.0), 1.0 / (256.0 * 256.0), 1.0 / 256.0]);
-
-const pixelToInt = pix => pix[0] + (pix[1] << 8) + (pix[2] << 16) + (pix[3] << 24);
-
-const toWorldNormal = (n) => math.normalizeVec3(math.divVec3Scalar(n, math.MAX_INT, math.vec3()));
-const toWorldPos    = (p, origin, scale) => math.vec3([ p[0] * scale[0] + origin[0],
-                                                        p[1] * scale[1] + origin[1],
-                                                        p[2] * scale[2] + origin[2] ]);
-
 /**
  * @private
  */
@@ -33,7 +20,7 @@ const Renderer = function (scene, options) {
 
     options = options || {};
 
-    const frameCtx = new FrameContext();
+    const frameCtx = new FrameContext(scene);
     const canvas = scene.canvas.canvas;
     /**
      * @type {WebGL2RenderingContext}
@@ -62,344 +49,15 @@ const Renderer = function (scene, options) {
     let pbrEnabled = true;
     let colorTextureEnabled = true;
 
-    const renderBufferManager = (function() {
-        const renderBuffersBasic  = {};
-        const renderBuffersScaled = {};
-        return {
-            getRenderBuffer: (id, colorFormats, hasDepthTexture) => {
-                const renderBuffers = (scene.canvas.resolutionScale === 1.0) ? renderBuffersBasic : renderBuffersScaled;
-                if (! renderBuffers[id]) {
-                    renderBuffers[id] = new RenderBuffer(gl, colorFormats, hasDepthTexture);
-                }
-                return renderBuffers[id];
-            },
-            destroy: () => {
-                Object.values(renderBuffersBasic ).forEach(buf => buf.destroy());
-                Object.values(renderBuffersScaled).forEach(buf => buf.destroy());
-            }
-        };
-    })();
-
-    const SAOProgram = (gl, name, programVariablesState, createOutColorDefinition) => {
-        const programVariables = programVariablesState.programVariables;
-
-        const uViewportInv   = programVariables.createUniform("vec2", "uViewportInv");
-        const uCameraNear    = programVariables.createUniform("float", "uCameraNear");
-        const uCameraFar     = programVariables.createUniform("float", "uCameraFar");
-        const uDepthTexture  = programVariables.createUniform("sampler2D", "uDepthTexture");
-
-        const uv       = programVariables.createAttribute("vec2", "uv");
-        const vUV      = programVariables.createVarying("vec2", "vUV", () => uv);
-        const outColor = programVariables.createOutput("vec4", "outColor");
-
-        const getOutColor = programVariables.createFragmentDefinition(
-            "getOutColor",
-            (name, src) => {
-                const getDepth = "getDepth";
-                src.push(`
-                float ${getDepth}(const in vec2 uv) {
-                    return texture(${uDepthTexture}, uv).r;
-                }
-            `);
-                src.push(createOutColorDefinition(name, vUV, uViewportInv, uCameraNear, uCameraFar, getDepth));
-            });
-
-        const [program, errors] = programVariablesState.buildProgram(
-            gl,
-            name,
-            {
-                clipPos: `vec4(2.0 * ${uv} - 1.0, 0.0, 1.0)`,
-                appendFragmentOutputs: (src) => src.push(`${outColor} = ${getOutColor}();`)
-            });
-
-        if (errors) {
-            console.error(errors.join("\n"));
-            throw errors;
-        } else {
-            const uvs = new Float32Array([1,1, 0,1, 0,0, 1,0]);
-            const uvBuf = new ArrayBuf(gl, gl.ARRAY_BUFFER, uvs, uvs.length, 2, gl.STATIC_DRAW);
-
-            // Mitigation: if Uint8Array is used, the geometry is corrupted on OSX when using Chrome with data-textures
-            const indices = new Uint32Array([0, 1, 2, 0, 2, 3]);
-            const indicesBuf = new ArrayBuf(gl, gl.ELEMENT_ARRAY_BUFFER, indices, indices.length, 1, gl.STATIC_DRAW);
-
-            return {
-                destroy: program.destroy,
-                bind:    (viewportSize, project, depthTexture) => {
-                    program.bind();
-                    uViewportInv.setInputValue([1 / viewportSize[0], 1 / viewportSize[1]]);
-                    uCameraNear.setInputValue(project.near);
-                    uCameraFar.setInputValue(project.far);
-                    uDepthTexture.setInputValue(depthTexture);
-                    uv.setInputValue(uvBuf);
-                },
-                draw:    () => {
-                    indicesBuf.bind();
-                    gl.drawElements(gl.TRIANGLES, indicesBuf.numItems, indicesBuf.itemType, 0);
-                }
-            };
-        }
-    };
-
-    // SAO implementation inspired from previous SAO work in THREE.js by ludobaka / ludobaka.github.io and bhouston
-    const saoOcclusionRenderer = (function() {
-        let currentRenrerer = null;
-        let curNumSamples = null;
-        return {
-            destroy: () => currentRenrerer && currentRenrerer.destroy(),
-            render: (viewportSize, project, sao, depthTexture) => {
-                const numSamples = Math.floor(sao.numSamples);
-                if (curNumSamples !== numSamples) {
-                    currentRenrerer && currentRenrerer.destroy();
-
-                    const programVariablesState = createProgramVariablesState();
-
-                    const programVariables = programVariablesState.programVariables;
-
-                    const uProjectMatrix = programVariables.createUniform("mat4", "uProjectMatrix");
-                    const uInvProjMatrix = programVariables.createUniform("mat4", "uInvProjMatrix");
-                    const uPerspective   = programVariables.createUniform("bool", "uPerspective");
-                    const uScale         = programVariables.createUniform("float", "uScale");
-                    const uIntensity     = programVariables.createUniform("float", "uIntensity");
-                    const uBias          = programVariables.createUniform("float", "uBias");
-                    const uKernelRadius  = programVariables.createUniform("float", "uKernelRadius");
-                    const uMinResolution = programVariables.createUniform("float", "uMinResolution");
-                    const uRandomSeed    = programVariables.createUniform("float", "uRandomSeed");
-
-                    const program = SAOProgram(
-                        gl,
-                        "SAOOcclusionRenderer",
-                        programVariablesState,
-                        (name, vUV, uViewportInv, uCameraNear, uCameraFar, getDepth) => {
-                            return `
-                                #define EPSILON 1e-6
-                                #define PI 3.14159265359
-                                #define PI2 6.28318530718
-                                #define NUM_SAMPLES ${numSamples}
-                                #define NUM_RINGS 4
-
-                                const vec3 packFactors = vec3(256. * 256. * 256., 256. * 256., 256.);
-
-                                vec4 packFloatToRGBA(const in float v) {
-                                    vec4 r = vec4(fract(v * packFactors), v);
-                                    r.yzw -= r.xyz / 256.;
-                                    return r * 256. / 255.;
-                                }
-
-                                highp float rand(const in vec2 uv) {
-                                    const highp float a = 12.9898, b = 78.233, c = 43758.5453;
-                                    return fract(sin(mod(dot(uv, vec2(a, b)), PI)) * c);
-                                }
-
-                                vec3 getViewPos(const in vec2 screenPos, const in float depth) {
-                                    float near = ${uCameraNear};
-                                    float far  = ${uCameraFar};
-                                    float viewZ = (${uPerspective}
-                                                   ? ((near * far) / ((far - near) * depth - far))
-                                                   : (depth * (near - far) - near));
-                                    float clipW = ${uProjectMatrix}[2][3] * viewZ + ${uProjectMatrix}[3][3];
-                                    return (${uInvProjMatrix} * (clipW * vec4((vec3(screenPos, depth) - 0.5) * 2.0, 1.0))).xyz;
-                                }
-
-                                vec4 ${name}() {
-                                    float centerDepth = ${getDepth}(${vUV});
-                                    if (centerDepth >= (1.0 - EPSILON)) {
-                                        discard;
-                                    }
-
-                                    vec3 centerViewPosition = getViewPos(${vUV}, centerDepth);
-                                    float scaleDividedByCameraFar = ${uScale} / ${uCameraFar};
-                                    float minResolutionMultipliedByCameraFar = ${uMinResolution} * ${uCameraFar};
-                                    vec3 centerViewNormal = normalize(cross(dFdx(centerViewPosition), dFdy(centerViewPosition)));
-
-                                    vec2 radiusStep = ${uKernelRadius} * ${uViewportInv} / float(NUM_SAMPLES);
-                                    vec2 radius = radiusStep;
-                                    const float angleStep = PI2 * float(NUM_RINGS) / float(NUM_SAMPLES);
-                                    float angle = PI2 * rand(${vUV} + ${uRandomSeed});
-
-                                    float occlusionSum = 0.0;
-                                    float weightSum = 0.0;
-
-                                    for (int i = 0; i < NUM_SAMPLES; i++) {
-                                        vec2 sampleUv = ${vUV} + vec2(cos(angle), sin(angle)) * radius;
-                                        radius += radiusStep;
-                                        angle += angleStep;
-
-                                        float sampleDepth = ${getDepth}(sampleUv);
-                                        if (sampleDepth >= (1.0 - EPSILON)) {
-                                            continue;
-                                        }
-
-                                        vec3 sampleViewPosition = getViewPos(sampleUv, sampleDepth);
-                                        vec3 viewDelta = sampleViewPosition - centerViewPosition;
-                                        float scaledScreenDistance = scaleDividedByCameraFar * length(viewDelta);
-                                        occlusionSum += max(0.0, (dot(centerViewNormal, viewDelta) - minResolutionMultipliedByCameraFar) / scaledScreenDistance - ${uBias}) / (1.0 + scaledScreenDistance * scaledScreenDistance );
-                                        weightSum += 1.0;
-                                    }
-
-                                    return packFloatToRGBA(1.0 - occlusionSum * ${uIntensity} / weightSum);
-                                }`;
-                        });
-
-                    currentRenrerer = {
-                        destroy: program.destroy,
-                        render:  (viewportSize, project, sao, depthTexture) => {
-                            program.bind(viewportSize, project, depthTexture);
-
-                            uProjectMatrix.setInputValue(project.matrix);
-                            uInvProjMatrix.setInputValue(project.inverseMatrix);
-                            uPerspective.setInputValue(project.type === "Perspective");
-                            uScale.setInputValue(sao.scale * project.far / 5);
-                            uIntensity.setInputValue(sao.intensity);
-                            uBias.setInputValue(sao.bias);
-                            uKernelRadius.setInputValue(sao.kernelRadius);
-                            uMinResolution.setInputValue(sao.minResolution);
-                            uRandomSeed.setInputValue(Math.random());
-
-                            program.draw();
-                        }
-                    };
-
-                    curNumSamples = numSamples;
-                }
-
-                currentRenrerer.render(viewportSize, project, sao, depthTexture);
-            }
-        };
-    })();
-
-    const saoDepthLimitedBlurRenderer = (function() {
-        const blurStdDev = 4;
-        const blurDepthCutoff = 0.01;
-        const KERNEL_RADIUS = 16;
-
-        const createSampleOffsets = (uvIncrement) => {
-            const offsets = [];
-            for (let i = 0; i <= KERNEL_RADIUS + 1; i++) {
-                offsets.push(uvIncrement[0] * i);
-                offsets.push(uvIncrement[1] * i);
-            }
-            return new Float32Array(offsets);
-        };
-
-        const sampleOffsetsVer = createSampleOffsets([0, 1]);
-        const sampleOffsetsHor = createSampleOffsets([1, 0]);
-
-        const gaussian = (i, stdDev) => Math.exp(-(i * i) / (2.0 * (stdDev * stdDev))) / (Math.sqrt(2.0 * Math.PI) * stdDev);
-        const sampleWeights = new Float32Array(iota(KERNEL_RADIUS + 1).map(i => gaussian(i, blurStdDev))); // TODO: Optimize
-
-        const programVariablesState = createProgramVariablesState();
+    const renderBufferManager = new RenderBufferManager(scene);
 
-        const programVariables = programVariablesState.programVariables;
+    let snapshotBound = false;
 
-        const uDepthCutoff   = programVariables.createUniform("float", "uDepthCutoff");
-        const uSampleOffsets = programVariables.createUniformArray("vec2",  "uSampleOffsets", KERNEL_RADIUS + 1);
-        const uSampleWeights = programVariables.createUniformArray("float", "uSampleWeights", KERNEL_RADIUS + 1);
+    const bindOutputFrameBuffer = null;
+    const unbindOutputFrameBuffer = null;
 
-        const uOcclusionTex  = programVariables.createUniform("sampler2D", "uOcclusionTex");
-
-        const program = SAOProgram(
-            gl,
-            "SAODepthLimitedBlurRenderer",
-            programVariablesState,
-            (name, vUV, uViewportInv, uCameraNear, uCameraFar, getDepth) => {
-                return `
-                    #define EPSILON 1e-6
-
-                    const vec3 packFactors = vec3(256. * 256. * 256., 256. * 256., 256.);
-
-                    vec4 packFloatToRGBA(const in float v) {
-                        vec4 r = vec4(fract(v * packFactors), v);
-                        r.yzw -= r.xyz / 256.;
-                        return r * 256. / 255.;
-                    }
-
-                    float getOcclusion(const in vec2 uv) {
-                        vec4 v = texture(${uOcclusionTex}, uv);
-                        return dot(floor(v * 255.0 + 0.5) / 255.0, 255. / 256. / vec4(packFactors, 1.)); // unpackRGBAToFloat
-                    }
-
-                    float getViewZ(const in float depth) {
-                        return (${uCameraNear} * ${uCameraFar}) / ((${uCameraFar} - ${uCameraNear}) * depth - ${uCameraFar});
-                    }
-
-                    vec4 ${name}() {
-                        float centerDepth = ${getDepth}(${vUV});
-                        if (centerDepth >= (1.0 - EPSILON)) {
-                            discard;
-                        }
-
-                        float centerViewZ = getViewZ(centerDepth);
-                        bool rBreak = false;
-                        bool lBreak = false;
-
-                        float weightSum = ${uSampleWeights}[0];
-                        float occlusionSum = getOcclusion(${vUV}) * weightSum;
-
-                        for (int i = 1; i <= ${KERNEL_RADIUS}; i++) {
-                            float sampleWeight = ${uSampleWeights}[i];
-                            vec2 sampleUVOffset = ${uSampleOffsets}[i] * ${uViewportInv};
-
-                            if (! rBreak) {
-                                vec2 rSampleUV = ${vUV} + sampleUVOffset;
-                                if (abs(centerViewZ - getViewZ(${getDepth}(rSampleUV))) > ${uDepthCutoff}) {
-                                    rBreak = true;
-                                } else {
-                                    occlusionSum += getOcclusion(rSampleUV) * sampleWeight;
-                                    weightSum += sampleWeight;
-                                }
-                            }
-
-                            if (! lBreak) {
-                                vec2 lSampleUV = ${vUV} - sampleUVOffset;
-                                if (abs(centerViewZ - getViewZ(${getDepth}(lSampleUV))) > ${uDepthCutoff}) {
-                                    lBreak = true;
-                                } else {
-                                    occlusionSum += getOcclusion(lSampleUV) * sampleWeight;
-                                    weightSum += sampleWeight;
-                                }
-                            }
-                        }
-
-                        return packFloatToRGBA(occlusionSum / weightSum);
-                    }`;
-            });
-
-        return {
-            destroy: program.destroy,
-            render:  (viewportSize, project, direction, depthTexture, occlusionTexture) => {
-                program.bind(viewportSize, project, depthTexture);
-
-                uDepthCutoff.setInputValue(blurDepthCutoff);
-                uSampleOffsets.setInputValue((direction === 0) ? sampleOffsetsHor : sampleOffsetsVer);
-                uSampleWeights.setInputValue(sampleWeights);
-                uOcclusionTex.setInputValue(occlusionTexture);
-
-                program.draw();
-            }
-        };
-    })();
-
-    const getSceneCameraViewParams = (function() {
-        let params = null; // scene.camera not defined yet
-        return function() {
-            if (! params) {
-                const camera = scene.camera;
-                params = {
-                    get eye() { return camera.eye; },
-                    get far() { return camera.project.far; },
-                    get projMatrix() { return camera.projMatrix; },
-                    get viewMatrix() { return camera.viewMatrix; },
-                    get viewNormalMatrix() { return camera.viewNormalMatrix; }
-                };
-            }
-            return params;
-        };
-    })();
-
-    const getNearPlaneHeight = (camera, drawingBufferHeight) => ((camera.projection === "ortho")
-                                                                 ? 1.0
-                                                                 : (drawingBufferHeight / (2 * Math.tan(0.5 * camera.perspective.fov * Math.PI / 180.0))));
+    const saoOcclusionRenderer = new SAOOcclusionRenderer(scene);
+    const saoDepthLimitedBlurRenderer = new SAODepthLimitedBlurRenderer(scene);
 
     this.scene = scene;
 
@@ -451,6 +109,19 @@ const Renderer = function (scene, options) {
         imageDirty = true;
     };
 
+    this.webglContextLost = function () {
+    };
+
+    this.webglContextRestored = function (gl) {
+
+        // renderBufferManager.webglContextRestored(gl);
+
+        saoOcclusionRenderer.init();
+        saoDepthLimitedBlurRenderer.init();
+
+        imageDirty = true;
+    };
+
     /**
      * Inserts a drawable into this renderer.
      *  @private
@@ -530,7 +201,13 @@ const Renderer = function (scene, options) {
             const backgroundColor = scene.canvas.backgroundColorFromAmbientLight ? this.lights.getAmbientColorAndIntensity() : scene.canvas.backgroundColor;
             gl.clearColor(backgroundColor[0], backgroundColor[1], backgroundColor[2], 1.0);
         }
+        if (bindOutputFrameBuffer) {
+            bindOutputFrameBuffer(params.pass);
+        }
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+        if (unbindOutputFrameBuffer) {
+            unbindOutputFrameBuffer(params.pass);
+        }
     };
 
     /**
@@ -546,10 +223,14 @@ const Renderer = function (scene, options) {
      * Renders inserted drawables.
      *  @private
      */
-    this.render = function(pass, clear) {
+    this.render = function (params) {
+        params = params || {};
+        if (params.force) {
+            imageDirty = true;
+        }
         updateDrawlist();
         if (imageDirty) {
-            draw(pass, clear);
+            draw(params);
             stats.frame.frameCount++;
             imageDirty = false;
         }
@@ -557,175 +238,243 @@ const Renderer = function (scene, options) {
 
     function updateDrawlist() { // Prepares state-sorted array of drawables from maps of inserted drawables
         if (drawableListDirty) {
-            Object.values(drawableTypeInfo).forEach(drawableInfo => {
-                const drawableListPreCull = drawableInfo.drawableListPreCull;
-                let lenDrawableList = 0;
-                Object.values(drawableInfo.drawableMap).forEach(drawable => { drawableListPreCull[lenDrawableList++] = drawable; });
-                drawableListPreCull.length = lenDrawableList;
-            });
+            buildDrawableList();
             drawableListDirty = false;
             stateSortDirty = true;
         }
         if (stateSortDirty) {
-            let lenDrawableList = 0;
-            Object.values(drawableTypeInfo).forEach(drawableInfo => {
-                drawableInfo.drawableListPreCull.forEach(drawable => { postSortDrawableList[lenDrawableList++] = drawable; });
-            });
-            postSortDrawableList.length = lenDrawableList;
-            postSortDrawableList.sort((a, b) => a.renderOrder - b.renderOrder);
+            sortDrawableList();
             stateSortDirty = false;
             imageDirty = true;
         }
         if (imageDirty) { // Image is usually dirty because the camera moved
-            let lenDrawableList = 0;
-            let lenUiList       = 0;
-            postSortDrawableList.forEach(drawable => {
-                drawable.rebuildRenderFlags();
-                if (!drawable.renderFlags.culled) {
-                    if (drawable.isUI) {
-                        uiDrawableList[lenUiList++] = drawable;
-                    } else {
-                        postCullDrawableList[lenDrawableList++] = drawable;
+            cullDrawableList();
+        }
+    }
+
+    function buildDrawableList() {
+        for (let type in drawableTypeInfo) {
+            if (drawableTypeInfo.hasOwnProperty(type)) {
+                const drawableInfo = drawableTypeInfo[type];
+                const drawableMap = drawableInfo.drawableMap;
+                const drawableListPreCull = drawableInfo.drawableListPreCull;
+                let lenDrawableList = 0;
+                for (let id in drawableMap) {
+                    if (drawableMap.hasOwnProperty(id)) {
+                        drawableListPreCull[lenDrawableList++] = drawableMap[id];
                     }
                 }
-            });
-            postCullDrawableList.length = lenDrawableList;
-            uiDrawableList.length       = lenUiList;
+                drawableListPreCull.length = lenDrawableList;
+            }
         }
     }
 
-    function draw(pass, clear) {
+    function sortDrawableList() {
+        let lenDrawableList = 0;
+        for (let type in drawableTypeInfo) {
+            if (drawableTypeInfo.hasOwnProperty(type)) {
+                const drawableInfo = drawableTypeInfo[type];
+                const drawableListPreCull = drawableInfo.drawableListPreCull;
+                for (let i = 0, len = drawableListPreCull.length; i < len; i++) {
+                    const drawable = drawableListPreCull[i];
+                    postSortDrawableList[lenDrawableList++] = drawable;
+                }
+            }
+        }
+        postSortDrawableList.length = lenDrawableList;
+        postSortDrawableList.sort((a, b) => {
+            return a.renderOrder - b.renderOrder;
+        });
+    }
+
+    function cullDrawableList() {
+        let lenDrawableList = 0;
+        let lenUiList       = 0;
+        for (let i = 0, len = postSortDrawableList.length; i < len; i++) {
+            const drawable = postSortDrawableList[i];
+            drawable.rebuildRenderFlags();
+            if (!drawable.renderFlags.culled) {
+                if (drawable.isUI) {
+                    uiDrawableList[lenUiList++] = drawable;
+                } else {
+                    postCullDrawableList[lenDrawableList++] = drawable;
+                }
+            }
+        }
+        postCullDrawableList.length = lenDrawableList;
+        uiDrawableList.length       = lenUiList;
+    }
+
+    function draw(params) {
 
         const sao = scene.sao;
-        const occlusionTexture = saoEnabled && sao.possible && (sao.numSamples >= 1) && drawSAOBuffers(pass);
-
-        scene._lightsState.lights.forEach(light => {
-
-            if (light.castsShadow) {
-                const shadowRenderBuf = light.getShadowRenderBuf();
-                shadowRenderBuf.bind();
-
-                frameCtx.reset();
-                frameCtx.backfaces = true;
-                frameCtx.frontface = true;
-                frameCtx.viewParams.viewMatrix = light.getShadowViewMatrix();
-                frameCtx.viewParams.projMatrix = light.getShadowProjMatrix();
-                frameCtx.nearPlaneHeight = getNearPlaneHeight(scene.camera, gl.drawingBufferHeight);
-
-                gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
-
-                gl.clearColor(0, 0, 0, 1);
-                gl.enable(gl.DEPTH_TEST);
-                gl.disable(gl.BLEND);
-
-                gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-
-                Object.values(drawableTypeInfo).forEach(
-                    drawableInfo => {
-                        drawableInfo.drawableList.forEach(
-                            drawable => {
-                                if ((drawable.visible !== false) && drawable.castsShadow && drawable.drawShadow) {
-                                    if (drawable.renderFlags.colorOpaque) { // Transparent objects don't cast shadows (yet)
-                                        drawable.drawShadow(frameCtx);
-                                    }
-                                }
-                            });
-                    });
 
-                shadowRenderBuf.unbind();
-            }
-        });
+        if (saoEnabled && sao.possible) {
+            drawSAOBuffers(params);
+        }
 
-        // const numVertexAttribs = WEBGL_INFO.MAX_VERTEX_ATTRIBS; // Fixes https://github.com/xeokit/xeokit-sdk/issues/174
-        // for (let ii = 0; ii < numVertexAttribs; ii++) {
-        //     gl.disableVertexAttribArray(ii);
-        // }
-        //
-        shadowsDirty = false;
+        drawShadowMaps();
 
-        drawColor(pass, clear, occlusionTexture);
+        drawColor(params);
     }
 
-    function drawSAOBuffers(pass) {
+    function drawSAOBuffers(params) {
 
         const sao = scene.sao;
 
-        const size = [gl.drawingBufferWidth, gl.drawingBufferHeight];
-
         // Render depth buffer
-        const saoDepthRenderBuffer = renderBufferManager.getRenderBuffer("saoDepth", [], true);
-        saoDepthRenderBuffer.setSize(size);
+
+        const saoDepthRenderBuffer = renderBufferManager.getRenderBuffer("saoDepth", {
+            depthTexture: true
+        });
+
         saoDepthRenderBuffer.bind();
-        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+        saoDepthRenderBuffer.clear();
+        drawDepth(params);
+        saoDepthRenderBuffer.unbind();
+
+        // Render occlusion buffer
+
+        const occlusionRenderBuffer1 = renderBufferManager.getRenderBuffer("saoOcclusion");
+
+        occlusionRenderBuffer1.bind();
+        occlusionRenderBuffer1.clear();
+        saoOcclusionRenderer.render(saoDepthRenderBuffer);
+        occlusionRenderBuffer1.unbind();
+
+        if (sao.blur) {
+
+            // Horizontally blur occlusion buffer 1 into occlusion buffer 2
+
+            const occlusionRenderBuffer2 = renderBufferManager.getRenderBuffer("saoOcclusion2");
+
+            occlusionRenderBuffer2.bind();
+            occlusionRenderBuffer2.clear();
+            saoDepthLimitedBlurRenderer.render(saoDepthRenderBuffer, occlusionRenderBuffer1, 0);
+            occlusionRenderBuffer2.unbind();
+
+            // Vertically blur occlusion buffer 2 back into occlusion buffer 1
+
+            occlusionRenderBuffer1.bind();
+            occlusionRenderBuffer1.clear();
+            saoDepthLimitedBlurRenderer.render(saoDepthRenderBuffer, occlusionRenderBuffer2, 1);
+            occlusionRenderBuffer1.unbind();
+        }
+    }
+
+    function drawDepth(params) {
 
         frameCtx.reset();
-        frameCtx.pass = pass;
-        frameCtx.viewParams = getSceneCameraViewParams();
-        frameCtx.nearPlaneHeight = getNearPlaneHeight(scene.camera, gl.drawingBufferHeight);
+        frameCtx.pass = params.pass;
 
         gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
+
         gl.clearColor(0, 0, 0, 0);
         gl.enable(gl.DEPTH_TEST);
         gl.frontFace(gl.CCW);
         gl.enable(gl.CULL_FACE);
         gl.depthMask(true);
-        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        postCullDrawableList.forEach(drawable => {
-            if (!drawable.culled && drawable.visible && drawable.drawDepth && drawable.saoEnabled && drawable.renderFlags.colorOpaque) {
+        if (params.clear !== false) {
+            gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+        }
+        for (let i = 0, len = postCullDrawableList.length; i < len; i++) {
+
+            const drawable = postCullDrawableList[i];
+
+            if (drawable.culled === true || drawable.visible === false || !drawable.drawDepth || !drawable.saoEnabled) {
+                continue;
+            }
+
+            if (drawable.renderFlags.colorOpaque) {
                 drawable.drawDepth(frameCtx);
             }
-        });
+        }
 
-        saoDepthRenderBuffer.unbind();
+        // const numVertexAttribs = WEBGL_INFO.MAX_VERTEX_ATTRIBS; // Fixes https://github.com/xeokit/xeokit-sdk/issues/174
+        // for (let ii = 0; ii < numVertexAttribs; ii++) {
+        //     gl.disableVertexAttribArray(ii);
+        // }
 
-        const depthTexture = saoDepthRenderBuffer.depthTexture;
+    }
 
-        // Render occlusion buffer
+    function drawShadowMaps() {
 
-        const occlusionRenderBuffer1 = renderBufferManager.getRenderBuffer("saoOcclusion");
-        occlusionRenderBuffer1.setSize(size);
-        occlusionRenderBuffer1.bind();
+        let lights = scene._lightsState.lights;
+
+        for (let i = 0, len = lights.length; i < len; i++) {
+            const light = lights[i];
+            if (!light.castsShadow) {
+                continue;
+            }
+            drawShadowMap(light);
+        }
+
+        // const numVertexAttribs = WEBGL_INFO.MAX_VERTEX_ATTRIBS; // Fixes https://github.com/xeokit/xeokit-sdk/issues/174
+        // for (let ii = 0; ii < numVertexAttribs; ii++) {
+        //     gl.disableVertexAttribArray(ii);
+        // }
+        //
+        shadowsDirty = false;
+    }
+
+    function drawShadowMap(light) {
+
+        const castsShadow = light.castsShadow;
+
+        if (!castsShadow) {
+            return;
+        }
+
+        const shadowRenderBuf = light.getShadowRenderBuf();
+
+        if (!shadowRenderBuf) {
+            return;
+        }
+
+        shadowRenderBuf.bind();
+
+        frameCtx.reset();
+
+        frameCtx.backfaces = true;
+        frameCtx.frontface = true;
+        frameCtx.shadowViewMatrix = light.getShadowViewMatrix();
+        frameCtx.shadowProjMatrix = light.getShadowProjMatrix();
+
+        gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
 
-        gl.viewport(0, 0, size[0], size[1]);
         gl.clearColor(0, 0, 0, 1);
-        gl.disable(gl.DEPTH_TEST);
+        gl.enable(gl.DEPTH_TEST);
         gl.disable(gl.BLEND);
-        gl.frontFace(gl.CCW);
-        gl.clear(gl.COLOR_BUFFER_BIT);
 
-        saoOcclusionRenderer.render(size, scene.camera.project, sao, depthTexture);
+        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        occlusionRenderBuffer1.unbind();
+        for (let type in drawableTypeInfo) {
 
-        if (sao.blur) {
-            const occlusionRenderBuffer2 = renderBufferManager.getRenderBuffer("saoOcclusion2");
-            occlusionRenderBuffer2.setSize(size);
+            if (drawableTypeInfo.hasOwnProperty(type)) {
 
-            const blurSAO = (src, dst, direction) => {
-                dst.bind();
+                const drawableInfo = drawableTypeInfo[type];
+                const drawableList = drawableInfo.drawableList;
 
-                gl.viewport(0, 0, size[0], size[1]);
-                gl.clearColor(0, 0, 0, 1);
-                gl.enable(gl.DEPTH_TEST);
-                gl.disable(gl.BLEND);
-                gl.frontFace(gl.CCW);
-                gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+                for (let i = 0, len = drawableList.length; i < len; i++) {
 
-                const project = scene.camera.project;
-                saoDepthLimitedBlurRenderer.render(size, project, direction, depthTexture, src.colorTextures[0]);
+                    const drawable = drawableList[i];
 
-                dst.unbind();
-            };
+                    if (drawable.visible === false || !drawable.castsShadow || !drawable.drawShadow) {
+                        continue;
+                    }
 
-            blurSAO(occlusionRenderBuffer1, occlusionRenderBuffer2, 0); // horizontally
-            blurSAO(occlusionRenderBuffer2, occlusionRenderBuffer1, 1); // vertically
+                    if (drawable.renderFlags.colorOpaque) { // Transparent objects don't cast shadows (yet)
+                        drawable.drawShadow(frameCtx);
+                    }
+                }
+            }
         }
 
-        return occlusionRenderBuffer1.colorTextures[0];
+        shadowRenderBuf.unbind();
     }
 
-    function drawColor(pass, clear, occlusionTexture) {
+    function drawColor(params) {
 
         const normalDrawSAOBin = [];
         const normalEdgesOpaqueBin = [];
@@ -751,12 +500,10 @@ const Renderer = function (scene, options) {
         const ambientColorAndIntensity = scene._lightsState.getAmbientColorAndIntensity();
 
         frameCtx.reset();
-        frameCtx.pass = pass;
+        frameCtx.pass = params.pass;
         frameCtx.withSAO = false;
         frameCtx.pbrEnabled = pbrEnabled && !!scene.pbrEnabled;
         frameCtx.colorTextureEnabled = colorTextureEnabled && !!scene.colorTextureEnabled;
-        frameCtx.viewParams = getSceneCameraViewParams();
-        frameCtx.nearPlaneHeight = getNearPlaneHeight(scene.camera, gl.drawingBufferHeight);
 
         gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
 
@@ -775,9 +522,15 @@ const Renderer = function (scene, options) {
 
         frameCtx.lineWidth = 1;
 
-        const sao = scene.sao;
-        frameCtx.saoParams = [gl.drawingBufferWidth, gl.drawingBufferHeight, scene.sao.blendCutoff, scene.sao.blendFactor];
-        frameCtx.occlusionTexture = occlusionTexture;
+        const saoPossible = scene.sao.possible;
+
+        if (saoEnabled && saoPossible) {
+            const occlusionRenderBuffer1 = renderBufferManager.getRenderBuffer("saoOcclusion");
+            frameCtx.occlusionTexture = occlusionRenderBuffer1 ? occlusionRenderBuffer1.getTexture() : null;
+        } else {
+            frameCtx.occlusionTexture = null;
+
+        }
 
         let i;
         let len;
@@ -785,7 +538,11 @@ const Renderer = function (scene, options) {
 
         const startTime = Date.now();
 
-        if (clear) {
+        if (bindOutputFrameBuffer) {
+            bindOutputFrameBuffer(params.pass);
+        }
+
+        if (params.clear !== false) {
             gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
         }
 
@@ -825,7 +582,7 @@ const Renderer = function (scene, options) {
             const renderFlags = drawable.renderFlags;
 
             if (renderFlags.colorOpaque) {
-                if (drawable.saoEnabled && occlusionTexture) {
+                if (saoEnabled && saoPossible && drawable.saoEnabled) {
                     normalDrawSAOBin[normalDrawSAOBinLen++] = drawable;
                 } else {
                     drawable.drawColorOpaque(frameCtx);
@@ -966,7 +723,7 @@ const Renderer = function (scene, options) {
             // Transparent color fill
 
             if (normalFillTransparentBinLen > 0) {
-                const eye = frameCtx.viewParams.eye;
+                const eye = frameCtx.pickOrigin || scene.camera.eye;
                 normalFillTransparentBin.length = normalFillTransparentBinLen; // normalFillTransparentBin reused by renderDrawables calls, so needs to be truncated if necessary
                 const byDist = normalFillTransparentBin.map(d => ({ drawable: d, distSq: math.distVec3(d.origin || vec3_0, eye) }));
                 byDist.sort((a, b) => b.distSq - a.distSq);
@@ -1144,29 +901,11 @@ const Renderer = function (scene, options) {
         for (let ii = 0; ii < numVertexAttribs; ii++) {
             gl.disableVertexAttribArray(ii);
         }
-    }
-
-    const resetPickFrameCtx = (canvasPos, clipTransformDiv, camera, eye, projMatrix, viewMatrix, frameCtx) => {
-        frameCtx.reset();
-        frameCtx.backfaces = true;
-        frameCtx.frontface = true; // "ccw"
-
-        frameCtx.viewParams.eye = eye;
-        frameCtx.viewParams.projMatrix = projMatrix;
-        frameCtx.viewParams.viewMatrix = viewMatrix;
-        frameCtx.nearPlaneHeight = getNearPlaneHeight(camera, gl.drawingBufferHeight);
-
-        const resolutionScale = scene.canvas.resolutionScale;
-        frameCtx.pickClipPos = [
-            canvasPos ? (    2 * canvasPos[0] * resolutionScale / gl.drawingBufferWidth - 1) : 0,
-            canvasPos ? (1 - 2 * canvasPos[1] * resolutionScale / gl.drawingBufferHeight)    : 0
-        ];
 
-        frameCtx.pickClipPosInv = [
-            gl.drawingBufferWidth  / clipTransformDiv,
-            gl.drawingBufferHeight / clipTransformDiv
-        ];
-    };
+        if (unbindOutputFrameBuffer) {
+            unbindOutputFrameBuffer(params.pass);
+        }
+    }
 
     /**
      * Picks an Entity.
@@ -1175,18 +914,11 @@ const Renderer = function (scene, options) {
     this.pick = (function () {
 
         const tempVec3a = math.vec3();
-        const tempVec3b = math.vec3();
-        const tempVec4a = math.vec4();
-        const tempVec4b = math.vec4();
-        const tempVec4c = math.vec4();
-        const tempVec4d = math.vec4();
-        const tempVec4e = math.vec4();
         const tempMat4a = math.mat4();
         const tempMat4b = math.mat4();
-        const tempMat4c = math.mat4();
-        const tempMat4d = math.mat4();
 
-        const upVec = math.vec3([0, 1, 0]);
+        const randomVec3 = math.vec3();
+        const up = math.vec3([0, 1, 0]);
         const _pickResult = new PickResult();
 
         const nearAndFar = math.vec2();
@@ -1198,22 +930,16 @@ const Renderer = function (scene, options) {
         const worldSurfacePos = math.vec3();
         const worldSurfaceNormal = math.vec3();
 
-        const pickBuffer = new RenderBuffer(gl);
-        pickBuffer.setSize([1, 1]);
-
-        const pickNormalBuffer = new RenderBuffer(gl, [gl.RGBA32I]);
-        pickNormalBuffer.setSize([3, 3]);
-
         return function (params, pickResult = _pickResult) {
 
             pickResult.reset();
 
             updateDrawlist();
 
+            let look;
             let pickViewMatrix = null;
             let pickProjMatrix = null;
             let projection = null;
-            const camera = scene.camera;
 
             pickResult.pickSurface = params.pickSurface;
 
@@ -1222,12 +948,12 @@ const Renderer = function (scene, options) {
                 canvasPos[0] = params.canvasPos[0];
                 canvasPos[1] = params.canvasPos[1];
 
-                pickViewMatrix = camera.viewMatrix;
-                pickProjMatrix = camera.projMatrix;
-                projection     = camera.projection;
+                pickViewMatrix = scene.camera.viewMatrix;
+                pickProjMatrix = scene.camera.projMatrix;
+                projection     = scene.camera.projection;
 
-                nearAndFar[0] = camera.project.near;
-                nearAndFar[1] = camera.project.far;
+                nearAndFar[0] = scene.camera.project.near;
+                nearAndFar[1] = scene.camera.project.far;
 
                 pickResult.canvasPos = params.canvasPos;
 
@@ -1239,37 +965,33 @@ const Renderer = function (scene, options) {
                 if (params.matrix) {
 
                     pickViewMatrix = params.matrix;
-                    pickProjMatrix = camera.projMatrix;
-                    projection     = camera.projection;
+                    pickProjMatrix = scene.camera.projMatrix;
+                    projection     = scene.camera.projection;
 
-                    nearAndFar[0] = camera.project.near;
-                    nearAndFar[1] = camera.project.far;
+                    nearAndFar[0] = scene.camera.project.near;
+                    nearAndFar[1] = scene.camera.project.far;
 
                 } else {
 
                     worldRayOrigin.set(params.origin || [0, 0, 0]);
                     worldRayDir.set(params.direction || [0, 0, 1]);
 
-                    const look = math.addVec3(worldRayOrigin, worldRayDir, tempVec3a);
-                    const up = tempVec3b;
+                    look = math.addVec3(worldRayOrigin, worldRayDir, tempVec3a);
 
-                    if (Math.abs(math.dotVec3(worldRayDir, upVec)) > (1 - 1e-6)) { // worldRayDir aligned with Y axis
-                        up[0] = 0;
-                        up[1] = 0;
-                        up[2] = Math.sign(worldRayDir[1]);
-                    } else {
-                        math.cross3Vec3(worldRayDir, upVec, up);
-                        math.cross3Vec3(up, worldRayDir, up);
-                        math.normalizeVec3(up, up);
-                    }
+                    randomVec3[0] = Math.random();
+                    randomVec3[1] = Math.random();
+                    randomVec3[2] = Math.random();
+
+                    math.normalizeVec3(randomVec3);
+                    math.cross3Vec3(worldRayDir, randomVec3, up);
 
                     pickViewMatrix = math.lookAtMat4v(worldRayOrigin, look, up, tempMat4b);
-                    //    pickProjMatrix = camera.projMatrix;
-                    pickProjMatrix = camera.ortho.matrix;
+                    //    pickProjMatrix = scene.camera.projMatrix;
+                    pickProjMatrix = scene.camera.ortho.matrix;
                     projection     = "ortho";
 
-                    nearAndFar[0] = camera.ortho.near;
-                    nearAndFar[1] = camera.ortho.far;
+                    nearAndFar[0] = scene.camera.ortho.near;
+                    nearAndFar[1] = scene.camera.ortho.far;
 
                     pickResult.origin = worldRayOrigin;
                     pickResult.direction = worldRayDir;
@@ -1279,42 +1001,23 @@ const Renderer = function (scene, options) {
                 canvasPos[1] = canvas.clientHeight * 0.5;
             }
 
-            pickBuffer.bind();
-
-            const resetFrameCtx = (clipTransformDiv) => resetPickFrameCtx(canvasPos, clipTransformDiv, camera, pickResult.origin || camera.eye, pickProjMatrix || camera.projMatrix, pickViewMatrix || camera.viewMatrix, frameCtx);
-
-            // gpuPickPickable
-            resetFrameCtx(1);
-            frameCtx.pickInvisible = !!params.pickInvisible;
-
-            gl.viewport(0, 0, 1, 1);
-            gl.depthMask(true);
-            gl.enable(gl.DEPTH_TEST);
-            gl.disable(gl.CULL_FACE);
-            gl.disable(gl.BLEND);
-            gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-
-            const includeEntityIds = params.includeEntityIds;
-            const excludeEntityIds = params.excludeEntityIds;
-
-            const renderDrawables = function(drawables) {
-                drawables.forEach(drawable => {
-                    if (!drawable.culled && drawable.visible && drawable.pickable && drawable.drawPickMesh // TODO: push this logic into drawable
-                        && ((! includeEntityIds) || includeEntityIds[drawable.id])
-                        && ((! excludeEntityIds) || (! excludeEntityIds[drawable.id]))) {
-                        drawable.drawPickMesh(frameCtx);
+            for (let type in drawableTypeInfo) {
+                if (drawableTypeInfo.hasOwnProperty(type)) {
+                    const drawableList = drawableTypeInfo[type].drawableList;
+                    for (let i = 0, len = drawableList.length; i < len; i++) {
+                        const drawable = drawableList[i];
+                        if (drawable.setPickMatrices) { // Eg. SceneModel, which needs pre-loading into texture
+                            drawable.setPickMatrices(pickViewMatrix, pickProjMatrix);
+                        }
                     }
-                });
-            };
-
-            renderDrawables(postCullDrawableList);
-            if (uiDrawableList.length > 0) {
-                gl.clear(gl.DEPTH_BUFFER_BIT);
-                renderDrawables(uiDrawableList);
+                }
             }
 
-            const pickID = pixelToInt(pickBuffer.read(0, 0));
-            const pickable = (pickID >= 0) && pickIDs.items[pickID];
+            const pickBuffer = renderBufferManager.getRenderBuffer("pick", {size: [1, 1]});
+
+            pickBuffer.bind();
+
+            const pickable = gpuPickPickable(pickBuffer, canvasPos, pickViewMatrix, pickProjMatrix, params, pickResult);
 
             if (!pickable) {
                 pickBuffer.unbind();
@@ -1334,21 +1037,7 @@ const Renderer = function (scene, options) {
 
                 if (pickable.canPickTriangle && pickable.canPickTriangle()) {
 
-                    if (pickable.drawPickTriangles) {
-                        resetFrameCtx(1);
-                        // frameCtx.pickInvisible = !!params.pickInvisible;
-
-                        gl.viewport(0, 0, 1, 1);
-                        gl.clearColor(0, 0, 0, 0);
-                        gl.enable(gl.DEPTH_TEST);
-                        gl.disable(gl.CULL_FACE);
-                        gl.disable(gl.BLEND);
-                        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-
-                        pickable.drawPickTriangles(frameCtx);
-
-                        pickResult.primIndex = 3 * pixelToInt(pickBuffer.read(0, 0)); // Convert from triangle number to first vertex in indices
-                    }
+                    gpuPickTriangle(pickBuffer, pickable, canvasPos, pickViewMatrix, pickProjMatrix, pickResult);
 
                     pickable.pickTriangleSurface(pickViewMatrix, pickProjMatrix, projection, pickResult);
 
@@ -1358,84 +1047,255 @@ const Renderer = function (scene, options) {
 
                     if (pickable.canPickWorldPos && pickable.canPickWorldPos()) {
 
-                        // pickWorldPos
-                        resetFrameCtx(1);
-                        frameCtx.viewParams.near = nearAndFar[0];
-                        frameCtx.viewParams.far  = nearAndFar[1];
+                        gpuPickWorldPos(pickBuffer, pickable, canvasPos, pickViewMatrix, pickProjMatrix, nearAndFar, pickResult);
 
-                        gl.viewport(0, 0, 1, 1);
+                        if (params.pickSurfaceNormal !== false) {
+                            gpuPickWorldNormal(pickBuffer, pickable, canvasPos, pickViewMatrix, pickProjMatrix, pickResult);
+                        }
 
-                        gl.clearColor(0, 0, 0, 0);
-                        gl.depthMask(true);
-                        gl.enable(gl.DEPTH_TEST);
-                        gl.disable(gl.CULL_FACE);
-                        gl.disable(gl.BLEND);
-                        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+                        pickResult.pickSurfacePrecision = false;
+                    }
+                }
+            }
+            pickBuffer.unbind();
+            pickResult.entity = pickedEntity;
+            return pickResult;
+        };
+    })();
+
+    function gpuPickPickable(pickBuffer, canvasPos, pickViewMatrix, pickProjMatrix, params, pickResult) {
+
+        const resolutionScale = scene.canvas.resolutionScale;
+
+        frameCtx.reset();
+        frameCtx.backfaces = true;
+        frameCtx.frontface = true; // "ccw"
+        frameCtx.pickOrigin = pickResult.origin;
+        frameCtx.pickViewMatrix = pickViewMatrix;
+        frameCtx.pickProjMatrix = pickProjMatrix;
+        frameCtx.pickInvisible = !!params.pickInvisible;
+        frameCtx.pickClipPos = [
+            getClipPosX(canvasPos[0] * resolutionScale, gl.drawingBufferWidth),
+            getClipPosY(canvasPos[1] * resolutionScale, gl.drawingBufferHeight)
+        ];
+
+        gl.viewport(0, 0, 1, 1);
+        gl.depthMask(true);
+        gl.enable(gl.DEPTH_TEST);
+        gl.disable(gl.CULL_FACE);
+        gl.disable(gl.BLEND);
+        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+
+        const includeEntityIds = params.includeEntityIds;
+        const excludeEntityIds = params.excludeEntityIds;
+
+        const renderDrawables = function(drawables) {
+        for (let i = 0, len = drawables.length; i < len; i++) {
+            const drawable = drawables[i];
+            if (drawable.culled === true || drawable.visible === false) {
+                continue;
+            }
+            if (!drawable.drawPickMesh || (params.pickInvisible !== true && drawable.visible === false) || drawable.pickable === false) {
+                continue;
+            }
+            if (includeEntityIds && !includeEntityIds[drawable.id]) { // TODO: push this logic into drawable
+                continue;
+            }
+            if (excludeEntityIds && excludeEntityIds[drawable.id]) {
+                continue;
+            }
+            drawable.drawPickMesh(frameCtx);
+        }
+        };
 
-                        pickable.drawPickDepths(frameCtx); // Draw color-encoded fragment screen-space depths
+        renderDrawables(postCullDrawableList);
+        if (uiDrawableList.length > 0) {
+            gl.clear(gl.DEPTH_BUFFER_BIT);
+            renderDrawables(uiDrawableList);
+        }
 
-                        const screenZ = math.dotVec4(pickBuffer.read(0, 0), bitShiftScreenZ);
+        const pix = pickBuffer.read(0, 0);
+        const pickID = pix[0] + (pix[1] << 8) + (pix[2] << 16) + (pix[3] << 24);
 
-                        // Calculate clip space coordinates, which will be in range of x=[-1..1] and y=[-1..1], with y=(+1) at top
-                        const x = (canvasPos[0] - canvas.clientWidth / 2) / (canvas.clientWidth / 2);
-                        const y = -(canvasPos[1] - canvas.clientHeight / 2) / (canvas.clientHeight / 2);
+        if (pickID < 0) {
+            return;
+        }
 
-                        const origin = pickable.origin;
+        const pickable = pickIDs.items[pickID];
 
-                        const pvMatInverse = math.inverseMat4(math.mulMat4(pickProjMatrix, (origin ? createRTCViewMat(pickViewMatrix, origin, tempMat4a) : pickViewMatrix), tempMat4c), tempMat4d);
+        return pickable;
+    }
 
-                        const toWorld = (z, dst) => {
-                            dst[0] = x;
-                            dst[1] = y;
-                            dst[2] = z;
-                            dst[3] = 1;
-                            math.transformVec4(pvMatInverse, dst, dst);
-                            return math.mulVec4Scalar(dst, 1 / dst[3]);
-                        };
+    function gpuPickTriangle(pickBuffer, pickable, canvasPos, pickViewMatrix, pickProjMatrix, pickResult) {
 
-                        const world1 = toWorld(-1, tempVec4a);
-                        const world2 = toWorld( 1, tempVec4b);
+        if (!pickable.drawPickTriangles) {
+            return;
+        }
 
-                        const dir = math.subVec3(world2, world1, tempVec4c);
-                        const worldPos = math.addVec3(world1, math.mulVec4Scalar(dir, screenZ, tempVec4d), tempVec4e);
+        const resolutionScale = scene.canvas.resolutionScale;
 
-                        if (origin) {
-                            math.addVec3(worldPos, origin);
-                        }
+        frameCtx.reset();
+        frameCtx.backfaces = true;
+        frameCtx.frontface = true; // "ccw"
+        frameCtx.pickOrigin = pickResult.origin;
+        frameCtx.pickViewMatrix = pickViewMatrix; // Can be null
+        frameCtx.pickProjMatrix = pickProjMatrix; // Can be null
+        // frameCtx.pickInvisible = !!params.pickInvisible;
+        frameCtx.pickClipPos = [
+            getClipPosX(canvasPos[0] * resolutionScale, gl.drawingBufferWidth),
+            getClipPosY(canvasPos[1] * resolutionScale, gl.drawingBufferHeight)
+        ];
 
-                        pickResult.worldPos = worldPos;
+        gl.viewport(0, 0, 1, 1);
 
-                        if (params.pickSurfaceNormal !== false) {
-                            // gpuPickWorldNormal
-                            resetFrameCtx(3);
+        gl.clearColor(0, 0, 0, 0);
+        gl.enable(gl.DEPTH_TEST);
+        gl.disable(gl.CULL_FACE);
+        gl.disable(gl.BLEND);
+        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-                            pickNormalBuffer.bind();
+        pickable.drawPickTriangles(frameCtx);
 
-                            gl.viewport(0, 0, pickNormalBuffer.size[0], pickNormalBuffer.size[1]);
-                            gl.enable(gl.DEPTH_TEST);
-                            gl.disable(gl.CULL_FACE);
-                            gl.disable(gl.BLEND);
-                            gl.clear(gl.DEPTH_BUFFER_BIT);
-                            gl.clearBufferiv(gl.COLOR, 0, new Int32Array([0, 0, 0, 0]));
+        const pix = pickBuffer.read(0, 0);
 
-                            pickable.drawPickNormals(frameCtx); // Draw color-encoded fragment World-space normals
+        let primIndex = pix[0] + (pix[1] * 256) + (pix[2] * 256 * 256) + (pix[3] * 256 * 256 * 256);
 
-                            const pix = pickNormalBuffer.read(1, 1, gl.RGBA_INTEGER, gl.INT, Int32Array, 4);
+        primIndex *= 3; // Convert from triangle number to first vertex in indices
 
-                            pickNormalBuffer.unbind();
+        pickResult.primIndex = primIndex;
+    }
 
-                            pickResult.worldNormal = toWorldNormal(pix);
-                        }
+    const gpuPickWorldPos = (function () {
 
-                        pickResult.pickSurfacePrecision = false;
+        const tempVec4a = math.vec4();
+        const tempVec4b = math.vec4();
+        const tempVec4c = math.vec4();
+        const tempVec4d = math.vec4();
+        const tempVec4e = math.vec4();
+        const tempMat4a = math.mat4();
+        const tempMat4b = math.mat4();
+        const tempMat4c = math.mat4();
+
+        return function (pickBuffer, pickable, canvasPos, pickViewMatrix, pickProjMatrix, nearAndFar, pickResult) {
+
+            const resolutionScale = scene.canvas.resolutionScale;
+
+            frameCtx.reset();
+            frameCtx.backfaces = true;
+            frameCtx.frontface = true; // "ccw"
+            frameCtx.pickOrigin = pickResult.origin;
+            frameCtx.pickViewMatrix = pickViewMatrix;
+            frameCtx.pickProjMatrix = pickProjMatrix;
+            frameCtx.pickZNear = nearAndFar[0];
+            frameCtx.pickZFar = nearAndFar[1];
+            frameCtx.pickElementsCount = pickable.pickElementsCount;
+            frameCtx.pickElementsOffset = pickable.pickElementsOffset;
+            frameCtx.pickClipPos = [
+                getClipPosX(canvasPos[0] * resolutionScale, gl.drawingBufferWidth),
+                getClipPosY(canvasPos[1] * resolutionScale, gl.drawingBufferHeight)
+            ];
+
+            gl.viewport(0, 0, 1, 1);
+
+            gl.clearColor(0, 0, 0, 0);
+            gl.depthMask(true);
+            gl.enable(gl.DEPTH_TEST);
+            gl.disable(gl.CULL_FACE);
+            gl.disable(gl.BLEND);
+            gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+
+            pickable.drawPickDepths(frameCtx); // Draw color-encoded fragment screen-space depths
+
+            const pix = pickBuffer.read(0, 0);
+
+            const screenZ = unpackDepth(pix); // Get screen-space Z at the given canvas coords
+
+            // Calculate clip space coordinates, which will be in range of x=[-1..1] and y=[-1..1], with y=(+1) at top
+            const x = (canvasPos[0] - canvas.clientWidth / 2) / (canvas.clientWidth / 2);
+            const y = -(canvasPos[1] - canvas.clientHeight / 2) / (canvas.clientHeight / 2);
+
+            const origin = pickable.origin;
+            let pvMat;
+
+            if (origin) {
+                const rtcPickViewMat = createRTCViewMat(pickViewMatrix, origin, tempMat4a);
+                pvMat = math.mulMat4(pickProjMatrix, rtcPickViewMat, tempMat4b);
+
+            } else {
+                pvMat = math.mulMat4(pickProjMatrix, pickViewMatrix, tempMat4b);
+            }
+
+            const pvMatInverse = math.inverseMat4(pvMat, tempMat4c);
+
+            tempVec4a[0] = x;
+            tempVec4a[1] = y;
+            tempVec4a[2] = -1;
+            tempVec4a[3] = 1;
+
+            let world1 = math.transformVec4(pvMatInverse, tempVec4a);
+            world1 = math.mulVec4Scalar(world1, 1 / world1[3]);
+
+            tempVec4b[0] = x;
+            tempVec4b[1] = y;
+            tempVec4b[2] = 1;
+            tempVec4b[3] = 1;
+
+            let world2 = math.transformVec4(pvMatInverse, tempVec4b);
+            world2 = math.mulVec4Scalar(world2, 1 / world2[3]);
+
+            const dir = math.subVec3(world2, world1, tempVec4c);
+            const worldPos = math.addVec3(world1, math.mulVec4Scalar(dir, screenZ, tempVec4d), tempVec4e);
+
+            if (origin) {
+                math.addVec3(worldPos, origin);
+            }
+
+            pickResult.worldPos = worldPos;
+        }
+    })();
+
+    function drawSnapInit(frameCtx) {
+        frameCtx.snapPickLayerParams = [];
+        frameCtx.snapPickLayerNumber = 0;
+
+        for (let i = 0, len = postCullDrawableList.length; i < len; i++) {
+
+            const drawable = postCullDrawableList[i];
+
+            if (drawable.drawSnapInit) {
+                if (!drawable.culled && drawable.visible && drawable.pickable) {
+                    drawable.drawSnapInit(frameCtx);
+                }
+            }
+        }
+        return frameCtx.snapPickLayerParams;
+    }
+
+    function drawSnap(frameCtx) {
+        frameCtx.snapPickLayerParams = frameCtx.snapPickLayerParams || [];
+        frameCtx.snapPickLayerNumber = frameCtx.snapPickLayerParams.length;
+        for (let i = 0, len = postCullDrawableList.length; i < len; i++) {
+
+            const drawable = postCullDrawableList[i];
+
+            if (drawable.drawSnapInit) {
+                if (drawable.drawSnap) {
+                    if (!drawable.culled && drawable.visible && drawable.pickable) {
+                        drawable.drawSnap(frameCtx);
                     }
                 }
             }
-            pickBuffer.unbind();
-            pickResult.entity = pickedEntity;
-            return pickResult;
-        };
-    })();
+        }
+        return frameCtx.snapPickLayerParams;
+    }
+
+    function getClipPosX(pos, size) {
+        return 2 * (pos / size) - 1;
+    }
+
+    function getClipPosY(pos, size) {
+        return 1 - 2 * (pos / size);
+    }
 
     /**
      * @param {[number, number]} canvasPos
@@ -1449,18 +1309,6 @@ const Renderer = function (scene, options) {
 
         const _pickResult = new PickResult();
 
-        const getVertexPickBuffer = (function() {
-            const cache = { };
-            return (snapRadiusInPixels) => {
-                if (! (snapRadiusInPixels in cache)) {
-                    const buf = new RenderBuffer(gl, [gl.RGBA32I, gl.RGBA32I, gl.RGBA8UI], true);
-                    buf.setSize([2 * snapRadiusInPixels + 1, 2 * snapRadiusInPixels + 1]);
-                    cache[snapRadiusInPixels] = buf;
-                }
-                return cache[snapRadiusInPixels];
-            };
-        })();
-
         return function (params, pickResult = _pickResult) {
 
             const {canvasPos, origin, direction, snapRadius, snapToVertex, snapToEdge} = params;
@@ -1469,21 +1317,40 @@ const Renderer = function (scene, options) {
                 return this.pick({canvasPos, pickSurface: true});
             }
 
-            const camera = scene.camera;
+            const resolutionScale = scene.canvas.resolutionScale;
+
+            frameCtx.reset();
+            frameCtx.backfaces = true;
+            frameCtx.frontface = true; // "ccw"
+            frameCtx.pickZNear = scene.camera.project.near;
+            frameCtx.pickZFar = scene.camera.project.far;
+
             const snapRadiusInPixels = snapRadius || 30;
-            const viewMatrix = (canvasPos
-                                ? camera.viewMatrix
-                                : math.lookAtMat4v(
-                                    origin,
-                                    math.addVec3(origin, direction, math.vec3()),
-                                    math.vec3([0, 1, 0]),
-                                    math.mat4()));
-            resetPickFrameCtx(canvasPos, 2 * snapRadiusInPixels, camera, camera.eye, camera.projMatrix, viewMatrix, frameCtx);
+
+            const vertexPickBuffer = renderBufferManager.getRenderBuffer(
+                `uniquePickColors-aabs-${snapRadiusInPixels}`,
+                {
+                    depthTexture: true,
+                    size: [
+                        2 * snapRadiusInPixels + 1,
+                        2 * snapRadiusInPixels + 1,
+                    ]
+                }
+            );
+
+            frameCtx.snapVectorA = [
+                canvasPos ? getClipPosX(canvasPos[0] * resolutionScale, gl.drawingBufferWidth) : 0,
+                canvasPos ? getClipPosY(canvasPos[1] * resolutionScale, gl.drawingBufferHeight) : 0,
+            ];
+
+            frameCtx.snapInvVectorAB = [
+                gl.drawingBufferWidth / (2 * snapRadiusInPixels),
+                gl.drawingBufferHeight / (2 * snapRadiusInPixels),
+            ];
 
             // Bind and clear the snap render target
 
-            const vertexPickBuffer = getVertexPickBuffer(snapRadiusInPixels);
-            vertexPickBuffer.bind();
+            vertexPickBuffer.bind(gl.RGBA32I, gl.RGBA32I, gl.RGBA8UI);
             gl.viewport(0, 0, vertexPickBuffer.size[0], vertexPickBuffer.size[1]);
             gl.enable(gl.DEPTH_TEST);
             gl.frontFace(gl.CCW);
@@ -1496,59 +1363,64 @@ const Renderer = function (scene, options) {
             gl.clearBufferiv(gl.COLOR, 1, new Int32Array([0, 0, 0, 0]));
             gl.clearBufferuiv(gl.COLOR, 2, new Uint32Array([0, 0, 0, 0]));
 
-            // a) init z-buffer
-            gl.drawBuffers([gl.COLOR_ATTACHMENT0, gl.COLOR_ATTACHMENT1, gl.COLOR_ATTACHMENT2]);
-
-            frameCtx.snapPickLayerParams = [];
-            frameCtx.snapPickLayerParams.push(null); // This recreates previous situation, which relied on snapPickLayerNumber
-            postCullDrawableList.forEach(drawable => {
-                if (!drawable.culled && drawable.visible && drawable.pickable && drawable.drawSnapInit) {
-                    drawable.drawSnapInit(frameCtx);
+            //////////////////////////////////
+            // Set view and proj mats for VBO renderers
+            ///////////////////////////////////////
+
+            frameCtx.pickViewMatrix = (canvasPos
+                                       ? scene.camera.viewMatrix
+                                       : math.lookAtMat4v(
+                                           origin,
+                                           math.addVec3(origin, direction, math.vec3()),
+                                           math.vec3([0, 1, 0]),
+                                           math.mat4()));
+
+            const pickProjMatrix = scene.camera.projMatrix;
+
+            for (let type in drawableTypeInfo) {
+                if (drawableTypeInfo.hasOwnProperty(type)) {
+                    const drawableList = drawableTypeInfo[type].drawableList;
+                    for (let i = 0, len = drawableList.length; i < len; i++) {
+                        const drawable = drawableList[i];
+                        if (drawable.setPickMatrices) { // Eg. SceneModel, which needs pre-loading into texture
+                            drawable.setPickMatrices(frameCtx.pickViewMatrix, pickProjMatrix);
+                        }
+                    }
                 }
-            });
+            }
 
-            const layerParamsSurface = frameCtx.snapPickLayerParams;
+            // a) init z-buffer
+            gl.drawBuffers([gl.COLOR_ATTACHMENT0, gl.COLOR_ATTACHMENT1, gl.COLOR_ATTACHMENT2]);
+            const layerParamsSurface = drawSnapInit(frameCtx);
 
             // b) snap-pick
-            frameCtx.snapPickLayerParams = [];
+            const layerParamsSnap = []
+            frameCtx.snapPickLayerParams = layerParamsSnap;
 
             gl.depthMask(false);
             gl.drawBuffers([gl.COLOR_ATTACHMENT0]);
 
-            const drawSnap = (snapMode) => {
-                frameCtx.snapMode = snapMode;
-                frameCtx.snapPickLayerParams.push(null); // This recreates previous situation, which relied on snapPickLayerNumber
-                postCullDrawableList.forEach(drawable => {
-                    if (!drawable.culled && drawable.visible && drawable.pickable && drawable.drawSnap) {
-                        drawable.drawSnap(frameCtx);
-                    }
-                });
-            };
+            if (snapToVertex && snapToEdge) {
+                frameCtx.snapMode = "edge";
+                drawSnap(frameCtx);
 
-            if (snapToEdge) {
-                drawSnap("edge");
-            }
-            if (snapToVertex) {
-                drawSnap("vertex");
+                frameCtx.snapMode = "vertex";
+                frameCtx.snapPickLayerNumber++;
+
+                drawSnap(frameCtx);
+            } else {
+                frameCtx.snapMode = snapToVertex ? "vertex" : "edge";
+
+                drawSnap(frameCtx);
             }
 
             gl.depthMask(true);
 
-            const layerParamsSnap = frameCtx.snapPickLayerParams;
-
             // Read and decode the snapped coordinates
-            const readSnapPickBuffer = (source, arrayType, glType) => {
-                const w = vertexPickBuffer.buffer.width;
-                const h = vertexPickBuffer.buffer.height;
-                const pix = new arrayType(4 * w * h);
-                gl.readBuffer(source);
-                gl.readPixels(0, 0, w, h, gl.RGBA_INTEGER, glType, pix, 0);
-                return pix;
-            };
 
-            const snapPickResultArray       = readSnapPickBuffer(gl.COLOR_ATTACHMENT0, Int32Array,  gl.INT);
-            const snapPickNormalResultArray = readSnapPickBuffer(gl.COLOR_ATTACHMENT1, Int32Array,  gl.INT);
-            const snapPickIdResultArray     = readSnapPickBuffer(gl.COLOR_ATTACHMENT2, Uint32Array, gl.UNSIGNED_INT);
+            const snapPickResultArray = vertexPickBuffer.readArray(gl.RGBA_INTEGER, gl.INT, Int32Array, 4);
+            const snapPickNormalResultArray = vertexPickBuffer.readArray(gl.RGBA_INTEGER, gl.INT, Int32Array, 4, 1);
+            const snapPickIdResultArray = vertexPickBuffer.readArray(gl.RGBA_INTEGER, gl.UNSIGNED_INT, Uint32Array, 4, 2);
 
             vertexPickBuffer.unbind();
 
@@ -1567,76 +1439,195 @@ const Renderer = function (scene, options) {
 
             if (pickResultMiddleXY[3] !== 0) {
                 const pickedLayerParmasSurface = layerParamsSurface[Math.abs(pickResultMiddleXY[3]) % layerParamsSurface.length];
-                worldPos = toWorldPos(pickResultMiddleXY, pickedLayerParmasSurface.origin, pickedLayerParmasSurface.coordinateScale);
-                worldNormal = toWorldNormal(pickNormalResultMiddleXY);
-
-                pickable = pickIDs.items[pixelToInt(pickPickableResultMiddleXY)];
+                const origin = pickedLayerParmasSurface.origin;
+                const scale = pickedLayerParmasSurface.coordinateScale;
+                worldPos = [
+                    pickResultMiddleXY[0] * scale[0] + origin[0],
+                    pickResultMiddleXY[1] * scale[1] + origin[1],
+                    pickResultMiddleXY[2] * scale[2] + origin[2],
+                ];
+                worldNormal = math.normalizeVec3([
+                    pickNormalResultMiddleXY[0] / math.MAX_INT,
+                    pickNormalResultMiddleXY[1] / math.MAX_INT,
+                    pickNormalResultMiddleXY[2] / math.MAX_INT,
+                ]);
+
+                const pickID =
+                    pickPickableResultMiddleXY[0]
+                    + (pickPickableResultMiddleXY[1] << 8)
+                    + (pickPickableResultMiddleXY[2] << 16)
+                    + (pickPickableResultMiddleXY[3] << 24);
+
+                pickable = pickIDs.items[pickID];
             }
 
             // result 2) hi-precision snapped (to vertex/edge) world position
 
-            const snapPickResult = [ ];
+            let snapPickResult = [];
+
             for (let i = 0; i < snapPickResultArray.length; i += 4) {
-                const layerNumber = snapPickResultArray[i + 3];
-                if (layerNumber > 0) {
+                if (snapPickResultArray[i + 3] > 0) {
                     const pixelNumber = Math.floor(i / 4);
                     const w = vertexPickBuffer.size[0];
                     const x = pixelNumber % w - Math.floor(w / 2);
                     const y = Math.floor(pixelNumber / w) - Math.floor(w / 2);
+                    const dist = (Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2)));
                     snapPickResult.push({
-                        dist:     math.lenVec2([ x, y ]),
-                        isVertex: (snapToVertex && snapToEdge) ? (layerNumber > layerParamsSnap.length / 2) : snapToVertex,
-                        result:   snapPickResultArray.subarray(i, i+4),
-                        normal:   snapPickNormalResultArray.subarray(i, i+4),
-                        id:       snapPickIdResultArray.subarray(i, i+4)
+                        x,
+                        y,
+                        dist,
+                        isVertex: snapToVertex && snapToEdge ? snapPickResultArray[i + 3] > layerParamsSnap.length / 2 : snapToVertex,
+                        result: [
+                            snapPickResultArray[i + 0],
+                            snapPickResultArray[i + 1],
+                            snapPickResultArray[i + 2],
+                            snapPickResultArray[i + 3],
+                        ],
+                        normal: [
+                            snapPickNormalResultArray[i + 0],
+                            snapPickNormalResultArray[i + 1],
+                            snapPickNormalResultArray[i + 2],
+                            snapPickNormalResultArray[i + 3],
+                        ],
+                        id: [
+                            snapPickIdResultArray[i + 0],
+                            snapPickIdResultArray[i + 1],
+                            snapPickIdResultArray[i + 2],
+                            snapPickIdResultArray[i + 3],
+                        ]
                     });
                 }
             }
 
-            const getPickedEntity = pickable => (pickable && pickable.delegatePickedEntity) ? pickable.delegatePickedEntity() : pickable;
+            let snappedWorldPos = null;
+            let snappedWorldNormal = null;
+            let snappedPickable = null;
+            let snapType = null;
 
             if (snapPickResult.length > 0) {
-                // closest vertex snap first, then closest edge snap
-                const res = snapPickResult.reduce((a,b) => ((((a.isVertex-b.isVertex) || (b.dist-a.dist)) > 0) ? a : b));
-                const snapPick = res.result;
+                // vertex snap first, then edge snap
+                snapPickResult.sort((a, b) => {
+                    if (a.isVertex !== b.isVertex) {
+                        return a.isVertex ? -1 : 1;
+                    } else {
+                        return a.dist - b.dist;
+                    }
+                });
+
+                snapType = snapPickResult[0].isVertex ? "vertex" : "edge";
+                const snapPick = snapPickResult[0].result;
+                const snapPickNormal = snapPickResult[0].normal;
+                const snapPickId = snapPickResult[0].id;
+
                 const pickedLayerParmas = layerParamsSnap[snapPick[3]];
-                const snappedWorldPos = toWorldPos(snapPick, pickedLayerParmas.origin, pickedLayerParmas.coordinateScale);
-                const snappedCanvasPos = camera.projectWorldPos(snappedWorldPos);
-
-                pickResult.reset();
-                pickResult.snappedToEdge    = !res.isVertex;
-                pickResult.snappedToVertex  = res.isVertex;
-                pickResult.worldPos         = snappedWorldPos;
-                pickResult.worldNormal      = toWorldNormal(res.normal);
-                pickResult.entity           = getPickedEntity(pickIDs.items[pixelToInt(res.id)]);
-                pickResult.canvasPos        = canvasPos || (worldPos && camera.projectWorldPos(worldPos)) || snappedCanvasPos;
-                pickResult.snappedCanvasPos = snappedCanvasPos;
-                return pickResult;
-
-            } else if (worldPos) {
-
-                pickResult.reset();
-                pickResult.snappedToEdge    = false;
-                pickResult.snappedToVertex  = false;
-                pickResult.worldPos         = worldPos;
-                pickResult.worldNormal      = worldNormal;
-                pickResult.entity           = getPickedEntity(pickable);
-                pickResult.canvasPos        = canvasPos || camera.projectWorldPos(worldPos);
-                pickResult.snappedCanvasPos = canvasPos;
-                return pickResult;
 
-            } else {
+                const origin = pickedLayerParmas.origin;
+                const scale = pickedLayerParmas.coordinateScale;
+
+                snappedWorldNormal = math.normalizeVec3([
+                    snapPickNormal[0] / math.MAX_INT,
+                    snapPickNormal[1] / math.MAX_INT,
+                    snapPickNormal[2] / math.MAX_INT,
+                ]);
+
+                snappedWorldPos = [
+                    snapPick[0] * scale[0] + origin[0],
+                    snapPick[1] * scale[1] + origin[1],
+                    snapPick[2] * scale[2] + origin[2],
+                ];
+
+                snappedPickable = pickIDs.items[
+                snapPickId[0]
+                + (snapPickId[1] << 8)
+                + (snapPickId[2] << 16)
+                + (snapPickId[3] << 24)
+                    ];
+            }
+
+            if (null === worldPos && null == snappedWorldPos) {   // If neither regular pick or snap pick, return null
                 return null;
             }
+
+            let snappedCanvasPos = null;
+
+            if (null !== snappedWorldPos) {
+                snappedCanvasPos = scene.camera.projectWorldPos(snappedWorldPos);
+            }
+
+            const snappedEntity = (snappedPickable && snappedPickable.delegatePickedEntity) ? snappedPickable.delegatePickedEntity() : snappedPickable;
+            if (!snappedEntity && pickable) {
+                pickable = pickable.delegatePickedEntity ? pickable.delegatePickedEntity() : pickable;
+            }
+
+            pickResult.reset();
+            pickResult.snappedToEdge = (snapType === "edge");
+            pickResult.snappedToVertex = (snapType === "vertex");
+            pickResult.worldPos = snappedWorldPos || worldPos;
+            pickResult.worldNormal = snappedWorldNormal || worldNormal;
+            pickResult.entity = snappedEntity || pickable;
+            pickResult.canvasPos = canvasPos || scene.camera.projectWorldPos(worldPos || snappedWorldPos);
+            pickResult.snappedCanvasPos = snappedCanvasPos || canvasPos;
+
+            return pickResult;
         };
     })();
 
+    function unpackDepth(depthZ) {
+        const vec = [depthZ[0] / 256.0, depthZ[1] / 256.0, depthZ[2] / 256.0, depthZ[3] / 256.0];
+        const bitShift = [1.0 / (256.0 * 256.0 * 256.0), 1.0 / (256.0 * 256.0), 1.0 / 256.0, 1.0];
+        return math.dotVec4(vec, bitShift);
+    }
+
+    function gpuPickWorldNormal(pickBuffer, pickable, canvasPos, pickViewMatrix, pickProjMatrix, pickResult) {
+
+        const resolutionScale = scene.canvas.resolutionScale;
+
+        frameCtx.reset();
+        frameCtx.backfaces = true;
+        frameCtx.frontface = true; // "ccw"
+        frameCtx.pickOrigin = pickResult.origin;
+        frameCtx.pickViewMatrix = pickViewMatrix;
+        frameCtx.pickProjMatrix = pickProjMatrix;
+        frameCtx.pickClipPos = [
+            getClipPosX(canvasPos[0] * resolutionScale, gl.drawingBufferWidth),
+            getClipPosY(canvasPos[1] * resolutionScale, gl.drawingBufferHeight),
+        ];
+
+        const pickNormalBuffer = renderBufferManager.getRenderBuffer("pick-normal", {size: [3, 3]});
+
+        pickNormalBuffer.bind(gl.RGBA32I);
+
+        gl.viewport(0, 0, pickNormalBuffer.size[0], pickNormalBuffer.size[1]);
+
+        gl.enable(gl.DEPTH_TEST);
+        gl.disable(gl.CULL_FACE);
+        gl.disable(gl.BLEND);
+        gl.clear(gl.DEPTH_BUFFER_BIT);
+        gl.clearBufferiv(gl.COLOR, 0, new Int32Array([0, 0, 0, 0]));
+
+        pickable.drawPickNormals(frameCtx); // Draw color-encoded fragment World-space normals
+
+        const pix = pickNormalBuffer.read(1, 1, gl.RGBA_INTEGER, gl.INT, Int32Array, 4);
+
+        pickNormalBuffer.unbind();
+
+        const worldNormal = [
+            pix[0] / math.MAX_INT,
+            pix[1] / math.MAX_INT,
+            pix[2] / math.MAX_INT,
+        ];
+
+        math.normalizeVec3(worldNormal);
+
+        pickResult.worldNormal = worldNormal;
+    }
+
     /**
      * Adds a {@link Marker} for occlusion testing.
      * @param marker
      */
     this.addMarker = function (marker) {
-        this._occlusionTester = this._occlusionTester || new OcclusionTester(scene);
+        this._occlusionTester = this._occlusionTester || new OcclusionTester(scene, renderBufferManager);
         this._occlusionTester.addMarker(marker);
         scene.occlusionTestCountdown = 0;
     };
@@ -1667,17 +1658,11 @@ const Renderer = function (scene, options) {
 
             updateDrawlist();
 
-            const readPixelBuf = (! OCCLUSION_TEST_MODE) && renderBufferManager.getRenderBuffer("occlusionReadPix");
-            if (readPixelBuf) {
-                readPixelBuf.setSize([gl.drawingBufferWidth, gl.drawingBufferHeight]);
-                readPixelBuf.bind();
-            }
+            this._occlusionTester.bindRenderBuf();
 
             frameCtx.reset();
             frameCtx.backfaces = true;
             frameCtx.frontface = true; // "ccw"
-            frameCtx.viewParams = getSceneCameraViewParams();
-            frameCtx.nearPlaneHeight = getNearPlaneHeight(scene.camera, gl.drawingBufferHeight);
 
             gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
             gl.clearColor(0, 0, 0, 0);
@@ -1686,143 +1671,121 @@ const Renderer = function (scene, options) {
             gl.disable(gl.BLEND);
             gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-            postCullDrawableList.forEach(drawable => {
-                if (!drawable.culled && drawable.visible && drawable.pickable && drawable.drawOcclusion) { // TODO: Option to exclude transparent?
-                    drawable.drawOcclusion(frameCtx);
-                }
-            });
 
-            this._occlusionTester.drawMarkers();
+            for (let i = 0, len = postCullDrawableList.length; i < len; i++) {
+
+                const drawable = postCullDrawableList[i];
+
+                if (!drawable.drawOcclusion || drawable.culled === true || drawable.visible === false || drawable.pickable === false) { // TODO: Option to exclude transparent?
+                    continue;
+                }
 
-            if (readPixelBuf) {
-                const resolutionScale = scene.canvas.resolutionScale;
-                this._occlusionTester.doOcclusionTest( // Updates Marker "visible" properties
-                    (x, y) => readPixelBuf.read(Math.round(resolutionScale * x), Math.round(resolutionScale * y)));
-                readPixelBuf.unbind();
+                drawable.drawOcclusion(frameCtx);
             }
+
+            this._occlusionTester.drawMarkers(frameCtx);
+            this._occlusionTester.doOcclusionTest(); // Updates Marker "visible" properties
+            this._occlusionTester.unbindRenderBuf();
         }
     };
 
-    this.snapshot = (() => {
-        let snapshotBound = false;
-        const snapshotBuffer = new RenderBuffer(gl);
-        let snapshotCanvas = null;
-
-        return {
-            /**
-             * Read pixels from the renderer's current output. Performs a force-render first.
-             * @param pixels
-             * @param colors
-             * @param len
-             * @private
-             */
-            readPixels: (pixels, colors, len) => {
-                snapshotBuffer.bind();
-                gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-                imageDirty = true;
-                this.render();
-                for (let i = 0; i < len; i++) {
-                    const j = i * 2;
-                    const k = i * 4;
-                    const color = snapshotBuffer.read(pixels[j], pixels[j + 1]);
-                    colors[k] = color[0];
-                    colors[k + 1] = color[1];
-                    colors[k + 2] = color[2];
-                    colors[k + 3] = color[3];
-                }
-                snapshotBuffer.unbind();
-                imageDirty = true;
-            },
-
-            /**
-             * Enter snapshot mode.
-             *
-             * Switches rendering to a hidden snapshot canvas.
-             *
-             * Exit snapshot mode using endSnapshot().
-             */
-            beginSnapshot: () => {
-                snapshotBuffer.setSize([gl.drawingBufferWidth, gl.drawingBufferHeight]);
-                snapshotBuffer.bind();
-                gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-                snapshotBound = true;
-            },
-
-            /**
-             * Returns an HTMLCanvas containing an image of the snapshot canvas.
-             *
-             * - The HTMLCanvas has a CanvasRenderingContext2D.
-             * - Expects the caller to draw more things on the HTMLCanvas (annotations etc).
-             *
-             * @returns {HTMLCanvasElement}
-             */
-            renderSnapshotToCanvas: () => {
-                const width  = snapshotBuffer.buffer.width;
-                const height = snapshotBuffer.buffer.height;
-
-                if ((! snapshotCanvas) || (snapshotCanvas.width !== width) || (snapshotCanvas.height !== height)) {
-                    snapshotCanvas = (function() {
-                        const canvas  = document.createElement('canvas');
-                        const context = canvas.getContext('2d');
-                        canvas.width  = width;
-                        canvas.height = height;
-                        const pixelData = new Uint8Array(width * height * 4);
-                        const imageData = context.createImageData(width, height);
-
-                        return {
-                            width:            width,
-                            height:           height,
-                            getUpdatedCanvas: () => {
-                                gl.readPixels(0, 0, width, height, gl.RGBA, gl.UNSIGNED_BYTE, pixelData);
-
-                                // flip verically
-                                const halfHeight = Math.floor(height / 2);
-                                const bytesPerRow = width * 4;
-                                const temp = new Uint8Array(bytesPerRow);
-                                for (let y = 0; y < halfHeight; ++y) {
-                                    const topOffset = y * bytesPerRow;
-                                    const bottomOffset = (height - y - 1) * bytesPerRow;
-                                    temp.set(pixelData.subarray(topOffset, topOffset + bytesPerRow));
-                                    pixelData.copyWithin(topOffset, bottomOffset, bottomOffset + bytesPerRow);
-                                    pixelData.set(temp, bottomOffset);
-                                }
-
-                                imageData.data.set(pixelData);
-
-                                context.resetTransform(); // Prevents strange scale-accumulation effect with html2canvas
-                                context.putImageData(imageData, 0, 0);
-
-                                return canvas;
-                            }
-                        };
-                    })();
-                }
+    /**
+     * Read pixels from the renderer's current output. Performs a force-render first.
+     * @param pixels
+     * @param colors
+     * @param len
+     * @param opaqueOnly
+     * @private
+     */
+    this.readPixels = function (pixels, colors, len, opaqueOnly) {
+        const snapshotBuffer = renderBufferManager.getRenderBuffer("snapshot");
+        snapshotBuffer.bind();
+        snapshotBuffer.clear();
+        this.render({force: true, opaqueOnly: opaqueOnly});
+        let color;
+        let i;
+        let j;
+        let k;
+        for (i = 0; i < len; i++) {
+            j = i * 2;
+            k = i * 4;
+            color = snapshotBuffer.read(pixels[j], pixels[j + 1]);
+            colors[k] = color[0];
+            colors[k + 1] = color[1];
+            colors[k + 2] = color[2];
+            colors[k + 3] = color[3];
+        }
+        snapshotBuffer.unbind();
+        imageDirty = true;
+    };
 
-                if (snapshotBound) {
-                    gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-                    imageDirty = true;
-                    this.render();
-                    imageDirty = true;
-                }
+    /**
+     * Enter snapshot mode.
+     *
+     * Switches rendering to a hidden snapshot canvas.
+     *
+     * Exit snapshot mode using endSnapshot().
+     */
+    this.beginSnapshot = function (params = {}) {
+        const snapshotBuffer = renderBufferManager.getRenderBuffer("snapshot");
+        if (params.width && params.height) {
+            snapshotBuffer.setSize([params.width, params.height]);
+        }
+        snapshotBuffer.bind();
+        snapshotBuffer.clear();
+        snapshotBound = true;
+    };
 
-                return snapshotCanvas.getUpdatedCanvas();
-            },
-
-            /**
-             * Exists snapshot mode.
-             *
-             * Switches rendering back to the main canvas.
-             */
-            endSnapshot: () => {
-                if (snapshotBound) {
-                    snapshotBuffer.unbind();
-                    snapshotBound = false;
-                }
-                imageDirty = true;
-                this.render();
-            }
-        };
-    })();
+    /**
+     * When in snapshot mode, renders a frame of the current Scene state to the snapshot canvas.
+     */
+    this.renderSnapshot = function () {
+        if (!snapshotBound) {
+            return;
+        }
+        const snapshotBuffer = renderBufferManager.getRenderBuffer("snapshot");
+        snapshotBuffer.clear();
+        this.render({force: true, opaqueOnly: false});
+        imageDirty = true;
+    };
+
+    /**
+     * When in snapshot mode, gets an image of the snapshot canvas.
+     *
+     * @private
+     * @returns {String} The image data URI.
+     */
+    this.readSnapshot = function (params) {
+        const snapshotBuffer = renderBufferManager.getRenderBuffer("snapshot");
+        return snapshotBuffer.readImage(params);
+    };
+
+    /**
+     * Returns an HTMLCanvas containing an image of the snapshot canvas.
+     *
+     * - The HTMLCanvas has a CanvasRenderingContext2D.
+     * - Expects the caller to draw more things on the HTMLCanvas (annotations etc).
+     *
+     * @returns {HTMLCanvasElement}
+     */
+    this.readSnapshotAsCanvas = function () {
+        const snapshotBuffer = renderBufferManager.getRenderBuffer("snapshot");
+        return snapshotBuffer.readImageAsCanvas();
+    };
+
+    /**
+     * Exists snapshot mode.
+     *
+     * Switches rendering back to the main canvas.
+     */
+    this.endSnapshot = function () {
+        if (!snapshotBound) {
+            return;
+        }
+        const snapshotBuffer = renderBufferManager.getRenderBuffer("snapshot");
+        snapshotBuffer.unbind();
+        snapshotBound = false;
+    };
 
     /**
      * Destroys this renderer.