@openglobus/og 0.11.8 → 0.12.0

package/src/og/segment/Segment.js

@@ -14,8 +14,6 @@ import * as segmentHelper from "../segment/segmentHelper.js";
 import { getMatrixSubArray } from "../utils/shared.js";
 import { Slice } from "./Slice.js";
 
-export const MAX_NORMAL_ZOOM = 7;
-
 var _tempHigh = new Vec3();
 var _tempLow = new Vec3();
 
@@ -41,8 +39,6 @@ _V[E] = true;
 _V[S] = false;
 _V[W] = true;
 
-window.BBSC = 100;
-
 /**
  * Planet segment Web Mercator tile class that stored and rendered with quad tree.
  * @class
@@ -97,10 +93,17 @@ class Segment {
          */
         this.bbox = new Box();
 
-        this._swNorm = null;
-        this._nwNorm = null;
-        this._seNorm = null;
-        this._neNorm = null;
+        //this._swNorm = null;
+        //this._nwNorm = null;
+        //this._seNorm = null;
+        //this._neNorm = null;
+
+        this._sw = new Vec3();
+        this._nw = new Vec3();
+        this._se = new Vec3();
+        this._ne = new Vec3();
+
+        this.centerNormal = new Vec3();
 
         /**
          * Geographical extent.
@@ -237,19 +240,6 @@ class Segment {
         this.plainProcessing = false;
     }
 
-    /**
-     * Returns that segment good for rendering with camera by current lod ratio.
-     * @public
-     * @param {Camera} camera - Camera object.
-     * @returns {boolean} -
-     */
-    acceptForRendering(camera) {
-        return (
-            camera.projectedSize(this.bsphere.center, this._plainRadius) <
-            256 / this.planet._lodRatio
-        );
-    }
-
     /**
      * Returns entity terrain point.
      * @public
@@ -997,22 +987,19 @@ class Segment {
         var coord_sw = ellipsoid.geodeticToCartesian(extent.southWest.lon, extent.southWest.lat);
         var coord_ne = ellipsoid.geodeticToCartesian(extent.northEast.lon, extent.northEast.lat);
 
-        // check for zoom
-        if (this.tileZoom <= MAX_NORMAL_ZOOM) {
-            var coord_nw = ellipsoid.geodeticToCartesian(
-                extent.southWest.lon,
-                extent.northEast.lat
-            );
-            var coord_se = ellipsoid.geodeticToCartesian(
-                extent.northEast.lon,
-                extent.southWest.lat
-            );
+        var coord_nw = ellipsoid.geodeticToCartesian(
+            extent.southWest.lon,
+            extent.northEast.lat
+        );
+        var coord_se = ellipsoid.geodeticToCartesian(
+            extent.northEast.lon,
+            extent.southWest.lat
+        );
 
-            this._swNorm = coord_sw.normal();
-            this._nwNorm = coord_nw.normal();
-            this._neNorm = coord_ne.normal();
-            this._seNorm = coord_se.normal();
-        }
+        this._sw.copy(coord_sw);
+        this._nw.copy(coord_nw);
+        this._ne.copy(coord_ne);
+        this._se.copy(coord_se);
 
         this.setBoundingVolume3v(coord_sw, coord_ne);
     }
@@ -1041,31 +1028,30 @@ class Segment {
                 this.bsphere.center.z = pn.segment.bsphere.center.z;
                 this.bsphere.radius = pn.segment.bsphere.radius;
 
-                if (this.tileZoom <= MAX_NORMAL_ZOOM) {
-                    let i0 = gridSize * offsetY;
-                    let j0 = gridSize * offsetX;
+                let i0 = gridSize * offsetY;
+                let j0 = gridSize * offsetX;
 
-                    let pnGsOne = pn.segment.gridSize + 1;
+                let pnGsOne = pn.segment.gridSize + 1;
 
-                    let ind_sw = 3 * ((i0 + gridSize) * pnGsOne + j0),
-                        ind_nw = 3 * (i0 * pnGsOne + j0),
-                        ind_ne = 3 * (i0 * pnGsOne + j0 + gridSize),
-                        ind_se = 3 * ((i0 + gridSize) * pnGsOne + j0 + gridSize);
+                let ind_sw = 3 * ((i0 + gridSize) * pnGsOne + j0),
+                    ind_nw = 3 * (i0 * pnGsOne + j0),
+                    ind_ne = 3 * (i0 * pnGsOne + j0 + gridSize),
+                    ind_se = 3 * ((i0 + gridSize) * pnGsOne + j0 + gridSize);
 
-                    let pVerts = pn.segment.tempVertices;
+                let pVerts = pn.segment.tempVertices;
 
-                    let v_sw = new Vec3(pVerts[ind_sw], pVerts[ind_sw + 1], pVerts[ind_sw + 2]),
-                        v_ne = new Vec3(pVerts[ind_ne], pVerts[ind_ne + 1], pVerts[ind_ne + 2]);
+                let v_sw = new Vec3(pVerts[ind_sw], pVerts[ind_sw + 1], pVerts[ind_sw + 2]),
+                    v_ne = new Vec3(pVerts[ind_ne], pVerts[ind_ne + 1], pVerts[ind_ne + 2]);
 
-                    // check for segment zoom
-                    let v_nw = new Vec3(pVerts[ind_nw], pVerts[ind_nw + 1], pVerts[ind_nw + 2]),
-                        v_se = new Vec3(pVerts[ind_se], pVerts[ind_se + 1], pVerts[ind_se + 2]);
+                // check for segment zoom
+                let v_nw = new Vec3(pVerts[ind_nw], pVerts[ind_nw + 1], pVerts[ind_nw + 2]),
+                    v_se = new Vec3(pVerts[ind_se], pVerts[ind_se + 1], pVerts[ind_se + 2]);
+
+                this._sw.copy(v_sw);
+                this._nw.copy(v_nw);
+                this._ne.copy(v_ne);
+                this._se.copy(v_se);
 
-                    this._swNorm = v_sw.normal();
-                    this._nwNorm = v_nw.normal();
-                    this._neNorm = v_ne.normal();
-                    this._seNorm = v_se.normal();
-                }
             } else {
                 let pseg = pn.segment;
 
@@ -1545,7 +1531,7 @@ class Segment {
         }
     }
 
-    heightPickingRendering(sh, layerSlice, sliceIndex, defaultTexture, isOverlay) {
+    heightPickingRendering(sh, layerSlice) {
         var gl = this.handler.gl;
         var sha = sh.attributes,
             shu = sh.uniforms;
@@ -1553,11 +1539,6 @@ class Segment {
         var pm = this.materials,
             p = this.planet;
 
-        // First always draw whole planet base layer segment with solid texture.
-        gl.activeTexture(gl.TEXTURE0 + p.SLICE_SIZE);
-        gl.bindTexture(gl.TEXTURE_2D, defaultTexture || p.solidTextureOne);
-        gl.uniform1i(shu.defaultTexture, p.SLICE_SIZE);
-
         var currHeight;
         if (layerSlice) {
             currHeight = layerSlice[0]._height;
@@ -1565,42 +1546,16 @@ class Segment {
             currHeight = 0;
         }
 
-        var slice = this._slices[sliceIndex];
+        gl.uniform1f(shu.height, currHeight);
 
-        var notEmpty = false;
+        gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexPositionBufferHigh);
+        gl.vertexAttribPointer(sha.aVertexPositionHigh, this.vertexPositionBufferHigh.itemSize, gl.FLOAT, false, 0, 0);
 
-        let len = slice.layers.length;
+        gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexPositionBufferLow);
+        gl.vertexAttribPointer(sha.aVertexPositionLow, this.vertexPositionBufferLow.itemSize, gl.FLOAT, false, 0, 0);
 
-        for (let n = 0; n < len; n++) {
-            notEmpty = true;
-            p._samplerArr[n] = n;
-            gl.activeTexture(gl.TEXTURE0 + n);
-            gl.bindTexture(gl.TEXTURE_2D, pm[slice.layers[n]._id].texture || p.transparentTexture);
-        }
-
-        if (notEmpty || !isOverlay) {
-            gl.uniform1i(shu.samplerCount, len);
-            gl.uniform1f(shu.height, currHeight);
-            gl.uniform1iv(shu.samplerArr, p._samplerArr);
-
-            //slice.uniform(gl, shu);
-
-            gl.uniform4fv(shu.tileOffsetArr, slice.tileOffsetArr);
-            gl.uniform1fv(shu.layerOpacityArr, slice.layerOpacityArr);
-            //gl.uniform4fv(shu.visibleExtentOffsetArr, slice.visibleExtentOffsetArr);
-
-            gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexPositionBufferHigh);
-            gl.vertexAttribPointer(sha.aVertexPositionHigh, this.vertexPositionBufferHigh.itemSize, gl.FLOAT, false, 0, 0);
-
-            gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexPositionBufferLow);
-            gl.vertexAttribPointer(sha.aVertexPositionLow, this.vertexPositionBufferLow.itemSize, gl.FLOAT, false, 0, 0);
-
-            gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexTextureCoordBuffer);
-            gl.vertexAttribPointer(sha.aTextureCoord, 2, gl.UNSIGNED_SHORT, true, 0, 0);
-
-            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBuffer);
-            gl.drawElements(gl.TRIANGLE_STRIP, this._indexBuffer.numItems, gl.UNSIGNED_INT, 0);
-        }
+        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBuffer);
+        gl.drawElements(gl.TRIANGLE_STRIP, this._indexBuffer.numItems, gl.UNSIGNED_INT, 0);
     }
 
     colorPickingRendering(sh, layerSlice, sliceIndex, defaultTexture, isOverlay) {
@@ -1670,19 +1625,11 @@ class Segment {
         }
     }
 
-    depthRendering(sh, layerSlice, sliceIndex, defaultTexture, isOverlay) {
+    depthRendering(sh, layerSlice) {
         var gl = this.handler.gl;
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var pm = this.materials,
-            p = this.planet;
-
-        // First always draw whole planet base layer segment with solid texture.
-        gl.activeTexture(gl.TEXTURE0 + p.SLICE_SIZE);
-        gl.bindTexture(gl.TEXTURE_2D, defaultTexture || p.solidTextureOne);
-        gl.uniform1i(shu.defaultTexture, p.SLICE_SIZE);
-
         var currHeight;
         if (layerSlice) {
             currHeight = layerSlice[0]._height;
@@ -1690,42 +1637,16 @@ class Segment {
             currHeight = 0;
         }
 
-        var slice = this._slices[sliceIndex];
-
-        var notEmpty = false;
-
-        let len = slice.layers.length;
-
-        for (let n = 0; n < len; n++) {
-            notEmpty = true;
-            p._samplerArr[n] = n;
-            gl.activeTexture(gl.TEXTURE0 + n);
-            gl.bindTexture(gl.TEXTURE_2D, pm[slice.layers[n]._id].texture || p.transparentTexture);
-        }
-
-        if (notEmpty || !isOverlay) {
-            gl.uniform1i(shu.samplerCount, len);
-            gl.uniform1f(shu.height, currHeight);
-            gl.uniform1iv(shu.samplerArr, p._samplerArr);
-
-            //slice.uniform(gl, shu);
-
-            gl.uniform4fv(shu.tileOffsetArr, slice.tileOffsetArr);
-            gl.uniform1fv(shu.layerOpacityArr, slice.layerOpacityArr);
-            //gl.uniform4fv(shu.visibleExtentOffsetArr, slice.visibleExtentOffsetArr);
-
-            gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexPositionBufferHigh);
-            gl.vertexAttribPointer(sha.aVertexPositionHigh, this.vertexPositionBufferHigh.itemSize, gl.FLOAT, false, 0, 0);
+        gl.uniform1f(shu.height, currHeight);
 
-            gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexPositionBufferLow);
-            gl.vertexAttribPointer(sha.aVertexPositionLow, this.vertexPositionBufferLow.itemSize, gl.FLOAT, false, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexPositionBufferHigh);
+        gl.vertexAttribPointer(sha.aVertexPositionHigh, this.vertexPositionBufferHigh.itemSize, gl.FLOAT, false, 0, 0);
 
-            gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexTextureCoordBuffer);
-            gl.vertexAttribPointer(sha.aTextureCoord, 2, gl.UNSIGNED_SHORT, true, 0, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexPositionBufferLow);
+        gl.vertexAttribPointer(sha.aVertexPositionLow, this.vertexPositionBufferLow.itemSize, gl.FLOAT, false, 0, 0);
 
-            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBuffer);
-            gl.drawElements(gl.TRIANGLE_STRIP, this._indexBuffer.numItems, gl.UNSIGNED_INT, 0);
-        }
+        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBuffer);
+        gl.drawElements(gl.TRIANGLE_STRIP, this._indexBuffer.numItems, gl.UNSIGNED_INT, 0);
     }
 
     _getIndexBuffer() {