@openglobus/og 0.17.2 → 0.18.1

package/src/og/layer/CanvasTiles.js

@@ -1,360 +0,0 @@
-"use strict";
-
-import * as quadTree from "../quadTree/quadTree.js";
-import { Layer } from "./Layer.js";
-
-/**
- * Maximum tiles per frame.
- * @const
- * @type {number}
- */
-
-const EVENT_NAMES = [/**
- * Triggered when current tile image has loaded before rendereing.
- * @event og.layer.CanvasTiles#load
- */
-    "load",
-
-    /**
-     * Triggered when all tiles have loaded or loading has stopped.
-     * @event og.layer.CanvasTiles#loadend
-     */
-    "loadend"];
-
-/**
- * Layer used to rendering each tile as a separate canvas object.
- * @class
- * @extends {Layer}
- * //TODO: make asynchronous handler.
- * @param {String} [name="noname"] - Layer name.
- * @param {Object} options:
- * @param {number} [options.opacity=1.0] - Layer opacity.
- * @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] - Base layer flag.
- * @param {boolean} [options.visibility=true] - Layer visibility.
- * @param {layer.CanvasTiles~drawTileCallback} [options.drawTile] - Draw tile callback.
- * @fires og.layer.CanvasTiles#load
- * @fires og.layer.CanvasTiles#loadend
- */
-class CanvasTiles extends Layer {
-    constructor(name, options = {}) {
-        super(name, options);
-
-        this.events.registerNames(EVENT_NAMES);
-
-        this.animated = options.animated || false;
-
-        this.minNativeZoom = options.minNativeZoom || 0;
-        this.maxNativeZoom = options.maxNativeZoom || 100;
-        /**
-         * Current creating tiles couter.
-         * @protected
-         * @type {number}
-         */
-        this._counter = 0;
-
-        /**
-         * Tile pending queue that waiting for create.
-         * @protected
-         * @type {Array.<planetSegment.Material>}
-         */
-        this._pendingsQueue = []; // new og.QueueArray();
-
-        /**
-         * Draw tile callback.
-         * @type {layer.CanvasTiles~drawTileCallback}
-         * @public
-         */
-        this.drawTile = options.drawTile || null;
-    }
-
-    addTo(planet) {
-        this._onLoadend_ = this._onLoadend.bind(this);
-        this.events.on("loadend", this._onLoadend_, this);
-        return super.addTo(planet);
-    }
-
-    remove() {
-        this.events.off("loadend", this._onLoadend_);
-        this._onLoadend_ = null;
-        return super.remove();
-    }
-
-    _onLoadend() {
-        if (this._planet && this._planet._terrainCompletedActivated) {
-            this._planet.events.dispatch(this._planet.events.layerloadend, this);
-        }
-    }
-
-    get instanceName() {
-        return "CanvasTiles";
-    }
-
-    get isIdle() {
-        return super.isIdle && this._counter === 0;
-    }
-
-    /**
-     * Abort loading tiles.
-     * @public
-     */
-    abortLoading() {
-        var q = this._pendingsQueue;
-        for (let i = q._shiftIndex + 1; i < q._popIndex + 1; i++) {
-            if (q._array[i]) {
-                this.abortMaterialLoading(q._array[i]);
-            }
-        }
-        this._pendingsQueue = [];
-        // this._pendingsQueue.clear();
-    }
-
-    /**
-     * Sets layer visibility.
-     * @public
-     * @param {boolean} visibility - Layer visibility.
-     */
-    setVisibility(visibility) {
-        if (visibility !== this._visibility) {
-            super.setVisibility(visibility);
-
-            if (!visibility) {
-                this.abortLoading();
-            }
-        }
-    }
-
-    /**
-     * Start to load tile material.
-     * @public
-     * @virtual
-     * @param {Material} material -
-     */
-    loadMaterial(material) {
-        let seg = material.segment;
-
-        if (this._isBaseLayer) {
-            material.texture = seg._isNorth ? seg.planet.solidTextureOne : seg.planet.solidTextureTwo;
-        } else {
-            material.texture = seg.planet.transparentTexture;
-        }
-
-        if (this._planet.layerLock.isFree() || material.segment.tileZoom < 2) {
-            material.isReady = false;
-            material.isLoading = true;
-            if (CanvasTiles.__requestsCounter >= CanvasTiles.MAX_REQUESTS && this._counter) {
-                this._pendingsQueue.push(material);
-            } else {
-                this._exec(material);
-            }
-        }
-    }
-
-    /**
-     * Loads material image and apply it to the planet segment.
-     * @protected
-     * @param {Material} material - Loads material image.
-     */
-    _exec(material) {
-        CanvasTiles.__requestsCounter++;
-        this._counter++;
-        var that = this;
-        if (this.drawTile) {
-            /**
-             * Tile custom draw function.
-             * @callback og.layer.CanvasTiles~drawTileCallback
-             * @param {Material} material
-             * @param {applyCanvasCallback} applyCanvasCallback
-             */
-            var e = that.events.load;
-            if (e.handlers.length) {
-                that.events.dispatch(e, material);
-            }
-            requestAnimationFrame(() => {
-                that.drawTile(
-                    material,
-                    /**
-                     * Apply canvas.
-                     * @callback applyCanvasCallback
-                     * @param {Object} canvas -
-                     */
-                    function (canvas) {
-                        that._counter--;
-                        CanvasTiles.__requestsCounter--;
-                        if (material.isLoading) {
-                            material.applyImage(canvas);
-                        }
-                        that._dequeueRequest();
-                    });
-            });
-        } else {
-            material.textureNotExists();
-        }
-    }
-
-    /**
-     * Abort exact material loading.
-     * @public
-     * @param {Material} material - Segment material.
-     */
-    abortMaterialLoading(material) {
-        if (material.isLoading && material.image) {
-            material.image.src = "";
-            this._counter--;
-            CanvasTiles.__requestsCounter--;
-            this._dequeueRequest();
-        }
-        material.isLoading = false;
-        material.isReady = false;
-    }
-
-    _dequeueRequest() {
-        if (this._pendingsQueue.length) {
-            if (CanvasTiles.__requestsCounter < CanvasTiles.MAX_REQUESTS) {
-                var pmat = this._whilePendings();
-                if (pmat) {
-                    this._exec(pmat);
-                }
-            }
-        } else if (this._counter === 0 && this._planet && this._planet._terrainCompletedActivated) {
-            this.events.dispatch(this.events.loadend);
-        }
-    }
-
-    _whilePendings() {
-        while (this._pendingsQueue.length) {
-            var pmat = this._pendingsQueue.pop();
-            if (pmat.segment.node) {
-                if (pmat.segment.initialized && pmat.segment.node.getState() === quadTree.RENDERING) {
-                    return pmat;
-                }
-                pmat.isLoading = false;
-            }
-        }
-        return null;
-    }
-
-    applyMaterial(material) {
-        if (material.isReady) {
-
-            // IMPORTANT!
-            // Animated doesn't work withMaxNativeZoom
-            // It could be fixed with call drawTile method only for parent
-            // material (which is rendered on the current segment material),
-            // just for one renderer frame
-            if (material.layer.animated) {
-                requestAnimationFrame(() => {
-                    this.drawTile(material, function (canvas) {
-                        material.applyImage(canvas);
-                    });
-                });
-            }
-
-            return material.texOffset;
-
-        } else if (material.segment.tileZoom < this.minNativeZoom) {
-            material.textureNotExists();
-        } else {
-
-            let segment = material.segment;
-            let pn = segment.node,
-                parentTextureExists = false;
-            let maxNativeZoom = material.layer.maxNativeZoom;
-
-            if (segment.passReady && !material.isLoading && segment.tileZoom <= maxNativeZoom) {
-                this.loadMaterial(material);
-            }
-
-            let mId = this._id;
-            let psegm = material;
-            while (pn.parentNode) {
-                pn = pn.parentNode;
-                psegm = pn.segment.materials[mId];
-                if (psegm && psegm.textureExists) {
-                    parentTextureExists = true;
-                    break;
-                }
-            }
-
-            if (segment.passReady) {
-                if (pn.segment.tileZoom === maxNativeZoom) {
-                    if (segment.tileZoom > maxNativeZoom) {
-                        material.textureNotExists();
-                    }
-                } else if (pn.segment.tileZoom < maxNativeZoom) {
-
-                    let pn = segment.node;
-                    while (pn.segment.tileZoom > maxNativeZoom) {
-                        pn = pn.parentNode;
-                    }
-
-                    let pnm = pn.segment.materials[mId];
-                    if (pnm) {
-                        !pnm.isLoading && !pnm.isReady && this.loadMaterial(pnm);
-                    } else {
-                        pnm = pn.segment.materials[material.layer._id] = material.layer.createMaterial(
-                            pn.segment
-                        );
-                        this.loadMaterial(pnm);
-                    }
-                }
-            }
-
-            if (parentTextureExists) {
-
-                //
-                // Animated doesn't work withMaxNativeZoom
-                //
-                if (material.layer.animated) {
-                    requestAnimationFrame(() => {
-                        this.drawTile(material, function (canvas) {
-                            material.applyImage(canvas);
-                        });
-                    });
-                }
-
-                material.appliedNodeId = pn.nodeId;
-                material.texture = psegm.texture;
-                let dZ2 = 1.0 / (2 << (segment.tileZoom - pn.segment.tileZoom - 1));
-                material.texOffset[0] = segment.tileX * dZ2 - pn.segment.tileX;
-                material.texOffset[1] = segment.tileY * dZ2 - pn.segment.tileY;
-                material.texOffset[2] = dZ2;
-                material.texOffset[3] = dZ2;
-            } else {
-                material.texture = segment.planet.transparentTexture;
-                material.texOffset[0] = 0.0;
-                material.texOffset[1] = 0.0;
-                material.texOffset[2] = 1.0;
-                material.texOffset[3] = 1.0;
-            }
-        }
-
-        return material.texOffset;
-    }
-
-    clearMaterial(material) {
-        if (material.isReady) {
-            material.isReady = false;
-            if (material.textureExists && material.texture && !material.texture.default) {
-                material.segment.handler.gl.deleteTexture(material.texture);
-                material.texture = null;
-            }
-        }
-
-        this.abortMaterialLoading(material);
-        material.isLoading = false;
-        material.textureExists = false;
-
-        material.layer = null;
-        material.segment = null;
-
-        if (material.image) {
-            material.image.src = "";
-            material.image = null;
-        }
-    }
-}
-
-export { CanvasTiles };

