@openglobus/og 0.11.1 → 0.11.6

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 { createTexture } from "../webgl/Handler.js";
 
 export const FADING_FACTOR = 0.29;
 
@@ -22,16 +23,17 @@ export const FADING_FACTOR = 0.29;
  * @param {String} [name="noname"] - Layer name.
  * @param {Object} [options] - Layer options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number,number,number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color.
+ * @param {Array.<number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color. (exactly 3 entries)
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
  * @param {string} [options.attribution] - Layer attribution that displayed in the attribution area on the screen.
  * @param {boolean} [options.isBaseLayer=false] - This is a base layer.
  * @param {boolean} [options.visibility=true] - Layer visibility.
- * @param {og.Extent} [options.extent=[[-180.0, -90.0], [180.0, 90.0]]] - Visible extent.
- * @param {og.Vec3} [options.ambient=[0.1, 0.1, 0.21]] - Ambient RGB color.
- * @param {og.Vec3} [options.diffuse=[1.0, 1.0, 1.0]] - Diffuse RGB color.
- * @param {og.Vec3} [options.specular=[0.00025, 0.00015, 0.0001]] - Specular RGB color.
+ * @param {Extent} [options.extent=[[-180.0, -90.0], [180.0, 90.0]]] - Visible extent.
+ * @param {Vec3} [options.ambient=[0.1, 0.1, 0.21]] - Ambient RGB color.
+ * @param {Vec3} [options.diffuse=[1.0, 1.0, 1.0]] - Diffuse RGB color.
+ * @param {Vec3} [options.specular=[0.00025, 0.00015, 0.0001]] - Specular RGB color.
+ * @param {string} [options.textureFilter="anisotropic"] - Image texture filter. Available values: "nearest", "linear", "mipmap" and "anisotropic".
  * @param {Number} [options.shininess=100] - Shininess.
  *
  * @fires og.Layer#visibilitychange
@@ -87,7 +89,7 @@ class Layer {
         /**
          * Transparent RGB color mask.
          * @public
-         * @type {Array.<number,number,number>}
+         * @type {Array.<number>} - (exactly 3 entries)
          */
         this.transparentColor = options.transparentColor || [-1, -1, -1];
 
@@ -118,7 +120,7 @@ class Layer {
         /**
          * Planet node.
          * @protected
-         * @type {og.scene.Planet}
+         * @type {Planet}
          */
         this._planet = null;
 
@@ -179,14 +181,22 @@ class Layer {
         /**
          * Visible degrees extent.
          * @protected
-         * @type {og.Extent}
+         * @type {Extent}
          */
         this._extent = null;
 
+        if (options.textureFilter) {
+            this.createTexture =
+                createTexture[options.textureFilter.trim().toUpperCase()] ||
+                createTexture.ANISOTROPIC;
+        } else {
+            this.createTexture = createTexture.ANISOTROPIC;
+        }
+
         /**
          * Visible mercator extent.
          * @protected
-         * @type {og.Extent}
+         * @type {Extent}
          */
         this._extentMerc = null;
 
@@ -201,7 +211,7 @@ class Layer {
         /**
          * Layer picking color. Assign when added to the planet.
          * @protected
-         * @type {og.Vec3}
+         * @type {Vec3}
          */
         this._pickingColor = new Vec3();
 
@@ -210,7 +220,7 @@ class Layer {
         /**
          * Events handler.
          * @public
-         * @type {og.Events}
+         * @type {Events}
          */
         this.events = new Events(EVENT_NAMES, this);
     }
@@ -310,7 +320,7 @@ class Layer {
     /**
      * Compares layers instances.
      * @public
-     * @param {og.Layer} layer - Layer instance to compare.
+     * @param {Layer} layer - Layer instance to compare.
      * @returns {boolean} - Returns true if the layers is the same instance of the input.
      */
     isEqual(layer) {
@@ -321,7 +331,7 @@ class Layer {
      * Assign the planet.
      * @protected
      * @virtual
-     * @param {og.scene.Planet} planet - Planet render node.
+     * @param {Planet} planet - Planet render node.
      */
     _assignPlanet(planet) {
         planet.layers.push(this);
@@ -348,7 +358,7 @@ class Layer {
     /**
      * Adds layer to the planet.
      * @public
-     * @param {og.scene.Planet} planet - Adds layer to the planet.
+     * @param {Planet} planet - Adds layer to the planet.
      */
     addTo(planet) {
         if (!this._planet) {
@@ -360,7 +370,7 @@ class Layer {
     /**
      * Removes from planet.
      * @public
-     * @returns {og.Layer} -This layer.
+     * @returns {Layer} -This layer.
      */
     remove() {
         var p = this._planet;
@@ -514,7 +524,7 @@ class Layer {
     /**
      * Sets visible geographical extent.
      * @public
-     * @param {og.Extent} extent - Layer visible geographical extent.
+     * @param {Extent} extent - Layer visible geographical extent.
      */
     setExtent(extent) {
         var sw = extent.southWest.clone(),
@@ -533,7 +543,7 @@ class Layer {
     /**
      * Gets layer extent.
      * @public
-     * @return {og.Extent} - Layer geodetic extent.
+     * @return {Extent} - Layer geodetic extent.
      */
     getExtent() {
         return this._extent;

package/src/og/layer/Material.js

@@ -2,76 +2,108 @@
  * @module og/layer/Material
  */
 
-'use strict';
+"use strict";
 
-const Material = function (segment, layer) {
-    this.segment = segment;
-    this.layer = layer;
-    this.isReady = false;
-    this.isLoading = false;
-    this.texture = null;
-    this.pickingMask = null;
-    //this.image = null;
-    this.textureExists = false;
-    this.appliedNodeId = 0;
-    this.texOffset = [0.0, 0.0, 1.0, 1.0];
-    this.loadingAttempts = 0;
+class Material {
+    /**
+     *
+     * @param {*} segment
+     * @param {*} layer
+     */
+    constructor(segment, layer) {
+        this.segment = segment;
+        this.layer = layer;
+        this.isReady = false;
+        this.isLoading = false;
+        this.texture = null;
+        this.pickingMask = null;
+        //this.image = null;
+        this.textureExists = false;
+        this.appliedNodeId = 0;
+        this.texOffset = [0.0, 0.0, 1.0, 1.0];
+        this.loadingAttempts = 0;
 
-    // vector data
-    this._updateTexture = null;
-    this._updatePickingMask = null;
-    this.pickingReady = false;
-};
+        // vector data
+        this._updateTexture = null;
+        this._updatePickingMask = null;
+        this.pickingReady = false;
+    }
 
-Material.prototype.assignLayer = function (layer) {
-    this.layer = layer;
-};
+    ///**
+    // * @param {*} layer
+    // */
+    //assignLayer(layer) {
+    //    this.layer = layer;
+    //}
 
-Material.prototype.abortLoading = function () {
-    this.layer.abortMaterialLoading(this);
-};
+    /**
+     *
+     */
+    abortLoading() {
+        this.layer.abortMaterialLoading(this);
+    }
 
-Material.prototype.applyImage = function (img) {
-    if (this.segment.initialized) {
-        this._updateTexture = null;
-        //this.image = img;
-        this.texture = this.segment.handler.createTexture(img);
-        this.appliedNodeId = this.segment.node.nodeId;
-        this.isReady = true;
-        this.pickingReady = true;
-        this.textureExists = true;
-        this.isLoading = false;
-        this.texOffset = [0.0, 0.0, 1.0, 1.0];
+    _createTexture(img) {
+        return this.layer.createTexture(this.segment.handler, img);
     }
-};
 
-Material.prototype.applyTexture = function (texture, pickingMask) {
-    if (this.segment.initialized) {
-        this.texture = texture;
-        this._updateTexture = null;
-        this.pickingMask = pickingMask || null;
-        this._updatePickingMask = null;
-        this.isReady = true;
-        this.pickingReady = true;
-        this.textureExists = true;
-        this.isLoading = false;
-        this.appliedNodeId = this.segment.node.nodeId;
-        this.texOffset = [0.0, 0.0, 1.0, 1.0];
+    /**
+     *
+     * @param {*} img
+     */
+    applyImage(img) {
+        if (this.segment.initialized) {
+            this._updateTexture = null;
+            //this.image = img;
+            this.texture = this._createTexture(img);
+            this.appliedNodeId = this.segment.node.nodeId;
+            this.isReady = true;
+            this.pickingReady = true;
+            this.textureExists = true;
+            this.isLoading = false;
+            this.texOffset = [0.0, 0.0, 1.0, 1.0];
+        }
     }
-};
 
-Material.prototype.textureNotExists = function () {
-    if (this.segment.initialized) {
-        this.pickingReady = true;
-        this.isLoading = false;
-        this.isReady = true;
-        this.textureExists = false;
+    /**
+     *
+     * @param {*} texture
+     * @param {*} pickingMask
+     */
+    applyTexture(texture, pickingMask) {
+        if (this.segment.initialized) {
+            this.texture = texture;
+            this._updateTexture = null;
+            this.pickingMask = pickingMask || null;
+            this._updatePickingMask = null;
+            this.isReady = true;
+            this.pickingReady = true;
+            this.textureExists = true;
+            this.isLoading = false;
+            this.appliedNodeId = this.segment.node.nodeId;
+            this.texOffset = [0.0, 0.0, 1.0, 1.0];
+        }
+    }
+
+    /**
+     *
+     */
+    textureNotExists() {
+        if (this.segment.initialized) {
+            this.pickingReady = true;
+            this.isLoading = false;
+            this.isReady = true;
+            this.textureExists = false;
+        }
     }
-};
 
-Material.prototype.clear = function () {
-    this.loadingAttempts = 0;
-    this.layer.clearMaterial(this);
-};
+    /**
+     *
+     */
+    clear() {
+        this.loadingAttempts = 0;
+        this.layer.clearMaterial(this);
+    }
+}
 
-export { Material };
+export { Material };