From 89295b03590f9cccf1a2419bbe784ecccec04b34 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Fri, 28 Jun 2019 16:20:14 +0200
Subject: [PATCH] Remove hit detection transforms from
 ol/renderer/webgl/PointsLayer

---
 src/ol/renderer/webgl/PointsLayer.js | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/ol/renderer/webgl/PointsLayer.js b/src/ol/renderer/webgl/PointsLayer.js
index 6f430792c5..be12622e46 100644
--- a/src/ol/renderer/webgl/PointsLayer.js
+++ b/src/ol/renderer/webgl/PointsLayer.js
@@ -301,18 +301,6 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
      */
     this.renderInstructions_ = new Float32Array(0);
 
-    /**
-     * @type {import("../../transform.js").Transform}
-     * @private
-     */
-    this.hitRenderTransform_ = createTransform();
-
-    /**
-     * @type {import("../../transform.js").Transform}
-     * @private
-     */
-    this.invertHitRenderTransform_ = createTransform();
-
     /**
      * These instructions are used for hit detection
      * @type {Float32Array}
@@ -341,26 +329,17 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
         this.indicesBuffer_.fromArrayBuffer(received.indexBuffer);
         this.helper.flushBufferData(this.indicesBuffer_);
 
+        this.renderTransform_ = projectionTransform;
+        makeInverseTransform(this.invertRenderTransform_, this.renderTransform_);
         if (received.hitDetection) {
-          this.hitRenderTransform_ = projectionTransform;
-          makeInverseTransform(this.invertHitRenderTransform_, this.hitRenderTransform_);
           this.hitRenderInstructions_ = new Float32Array(event.data.renderInstructions);
         } else {
-          this.renderTransform_ = projectionTransform;
-          makeInverseTransform(this.invertRenderTransform_, this.renderTransform_);
           this.renderInstructions_ = new Float32Array(event.data.renderInstructions);
         }
       }
     }.bind(this));
   }
 
-  /**
-   * @inheritDoc
-   */
-  disposeInternal() {
-    super.disposeInternal();
-  }
-
   /**
    * @inheritDoc
    */
@@ -574,9 +553,6 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
     this.helper.useProgram(this.hitProgram_);
     this.helper.prepareDrawToRenderTarget(frameState, this.hitRenderTarget_, true);
 
-    this.helper.makeProjectionTransform(frameState, this.currentTransform_);
-    multiplyTransform(this.currentTransform_, this.invertHitRenderTransform_);
-
     this.helper.bindBuffer(this.hitVerticesBuffer_);
     this.helper.bindBuffer(this.indicesBuffer_);