@openglobus/og 0.16.3 → 0.17.1

package/src/og/control/ShowFps.js

@@ -1,44 +1,40 @@
-/**
- * @module og/control/ShowFps
- */
-
-"use strict";
-
-import { print2d } from "../utils/shared.js";
-import { Control } from "./Control.js";
-
-/**
- * Frame per second(FPS) display control.
- * @class
- * @extends {Control}
- * @param {Object} [options] - Control options.
- */
-class ShowFps extends Control {
-    constructor(options) {
-        super(options);
-    }
-
-    oninit() {
-        var d = document.createElement("div");
-        d.className = "defaultText ";
-        d.id = "ogShowFpsControl";
-        document.body.appendChild(d);
-        this.renderer.events.on("draw", this._draw, this);
-    }
-
-    _draw() {
-        print2d(
-            "ogShowFpsControl",
-            (1000.0 / this.renderer.handler.deltaTime).toFixed(1),
-            this.renderer.handler.canvas.clientWidth - 60,
-            0
-        );
-    }
-}
-
-export function showFps(options) {
-    return new ShowFps(options);
-}
-
-export { ShowFps };
-
+"use strict";
+
+import { print2d } from "../utils/shared.js";
+import { Control } from "./Control.js";
+
+/**
+ * Frame per second(FPS) display control.
+ * @class
+ * @extends {Control}
+ * @param {Object} [options] - Control options.
+ */
+class ShowFps extends Control {
+    constructor(options) {
+        super(options);
+    }
+
+    oninit() {
+        var d = document.createElement("div");
+        d.className = "defaultText ";
+        d.id = "ogShowFpsControl";
+        document.body.appendChild(d);
+        this.renderer.events.on("draw", this._draw, this);
+    }
+
+    _draw() {
+        print2d(
+            "ogShowFpsControl",
+            (1000.0 / this.renderer.handler.deltaTime).toFixed(1),
+            this.renderer.handler.canvas.clientWidth - 60,
+            0
+        );
+    }
+}
+
+export function showFps(options) {
+    return new ShowFps(options);
+}
+
+export { ShowFps };
+

package/src/og/control/SimpleNavigation.js

@@ -35,7 +35,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var camera = this.camera;
             camera.slide(0, 0, -this.speed);
-            //camera.update();
+            camera.update();
         }
     }
 
@@ -43,7 +43,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var camera = this.camera;
             camera.slide(0, 0, this.speed);
-            //camera.update();
+            camera.update();
         }
     }
 
@@ -51,7 +51,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var camera = this.camera;
             camera.slide(-this.speed, 0, 0);
-            //camera.update();
+            camera.update();
         }
     }
 
@@ -59,7 +59,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var camera = this.camera;
             camera.slide(this.speed, 0, 0);
-            //camera.update();
+            camera.update();
         }
     }
 
@@ -67,7 +67,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.pitch(0.5);
-            //cam.update();
+            cam.update();
         }
     }
 
@@ -75,7 +75,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.pitch(-0.5);
-            //cam.update();
+            cam.update();
         }
     }
 
@@ -83,7 +83,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.yaw(0.5);
-            //cam.update();
+            cam.update();
         }
     }
 
@@ -91,7 +91,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.yaw(-0.5);
-            //cam.update();
+            cam.update();
         }
     }
 
@@ -99,7 +99,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.roll(-0.5);
-            //cam.update();
+            cam.update();
         }
     }
 
@@ -107,7 +107,7 @@ class SimpleNavigation extends Control {
         if (this._active) {
             var cam = this.camera;
             cam.roll(0.5);
-            //cam.update();
+            cam.update();
         }
     }
 }

package/src/og/control/SimpleSkyBackground.js

@@ -1,7 +1,3 @@
-/**
- * @module og/control/SimpleSkyBackground
- */
-
 "use strict";
 
 import { htmlColorToRgb } from "../utils/shared.js";

package/src/og/control/Sun.js

@@ -1,7 +1,3 @@
-/**
- * @module og/control/Sun
- */
-
 "use strict";
 
 import { getSunPosition } from "../astro/earth.js";

package/src/og/control/ToggleWireframe.js

