@openglobus/og 0.15.0 → 0.15.2

package/src/og/entity/Strip.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import * as utils from "../utils/shared.js";
-import { Vec3 } from "../math/Vec3.js";
 import { Line3 } from "../math/Line3.js";
+import { Vec3 } from "../math/Vec3.js";
+import * as utils from "../utils/shared.js";
 
 let _tempHigh = new Vec3(),
     _tempLow = new Vec3();
@@ -202,9 +202,10 @@ class Strip {
                 sha = p.attributes,
                 shu = p.uniforms;
 
-            gl.disable(gl.CULL_FACE);
             sh.activate();
 
+            gl.disable(gl.CULL_FACE);
+
             gl.uniformMatrix4fv(shu.viewMatrix, false, r.activeCamera.getViewMatrix());
             gl.uniformMatrix4fv(shu.projectionMatrix, false, r.activeCamera.getProjectionMatrix());
 
@@ -238,6 +239,7 @@ class Strip {
                 gl.UNSIGNED_INT,
                 0
             );
+
             gl.enable(gl.CULL_FACE);
         }
     }
@@ -253,10 +255,10 @@ class Strip {
                 sha = p.attributes,
                 shu = p.uniforms;
 
-            gl.disable(gl.CULL_FACE);
-
             sh.activate();
 
+            gl.disable(gl.CULL_FACE);
+
             gl.uniformMatrix4fv(shu.viewMatrix, false, r.activeCamera.getViewMatrix());
             gl.uniformMatrix4fv(shu.projectionMatrix, false, r.activeCamera.getProjectionMatrix());
 
@@ -290,6 +292,7 @@ class Strip {
                 gl.UNSIGNED_INT,
                 0
             );
+
             gl.enable(gl.CULL_FACE);
         }
     }

package/src/og/entity/index.js

@@ -1,6 +1,6 @@
+import { Billboard } from "./Billboard.js";
 import { Entity } from "./Entity.js";
 import { EntityCollection } from "./EntityCollection.js";
-import { Billboard } from "./Billboard.js";
 import { Geometry } from "./Geometry.js";
 import { Label } from "./Label.js";
 import { PointCloud } from "./PointCloud.js";

package/src/og/index.core.js

@@ -9,12 +9,12 @@ import { Sphere } from './bv/Sphere.js';
 
 import { Control } from './control/Control.js';
 import { DebugInfo } from './control/DebugInfo';
-import { SimpleNavigation } from './control/SimpleNavigation.js';
 import { ShowFps } from './control/ShowFps.js';
+import { SimpleNavigation } from './control/SimpleNavigation.js';
 
+import { Billboard } from './entity/Billboard.js';
 import { Entity } from './entity/Entity.js';
 import { EntityCollection } from './entity/EntityCollection.js';
-import { Billboard } from './entity/Billboard.js';
 import { Label } from './entity/Label.js';
 import { PointCloud } from './entity/PointCloud.js';
 import { Polyline } from './entity/Polyline.js';
@@ -37,8 +37,8 @@ import { Vec4 } from './math/Vec4.js';
 import { Framebuffer } from './webgl/Framebuffer.js';
 import { Handler } from './webgl/Handler.js';
 import { Multisample } from './webgl/Multisample.js';
-import { types } from './webgl/types.js';
 import { Program } from './webgl/Program.js';
+import { types } from './webgl/types.js';
 
 import { Renderer } from './renderer/Renderer.js';
 
@@ -113,4 +113,4 @@ export {
     Vec4,
     entity,
     Entity
-};
+};

package/src/og/index.js

@@ -5,13 +5,13 @@ import * as math from './math.js';
 import * as mercator from './mercator.js';
 import * as utils from './utils/shared.js';
 
+import * as bv from './bv/index.js';
 import * as control from './control/index.js';
+import * as entity from './entity/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 * as webgl from './webgl/index.js';
 
 import { Globe } from './Globe.js';
 
