@openglobus/og 0.11.4 → 0.11.8

package/src/og/scene/Planet.js

@@ -4,6 +4,7 @@
 
 "use strict";
 
+import * as utils from "../utils/shared.js";
 import * as shaders from "../shaders/drawnode.js";
 import * as math from "../math.js";
 import * as mercator from "../mercator.js";
@@ -32,7 +33,7 @@ import { NIGHT, SPECULAR } from "../res/images.js";
 import { Geoid } from "../terrain/Geoid.js";
 import { isUndef } from "../utils/shared.js";
 
-const MAX_LOD = 0.9;
+const MAX_LOD = 1.0;
 const MIN_LOD = 0.75;
 
 let _tempPickingPix_ = new Uint8Array(4),
@@ -93,7 +94,7 @@ const EVENT_NAMES = [
  * @param {string} [options.name="Earth"] - Planet name(Earth by default)
  * @param {Ellipsoid} [options.ellipsoid] - Planet ellipsoid(WGS84 by default)
  * @param {Number} [options.maxGridSize=128] - Segment maximal grid size
- * @param {Number} [options.maxEqualZoomAltitude=850000.0] - Maximal altitude since segments on the screen bacame the same zoom level
+ * @param {Number} [options.maxEqualZoomAltitude=15000000.0] - Maximal altitude since segments on the screen bacame the same zoom level
  * @param {Number} [options.minEqualZoomAltitude=10000.0] - Minimal altitude since segments on the screen bacame the same zoom level
  * @param {Number} [options.minEqualZoomCameraSlope=0.8] - Minimal camera slope above te globe where segments on the screen bacame the same zoom level
  * @fires og.scene.Planet#draw
@@ -180,7 +181,7 @@ export class Planet extends RenderNode {
         this._minAltitude = options.minAltitude;
         this._maxAltitude = options.maxAltitude;
 
-        this.maxEqualZoomAltitude = options.maxEqualZoomAltitude || 850000.0;
+        this.maxEqualZoomAltitude = options.maxEqualZoomAltitude || 15000000.0;
         this.minEqualZoomAltitude = options.minEqualZoomAltitude || 10000.0;
         this.minEqualZoomCameraSlope = options.minEqualZoomCameraSlope || 0.8;
 
@@ -335,6 +336,16 @@ export class Planet extends RenderNode {
          */
         this._specularTexture = null;
 
+        //TODO: replace to a function
+        let a = utils.createColorRGB(options.ambient, new Vec3(0.2, 0.2, 0.2));
+        let d = utils.createColorRGB(options.diffuse, new Vec3(0.8, 0.8, 0.8));
+        let s = utils.createColorRGB(options.specular, new Vec3(0.0003, 0.0003, 0.0003));
+        let shininess = options.shininess || 20.0;
+
+        this._ambient = new Float32Array([a.x, a.y, a.z]);
+        this._diffuse = new Float32Array([d.x, d.y, d.z]);
+        this._specular = new Float32Array([s.x, s.y, s.z, shininess]);
+
         /**
          * True for rendering night glowing texture.
          * @protected
@@ -371,14 +382,7 @@ export class Planet extends RenderNode {
         this._maxLodRatio = MAX_LOD;
         this._minLodRatio = MIN_LOD;
 
-        this._diffuseMaterialArr = new Float32Array(this.SLICE_SIZE_3 + 3);
-        this._ambientMaterialArr = new Float32Array(this.SLICE_SIZE_3 + 3);
-        this._specularMaterialArr = new Float32Array(this.SLICE_SIZE_4 + 4);
-
-        this._tileOffsetArr = new Float32Array(this.SLICE_SIZE_4);
-        this._visibleExtentOffsetArr = new Float32Array(this.SLICE_SIZE_4);
-        this._transparentColorArr = new Float32Array(this.SLICE_SIZE_4);
-        this._pickingColorArr = new Float32Array(this.SLICE_SIZE_3);
+        this._pickingColorArr = new Float32Array(this.SLICE_SIZE_4);
         this._samplerArr = new Int32Array(this.SLICE_SIZE);
         this._pickingMaskArr = new Int32Array(this.SLICE_SIZE);
 
@@ -619,11 +623,8 @@ export class Planet extends RenderNode {
         var h = this.renderer.handler;
 
         h.addProgram(shaders.drawnode_screen_nl(), true);
-
         //h.addProgram(shaders.drawnode_screen_wl(), true);
-
         h.addProgram(shaders.drawnode_screen_wl_webgl2(), true);
-
         h.addProgram(shaders.drawnode_colorPicking(), true);
         h.addProgram(shaders.drawnode_depth(), true);
         h.addProgram(shaders.drawnode_heightPicking(), true);
@@ -731,31 +732,13 @@ export class Planet extends RenderNode {
         }
 
         // Creating quad trees nodes
-        this._quadTree = new Node(
-            Segment,
-            this,
-            quadTree.NW,
-            null,
-            0,
-            0,
+        this._quadTree = new Node(Segment, this, quadTree.NW, null, 0, 0,
             Extent.createFromArray([-20037508.34, -20037508.34, 20037508.34, 20037508.34])
         );
-        this._quadTreeNorth = new Node(
-            SegmentLonLat,
-            this,
-            quadTree.NW,
-            null,
-            0,
-            0,
+        this._quadTreeNorth = new Node(SegmentLonLat, this, quadTree.NW, null, 0, 0,
             Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90])
         );
-        this._quadTreeSouth = new Node(
-            SegmentLonLat,
-            this,
-            quadTree.NW,
-            null,
-            0,
-            0,
+        this._quadTreeSouth = new Node(SegmentLonLat, this, quadTree.NW, null, 0, 0,
             Extent.createFromArray([-180, -90, 180, mercator.MIN_LAT])
         );
 
@@ -771,7 +754,7 @@ export class Planet extends RenderNode {
         // loading Earth night glowing texture
         if (this._useNightTexture) {
             createImageBitmap(NIGHT).then(
-                (e) => (this._nightTexture = this.renderer.handler.createTexture(e))
+                (e) => (this._nightTexture = this.renderer.handler.createTextureDefault(e))
             );
         }
 
@@ -1093,7 +1076,9 @@ export class Planet extends RenderNode {
     frame() {
         this._renderScreenNodesPASS();
 
-        this._renderHeightPickingFramebufferPASS();
+        if (this.renderer.isActiveBackbuffers) {
+            this._renderHeightPickingFramebufferPASS();
+        }
 
         this.drawEntityCollections(this._frustumEntityCollections);
     }
@@ -1124,7 +1109,7 @@ export class Planet extends RenderNode {
         gl.disable(gl.POLYGON_OFFSET_FILL);
 
         if (frustumIndex === cam.FARTHEST_FRUSTUM_INDEX) {
-            if (this._skipPreRender && (!this._renderCompletedActivated || cam.isMoved)) {
+            if (this._skipPreRender/* && (!this._renderCompletedActivated || cam.isMoved)*/) {
                 this._collectRenderNodes();
             }
             this._skipPreRender = true;
@@ -1147,12 +1132,12 @@ export class Planet extends RenderNode {
             this._vectorTileCreator.frame();
         }
 
-        gl.blendEquation(gl.FUNC_ADD);
 
-        gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+        gl.enable(gl.CULL_FACE);
 
         gl.enable(gl.BLEND);
-        gl.enable(gl.CULL_FACE);
+        gl.blendEquation(gl.FUNC_ADD);
+        gl.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
 
         if (this.lightEnabled) {
             h.programs.drawnode_screen_wl.activate();
@@ -1165,13 +1150,17 @@ export class Planet extends RenderNode {
             gl.uniformMatrix4fv(shu.viewMatrix, false, cam.getViewMatrix());
             gl.uniformMatrix4fv(shu.projectionMatrix, false, cam.getProjectionMatrix());
 
+            gl.uniform3fv(shu.diffuse, this._diffuse);
+            gl.uniform3fv(shu.ambient, this._ambient);
+            gl.uniform4fv(shu.specular, this._specular);
+
             // bind night glowing material
             gl.activeTexture(gl.TEXTURE0 + this.SLICE_SIZE);
             gl.bindTexture(
                 gl.TEXTURE_2D,
                 (this.camera._lonLat.height > 329958.0 &&
                     (this._nightTexture || this.transparentTexture)) ||
-                    this.transparentTexture
+                this.transparentTexture
             );
             gl.uniform1i(shu.nightTexture, this.SLICE_SIZE);
 
@@ -1180,34 +1169,6 @@ export class Planet extends RenderNode {
             gl.bindTexture(gl.TEXTURE_2D, this._specularTexture || this.transparentTexture);
             gl.uniform1i(shu.specularTexture, this.SLICE_SIZE + 1);
 
-            var b = this.baseLayer;
-            if (b) {
-                this._diffuseMaterialArr[0] = b.diffuse.x;
-                this._diffuseMaterialArr[1] = b.diffuse.y;
-                this._diffuseMaterialArr[2] = b.diffuse.z;
-
-                this._ambientMaterialArr[0] = b.ambient.x;
-                this._ambientMaterialArr[1] = b.ambient.y;
-                this._ambientMaterialArr[2] = b.ambient.z;
-
-                this._specularMaterialArr[0] = b.specular.x;
-                this._specularMaterialArr[1] = b.specular.y;
-                this._specularMaterialArr[2] = b.specular.z;
-                this._specularMaterialArr[3] = b.shininess;
-            } else {
-                this._diffuseMaterialArr[0] = 0.89;
-                this._diffuseMaterialArr[1] = 0.9;
-                this._diffuseMaterialArr[2] = 0.83;
-
-                this._ambientMaterialArr[0] = 0.0;
-                this._ambientMaterialArr[1] = 0.0;
-                this._ambientMaterialArr[2] = 0.0;
-
-                this._specularMaterialArr[0] = 0.0003;
-                this._specularMaterialArr[1] = 0.00012;
-                this._specularMaterialArr[2] = 0.00001;
-                this._specularMaterialArr[3] = 20.0;
-            }
         } else {
             h.programs.drawnode_screen_nl.activate();
             sh = h.programs.drawnode_screen_nl._program;
@@ -1385,6 +1346,7 @@ export class Planet extends RenderNode {
         let cam = renderer.activeCamera;
 
         gl.disable(gl.BLEND);
+        gl.disable(gl.POLYGON_OFFSET_FILL);
 
         gl.uniformMatrix4fv(shu.viewMatrix, false, cam.getViewMatrix());
         gl.uniformMatrix4fv(shu.projectionMatrix, false, cam.getProjectionMatrix());
@@ -1403,7 +1365,6 @@ export class Planet extends RenderNode {
             rn[i].segment.depthRendering(sh, sl[0], 0);
         }
 
-        gl.enable(gl.POLYGON_OFFSET_FILL);
         for (let j = 1, len = sl.length; j < len; j++) {
             i = rn.length;
             gl.polygonOffset(0, -j);
@@ -1509,12 +1470,11 @@ export class Planet extends RenderNode {
      * Returns 3d cartesian coordinates on the relief planet by mouse cursor
      * position or null if mouse cursor is outside the planet.
      * @public
-     * @param {Boolean} [force=false] - Force framebuffer rendering.
      * @returns {Vec3} -
      */
-    getCartesianFromMouseTerrain(force) {
+    getCartesianFromMouseTerrain() {
         var ms = this.renderer.events.mouseState;
-        var distance = this.getDistanceFromPixel(ms, force);
+        var distance = this.getDistanceFromPixel(ms);
         if (distance) {
             return ms.direction.scaleTo(distance).addA(this.renderer.activeCamera.eye);
         }
@@ -1529,8 +1489,8 @@ export class Planet extends RenderNode {
      * @param {Boolean} [force=false] - Force framebuffer rendering.
      * @returns {Vec3} -
      */
-    getCartesianFromPixelTerrain(px, force) {
-        var distance = this.getDistanceFromPixel(px, force);
+    getCartesianFromPixelTerrain(px) {
+        var distance = this.getDistanceFromPixel(px);
         if (distance) {
             var direction = px.direction || this.renderer.activeCamera.unproject(px.x, px.y);
             return direction.scaleTo(distance).addA(this.renderer.activeCamera.eye);
@@ -1609,7 +1569,9 @@ export class Planet extends RenderNode {
 
         // HEIGHT
         this._heightPickingFramebuffer.activate();
-        this._heightPickingFramebuffer.readPixels(_tempPickingPix_, spx, spy);
+        if (this._heightPickingFramebuffer.isComplete()) {
+            this._heightPickingFramebuffer.readPixels(_tempPickingPix_, spx, spy);
+        }
         this._heightPickingFramebuffer.deactivate();
 
         let dist = decodeFloatFromRGBAArr(_tempPickingPix_);
@@ -1618,20 +1580,19 @@ export class Planet extends RenderNode {
             dist = this.getDistanceFromPixelEllipsoid(px) || 0;
         } else if (dist < DEPTH_DISTANCE) {
             r.screenDepthFramebuffer.activate();
-            r.screenDepthFramebuffer.readPixels(_tempDepthColor_, spx, spy, 0);
+            if (r.screenDepthFramebuffer.isComplete()) {
+                r.screenDepthFramebuffer.readPixels(_tempDepthColor_, spx, spy);
+                let screenPos = new Vec4(
+                    spx * 2.0 - 1.0,
+                    spy * 2.0 - 1.0,
+                    (_tempDepthColor_[0] / 255.0) * 2.0 - 1.0,
+                    1.0 * 2.0 - 1.0
+                );
+                let viewPosition = this.camera.frustums[0]._inverseProjectionMatrix.mulVec4(screenPos);
+                let dir = px.direction || this.renderer.activeCamera.unproject(px.x, px.y);
+                dist = -(viewPosition.z / viewPosition.w) / dir.dot(this.renderer.activeCamera.getForward());
+            }
             r.screenDepthFramebuffer.deactivate();
-
-            let screenPos = new Vec4(
-                spx * 2.0 - 1.0,
-                spy * 2.0 - 1.0,
-                (_tempDepthColor_[0] / 255.0) * 2.0 - 1.0,
-                1.0 * 2.0 - 1.0
-            );
-            let viewPosition = this.camera.frustums[0]._inverseProjectionMatrix.mulVec4(screenPos);
-            let dir = px.direction || this.renderer.activeCamera.unproject(px.x, px.y);
-            dist =
-                -(viewPosition.z / viewPosition.w) /
-                dir.dot(this.renderer.activeCamera.getForward());
         }
 
         return dist;

package/src/og/scene/RenderNode.js

@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
-import { BaseNode } from './BaseNode.js';
-import { Events } from '../Events.js';
+import { BaseNode } from "./BaseNode.js";
+import { Events } from "../Events.js";
 
 /**
  * Render node is a logical part of a render mechanism. Represents scene rendering.
@@ -98,8 +98,7 @@ class RenderNode extends BaseNode {
             n = this.name;
 
         if (r) {
-            if (r.renderNodes[n] &&
-                r.renderNodes[n].isEqual(this)) {
+            if (r.renderNodes[n] && r.renderNodes[n].isEqual(this)) {
                 r.renderNodes[n] = null;
                 delete r.renderNodes[n];
             }
@@ -195,7 +194,10 @@ class RenderNode extends BaseNode {
 
         if (this.renderer) {
             if (this._isActive && this._pickingId === -1) {
-                this._pickingId = this.renderer.addPickingCallback(this, this._entityCollectionPickingCallback);
+                this._pickingId = this.renderer.addPickingCallback(
+                    this,
+                    this._entityCollectionPickingCallback
+                );
             } else if (!this._isActive && this._pickingId !== -1) {
                 this.renderer.removePickingCallback(this._pickingId);
                 this._pickingId = -1;
@@ -277,7 +279,6 @@ class RenderNode extends BaseNode {
      */
     drawPickingEntityCollections(ec) {
         if (ec.length) {
-
             var gl = this.renderer.handler.gl;
 
             gl.disable(gl.CULL_FACE);
@@ -292,6 +293,12 @@ class RenderNode extends BaseNode {
                 ec[i]._fadingOpacity && ec[i].billboardHandler.drawPicking();
             }
 
+            // geoObject pass
+            i = ec.length;
+            while (i--) {
+                ec[i]._fadingOpacity && ec[i].geoObjectHandler.drawPicking();
+            }
+
             // label pass
             i = ec.length;
             while (i--) {
@@ -344,4 +351,4 @@ class RenderNode extends BaseNode {
     }
 }
 
-export { RenderNode };
+export { RenderNode };