@openglobus/og 0.15.1 → 0.15.2

package/src/og/shapes/Icosphere.js

@@ -1,179 +0,0 @@
-/**
- * @module og/shape/BaseShape
- */
-
-"use strict";
-
-import { BaseShape } from "./BaseShape.js";
-
-/**
- * @class
- * @extends {BaseShape}
- * @param {Object} options - Icosphere parameters:
- * @param {Vec3} [options.position] - Icosphere position.
- * @param {Quat} [options.orientation] - Icosphere orientation(rotation).
- * @param {Vec3} [options.scale] - Scale vector.
- * @param {Array.<number>} [options.color] - Icosphere RGBA color. (exactly 4 entries)
- * @param {string} [options.src] - Texture image url source.
- * @param {boolean} [options.visibility] - Icosphere visibility.
- * @param {number} [options.size] - Icosphere radius.
- * @param {number} [options.level] - Icosphere complexity level.
- */
-class Icosphere extends BaseShape {
-    constructor(options) {
-        super(options);
-        /**
-         * Icosphere radius.
-         * @protected
-         * @type {number}
-         */
-        this._size = options.size || 1.0;
-
-        /**
-         * Icosphere recursion level.
-         * @protected
-         * @type {number}
-         */
-        this._level = options.level || 0;
-
-        this._index = 0;
-        this._middlePointIndexCache = {};
-
-        this._createData();
-    }
-
-    // add vertex to mesh, fix position to be on unit sphere, return index
-    _addVertex(p) {
-        var length = Math.sqrt(p[0] * p[0] + p[1] * p[1] + p[2] * p[2]);
-        this._positionData.push(
-            (this._size * p[0]) / length,
-            (this._size * p[1]) / length,
-            (this._size * p[2]) / length
-        );
-        return this._index++;
-    }
-
-    // return index of point in the middle of p1 and p2
-    _getMiddlePoint(p1, p2) {
-        // first check if we have it already
-        var firstIsSmaller = p1 < p2;
-        var smallerIndex = firstIsSmaller ? p1 : p2;
-        var greaterIndex = firstIsSmaller ? p2 : p1;
-
-        var key = smallerIndex + "_" + greaterIndex;
-
-        var ret = this._middlePointIndexCache[key];
-        if (ret) {
-            return ret;
-        }
-
-        var point1 = [
-            this._positionData[p1 * 3],
-            this._positionData[p1 * 3 + 1],
-            this._positionData[p1 * 3 + 2]
-        ];
-        var point2 = [
-            this._positionData[p2 * 3],
-            this._positionData[p2 * 3 + 1],
-            this._positionData[p2 * 3 + 2]
-        ];
-        var middle = [
-            (point1[0] + point2[0]) / 2.0,
-            (point1[1] + point2[1]) / 2.0,
-            (point1[2] + point2[2]) / 2.0
-        ];
-
-        // add vertex makes sure point is on unit sphere
-        var i = this._addVertex(middle);
-        this._middlePointIndexCache[key] = i;
-        return i;
-    }
-
-    /**
-     * Create specific shape vertices data.
-     * @protected
-     * @virtual
-     */
-    _createData() {
-        this._positionData = [];
-        this._indexData = [];
-        this._index = 0;
-        this._middlePointIndexCache = {};
-
-        // create 12 vertices of a icosahedron
-        var t = (1.0 + Math.sqrt(5.0)) / 2.0;
-
-        this._addVertex([-1, t, 0]);
-        this._addVertex([1, t, 0]);
-        this._addVertex([-1, -t, 0]);
-        this._addVertex([1, -t, 0]);
-
-        this._addVertex([0, -1, t]);
-        this._addVertex([0, 1, t]);
-        this._addVertex([0, -1, -t]);
-        this._addVertex([0, 1, -t]);
-
-        this._addVertex([t, 0, -1]);
-        this._addVertex([t, 0, 1]);
-        this._addVertex([-t, 0, -1]);
-        this._addVertex([-t, 0, 1]);
-
-        // create 20 triangles of the icosahedron
-        var faces = [];
-
-        // 5 faces around point 0
-        faces.push([0, 11, 5]);
-        faces.push([0, 5, 1]);
-        faces.push([0, 1, 7]);
-        faces.push([0, 7, 10]);
-        faces.push([0, 10, 11]);
-
-        // 5 adjacent faces
-        faces.push([1, 5, 9]);
-        faces.push([5, 11, 4]);
-        faces.push([11, 10, 2]);
-        faces.push([10, 7, 6]);
-        faces.push([7, 1, 8]);
-
-        // 5 faces around point 3
-        faces.push([3, 9, 4]);
-        faces.push([3, 4, 2]);
-        faces.push([3, 2, 6]);
-        faces.push([3, 6, 8]);
-        faces.push([3, 8, 9]);
-
-        // 5 adjacent faces
-        faces.push([4, 9, 5]);
-        faces.push([2, 4, 11]);
-        faces.push([6, 2, 10]);
-        faces.push([8, 6, 7]);
-        faces.push([9, 8, 1]);
-
-        // refine triangles
-        for (let i = 0; i < this._level; i++) {
-            var faces2 = [];
-            for (let j = 0; j < faces.length; j++) {
-                let tri = faces[j];
-                // replace triangle by 4 triangles
-                var a = this._getMiddlePoint(tri[0], tri[1]);
-                var b = this._getMiddlePoint(tri[1], tri[2]);
-                var c = this._getMiddlePoint(tri[2], tri[0]);
-
-                faces2.push([tri[0], a, c]);
-                faces2.push([tri[1], b, a]);
-                faces2.push([tri[2], c, b]);
-                faces2.push([a, b, c]);
-            }
-            faces = faces2;
-        }
-
-        for (let i = 0; i < faces.length; i++) {
-            let tri = faces[i];
-            this._indexData.push(tri[0]);
-            this._indexData.push(tri[1]);
-            this._indexData.push(tri[2]);
-        }
-    }
-}
-
-export { Icosphere };

