@openglobus/og 0.16.3 → 0.17.0

package/src/og/scene/SkyBox.js

@@ -1,108 +1,104 @@
-/**
- * @module og/scene/SkyBox
- */
-
-'use strict';
-
-import * as shaders from '../shaders/skybox.js';
-import { RenderNode } from './RenderNode.js';
-
-class SkyBox extends RenderNode {
-    constructor(params) {
-        super("skybox");
-        this.params = params;
-        this.vertexPositionBuffer = null;
-        this.texture = null;
-    }
-
-    static createDefault(RESOURCES_URL) {
-        return new SkyBox({
-            nx: RESOURCES_URL + "skybox/gal/_nx.jpg",
-            px: RESOURCES_URL + "skybox/gal/_px.jpg",
-            py: RESOURCES_URL + "skybox/gal/_py.jpg",
-            ny: RESOURCES_URL + "skybox/gal/_ny.jpg",
-            pz: RESOURCES_URL + "skybox/gal/_pz.jpg",
-            nz: RESOURCES_URL + "skybox/gal/_nz.jpg"
-        });
-    }
-
-    init() {
-        this.renderer.handler.addProgram(shaders.skybox(), true);
-        this.texture = this.renderer.handler.loadCubeMapTexture(this.params);
-        this._createBuffers();
-        this.drawMode = this.renderer.handler.gl.TRIANGLES;
-    }
-
-    frame() {
-        var h = this.renderer.handler;
-        var gl = h.gl;
-        var cam = this.renderer.activeCamera;
-        gl.disable(h.gl.DEPTH_TEST);
-
-        h.programs.skybox.activate();
-        var sh = h.programs.skybox._program;
-        var shu = sh.uniforms;
-        gl.uniformMatrix4fv(shu.projectionViewMatrix, false, cam.getProjectionViewMatrix());
-        gl.uniform3fv(shu.pos, cam.eye.toVec());
-        gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_CUBE_MAP, this.texture);
-        gl.uniform1i(shu.uSampler, 0);
-        var buf = this.vertexPositionBuffer;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buf);
-        gl.vertexAttribPointer(sh.attributes.aVertexPosition, buf.itemSize, gl.FLOAT, false, 0, 0);
-
-        gl.drawArrays(this.drawMode, 0, buf.numItems);
-        h.gl.enable(h.gl.DEPTH_TEST);
-    }
-
-    _createBuffers() {
-
-        var vertices = new Float32Array([
-            -100000000.0, 100000000.0, -100000000.0,
-            -100000000.0, -100000000.0, -100000000.0,
-            100000000.0, -100000000.0, -100000000.0,
-            100000000.0, -100000000.0, -100000000.0,
-            100000000.0, 100000000.0, -100000000.0,
-            -100000000.0, 100000000.0, -100000000.0,
-
-            -100000000.0, -100000000.0, 100000000.0,
-            -100000000.0, -100000000.0, -100000000.0,
-            -100000000.0, 100000000.0, -100000000.0,
-            -100000000.0, 100000000.0, -100000000.0,
-            -100000000.0, 100000000.0, 100000000.0,
-            -100000000.0, -100000000.0, 100000000.0,
-
-            100000000.0, -100000000.0, -100000000.0,
-            100000000.0, -100000000.0, 100000000.0,
-            100000000.0, 100000000.0, 100000000.0,
-            100000000.0, 100000000.0, 100000000.0,
-            100000000.0, 100000000.0, -100000000.0,
-            100000000.0, -100000000.0, -100000000.0,
-
-            -100000000.0, -100000000.0, 100000000.0,
-            -100000000.0, 100000000.0, 100000000.0,
-            100000000.0, 100000000.0, 100000000.0,
-            100000000.0, 100000000.0, 100000000.0,
-            100000000.0, -100000000.0, 100000000.0,
-            -100000000.0, -100000000.0, 100000000.0,
-
-            -100000000.0, 100000000.0, -100000000.0,
-            100000000.0, 100000000.0, -100000000.0,
-            100000000.0, 100000000.0, 100000000.0,
-            100000000.0, 100000000.0, 100000000.0,
-            -100000000.0, 100000000.0, 100000000.0,
-            -100000000.0, 100000000.0, -100000000.0,
-
-            -100000000.0, -100000000.0, -100000000.0,
-            -100000000.0, -100000000.0, 100000000.0,
-            100000000.0, -100000000.0, -100000000.0,
-            100000000.0, -100000000.0, -100000000.0,
-            -100000000.0, -100000000.0, 100000000.0,
-            100000000.0, -100000000.0, 100000000.0
-        ]);
-
-        this.vertexPositionBuffer = this.renderer.handler.createArrayBuffer(vertices, 3, vertices.length / 3);
-    }
-}
-
-export { SkyBox };
+'use strict';
+
+import * as shaders from '../shaders/skybox.js';
+import { RenderNode } from './RenderNode.js';
+
+class SkyBox extends RenderNode {
+    constructor(params) {
+        super("skybox");
+        this.params = params;
+        this.vertexPositionBuffer = null;
+        this.texture = null;
+    }
+
+    static createDefault(RESOURCES_URL) {
+        return new SkyBox({
+            nx: RESOURCES_URL + "skybox/gal/_nx.jpg",
+            px: RESOURCES_URL + "skybox/gal/_px.jpg",
+            py: RESOURCES_URL + "skybox/gal/_py.jpg",
+            ny: RESOURCES_URL + "skybox/gal/_ny.jpg",
+            pz: RESOURCES_URL + "skybox/gal/_pz.jpg",
+            nz: RESOURCES_URL + "skybox/gal/_nz.jpg"
+        });
+    }
+
+    init() {
+        this.renderer.handler.addProgram(shaders.skybox(), true);
+        this.texture = this.renderer.handler.loadCubeMapTexture(this.params);
+        this._createBuffers();
+        this.drawMode = this.renderer.handler.gl.TRIANGLES;
+    }
+
+    frame() {
+        var h = this.renderer.handler;
+        var gl = h.gl;
+        var cam = this.renderer.activeCamera;
+        gl.disable(h.gl.DEPTH_TEST);
+
+        h.programs.skybox.activate();
+        var sh = h.programs.skybox._program;
+        var shu = sh.uniforms;
+        gl.uniformMatrix4fv(shu.projectionViewMatrix, false, cam.getProjectionViewMatrix());
+        gl.uniform3fv(shu.pos, cam.eye.toVec());
+        gl.activeTexture(gl.TEXTURE0);
+        gl.bindTexture(gl.TEXTURE_CUBE_MAP, this.texture);
+        gl.uniform1i(shu.uSampler, 0);
+        var buf = this.vertexPositionBuffer;
+        gl.bindBuffer(gl.ARRAY_BUFFER, buf);
+        gl.vertexAttribPointer(sh.attributes.aVertexPosition, buf.itemSize, gl.FLOAT, false, 0, 0);
+
+        gl.drawArrays(this.drawMode, 0, buf.numItems);
+        h.gl.enable(h.gl.DEPTH_TEST);
+    }
+
+    _createBuffers() {
+
+        var vertices = new Float32Array([
+            -100000000.0, 100000000.0, -100000000.0,
+            -100000000.0, -100000000.0, -100000000.0,
+            100000000.0, -100000000.0, -100000000.0,
+            100000000.0, -100000000.0, -100000000.0,
+            100000000.0, 100000000.0, -100000000.0,
+            -100000000.0, 100000000.0, -100000000.0,
+
+            -100000000.0, -100000000.0, 100000000.0,
+            -100000000.0, -100000000.0, -100000000.0,
+            -100000000.0, 100000000.0, -100000000.0,
+            -100000000.0, 100000000.0, -100000000.0,
+            -100000000.0, 100000000.0, 100000000.0,
+            -100000000.0, -100000000.0, 100000000.0,
+
+            100000000.0, -100000000.0, -100000000.0,
+            100000000.0, -100000000.0, 100000000.0,
+            100000000.0, 100000000.0, 100000000.0,
+            100000000.0, 100000000.0, 100000000.0,
+            100000000.0, 100000000.0, -100000000.0,
+            100000000.0, -100000000.0, -100000000.0,
+
+            -100000000.0, -100000000.0, 100000000.0,
+            -100000000.0, 100000000.0, 100000000.0,
+            100000000.0, 100000000.0, 100000000.0,
+            100000000.0, 100000000.0, 100000000.0,
+            100000000.0, -100000000.0, 100000000.0,
+            -100000000.0, -100000000.0, 100000000.0,
+
+            -100000000.0, 100000000.0, -100000000.0,
+            100000000.0, 100000000.0, -100000000.0,
+            100000000.0, 100000000.0, 100000000.0,
+            100000000.0, 100000000.0, 100000000.0,
+            -100000000.0, 100000000.0, 100000000.0,
+            -100000000.0, 100000000.0, -100000000.0,
+
+            -100000000.0, -100000000.0, -100000000.0,
+            -100000000.0, -100000000.0, 100000000.0,
+            100000000.0, -100000000.0, -100000000.0,
+            100000000.0, -100000000.0, -100000000.0,
+            -100000000.0, -100000000.0, 100000000.0,
+            100000000.0, -100000000.0, 100000000.0
+        ]);
+
+        this.vertexPositionBuffer = this.renderer.handler.createArrayBuffer(vertices, 3, vertices.length / 3);
+    }
+}
+
+export { SkyBox };

