@pirireis/webglobeplugins 0.11.1-alpha → 0.12.0-alpha

package/programs/totems/{camerauniformblock1.js → canvas-webglobe-info1.js}

@@ -1,23 +1,14 @@
 import { globeProgramCache } from "../programcache";
-// import { getFrustumPlanes } from "../../Math/frustum/from-projection-matrix";
-// import { getFrustum } from "../../Math/frustum/from-globeinfo"
-// import { Plane } from "../../Math/";
-export const CameraUniformBlockString = `
-layout(std140) uniform CameraUniformBlock {
-    mat4 view; // 64 bytes           0
-    mat4 projection; // 64 bytes     64
-    vec3 translate; // 12 bytes      128
-    bool is3D; // 4 bytes            140
-    vec2 mapWH; // 8 bytes           144
-    vec2 screenWH; //  8 bytes       152
-    float z_level; // 4 bytes        160 | 164
-    float world_distance; // 4 bytes 164
-    float world_tilt; // 4 bytes     168
-    float world_north_angle; // 4 bytes 172
-    vec2 world_center_radian; // 8 bytes    176 | 184
-}; // 14 lines
+export const WebglobeInfoUniformBlockString = `
+layout(std140) uniform WebglobeInfo {
+    vec2 canvas_resolution;
+    vec2 mouse_radian_long_lat;
+    vec2 mouse_pixel_xy;
+    float north_angle;
+    float world_tilt;
+    float earth_distance;
+}; 
 `;
-const Radian = Math.PI / 180.0;
 export default class CameraUniformBlockTotem {
     constructor() {
         this.id = "CameraUniformBlockTotem";
@@ -25,18 +16,6 @@ export default class CameraUniformBlockTotem {
         this.gl = null;
         this.globe = null;
         this.ubo = null;
-        // this._frustumPlanes = {
-        //     left: new Plane(),
-        //     right: new Plane(),
-        //     top: new Plane(),
-        //     bottom: new Plane(),
-        //     near: new Plane(),
-        //     far: new Plane()
-        // }
-        this._isMovedParams = {
-            lastLod: null,
-            isMoved: false,
-        };
     }
     init(globe, gl) {
         this.gl = gl;
@@ -51,8 +30,7 @@ export default class CameraUniformBlockTotem {
         const { gl } = this;
         const ubo = gl.createBuffer();
         gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        // 184 bytes in reality. Overflow on linux for some reason. So, 200 bytes.
-        gl.bufferData(gl.UNIFORM_BUFFER, 200, gl.STREAM_DRAW);
+        gl.bufferData(gl.UNIFORM_BUFFER, 164, gl.STREAM_DRAW);
         gl.bindBufferBase(gl.UNIFORM_BUFFER, 0, ubo);
         gl.bindBuffer(gl.UNIFORM_BUFFER, null);
         return ubo;
@@ -72,7 +50,7 @@ export default class CameraUniformBlockTotem {
     draw3D(projection, modelView, translate) {
         const { gl, traslateFloat32, ubo, mapWHFloat32, globe } = this;
         gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        { // view, projection, translat
+        { // view, projection, translate
             gl.bufferSubData(gl.UNIFORM_BUFFER, 0, modelView);
             gl.bufferSubData(gl.UNIFORM_BUFFER, 64, projection);
             traslateFloat32.set([translate.x, translate.y, translate.z], 0);
@@ -89,42 +67,11 @@ export default class CameraUniformBlockTotem {
                 gl.bufferSubData(gl.UNIFORM_BUFFER, 144, mapWHFloat32);
             }
         }
-        {
-            // float world_distance; // 4 bytes 164
-            // float world_tilt; // 4 bytes     168
-            // float world_north_angle; // 4 bytes 172
-            // vec2 world_center_radian; // 8 bytes    180
-            const { CenterLong, CenterLat, Distance, Tilt, NorthAng } = globe.api_GetCurrentLookInfo();
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 164, new Float32Array([
-                Distance, Radian * Tilt, Radian * NorthAng, Radian * CenterLong, Radian * CenterLat
-            ]));
-        }
-        // this._frustumPlanes = getFrustumPlanes(projection, translate);
         gl.bindBuffer(gl.UNIFORM_BUFFER, null);
-        { // isMoved
-            const currentLOD = globe.api_GetCurrentLODWithDecimal();
-            this._isMovedParams.isMoved = this._isMovedParams.lastLod !== currentLOD || globe.api_IsScreenMoving();
-            this._isMovedParams.lastLod = currentLOD;
-        }
-        // getFrustum(globe, 50, this._frustumPlanes);
-        this._normalizedCameraVector = (() => {
-            const { Fp, FUPos } = globe;
-            const cameraVector = [Fp.x, Fp.y, Fp.z];
-            const length = Math.sqrt(cameraVector.reduce((sum, val) => sum + val * val, 0));
-            return normalizedCameraVector.map(val => val / length);
-        })();
-    }
-    assignBindingPoint(program, bindingPoint) {
-        const { gl } = this;
-        const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-        gl.uniformBlockBinding(program, cameraBlockIndex, bindingPoint);
     }
     getUBO() {
         return this.ubo;
     }
-    getFrustumPlanes() {
-        return this._frustumPlanes;
-    }
     bind(bindingPoint) {
         const { gl, ubo } = this;
         gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, ubo);
@@ -133,18 +80,6 @@ export default class CameraUniformBlockTotem {
         const { gl } = this;
         gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, null);
     }
-    isMoved() {
-        return this._isMovedParams.isMoved;
-    }
-    getCameraVector() {
-        return [this.globe.Fp.x, this.globe.Fp.y, this.globe.Fp.z];
-    }
-    getNormalizedCameraVector() {
-        return this._normalizedCameraVector;
-    }
-    getCameraUpPosition() {
-        return [this.globe.FUPos.x, this.globe.FUPos.y, this.globe.FUPos.z];
-    }
     free() {
         const { gl, ubo } = this;
         gl.deleteBuffer(ubo);

package/programs/vectorfields/logics/pixelbased.js

@@ -74,7 +74,7 @@ vec2 random_position(vec2 st){
 
 
 void main(){
-    vec2 vec = lookup_wind(in_position).xy;
+    vec2 vec = -lookup_wind(in_position).xy;
     if (vec.x == 0.0 && vec.y == 0.0){
         out_position = random_position(in_position);
         return;