@openglobus/og 0.20.3 → 0.20.4

package/lib/js/shaders/geoObject.js

@@ -1,4 +1,7 @@
 import { Program } from "../webgl/Program";
+const QROT = `vec3 qRotate(vec4 q, vec3 v){
+    return v + 2.0 * cross(q.xyz, cross(q.xyz, v) + q.w * v);
+}`;
 export const geo_object = () => new Program("geo_object", {
     uniforms: {
         viewMatrix: "mat4",
@@ -10,7 +13,8 @@ export const geo_object = () => new Program("geo_object", {
         lightsParamsv: "vec3",
         lightsParamsf: "float",
         uTexture: "sampler2d",
-        uUseTexture: "float"
+        uUseTexture: "float",
+        useLighting: "float"
     },
     attributes: {
         aVertexPosition: "vec3",
@@ -18,11 +22,10 @@ export const geo_object = () => new Program("geo_object", {
         aTexCoord: "vec2",
         aPositionHigh: { type: "vec3", divisor: 1 },
         aPositionLow: { type: "vec3", divisor: 1 },
-        aDirection: { type: "vec3", divisor: 1 },
-        aPitchRoll: { type: "vec2", divisor: 1 },
         aColor: { type: "vec4", divisor: 1 },
         aScale: { type: "vec3", divisor: 1 },
-        aDispose: { type: "float", divisor: 1 }
+        aDispose: { type: "float", divisor: 1 },
+        qRot: { type: "vec4", divisor: 1 }
     },
     vertexShader: `precision highp float;
             
@@ -30,13 +33,12 @@ export const geo_object = () => new Program("geo_object", {
             attribute vec3 aVertexNormal; 
             attribute vec3 aPositionHigh;
             attribute vec3 aPositionLow;    
-            attribute vec3 aDirection;
-            attribute vec2 aPitchRoll;
             attribute vec4 aColor;
             attribute vec3 aScale;
             attribute float aDispose;
             attribute float aUseTexture;
             attribute vec2 aTexCoord;
+            attribute vec4 qRot;
             
             uniform vec3 uScaleByDistance;
             uniform mat4 projectionMatrix;
@@ -51,11 +53,8 @@ export const geo_object = () => new Program("geo_object", {
             varying vec4 vColor;
             varying float vDispose;
             varying vec2 vTexCoords;
-            //varying float useLighting;
             
-            const float PI = 3.141592653589793;
-            
-            const float RADIANS = PI / 180.0;
+            ${QROT}
            
             void main(void) {
                         
@@ -69,43 +68,16 @@ export const geo_object = () => new Program("geo_object", {
                 vec3 look = cameraPosition - position;
                 float lookLength = length(look);
 
-                // useLighting = 1.0;                
-                // if(lookLength > 2000000.0){
-                //      useLighting = 0.0;
-                // }
-
-            
                 vColor = aColor;
                 vTexCoords = aTexCoord;
               
-                float cos_roll = cos(aPitchRoll.y);
-                float sin_roll = sin(aPitchRoll.y);
-                
-                mat3 rotZ = mat3(
-                     vec3(cos_roll, sin_roll, 0.0),
-                     vec3(-sin_roll, cos_roll, 0.0), 
-                     vec3(0.0, 0.0, 1.0) 
-                );
-
-                float cos_pitch = cos(aPitchRoll.x);
-                float sin_pitch = sin(aPitchRoll.x);
-
-                mat3 rotX = mat3(
-                    vec3(1.0, 0.0, 0.0),
-                    vec3(0.0, cos_pitch, sin_pitch), 
-                    vec3(0.0, -sin_pitch, cos_pitch) 
-               );
-
-                vec3 r = cross(normalize(-position), aDirection);
-                mat3 modelMatrix = mat3(r, normalize(position), -aDirection) * rotX * rotZ;
-
                 mat4 viewMatrixRTE = viewMatrix;
                 viewMatrixRTE[3] = vec4(0.0, 0.0, 0.0, 1.0);
 
                 vec3 highDiff = aPositionHigh - eyePositionHigh;
                 vec3 lowDiff = aPositionLow - eyePositionLow;
              
-                vNormal = modelMatrix * aVertexNormal;
+                vNormal = qRotate(qRot, aVertexNormal);
                                
                 // if(lookLength > uScaleByDistance[1])
                 // {
@@ -116,9 +88,10 @@ export const geo_object = () => new Program("geo_object", {
                 //     scd = lookLength / uScaleByDistance[0];
                 // }
                 // ... is the same math
+                // use scaleByDistance: [1.0, 1.0, 1.0] for real sized objects 
                 float scd = uScaleByDistance[2] * clamp(lookLength, uScaleByDistance[0], uScaleByDistance[1]) / uScaleByDistance[0];
                 
-                vec3 vert = modelMatrix * (aVertexPosition * aScale) * scd;
+                vec3 vert = qRotate(qRot, (aVertexPosition * aScale)) * scd;
                 
                 vert += lowDiff;
                                
@@ -135,19 +108,19 @@ export const geo_object = () => new Program("geo_object", {
                 uniform float lightsParamsf[MAX_POINT_LIGHTS];
                 uniform sampler2D uTexture;
                 uniform float uUseTexture;
+                uniform float useLighting;                
                             
                 varying vec3 cameraPosition;
                 varying vec3 v_vertex;                
                 varying vec4 vColor;
                 varying vec3 vNormal;
                 varying vec2 vTexCoords;
-                //varying float useLighting;
                 
                 void main(void) {        
                                         
                     vec3 lightWeighting = vec3(1.0);
                 
-                    //if(useLighting != 0.0){
+                    if(useLighting != 0.0){
                         vec3 normal = normalize(vNormal);
                         vec3 lightDir = normalize(lightsPositions[0]);
                         vec3 viewDir = normalize(cameraPosition - v_vertex);                
@@ -156,7 +129,7 @@ export const geo_object = () => new Program("geo_object", {
                         float specularLightWeighting = pow( reflection, lightsParamsf[0]);                                        
                         float diffuseLightWeighting = max(dot(normal, lightDir), 0.0);
                         lightWeighting = lightsParamsv[0] + lightsParamsv[1] * diffuseLightWeighting + lightsParamsv[2] * specularLightWeighting;
-                    //}
+                    }
                                        
                     if(uUseTexture > 0.0) {
                         vec4 tColor = texture2D(uTexture, vTexCoords);
@@ -179,22 +152,20 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
         aVertexPosition: "vec3",
         aPositionHigh: { type: "vec3", divisor: 1 },
         aPositionLow: { type: "vec3", divisor: 1 },
-        aDirection: { type: "vec3", divisor: 1 },
-        aPitchRoll: { type: "vec2", divisor: 1 },
         aPickingColor: { type: "vec3", divisor: 1 },
         aScale: { type: "vec3", divisor: 1 },
-        aDispose: { type: "float", divisor: 1 }
+        aDispose: { type: "float", divisor: 1 },
+        qRot: { type: "vec4", divisor: 1 }
     },
     vertexShader: `precision highp float;
 
             attribute vec3 aVertexPosition;
             attribute vec3 aPositionHigh;
-            attribute vec3 aPositionLow;    
-            attribute vec3 aDirection;
-            attribute vec3 aPickingColor;
-            attribute vec2 aPitchRoll;
+            attribute vec3 aPositionLow;
+            attribute vec3 aPickingColor;    
             attribute vec3 aScale;
             attribute float aDispose;
+            attribute vec4 qRot;
             
             uniform vec3 eyePositionHigh;
             uniform vec3 eyePositionLow;
@@ -205,7 +176,7 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
 
             varying vec3 vColor;
             
-            const float RADIANS = 3.141592653589793 / 180.0;
+            ${QROT}
 
             void main(void) {
 
@@ -214,29 +185,9 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
                  }
             
                  vColor = aPickingColor;
-               
-                float cos_roll = cos(aPitchRoll.y);
-                float sin_roll = sin(aPitchRoll.y);
                 
-                mat3 rotZ = mat3(
-                     vec3(cos_roll, sin_roll, 0.0),
-                     vec3(-sin_roll, cos_roll, 0.0), 
-                     vec3(0.0, 0.0, 1.0) 
-                );
-
-                float cos_pitch = cos(aPitchRoll.x);
-                float sin_pitch = sin(aPitchRoll.x);
-
-                mat3 rotX = mat3(
-                    vec3(1.0, 0.0, 0.0),
-                    vec3(0.0, cos_pitch, sin_pitch), 
-                    vec3(0.0, -sin_pitch, cos_pitch) 
-               );
- 
                  vec3 position = aPositionHigh + aPositionLow;
                  vec3 cameraPosition = eyePositionHigh + eyePositionLow;
-                 vec3 r = cross(normalize(-position), aDirection);
-                 mat3 modelMatrix = mat3(r, normalize(position), -aDirection) * rotX * rotZ;
  
                  mat4 viewMatrixRTE = viewMatrix;
                  viewMatrixRTE[3] = vec4(0.0, 0.0, 0.0, 1.0);
@@ -261,7 +212,7 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
                  // tays in the vert above it affects on Mac Safari jitter
                  float scd = pickingScale * uScaleByDistance[2] * clamp(lookLength, uScaleByDistance[0], uScaleByDistance[1]) / uScaleByDistance[0];
 
-                 vec3 vert = modelMatrix * (aVertexPosition * aScale) * scd;
+                 vec3 vert = qRotate(qRot, (aVertexPosition * aScale)) * scd;
                  
                  vert += lowDiff;
                                 

package/lib/js/terrain/GlobusRgbTerrain.js

@@ -7,14 +7,14 @@ const urlPref = {
 const urlRewriteFunc = (tileX, tileY, tileZoom, tileGroup) => {
     let g = urlPref[tileGroup];
     if (g)
-        return `https://terrain.openglobus.org/public/poles/${g}/${tileZoom}/${tileX}/${tileY}.png`;
+        return `https://terrain.openglobus.org/poles/${g}/${tileZoom}/${tileX}/${tileY}.png`;
 };
 export class GlobusRgbTerrain extends RgbTerrain {
     constructor(name, options) {
         super(name || "GlobusEarthRgb", {
             maxNativeZoom: 6,
             maxZoom: 17,
-            url: "https://{s}.terrain.openglobus.org/public/all/{z}/{x}/{y}.png",
+            url: "https://{s}.terrain.openglobus.org/all/{z}/{x}/{y}.png",
             urlRewrite: urlRewriteFunc,
             ...options
         });

package/lib/js/terrain/GlobusTerrain.d.ts

@@ -19,6 +19,8 @@ type TileData = {
     extent: Extent | null;
 };
 /**
+ * @deprecated
+ * Use GlobusRgbTerrain
  * Class that loads segment elevation data, converts it to the array and passes it to the planet segment.
  * @class
  * @extends {GlobusTerrain}

package/lib/js/terrain/GlobusTerrain.js

@@ -12,6 +12,8 @@ import { TILEGROUP_COMMON } from "../segment/Segment";
 import { Ray } from "../math/Ray";
 import { Vec3 } from "../math/Vec3";
 /**
+ * @deprecated
+ * Use GlobusRgbTerrain
  * Class that loads segment elevation data, converts it to the array and passes it to the planet segment.
  * @class
  * @extends {GlobusTerrain}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.20.3",
+  "version": "0.20.4",
   "description": "[openglobus](https://www.openglobus.org/) is a javascript/typescript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers, and 3D objects. It uses the WebGL technology, open source, and completely free.",
   "directories": {
     "example": "./sandbox"