package/src/og/segment/Segment.js

@@ -251,11 +251,15 @@ class Segment {
      * @returns {Vec3} -
      */
     getEntityTerrainPoint(entity, res) {
-        return this.getTerrainPoint(entity._cartesian, entity._lonlatMerc, res);
+        return this.getTerrainPoint(entity._cartesian, this.getInsideLonLat(entity), res);
     }
 
-    isEntityInside(e) {
-        return this._extentLonLat.isInside(e._lonlat);
+    getInsideLonLat(obj) {
+        return obj._lonLatMerc;
+    }
+
+    isEntityInside(entity) {
+        return this._extentLonLat.isInside(entity._lonLat);
     }
 
     /**
@@ -263,7 +267,7 @@ class Segment {
      * @public
      * @param {Vec3} xyz - Cartesian object position.
      * @param {LonLat} insideSegmentPosition - Geodetic object position.
-     * @param {Vec3} [res] - Result cartesian coordiantes on the terrain.
+     * @param {Vec3} [res] - Result cartesian coordinates on the terrain.
      * @param {Vec3} [normal] - Terrain point normal.
      * @returns {number} -
      */

package/src/og/segment/SegmentLonLat.js

@@ -58,12 +58,8 @@ class SegmentLonLat extends Segment {
         return coords;
     }
 
-    getTerrainPoint(xyz, insideSegmentPosition, res, normal) {
-        res.copy(this.planet.ellipsoid.hitRay(xyz, xyz.negateTo().normalize()));
-        if (normal) {
-            normal.copy(res.normal());
-        }
-        return xyz.length() - res.length();
+    getInsideLonLat(obj) {
+        return obj._lonLat;
     }
 
     _getMaxZoom() {