@openglobus/og 0.13.12 → 0.14.1

package/src/og/entity/Polyline.js

@@ -1995,14 +1995,6 @@ class Polyline {
 
             sh.activate();
 
-            gl.enable(gl.BLEND);
-            gl.blendEquationSeparate(gl.FUNC_ADD, gl.FUNC_ADD);
-            gl.blendFuncSeparate(
-                gl.SRC_ALPHA,
-                gl.ONE_MINUS_SRC_ALPHA,
-                gl.ONE,
-                gl.ONE_MINUS_SRC_ALPHA
-            );
             gl.disable(gl.CULL_FACE);
 
             gl.uniform1f(shu.depthOffset, ec.polygonOffsetUnits + window.POLYLINE_DEPTH_OFFSET);
@@ -2058,14 +2050,6 @@ class Polyline {
 
             sh.activate();
 
-            gl.enable(gl.BLEND);
-            gl.blendEquationSeparate(gl.FUNC_ADD, gl.FUNC_ADD);
-            gl.blendFuncSeparate(
-                gl.SRC_ALPHA,
-                gl.ONE_MINUS_SRC_ALPHA,
-                gl.ONE,
-                gl.ONE_MINUS_SRC_ALPHA
-            );
             gl.disable(gl.CULL_FACE);
 
             gl.uniform1f(shu.depthOffset, this._handler._entityCollection.polygonOffsetUnits + window.POLYLINE_DEPTH_OFFSET);

package/src/og/entity/Ray.js

@@ -34,11 +34,6 @@ class Ray {
         // Thickenss
         this._thickness = options.thickness || 2.0;
 
-        // RTE length
-        this._length = options.length || 0.0;
-        this._lengthHighLow = new Float32Array(2);
-        doubleToTwoFloats2(this._length, this._lengthHighLow);
-
         // RTE start position
         this._startPosition = utils.createVector3(options.startPosition);
         this._startPositionHigh = new Vec3();
@@ -172,11 +167,6 @@ class Ray {
             );
     }
 
-    setLength(length) {
-        this._length = length;
-        this._handler && this._handler.setLengthArr(this._handlerIndex, length);
-    }
-
     setThickness(thickness) {
         this._thickness = thickness;
         this._handler && this._handler.setThicknessArr(this._handlerIndex, thickness);

package/src/og/entity/RayHandler.js

@@ -6,10 +6,9 @@ import { concatArrays, makeArrayTyped, spliceArray } from "../utils/shared.js";
 const PICKINGCOLOR_BUFFER = 0;
 const START_POSITION_BUFFER = 1;
 const END_POSITION_BUFFER = 2;
-const LENGTH_BUFFER = 3;
-const RGBA_BUFFER = 4;
-const THICKNESS_BUFFER = 5;
-const VERTEX_BUFFER = 6;
+const RGBA_BUFFER = 3;
+const THICKNESS_BUFFER = 4;
+const VERTEX_BUFFER = 5;
 
 /*
  * og.RayHandler
@@ -36,7 +35,6 @@ class RayHandler {
         this._startPositionLowBuffer = null;
         this._endPositionHighBuffer = null;
         this._endPositionLowBuffer = null;
-        this._lengthBuffer = null;
         this._thicknessBuffer = null;
         this._rgbaBuffer = null;
 
@@ -45,7 +43,6 @@ class RayHandler {
         this._startPositionLowArr = [];
         this._endPositionHighArr = [];
         this._endPositionLowArr = [];
-        this._lengthArr = [];
         this._thicknessArr = [];
         this._rgbaArr = [];
 
@@ -56,7 +53,6 @@ class RayHandler {
         this._buffersUpdateCallbacks[VERTEX_BUFFER] = this.createVertexBuffer;
         this._buffersUpdateCallbacks[START_POSITION_BUFFER] = this.createStartPositionBuffer;
         this._buffersUpdateCallbacks[END_POSITION_BUFFER] = this.createEndPositionBuffer;
-        this._buffersUpdateCallbacks[LENGTH_BUFFER] = this.createLengthBuffer;
         this._buffersUpdateCallbacks[THICKNESS_BUFFER] = this.createThicknessBuffer;
         this._buffersUpdateCallbacks[RGBA_BUFFER] = this.createRgbaBuffer;
         this._buffersUpdateCallbacks[PICKINGCOLOR_BUFFER] = this.createPickingColorBuffer;
@@ -124,7 +120,6 @@ class RayHandler {
         this._startPositionLowArr = null;
         this._endPositionHighArr = null;
         this._endPositionLowArr = null;
-        this._lengthArr = null;
         this._thicknessArr = null;
         this._rgbaArr = null;
 
@@ -133,7 +128,6 @@ class RayHandler {
         this._startPositionLowArr = new Float32Array();
         this._endPositionHighArr = new Float32Array();
         this._endPositionLowArr = new Float32Array();
-        this._lengthArr = new Float32Array();
         this._thicknessArr = new Float32Array();
         this._rgbaArr = new Float32Array();
 
@@ -150,7 +144,6 @@ class RayHandler {
             gl.deleteBuffer(this._startPositionLowBuffer);
             gl.deleteBuffer(this._endPositionHighBuffer);
             gl.deleteBuffer(this._endPositionLowBuffer);
-            gl.deleteBuffer(this._lengthBuffer);
             gl.deleteBuffer(this._thicknessBuffer);
             gl.deleteBuffer(this._rgbaBuffer);
             gl.deleteBuffer(this._vertexBuffer);
@@ -159,7 +152,6 @@ class RayHandler {
             this._startPositionLowBuffer = null;
             this._endPositionHighBuffer = null;
             this._endPositionLowBuffer = null;
-            this._lengthBuffer = null;
             this._thicknessBuffer = null;
             this._rgbaBuffer = null;
             this._vertexBuffer = null;
@@ -300,9 +292,6 @@ class RayHandler {
         x = ray._thickness;
         this._thicknessArr = concatArrays(this._thicknessArr, [x, x, x, x, x, x]);
 
-        x = ray._length;
-        this._lengthArr = concatArrays(this._lengthArr, [x, x, x, x, x, x]);
-
         let r0 = ray._startColor.x,
             g0 = ray._startColor.y,
             b0 = ray._startColor.z,
@@ -439,9 +428,6 @@ class RayHandler {
             0
         );
 
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._lengthBuffer);
-        gl.vertexAttribPointer(sha.a_length, this._lengthBuffer.itemSize, gl.FLOAT, false, 0, 0);
-
         gl.bindBuffer(gl.ARRAY_BUFFER, this._vertexBuffer);
         gl.vertexAttribPointer(sha.a_vertices, this._vertexBuffer.itemSize, gl.FLOAT, false, 0, 0);
 
@@ -492,7 +478,6 @@ class RayHandler {
 
         i = ri * 6;
         this._thicknessArr = spliceArray(this._thicknessArr, i, 6);
-        this._lengthArr = spliceArray(this._lengthArr, i, 6);
 
         this.reindexRaysArray(ri);
         this.refresh();
@@ -732,20 +717,6 @@ class RayHandler {
         this._changedBuffers[THICKNESS_BUFFER] = true;
     }
 
-    setLengthArr(index, length) {
-        var i = index * 6;
-        var a = this._lengthArr;
-
-        a[i] = length;
-        a[i + 1] = length;
-        a[i + 2] = length;
-        a[i + 3] = length;
-        a[i + 4] = length;
-        a[i + 5] = length;
-
-        this._changedBuffers[LENGTH_BUFFER] = true;
-    }
-
     setVisibility(index, visibility) {
         var vArr;
         if (visibility) {
@@ -839,18 +810,6 @@ class RayHandler {
         );
     }
 
-    createLengthBuffer() {
-        var h = this._renderer.handler;
-        h.gl.deleteBuffer(this._lengthBuffer);
-        this._lengthArr = makeArrayTyped(this._lengthArr);
-        this._lengthBuffer = h.createArrayBuffer(
-            this._lengthArr,
-            1,
-            this._lengthArr.length,
-            h.gl.DYNAMIC_DRAW
-        );
-    }
-
     createVertexBuffer() {
         var h = this._renderer.handler;
         h.gl.deleteBuffer(this._vertexBuffer);

package/src/og/entity/Strip.js

@@ -203,9 +203,6 @@ class Strip {
                 shu = p.uniforms;
 
             gl.disable(gl.CULL_FACE);
-            gl.blendEquation(gl.FUNC_ADD);
-            gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
-            gl.enable(gl.BLEND);
             sh.activate();
 
             gl.uniformMatrix4fv(shu.viewMatrix, false, r.activeCamera.getViewMatrix());
@@ -257,9 +254,7 @@ class Strip {
                 shu = p.uniforms;
 
             gl.disable(gl.CULL_FACE);
-            gl.blendEquation(gl.FUNC_ADD);
-            gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
-            gl.enable(gl.BLEND);
+
             sh.activate();
 
             gl.uniformMatrix4fv(shu.viewMatrix, false, r.activeCamera.getViewMatrix());

package/src/og/index.js

@@ -1,96 +1,107 @@
-'use strict';
-
-import * as jd from './astro/jd.js';
-import * as math from './math.js';
-import * as mercator from './mercator.js';
-import * as utils from './utils/shared.js';
-
-import * as control from './control/index.js';
-import * as layer from './layer/index.js';
-import * as bv from './bv/index.js';
-import * as scene from './scene/index.js';
-import * as entity from './entity/index.js';
-import * as webgl from './webgl/index.js';
-import * as terrain from './terrain/index.js';
-
-import { Globe } from './Globe.js';
-
-import { Geoid } from './terrain/Geoid.js';
-
-import { input } from './input/input.js';
-
-import { Ellipsoid, wgs84 } from './ellipsoid/index.js';
-
-import { Camera, PlanetCamera } from './camera/index.js';
-
-import { Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4 } from './math/index.js';
-
-import { Renderer } from './renderer/Renderer.js';
-
-import { LightSource } from './light/LightSource.js';
-
-import { Clock } from './Clock.js';
-import { Events } from './Events.js';
-import { Extent } from './Extent.js';
-import { LonLat } from './LonLat.js';
-import { RenderNode } from './scene/RenderNode.js';
-
-import { Popup } from './Popup.js';
-
-import pkg from "../../package.json";
-
-const { Handler } = webgl, { Control } = control;
-const { Layer } = layer;
-const {
-    EntityCollection,
-    Entity
-} = entity;
-
-const version = {
-    version: pkg.version
-};
-
-export {
-    version,
-    bv,
-    jd,
-    math,
-    mercator,
-    utils,
-    input,
-    Layer,
-    layer,
-    terrain,
-    Control,
-    control,
-    webgl,
-    wgs84,
-    Camera,
-    Ellipsoid,
-    PlanetCamera,
-    Globe,
-    LightSource,
-    EntityCollection,
-    Handler,
-    Renderer,
-    Clock,
-    Events,
-    Extent,
-    LonLat,
-    scene,
-    RenderNode,
-    Line2,
-    Line3,
-    Mat3,
-    Mat4,
-    Plane,
-    Quat,
-    Ray,
-    Vec2,
-    Vec3,
-    Vec4,
-    entity,
-    Entity,
-    Geoid,
-    Popup
+'use strict';
+
+import * as jd from './astro/jd.js';
+import * as math from './math.js';
+import * as mercator from './mercator.js';
+import * as utils from './utils/shared.js';
+
+import * as control from './control/index.js';
+import * as layer from './layer/index.js';
+import * as bv from './bv/index.js';
+import * as scene from './scene/index.js';
+import * as entity from './entity/index.js';
+import * as webgl from './webgl/index.js';
+import * as terrain from './terrain/index.js';
+
+import { Globe } from './Globe.js';
+
+import { Geoid } from './terrain/Geoid.js';
+
+import { input } from './input/input.js';
+
+import { Ellipsoid, wgs84 } from './ellipsoid/index.js';
+
+import { Camera, PlanetCamera } from './camera/index.js';
+
+import { Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4 } from './math/index.js';
+
+import { Renderer } from './renderer/Renderer.js';
+
+import { LightSource } from './light/LightSource.js';
+
+import { Clock } from './Clock.js';
+import { Events } from './Events.js';
+import { Extent } from './Extent.js';
+import { LonLat } from './LonLat.js';
+import { RenderNode } from './scene/RenderNode.js';
+
+import { Popup } from './Popup.js';
+
+import { QuadTreeStrategy } from './quadTree/QuadTreeStrategy.js';
+import { MarsQuadTreeStrategy } from './quadTree/MarsQuadTreeStrategy.js';
+import { EarthQuadTreeStrategy } from './quadTree/EarthQuadTreeStrategy.js';
+import { Wgs84QuadTreeStrategy } from './quadTree/Wgs84QuadTreeStrategy.js';
+import { quadTreeStrategyType } from './utils/quadTreeType.js';
+
+import pkg from "../../package.json";
+
+const { Handler } = webgl, { Control } = control;
+const { Layer } = layer;
+const {
+    EntityCollection,
+    Entity
+} = entity;
+
+const version = {
+    version: pkg.version
+};
+
+export {
+    version,
+    bv,
+    jd,
+    math,
+    mercator,
+    utils,
+    input,
+    Layer,
+    layer,
+    terrain,
+    Control,
+    control,
+    webgl,
+    wgs84,
+    Camera,
+    Ellipsoid,
+    PlanetCamera,
+    Globe,
+    LightSource,
+    EntityCollection,
+    Handler,
+    Renderer,
+    Clock,
+    Events,
+    Extent,
+    LonLat,
+    scene,
+    RenderNode,
+    Line2,
+    Line3,
+    Mat3,
+    Mat4,
+    Plane,
+    Quat,
+    Ray,
+    Vec2,
+    Vec3,
+    Vec4,
+    entity,
+    Entity,
+    Geoid,
+    Popup,
+    QuadTreeStrategy,
+    MarsQuadTreeStrategy,
+    EarthQuadTreeStrategy,
+    Wgs84QuadTreeStrategy,
+    quadTreeStrategyType
 };

package/src/og/layer/GeoVideo.js

@@ -156,6 +156,7 @@ class GeoVideo extends BaseGeoImage {
                 }
             } else {
                 this._video = document.createElement("video");
+                this._video.crossOrigin = "Anonymous";
                 let that = this;
                 this._video.addEventListener("canplay", function () {
                     that._onCanPlay(this);

package/src/og/layer/Layer.js

@@ -11,6 +11,7 @@ import { Extent } from "../Extent.js";
 import { LonLat } from "../LonLat.js";
 import { Material } from "./Material.js";
 import { Vec3 } from "../math/Vec3.js";
+import { createColorRGB } from "../utils/shared.js";
 
 const FADING_RATIO = 15.8;
 
@@ -208,6 +209,63 @@ class Layer {
          * @type {Events}
          */
         this.events = new Events(options.events ? [...EVENT_NAMES, ...options.events] : EVENT_NAMES, this);
+
+        this._ambient = null;
+        this._diffuse = null;
+        this._specular = null;
+
+        if (options.ambient) {
+            let a = utils.createColorRGB(options.ambient, new Vec3(0.2, 0.2, 0.2));
+            this._ambient = new Float32Array([a.x, a.y, a.z]);
+        }
+
+        if (options.diffuse) {
+            let d = utils.createColorRGB(options.diffuse, new Vec3(0.8, 0.8, 0.8));
+            this._diffuse = new Float32Array([d.x, d.y, d.z]);
+        }
+
+        if (options.specular) {
+            let s = utils.createColorRGB(options.specular, new Vec3(0.0003, 0.0003, 0.0003));
+            let shininess = options.shininess || 20.0;
+            this._specular = new Float32Array([s.x, s.y, s.z, shininess]);
+        }
+    }
+
+    set diffuse(rgb) {
+        if (rgb) {
+            let vec = createColorRGB(rgb);
+            this._diffuse = new Float32Array(vec.toArray());
+        } else {
+            this._diffuse = null;
+        }
+    }
+
+    set ambient(rgb) {
+        if (rgb) {
+            let vec = createColorRGB(rgb);
+            this._ambient = new Float32Array(vec.toArray());
+        } else {
+            this._ambient = null;
+        }
+    }
+
+    set specular(rgb) {
+        if (rgb) {
+            let vec = createColorRGB(rgb);
+            this._specular = new Float32Array([vec.x, vec.y, vec.y, this._specular[3]]);
+        } else {
+            this._specular = null;
+        }
+    }
+
+    set shininess(v) {
+        if (this._specular) {
+            this._specular[3] = v;
+        }
+    }
+
+    get normalMapCreator() {
+        return this._normalMapCreator;
     }
 
     static getTMS(x, y, z) {
@@ -545,9 +603,10 @@ class Layer {
             let p = this._planet,
                 maxZoom = Math.max(...this._preLoadZoomLevels);
 
-            this._preLoadRecursive(p._quadTreeSouth, maxZoom);
-            this._preLoadRecursive(p._quadTreeNorth, maxZoom);
-            this._preLoadRecursive(p._quadTree, maxZoom);
+            for (let i = 0, len = p.quadTreeStrategy.quadTreeList.length; i < len; i++) {
+                this._preLoadRecursive(p.quadTreeStrategy.quadTreeList[i], maxZoom);
+            }
+
         }
     }
 

package/src/og/layer/XYZ.js

@@ -9,6 +9,7 @@ import { EPSG3857 } from "../proj/EPSG3857.js";
 import { Layer } from "./Layer.js";
 import { stringTemplate } from "../utils/shared.js";
 import { RENDERING } from "../quadTree/quadTree.js";
+import { EPSG4326 } from "../proj/EPSG4326.js";
 
 /**
  * Represents an imagery tiles source provider.
@@ -143,7 +144,7 @@ class XYZ extends Layer {
     }
 
     _checkSegment(segment) {
-        return segment._projection.id === EPSG3857.id;
+        return segment._projection.id === this._planet.quadTreeStrategy.projection.id;// EPSG4326.id;// EPSG3857.id;
     }
 
     /**
@@ -251,7 +252,7 @@ class XYZ extends Layer {
     applyMaterial(material, forceLoading) {
         if (material.isReady) {
             return material.texOffset;
-        } else if (material.segment.tileZoom <= this.minNativeZoom) {
+        } else if (material.segment.tileZoom < this.minNativeZoom) {
             material.textureNotExists();
         } else {
 
@@ -317,7 +318,7 @@ class XYZ extends Layer {
     clearMaterial(material) {
         if (material.isReady && material.textureExists) {
             !material.texture.default &&
-            material.segment.handler.gl.deleteTexture(material.texture);
+                material.segment.handler.gl.deleteTexture(material.texture);
             material.texture = null;
 
             if (material.image) {