package/src/og/shapes/Sphere.js

@@ -1,100 +0,0 @@
-/**
- * @module og/shape/BaseShape
- */
-
-"use strict";
-
-import { BaseShape } from "./BaseShape.js";
-
-/**
- * @class
- * @extends {BaseShape}
- * @param {Object} options - Sphere parameters:
- * @param {Vec3} [options.position] - Sphere position.
- * @param {Quat} [options.orientation] - Sphere orientation(rotation).
- * @param {Vec3} [options.scale] - Scale vector.
- * @param {Array.<number>} [options.color] - Sphere RGBA color. (exactly 4 entries)
- * @param {string} [options.src] - Texture image url source.
- * @param {boolean} [options.visibility] - Sphere visibility.
- * @param {number} [options.radius=100] - Sphere radius.
- * @param {number} [options.latBands=16] - Number of latitude bands.
- * @param {number} [options.lonBands=16] - Number of longitude bands.
- */
-class Sphere extends BaseShape {
-    constructor(options) {
-        super(options);
-
-        /**
-         * Sphere radius.
-         * @protected
-         * @type {number}
-         */
-        this._radius = options.radius || 1;
-
-        /**
-         * Number of latitude bands.
-         * @protected
-         * @type {number}
-         */
-        this._latBands = options.latBands || 16;
-
-        /**
-         * Number of longitude bands.
-         * @protected
-         * @type {number}
-         */
-        this._lonBands = options.lonBands || 16;
-
-        //BUG: virtual method in constructor
-        this._createData();
-    }
-
-    /**
-     * Create specific shape vertices data.
-     * @protected
-     * @virtual
-     */
-    _createData() {
-        for (let latNumber = 0; latNumber <= this._latBands; latNumber++) {
-            var theta = (latNumber * Math.PI) / this._latBands;
-            var sinTheta = Math.sin(theta);
-            var cosTheta = Math.cos(theta);
-
-            for (let longNumber = 0; longNumber <= this._lonBands; longNumber++) {
-                var phi = (longNumber * 2 * Math.PI) / this._lonBands;
-                var sinPhi = Math.sin(phi);
-                var cosPhi = Math.cos(phi);
-                var x = cosPhi * sinTheta;
-                var y = cosTheta;
-                var z = sinPhi * sinTheta;
-                var u = 1 - longNumber / this._lonBands;
-                var v = latNumber / this._latBands;
-                this._normalData.push(x);
-                this._normalData.push(y);
-                this._normalData.push(z);
-                this._textureCoordData.push(u);
-                this._textureCoordData.push(v);
-                this._positionData.push(this._radius * x);
-                this._positionData.push(this._radius * y);
-                this._positionData.push(this._radius * z);
-            }
-        }
-
-        for (let latNumber = 0; latNumber < this._latBands; latNumber++) {
-            for (let longNumber = 0; longNumber < this._lonBands; longNumber++) {
-                var first = latNumber * (this._lonBands + 1) + longNumber;
-                var second = first + this._lonBands + 1;
-
-                this._indexData.push(first);
-                this._indexData.push(first + 1);
-                this._indexData.push(second);
-
-                this._indexData.push(second);
-                this._indexData.push(first + 1);
-                this._indexData.push(second + 1);
-            }
-        }
-    }
-}
-
-export { Sphere };