package/src/og/layer/GeoImage.js

@@ -1,150 +0,0 @@
-"use strict";
-
-import { nextHighestPowerOfTwo } from "../math.js";
-import { BaseGeoImage } from "./BaseGeoImage.js";
-import { isImageLoaded } from "../utils/shared.js";
-
-/**
- * Used to load and display a single image over specific corner coordinates on the globe, implements og.layer.BaseGeoImage interface.
- * @class
- * @extends {BaseGeoImage}
- */
-class GeoImage extends BaseGeoImage {
-    constructor(name, options) {
-        super(name, options);
-
-        /**
-         * Image object.
-         * @private
-         * @type {Image}
-         */
-        this._image = options.image || null;
-
-        /**
-         * Image source url path.
-         * @private
-         * @type {String}
-         */
-        this._src = options.src || null;
-    }
-
-    get instanceName() {
-        return "GeoImage";
-    }
-
-    abortLoading() {
-        this._image.src = "";
-    }
-
-    /**
-     * Sets image source url path.
-     * @public
-     * @param {String} srs - Image url path.
-     */
-    setSrc(src) {
-        this._planet && this._planet._geoImageCreator.remove(this);
-        this._src = src;
-        this._sourceReady = false;
-        this._sourceCreated = false;
-        this._image = new Image();
-        this._onLoad_ = this._onLoad.bind(this);
-        this._image.addEventListener("load", this._onLoad_);
-        this._image.src = src;
-    }
-
-    /**
-     * Sets image object.
-     * @public
-     * @param {Image} image - Image object.
-     */
-    setImage(image) {
-        this._planet && this._planet._geoImageCreator.remove(this);
-        this._sourceCreated = false;
-        this._sourceReady = false;
-        this._image = image;
-        this._src = image.src;
-        if (isImageLoaded(this._image)) {
-            this._applyImage(this._image);
-        } else {
-            this._onLoad_ = this._onLoad.bind(this);
-            this._image.addEventListener("load", this._onLoad_);
-        }
-    }
-
-    /**
-     * Creates source gl texture.
-     * @virtual
-     * @protected
-     */
-    _createSourceTexture() {
-        if (!this._sourceCreated) {
-            this._sourceTexture = this._planet.renderer.handler.createTexture_l(this._image);
-            this._sourceCreated = true;
-        }
-    }
-
-    /**
-     * @private
-     * @param {Image} [img]
-     */
-    _onLoad() {
-        this._applyImage(this._image);
-        this._image.removeEventListener("load", this._onLoad_);
-        this._onLoad_ = undefined;
-    }
-
-    /**
-     * @private
-     * @param {Image} [img]
-     */
-    _applyImage(img) {
-        if (img) {
-            this._frameWidth = nextHighestPowerOfTwo(img.width * 2, 4096);
-            this._frameHeight = nextHighestPowerOfTwo(img.height * 3, 4096);
-            this._sourceReady = true;
-            this._planet._geoImageCreator.add(this);
-        }
-    }
-
-
-    /**
-     * Loads planet segment material. In this case - GeoImage source image.
-     * @virtual
-     * @public
-     * @param {Material} material - GeoImage planet material.
-     */
-    loadMaterial(material) {
-        material.isLoading = true;
-        this._creationProceeding = true;
-        if (!this._sourceReady && this._src) {
-            if (this._image) {
-                if (isImageLoaded(this._image)) {
-                    this._applyImage(this._image);
-                } else {
-                    this._onLoad_ = this._onLoad.bind(this);
-                    this._image.addEventListener("load", this._onLoad_);
-                }
-            } else {
-                this._image = new Image();
-                this._onLoad_ = this._onLoad.bind(this);
-                this._image.addEventListener("load", this._onLoad_);
-                this._image.src = this._src;
-            }
-        } else {
-            this._planet._geoImageCreator.add(this);
-        }
-    }
-
-    /**
-     * @virtual
-     * @param {Material} material - GeoImage material.
-     */
-    abortMaterialLoading(material) {
-        this._image && (this._image.src = "");
-        this._creationProceeding = false;
-        material.isLoading = false;
-        material.isReady = false;
-    }
-}
-
-export { GeoImage };