@@ -47,6 +47,7 @@ import {
 
 import pkg from "../../package.json";
 
+import { Object3d } from './Object3d.js';
 const { Handler } = webgl, { Control } = control;
 const { Layer, Vector, XYZ} = layer;
 const {
@@ -107,5 +108,6 @@ export {
     MarsQuadTreeStrategy,
     EarthQuadTreeStrategy,
     Wgs84QuadTreeStrategy,
-    quadTreeStrategyType
-};
+    quadTreeStrategyType,
+    Object3d
+};

package/src/og/index.webgl.js

@@ -1,11 +1,11 @@
 'use strict';
 
+import { TextureAtlas } from './utils/TextureAtlas.js';
 import { Framebuffer } from './webgl/Framebuffer.js';
 import { Handler } from './webgl/Handler.js';
 import { Multisample } from './webgl/Multisample.js';
-import { types } from './webgl/types.js';
 import { Program } from './webgl/Program.js';
-import { TextureAtlas } from './utils/TextureAtlas.js';
+import { types } from './webgl/types.js';
 
 export {
     Handler,
@@ -14,4 +14,4 @@ export {
     types,
     Program,
     TextureAtlas
-};
+};

package/src/og/layer/BaseGeoImage.js

@@ -4,10 +4,10 @@
 
 "use strict";
 
-import * as mercator from "../mercator.js";
 import { Extent } from "../Extent.js";
-import { Layer } from "./Layer.js";
 import { LonLat } from "../LonLat.js";
+import * as mercator from "../mercator.js";
+import { Layer } from "./Layer.js";
 
 const EVENT_NAMES = [
     /**

package/src/og/layer/GeoImage.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-import { BaseGeoImage } from "./BaseGeoImage.js";
 import { nextHighestPowerOfTwo } from "../math.js";
+import { BaseGeoImage } from "./BaseGeoImage.js";
 
 /**
  * Used to load and display a single image over specific corner coordinates on the globe, implements og.layer.BaseGeoImage interface.
@@ -220,4 +220,4 @@ class GeoImage extends BaseGeoImage {
     }
 }
 
-export { GeoImage };
+export { GeoImage };

package/src/og/layer/GeoTexture2d.js

@@ -140,4 +140,4 @@ class GeoTexture2d extends BaseGeoImage {
     }
 }
 
-export { GeoTexture2d };
+export { GeoTexture2d };

package/src/og/layer/Layer.js

@@ -4,14 +4,14 @@
 
 "use strict";
 
-import * as utils from "../utils/shared.js";
-import * as mercator from "../mercator.js";
 import { Events } from "../Events.js";
 import { Extent } from "../Extent.js";
 import { LonLat } from "../LonLat.js";
-import { Material } from "./Material.js";
 import { Vec3 } from "../math/Vec3.js";
+import * as mercator from "../mercator.js";
+import * as utils from "../utils/shared.js";
 import { createColorRGB } from "../utils/shared.js";
+import { Material } from "./Material.js";
 
 const FADING_RATIO = 15.8;
 

package/src/og/layer/Vector.js

@@ -4,20 +4,20 @@
 
 "use strict";
 
-import * as math from "../math.js";
-import * as mercator from "../mercator.js";
-import * as quadTree from "../quadTree/quadTree.js";
 import { Entity } from "../entity/Entity.js";
 import { EntityCollection } from "../entity/EntityCollection.js";
+import { GeometryHandler } from "../entity/GeometryHandler.js";
 import { Extent } from "../Extent.js";
+import * as math from "../math.js";
+import { Vec3 } from "../math/Vec3.js";
+import * as mercator from "../mercator.js";
 import {
     EntityCollectionNode,
     EntityCollectionNodeWGS84
 } from "../quadTree/EntityCollectionNode.js";
-import { GeometryHandler } from "../entity/GeometryHandler.js";
-import { Layer } from "./Layer.js";
+import * as quadTree from "../quadTree/quadTree.js";
 import { QueueArray } from "../QueueArray.js";
-import { Vec3 } from "../math/Vec3.js";
+import { Layer } from "./Layer.js";
 
 /**
  * Creates entity instance array.
@@ -280,10 +280,6 @@ class Vector extends Layer {
     _proceedEntity(entity, rightNow) {
         let temp = this._hasImageryTiles;
 
-        //
-        // ...pointCloud, shape, model etc.
-        //
-
         if (entity.strip) {
             this._stripEntityCollection.add(entity);
         }
@@ -554,7 +550,7 @@ class Vector extends Layer {
                 this._polylineEntityCollection.add(ei);
             } else if (ei.geoObject) {
                 this._geoObjectEntityCollection.add(ei);
-            } else if (ei.billboard || ei.label || ei.shape) {
+            } else if (ei.billboard || ei.label) {
                 entitiesForTree.push(ei);
             }
 

package/src/og/layer/WMS.js

@@ -4,9 +4,9 @@
 
 "use strict";
 
-import * as mercator from "../mercator.js";
 import { Extent } from "../Extent.js";
 import { LonLat } from "../LonLat.js";
+import * as mercator from "../mercator.js";
 import { XYZ } from "./XYZ.js";
 
 /**
@@ -183,3 +183,4 @@ class WMS extends XYZ {
 }
 
 export { WMS };
+

package/src/og/layer/XYZ.js

@@ -5,11 +5,9 @@
 "use strict";
 
 import * as mercator from "../mercator.js";
-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";
+import { stringTemplate } from "../utils/shared.js";
+import { Layer } from "./Layer.js";
 
 /**
  * Represents an imagery tiles source provider.

package/src/og/math/Line3.js

@@ -1,6 +1,5 @@
 'use strict';
 
-import * as math from '../math.js';
 import { EPS10 } from '../math.js';
 import { Vec3 } from './Vec3.js';
 

package/src/og/math/Plane.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import * as math from "../math.js";
 import { EPS5 } from "../math.js";
 import { Vec3 } from "./Vec3.js";
 

package/src/og/math/Ray.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-import * as math from "../math.js";
 import { EPS10 } from "../math.js";
 import { Vec3 } from "./Vec3.js";
 

package/src/og/math/Vec2.js

@@ -50,12 +50,12 @@ export class Vec2 {
     /**
      * Returns summary vector.
      * @static
-     * @param {math.Vec2} a - First vector.
-     * @param {math.Vec2} b - Second vector.
-     * @returns {math.Vec2} - Summary vector.
+     * @param {Vec2} a - First vector.
+     * @param {Vec2} b - Second vector.
+     * @returns {Vec2} - Summary vector.
      */
     static add(a, b) {
-        var res = new Vec2(a.x, a.y);
+        const res = new Vec2(a.x, a.y);
         res.addA(b);
         return res;
     }
@@ -63,9 +63,9 @@ export class Vec2 {
     /**
      * Returns two vectors subtraction.
      * @static
-     * @param {math.Vec2} a - First vector.
-     * @param {math.Vec2} b - Second vector.
-     * @returns {math.Vec2} - Vectors subtraction.
+     * @param {Vec2} a - First vector.
+     * @param {Vec2} b - Second vector.
+     * @returns {Vec2} - Vectors subtraction.
      */
     static sub(a, b) {
         var res = new Vec2(a.x, a.y);
@@ -76,9 +76,9 @@ export class Vec2 {
     /**
      * Returns scaled vector.
      * @static
-     * @param {math.Vec2} a - Input vector.
+     * @param {Vec2} a - Input vector.
      * @param {number} scale - Scale value.
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     static scale(a, scale) {
         var res = new Vec2(a.x, a.y);
@@ -89,9 +89,9 @@ export class Vec2 {
     /**
      * Returns two vectors production.
      * @static
-     * @param {math.Vec2} a - First vector.
-     * @param {math.Vec2} b - Second vector.
-     * @returns {math.Vec2}
+     * @param {Vec2} a - First vector.
+     * @param {Vec2} b - Second vector.
+     * @returns {Vec2}
      */
     static mul(a, b) {
         var res = new Vec2(a.x, a.y);
@@ -102,9 +102,9 @@ export class Vec2 {
     /**
      * Returns vector components division product one to another.
      * @static
-     * @param {math.Vec2} a - First vector.
-     * @param {math.Vec2} b - Second vector.
-     * @returns {math.Vec2}
+     * @param {Vec2} a - First vector.
+     * @param {Vec2} b - Second vector.
+     * @returns {Vec2}
      */
     static div(a, b) {
         var res = new Vec2(a.x, a.y);
@@ -115,9 +115,9 @@ export class Vec2 {
     /**
      * Get projection of the first vector to the second.
      * @static
-     * @param {math.Vec2} b - First vector.
-     * @param {math.Vec2} a - Second vector.
-     * @returns {math.Vec2}
+     * @param {Vec2} b - First vector.
+     * @param {Vec2} a - Second vector.
+     * @returns {Vec2}
      */
     static proj_b_to_a(b, a) {
         return a.scaleTo(a.dot(b) / a.dot(a));
@@ -126,8 +126,8 @@ export class Vec2 {
     /**
      * Gets angle between two vectors.
      * @static
-     * @param {math.Vec2} a - First vector.
-     * @param {math.Vec2} b - Second vector.
+     * @param {Vec2} a - First vector.
+     * @param {Vec2} b - Second vector.
      * @returns {number}
      */
     static angle(a, b) {
@@ -137,9 +137,9 @@ export class Vec2 {
     /**
      * Makes vectors normalized and orthogonal to each other.
      * @static
-     * @param {math.Vec2} normal - Normal vector.
-     * @param {math.Vec2} tangent - Tangent vector.
-     * @returns {math.Vec2}
+     * @param {Vec2} normal - Normal vector.
+     * @param {Vec2} tangent - Tangent vector.
+     * @returns {Vec2}
      */
     static orthoNormalize(normal, tangent) {
         normal = normal.norm();
@@ -159,7 +159,7 @@ export class Vec2 {
     /**
      * Returns clone vector.
      * @public
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     clone() {
         return new Vec2(this.x, this.y);
@@ -168,7 +168,7 @@ export class Vec2 {
     /**
      * Compares with vector. Returns true if it equals another.
      * @public
-     * @param {math.Vec2} p - Vector to compare.
+     * @param {Vec2} p - Vector to compare.
      * @returns {boolean}
      */
     equal(p) {
@@ -177,8 +177,8 @@ export class Vec2 {
 
     /**
      * Copy input vector's values.
-     * @param {math.Vec2} point2 - Vector to copy.
-     * @returns {math.Vec2}
+     * @param {Vec2} point2 - Vector to copy.
+     * @returns {Vec2}
      */
     copy(point2) {
         this.x = point2.x;
@@ -207,8 +207,8 @@ export class Vec2 {
     /**
      * Adds vector to the current.
      * @public
-     * @param {math.Vec2}
-     * @returns {math.Vec2}
+     * @param {Vec2}
+     * @returns {Vec2}
      */
     addA(v) {
         this.x += v.x;
@@ -219,8 +219,8 @@ export class Vec2 {
     /**
      * Summarize two vectors.
      * @public
-     * @param {math.Vec2}
-     * @returns {math.Vec2}
+     * @param {Vec2}
+     * @returns {Vec2}
      */
     add(v) {
         return new Vec2(this.x + v.x, this.y + v.y);
@@ -229,8 +229,8 @@ export class Vec2 {
     /**
      * Subtract vector from the current where results saved on the current instance.
      * @public
-     * @param {math.Vec2} v - Subtract vector.
-     * @returns {math.Vec2}
+     * @param {Vec2} v - Subtract vector.
+     * @returns {Vec2}
      */
     subA(v) {
         this.x -= v.x;
@@ -241,8 +241,8 @@ export class Vec2 {
     /**
      * Subtract vector from the current.
      * @public
-     * @param {math.Vec2} v - Subtract vector.
-     * @returns {math.Vec2}
+     * @param {Vec2} v - Subtract vector.
+     * @returns {Vec2}
      */
     sub(v) {
         return new Vec2(this.x - v.x, this.y - v.y);
@@ -252,7 +252,7 @@ export class Vec2 {
      * Scale current vector.
      * @public
      * @param {number} scale - Scale value.
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     scale(scale) {
         this.x *= scale;
@@ -264,7 +264,7 @@ export class Vec2 {
      * Scale current vector to another instance.
      * @public
      * @param {number} scale - Scale value.
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     scaleTo(scale) {
         return new Vec2(this.x * scale, this.y * scale);
@@ -273,8 +273,8 @@ export class Vec2 {
     /**
      * Multiply current vector object to another and store result in the current instance.
      * @public
-     * @param {math.Vec2} vec - Multiply vector.
-     * @returns {math.Vec2}
+     * @param {Vec2} vec - Multiply vector.
+     * @returns {Vec2}
      */
     mulA(vec) {
         this.x *= vec.x;
@@ -285,8 +285,8 @@ export class Vec2 {
     /**
      * Multiply current vector object to another and returns new vector instance.
      * @public
-     * @param {math.Vec2} vec - Multiply vector.
-     * @returns {math.Vec2}
+     * @param {Vec2} vec - Multiply vector.
+     * @returns {Vec2}
      */
     mul(vec) {
         return new Vec2(this.x * vec.x, this.y * vec.y);
@@ -295,8 +295,8 @@ export class Vec2 {
     /**
      * Divide current vector's components to another. Results stores in the current vector object.
      * @public
-     * @param {math.Vec2}
-     * @returns {math.Vec2}
+     * @param {Vec2}
+     * @returns {Vec2}
      */
     divA(vec) {
         this.x /= vec.x;
@@ -307,7 +307,7 @@ export class Vec2 {
     /**
      * Gets vectors dot production.
      * @public
-     * @param {math.Vec2} v - Another vector.
+     * @param {Vec2} v - Another vector.
      * @returns {number}
      */
     dot(v) {
@@ -327,8 +327,8 @@ export class Vec2 {
     /**
      * Gets vectors cross production.
      * @public
-     * @param {math.Vec2} v - Another vector.
-     * @returns {math.Vec2}
+     * @param {Vec2} v - Another vector.
+     * @returns {Vec2}
      */
     cross(v) {
         return this.x * v.y - this.y * v.x;
@@ -337,7 +337,7 @@ export class Vec2 {
     /**
      * Sets vector to zero.
      * @public
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     clear() {
         this.x = this.y = 0;
@@ -347,7 +347,7 @@ export class Vec2 {
     /**
      * Returns normalized vector.
      * @public
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     normal() {
         var res = new Vec2();
@@ -364,7 +364,7 @@ export class Vec2 {
     /**
      * Normalize current vector.
      * @public
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     normalize() {
         var length = 1.0 / this.length();
@@ -387,7 +387,7 @@ export class Vec2 {
     /**
      * Gets distance to point.
      * @public
-     * @param {math.Vec2} p - Distant point.
+     * @param {Vec2} p - Distant point.
      * @returns {number}
      */
     distance(p) {
@@ -400,7 +400,7 @@ export class Vec2 {
      * @public
      * @param {number} x - Value X.
      * @param {number} y - Value Y.
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     set(x, y) {
         this.x = x;
@@ -411,7 +411,7 @@ export class Vec2 {
     /**
      * Negate current vector.
      * @public
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     negate() {
         this.x = -this.x;
@@ -422,7 +422,7 @@ export class Vec2 {
     /**
      * Negate current vector to another instance.
      * @public
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     negateTo() {
         return new Vec2(-this.x, -this.y);
@@ -431,9 +431,9 @@ export class Vec2 {
     /**
      * Gets projected point coordinates of the current vector on the ray.
      * @public
-     * @param {math.Vec2} pos - Ray position.
-     * @param {math.Vec2} direction - Ray direction.
-     * @returns {math.Vec2}
+     * @param {Vec2} pos - Ray position.
+     * @param {Vec2} direction - Ray direction.
+     * @returns {Vec2}
      */
     projToRay(pos, direction) {
         var v = Vec2.proj_b_to_a(Vec2.sub(this, pos), direction);
@@ -444,7 +444,7 @@ export class Vec2 {
     /**
      * Gets angle between two vectors.
      * @public
-     * @param {math.Vec2} a - Another vector.
+     * @param {Vec2} a - Another vector.
      * @returns {number}
      */
     angle(a) {
@@ -454,9 +454,9 @@ export class Vec2 {
     /**
      * Returns two vectors linear interpolation.
      * @public
-     * @param {math.Vec2} v2 - End vector.
+     * @param {Vec2} v2 - End vector.
      * @param {number} l - Interpolate value.
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     lerp(v1, v2, l) {
         var res = Vec2.clone(this);
@@ -480,9 +480,9 @@ export class Vec2 {
      * the vectors are treated as directions rather than points in space. The direction of the returned vector is interpolated
      * by the angle and its magnitude is interpolated between the magnitudes of from and to.
      * @public
-     * @param {math.Vec2} v2 -
+     * @param {Vec2} v2 -
      * @param {number} t - The parameter t is clamped to the range [0, 1].
-     * @returns {math.Vec2}
+     * @returns {Vec2}
      */
     slerp(v2, t) {
         var res = new Vec2();
@@ -517,7 +517,7 @@ export class Vec2 {
  * @function
  * @param {number} [x] - First cvalue.
  * @param {number} [y] - Second value.
- * @returns {math.Vec2}
+ * @returns {Vec2}
  */
 export function vec2(x, y) {
     return new Vec2(x, y);

package/src/og/math/Vec3.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-import { Vec4 } from "./Vec4.js";
 import { Quat } from "./Quat.js";
+import { Vec4 } from "./Vec4.js";
 
 /**
  * Class represents a 3d vector.

package/src/og/math/Vec4.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-import { Vec3 } from "./Vec3.js";
 import { frac } from "../math.js";
+import { Vec3 } from "./Vec3.js";
 
 /**
  * Class represents a 4d vector.