@@ -1,39 +1,35 @@
-/**
- * @module og/control/ToggleWireframe
- */
-
-"use strict";
-
-import { input } from "../input/input.js";
-import { Control } from "./Control.js";
-
-/**
- * Planet GL draw mode(TRIANGLE_STRIP/LINE_STRING) changer.
- * @class
- * @extends {Control}
- * @param {Object} [options] - Control options.
- */
-class ToggleWireframe extends Control {
-    constructor(options = {}) {
-        super(options);
-        this._isActive = options.isActive || false;
-    }
-
-    oninit() {
-        this.renderer.events.on("charkeypress", input.KEY_X, this.toogleWireframe, this);
-        if (this._isActive) {
-            this.planet.setDrawMode(this.renderer.handler.gl.LINE_STRIP);
-        }
-    }
-
-    toogleWireframe(e) {
-        if (this.planet.drawMode === this.renderer.handler.gl.LINE_STRIP) {
-            this.planet.setDrawMode(this.renderer.handler.gl.TRIANGLE_STRIP);
-        } else {
-            this.planet.setDrawMode(this.renderer.handler.gl.LINE_STRIP);
-        }
-    }
-}
-
-export { ToggleWireframe };
-
+"use strict";
+
+import { input } from "../input/input.js";
+import { Control } from "./Control.js";
+
+/**
+ * Planet GL draw mode(TRIANGLE_STRIP/LINE_STRING) changer.
+ * @class
+ * @extends {Control}
+ * @param {Object} [options] - Control options.
+ */
+class ToggleWireframe extends Control {
+    constructor(options = {}) {
+        super(options);
+        this._isActive = options.isActive || false;
+    }
+
+    oninit() {
+        this.renderer.events.on("charkeypress", input.KEY_X, this.toogleWireframe, this);
+        if (this._isActive) {
+            this.planet.setDrawMode(this.renderer.handler.gl.LINE_STRIP);
+        }
+    }
+
+    toogleWireframe(e) {
+        if (this.planet.drawMode === this.renderer.handler.gl.LINE_STRIP) {
+            this.planet.setDrawMode(this.renderer.handler.gl.TRIANGLE_STRIP);
+        } else {
+            this.planet.setDrawMode(this.renderer.handler.gl.LINE_STRIP);
+        }
+    }
+}
+
+export { ToggleWireframe };
+

package/src/og/control/ZoomControl.js

@@ -1,7 +1,3 @@
-/**
- * @module og/control/ZoomControl
- */
-
 "use strict";
 
 import { Key } from "../Lock.js";

package/src/og/control/drawing/DrawingControl.js

@@ -0,0 +1,51 @@
+"use strict";
+
+import { Control } from "../Control.js";
+import { PolygonDrawingScene } from "./PolygonDrawingScene.js";
+import { LineStringDrawingScene } from "./LineStringDrawingScene.js";
+
+/**
+ * Activate drawing
+ * @class
+ * @extends {Control}
+ * @param {Object} [options] - Control options.
+ */
+class DrawingControl extends Control {
+    constructor(options = {}) {
+        super(options);
+
+        this._drawingScene = new LineStringDrawingScene({
+            name: `drawingScene:${this._id}`
+        });
+    }
+
+    activatePolygonDrawing(){
+        this.deactivate();
+        this._drawingScene = new PolygonDrawingScene({
+            name: `drawingScene:${this._id}`
+        });
+        this.activate();
+    }
+
+    activateLineStringDrawing() {
+        this.deactivate();
+        this._drawingScene = new LineStringDrawingScene({
+            name: `drawingScene:${this._id}`
+        });
+        this.activate();
+    }
+
+    oninit() {
+    }
+
+    onactivate() {
+        this._drawingScene.bindPlanet(this.planet);
+        this.renderer.addNode(this._drawingScene);
+    }
+
+    ondeactivate() {
+        this.renderer.removeNode(this._drawingScene);
+    }
+}
+
+export { DrawingControl };

package/src/og/control/drawing/LineStringDrawingScene.js