package/src/og/layer/GeoTexture2d.js

@@ -1,50 +0,0 @@
-'use strict';
-
-import * as math from '../math.js';
-import { BaseGeoImage } from './BaseGeoImage.js';
-
-class GeoTexture2d extends BaseGeoImage {
-    constructor(name, options) {
-        super(name, options);
-
-        this._sourceTexture = options.texture || null;
-
-        if (options.texture) {
-            this._sourceReady = true;
-            this._sourceCreated = true;
-        }
-
-        this._frameWidth = options.frameWidth ? math.nextHighestPowerOfTwo(options.frameWidth) : 256;
-        this._frameHeight = options.frameHeight ? math.nextHighestPowerOfTwo(options.frameHeight) : 256;
-
-        this._animate = true;
-    }
-
-    get instanceName() {
-        return "GeoTexture2d";
-    }
-
-    loadMaterial(material) {
-        this._planet._geoImageCreator.add(this);
-    }
-
-    bindTexture(texture) {
-        this._sourceReady = true;
-        this._sourceCreated = true;
-        this._sourceTexture = texture;
-    }
-
-    setSize(width, height) {
-        this._frameWidth = width;
-        this._frameHeight = height;
-        this._frameCreated = false;
-    }
-
-    abortMaterialLoading(material) {
-        this._creationProceeding = false;
-        material.isLoading = false;
-        material.isReady = false;
-    }
-}
-
-export { GeoTexture2d };