@openglobus/og 0.15.0 → 0.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "[OpenGlobus](https://www.openglobus.org/) is a javascript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers and 3d objects. It uses the WebGL technology, open source and completely free.",
   "directories": {
     "example": "./sandbox"

package/src/og/control/Control.js

@@ -41,7 +41,7 @@ class Control {
          * @public
          * @type {Boolean}
          */
-        this.autoActivate = options.autoActivate != undefined ? options.autoActivate : true;
+        this.autoActivate = options.autoActivate || false;
 
         /**
          * Control activity.
@@ -76,35 +76,40 @@ class Control {
      * @public
      * @virtual
      */
-    oninit() {}
+    oninit() {
+    }
 
     /**
      * Control renderer assigning function have to be overriden.
      * @public
      * @virtual
      */
-    onadd() {}
+    onadd() {
+    }
 
     /**
      * Control remove function have to be overriden.
      * @public
      * @virtual
      */
-    onremove() {}
+    onremove() {
+    }
 
     /**
      * Control activation function have to be overriden.
      * @public
      * @virtual
      */
-    onactivate() {}
+    onactivate() {
+    }
 
     /**
      * Control deactivation function have to be overriden.
      * @public
      * @virtual
      */
-    ondeactivate() {}
+    ondeactivate() {
+    }
 
     /**
      * Assign renderer to the control.
@@ -116,9 +121,10 @@ class Control {
             this.renderer = renderer;
             renderer.controls[this.name] = this;
             this.onadd && this.onadd();
+            this._initialized = true;
+            this.oninit && this.oninit();
             if (this.autoActivate) {
-                this._initialized = true;
-                this.oninit && this.oninit();
+                this.activate();
             }
         }
     }
@@ -154,12 +160,14 @@ class Control {
      * @public
      */
     activate() {
-        if (!this._initialized) {
-            this._initialized = true;
-            this.oninit && this.oninit();
+        if (!this._active) {
+            if (!this._initialized) {
+                this._initialized = true;
+                this.oninit && this.oninit();
+            }
+            this._active = true;
+            this.onactivate && this.onactivate();
         }
-        this._active = true;
-        this.onactivate && this.onactivate();
     }
 
     /**
@@ -167,8 +175,10 @@ class Control {
      * @public
      */
     deactivate() {
-        this._active = false;
-        this.ondeactivate && this.ondeactivate();
+        if (this._active) {
+            this._active = false;
+            this.ondeactivate && this.ondeactivate();
+        }
     }
 
     /**

package/src/og/control/Sun.js

@@ -18,7 +18,7 @@ import { Vec3 } from "../math/Vec3.js";
  */
 class Sun extends Control {
     constructor(options) {
-        super(options);
+        super({ autoActivate: true, ...options });
 
         this._name = "sun";
 

package/src/og/index.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/scene/Planet.js

@@ -342,10 +342,10 @@ 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.013, 0.005, 0.0));
-        let shininess = options.shininess || 27.0;
+        let a = utils.createColorRGB(options.ambient, new Vec3(0.2, 0.2, 0.3));
+        let d = utils.createColorRGB(options.diffuse, new Vec3(1.0, 1.0, 1.0));
+        let s = utils.createColorRGB(options.specular, new Vec3(0.00063, 0.00055, 0.00032));
+        let shininess = options.shininess || 18.0;
 
         this._ambient = new Float32Array([a.x, a.y, a.z]);
         this._diffuse = new Float32Array([d.x, d.y, d.z]);
@@ -430,7 +430,7 @@ export class Planet extends RenderNode {
          * Night texture brightness coefficient
          * @type {number}
          */
-        this.nightTextureCoefficient = 1.5;
+        this.nightTextureCoefficient = 2.0;
 
         this._renderScreenNodesPASS = this._renderScreenNodesPASSNoAtmos;
 

package/types/index.d.ts

@@ -49,4 +49,5 @@ import { MarsQuadTreeStrategy } from "./quadTree/index.js";
 import { EarthQuadTreeStrategy } from "./quadTree/index.js";
 import { Wgs84QuadTreeStrategy } from "./quadTree/index.js";
 import { quadTreeStrategyType } from "./quadTree/index.js";
-export { bv, jd, math, mercator, utils, input, layer, terrain, control, webgl, wgs84, Camera, Ellipsoid, PlanetCamera, Globe, LightSource, Renderer, Clock, Events, Extent, LonLat, scene, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, entity, Geoid, Popup, QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, quadTreeStrategyType };
+import { Object3d } from "./Object3d.js";
+export { bv, jd, math, mercator, utils, input, layer, terrain, control, webgl, wgs84, Camera, Ellipsoid, PlanetCamera, Globe, LightSource, Renderer, Clock, Events, Extent, LonLat, scene, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, entity, Geoid, Popup, QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, quadTreeStrategyType, Object3d };