@@ -0,0 +1,203 @@
+import {
+    OUTLINE_ALT,
+    CORNER_OPTIONS,
+    NUM_SEGMENTS,
+    OUTLINE_OPTIONS,
+    CENTER_OPTIONS,
+    PolygonDrawingScene
+} from "./PolygonDrawingScene.js";
+import { Entity } from "../../entity/Entity.js";
+import { Line3, Vec2, Vec3 } from "../../math/index.js";
+import * as math from "../../math.js";
+import { GeometryType } from "../../entity/Geometry.js";
+
+class LineStringDrawingScene extends PolygonDrawingScene {
+    constructor(props) {
+        super(props);
+    }
+
+    get geometryType() {
+        return "LineString";
+    }
+
+    _addNew(cart) {
+        this._appendCart(cart);
+    }
+
+    _appendCart(cart) {
+        let corners = this._cornerLayer.getEntities();
+
+        let segNum = corners.length - 1;
+        let prevCorn = corners[segNum];
+
+        let corner = new Entity({
+            geoObject: CORNER_OPTIONS,
+        });
+
+        corner.setCartesian3v(cart);
+        corner.addTo(this._cornerLayer);
+        this._checkTerrainCollision(corner);
+
+        if (prevCorn) {
+
+            let prevCart = prevCorn.getCartesian();
+
+            let vecPrev = corner.getCartesian().sub(prevCart);
+
+            let distPrev = vecPrev.length();
+
+            vecPrev.normalize();
+
+            let prevPath = [];
+
+            for (let i = 0; i <= NUM_SEGMENTS; i++) {
+                let p = vecPrev.scaleTo(i * distPrev / NUM_SEGMENTS).addA(prevCart);
+                prevPath.push(p);
+            }
+
+            let entity = new Entity({
+                polyline: {
+                    path3v: [prevPath],
+                    isClosed: false,
+                    properties: {
+                        index: segNum + 1
+                    },
+                    ...OUTLINE_OPTIONS
+                }
+            });
+            entity.polyline.altitude = OUTLINE_ALT;
+            this._outlineLayer.add(entity);
+
+            let prevCenterCart = vecPrev.scaleTo(distPrev * 0.5).addA(prevCart);
+
+            let center = new Entity({
+                geoObject: CENTER_OPTIONS,
+            });
+            center.setCartesian3v(prevCenterCart);
+            center.addTo(this._centerLayer);
+            this._checkTerrainCollision(center);
+
+        }
+    }
+
+    _clearGhostPointer() {
+        this._ghostOutlineLayer.getEntities()[0].polyline.clear();
+    }
+
+    _moveCorner(indexCurrent, indexPrev, indexCenter) {
+        let corners = this._cornerLayer.getEntities();
+        if (corners.length == 0) return;
+        if (corners.length == 1) {
+            indexCurrent = indexPrev = indexCenter = 0;
+        }
+        let cartCurr = corners[indexCurrent].getCartesian();
+        let vecCurr = this._pickedCorner.getCartesian().sub(cartCurr);
+        let distCurr = vecCurr.length();
+        vecCurr.normalize();
+
+        let path = [];
+        for (let i = 0; i <= NUM_SEGMENTS; i++) {
+            let p = vecCurr.scaleTo(i * distCurr / NUM_SEGMENTS).addA(cartCurr);
+            path.push(p);
+        }
+
+        let entities = this._outlineLayer.getEntities();
+
+        let prevPolyline = entities[indexPrev].polyline;
+
+        prevPolyline.setPath3v([path]);
+
+        //
+        // Move center points
+        let centers = this._centerLayer.getEntities();
+        let center = centers[indexCenter];
+
+        if (center) {
+            let centerCart = vecCurr.scaleTo(distCurr * 0.5).addA(cartCurr);
+            center.setCartesian3v(centerCart);
+            this._checkTerrainCollision(center);
+        }
+    }
+
+    _moveCornerPoint(e) {
+        let d = new Vec2(e.x, e.y).sub(this._startClick),
+            p = this._startPos.add(d);
+
+        let groundCoords = this._planet.getCartesianFromPixelTerrain(p);
+
+        if (groundCoords) {
+
+            this._pickedCorner.setCartesian3v(groundCoords);
+
+            let corners = this._cornerLayer.getEntities();
+
+            if (corners.length) {
+                let ind = this._pickedCorner.layerIndex;
+                let size = corners.length;
+
+                if (ind === 0) {
+                    this._moveCorner(ind + 1, ind + 1, ind);
+                } else if (ind === corners.length - 1) {
+                    this._moveCorner(ind - 1, ind, ind - 1);
+                } else {
+                    this._moveCorner(ind + 1, ind + 1, ind);
+                    this._moveCorner(ind - 1, ind, ind - 1);
+                }
+            }
+        }
+    }
+
+    _updateGhostOutlinePointer(groundPos) {
+
+        let corners = this._cornerLayer.getEntities();
+        let size = corners.length;
+
+        if (size > 0) {
+
+            let ind = size - 1;
+
+            this._insertCornerIndex = ind;
+
+            let cartPrev = corners[ind].getCartesian();
+
+            let vecPrev = this._ghostCorner.getCartesian().sub(cartPrev);
+
+            let distPrev = vecPrev.length();
+
+            vecPrev.normalize();
+
+            let pathPrev = [];
+
+            for (let i = 0; i <= NUM_SEGMENTS; i++) {
+                let p = vecPrev.scaleTo(i * distPrev / NUM_SEGMENTS).addA(cartPrev);
+                pathPrev.push(p);
+            }
+
+            let entities = this._ghostOutlineLayer.getEntities();
+
+            let prevPolyline = entities[0].polyline;
+
+            prevPolyline.setPath3v([pathPrev]);
+        }
+    }
+
+    _initGhostLayerPointer() {
+        this._ghostOutlineLayer.setEntities([
+            new Entity({
+                polyline: {
+                    path3v: [],
+                    isClosed: false,
+                    ...OUTLINE_OPTIONS
+                },
+                properties: {
+                    index: 0
+                }
+            }),
+            this._ghostCorner
+        ]);
+
+        this._ghostOutlineLayer.getEntities()[0].polyline.altitude = OUTLINE_ALT;
+    }
+}
+
+export { LineStringDrawingScene };