package/types/entity/ShapeHandler.d.ts

@@ -1,22 +0,0 @@
-export class ShapeHandler {
-    static set _staticCounter(arg: any);
-    static get _staticCounter(): any;
-    constructor(entityCollection: any);
-    /**
-     * Picking rendering option.
-     * @public
-     * @type {boolean}
-     */
-    public pickingEnabled: boolean;
-    _entityCollection: any;
-    _renderer: any;
-    _shapes: any[];
-    __staticId: number;
-    _initProgram(): void;
-    setRenderNode(renderNode: any): void;
-    add(shape: any): void;
-    remove(shape: any): void;
-    draw(): void;
-    drawPicking(): void;
-    clear(): void;
-}

package/types/shaders/shape.d.ts

@@ -1,4 +0,0 @@
-export function shape_wl(): Program;
-export function shape_nl(): Program;
-export function shape_picking(): Program;
-import { Program } from "../webgl/Program.js";

package/types/shapes/BaseShape.d.ts

@@ -1,250 +0,0 @@
-/**
- * Base geometry shape class.
- * @class
- * @param {Object} options - Shape parameters:
- * @param {Vec3} [options.position] - Shape position.
- * @param {Quat} [options.orientation] - Shape orientation(rotation).
- * @param {Vec3} [options.scale] - Scale vector.
- * @param {Array.<number>} [options.color] - Shape RGBA color. (exactly 4 entries)
- * @param {string} [options.src] - Texture image url source.
- * @param {boolean} [options.visibility] - Shape visibility.
- */
-export class BaseShape {
-    static set _staticCounter(arg: any);
-    static get _staticCounter(): any;
-    constructor(options: any);
-    /**
-     * Unic identifier.
-     * @public
-     * @readonly
-     * @type {number}
-     */
-    public readonly id: number;
-    /**
-     * Shape position.
-     * @public
-     * @type {Vec3}
-     */
-    public position: Vec3;
-    /**
-     * Shape orientation(rotation)
-     * @public
-     * @type {Quat}
-     */
-    public orientation: Quat;
-    /**
-     * Scale.
-     * @public
-     * @type {Vec3}
-     */
-    public scale: Vec3;
-    /**
-     * Shape RGBA color.
-     * @public
-     * @type {Array.<number>} - (exactly 4 entries)
-     */
-    public color: Array<number>;
-    /**
-     * Shape visibility.
-     * @public
-     * @type {boolean}
-     */
-    public visibility: boolean;
-    /**
-     * Image url source.
-     * @protected
-     * @type {string}
-     */
-    protected _src: string;
-    /**
-     * Vertices position gl buffer.
-     * @protected
-     */
-    protected _positionBuffer: any;
-    /**
-     * Vertices normal gl buffer.
-     * @protected
-     */
-    protected _normalBuffer: any;
-    /**
-     * Vertices indexes gl buffer.
-     * @protected
-     */
-    protected _indexBuffer: any;
-    /**
-     * Vertex texture coordinates gl buffer.
-     * @protected
-     */
-    protected _textureCoordBuffer: any;
-    /**
-     * Vertex positions.
-     * @protected
-     * @type {Array.<number>}
-     */
-    protected _positionData: Array<number>;
-    /**
-     * Vertex normals.
-     * @protected
-     * @type {Array.<number>}
-     */
-    protected _normalData: Array<number>;
-    /**
-     * Vertex indeces.
-     * @protected
-     * @type {Array.<number>}
-     */
-    protected _indexData: Array<number>;
-    /**
-     * Vertex texture coordinates.
-     * @protected
-     * @type {Array.<number>}
-     */
-    protected _textureCoordData: Array<number>;
-    /**
-     * Scale matrix.
-     * @protected
-     * @type {Mat4}
-     */
-    protected _mxScale: Mat4;
-    /**
-     * Translation matrix.
-     * @protected
-     * @type {Mat4}
-     */
-    protected _mxTranslation: Mat4;
-    /**
-     * Model matrix.
-     * @protected
-     * @type {Mat4}
-     */
-    protected _mxModel: Mat4;
-    /**
-     * Gl texture pointer.
-     * @protected
-     */
-    protected texture: any;
-    /**
-     * Assigned render node.
-     * @protected
-     * @type {RenderNode}
-     */
-    protected _renderNode: RenderNode;
-    /**
-     * Assigned picking color.
-     * @protected
-     * @type {Array.<number>} - (exactly 3 entries)
-     */
-    protected _pickingColor: Array<number>;
-    /**
-     * Entity instance that holds this shape.
-     * @protected
-     * @type {Entity}
-     */
-    protected _entity: Entity;
-    /**
-     * Handler that stores and renders this shape object.
-     * @protected
-     * @type {ShapeHandler}
-     */
-    protected _handler: ShapeHandler;
-    /**
-     * Shape handler array index.
-     * @protected
-     * @type {number}
-     */
-    protected _handlerIndex: number;
-    /**
-     * Clear shape parameters.
-     * @public
-     */
-    public clear(): void;
-    /**
-     * Sets shape color.
-     * @public
-     * @param {Array.<number>} color - RGBA color values array. (exactly 4 entries)
-     */
-    public setColor(color: Array<number>): void;
-    /**
-     * Sets shape color.
-     * @public
-     * @param {Vec4} color - RGBA color vector.
-     */
-    public setColor4v(color: Vec4): void;
-    /**
-     * Sets shape opacity value.
-     * @public
-     * @param {number} opacity - Opacity value.
-     */
-    public setOpacity(opacity: number): void;
-    /**
-     * Delete gl buffers.
-     * @protected
-     */
-    protected _deleteBuffers(): void;
-    /**
-     * Sets shape visibility.
-     * @public
-     * @param {boolean} visibility - Visibility.
-     */
-    public setVisibility(visibility: boolean): void;
-    /**
-     * Gets visibilty flag.
-     * @public
-     * @returns {boolean} -
-     */
-    public getVisibility(): boolean;
-    /**
-     * Assign render node.
-     * @public
-     * @param {RenderNode} renderNode - Render node to assign.
-     */
-    public setRenderNode(renderNode: RenderNode): void;
-    /**
-     * Sets shape position.
-     * @public
-     * @param {Vec3} position - Shape position.
-     */
-    public setPosition3v(position: Vec3): void;
-    /**
-     * Translate shape position to vector.
-     * @public
-     * @param {Vec3} vec - Translation vector.
-     */
-    public translate3v(vec: Vec3): void;
-    /**
-     * Sets shape scale.
-     * @param {Vec3} scale - Scale vector.
-     */
-    setScale3v(scale: Vec3): void;
-    setScale(scale: any): void;
-    /**
-     * Removes shape from shape handler.
-     * @public
-     */
-    public remove(): void;
-    /**
-     * Assign picking color.
-     * @protected
-     * @param {Vec3} color - Picking RGB color.
-     */
-    protected setPickingColor3v(color: Vec3): void;
-    /**
-     * Creates buffers.
-     * @protected
-     */
-    protected _createBuffers(): void;
-    /**
-     * Update model matrix.
-     * @public
-     */
-    public refresh(): void;
-    /**
-     * Shape rendering.
-     * @public
-     */
-    public draw(): void;
-    drawPicking(): void;
-}
-import { Vec3 } from "../math/Vec3.js";
-import { Quat } from "../math/Quat.js";
-import { Mat4 } from "../math/Mat4.js";

package/types/shapes/Sphere.d.ts

@@ -1,41 +0,0 @@
-/**
- * @class
- * @extends {BaseShape}
- * @param {Object} options - Sphere parameters:
- * @param {Vec3} [options.position] - Sphere position.
- * @param {Quat} [options.orientation] - Sphere orientation(rotation).
- * @param {Vec3} [options.scale] - Scale vector.
- * @param {Array.<number>} [options.color] - Sphere RGBA color. (exactly 4 entries)
- * @param {string} [options.src] - Texture image url source.
- * @param {boolean} [options.visibility] - Sphere visibility.
- * @param {number} [options.radius=100] - Sphere radius.
- * @param {number} [options.latBands=16] - Number of latitude bands.
- * @param {number} [options.lonBands=16] - Number of longitude bands.
- */
-export class Sphere extends BaseShape {
-    /**
-     * Sphere radius.
-     * @protected
-     * @type {number}
-     */
-    protected _radius: number;
-    /**
-     * Number of latitude bands.
-     * @protected
-     * @type {number}
-     */
-    protected _latBands: number;
-    /**
-     * Number of longitude bands.
-     * @protected
-     * @type {number}
-     */
-    protected _lonBands: number;
-    /**
-     * Create specific shape vertices data.
-     * @protected
-     * @virtual
-     */
-    protected _createData(): void;
-}
-import { BaseShape } from "./BaseShape.js";