@pirireis/webglobeplugins 0.16.0 → 0.16.1

package/programs/line-on-globe/naive-accurate-flexible.ts

@@ -1,258 +0,0 @@
-import { CameraUniformBlockString, CameraUniformBlockTotemCache, CameraUniformBlockTotem } from "../totems/camerauniformblock";
-import { slerp, POLE, R_3D, mercatorXYToGLPosition, cartesian3DToGLPosition } from "../../util/shaderfunctions/geometrytransformations";
-import { createProgram } from "../../util/webglobjectbuilders";
-import { noRegisterGlobeProgramCache } from "../programcache";
-import { attributeLoader, createBufferAndReadInfo } from "../../util/gl-util/buffer/attribute-loader";
-import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
-
-import { drawInstanced } from "../../util/gl-util/draw-options/methods";
-import { UBOHandler, Globe, BufferAndReadInfo, DrawRangeIndexParams } from "../../types";
-
-// Type definitions
-interface FlexibleOptions {
-    color?: [number, number, number, number]; // 0-1
-    dash_opacity?: number;
-    dash_ratio?: number;
-}
-
-
-
-interface UniformBindingPoints {
-    camera: number;
-    flexible: number;
-}
-
-
-
-const GLOBE_MIDPOINT_COUNT: number = 30;
-
-const escapeValue: number = -1.0;
-
-const uniformBindingPoints: UniformBindingPoints = {
-    camera: 0,
-    flexible: 1
-}
-
-const uniformBlockManager = new UniformBlockManager(
-    'FlexibleAttibutes',
-    [
-        { name: 'u_color', type: 'vec4', value: null },
-        { name: 'u_dash_ratio', type: 'float', value: null },
-        { name: 'u_dash_opacity', type: 'float', value: null }
-    ],
-    uniformBindingPoints.flexible
-)
-
-const vertexShader: string = `#version 300 es
-precision highp float;
-
-${R_3D}
-${CameraUniformBlockString}
-${slerp}
-${mercatorXYToGLPosition}
-${cartesian3DToGLPosition}
-
-${uniformBlockManager.glslCode()}
-
-in vec2 start_position;
-in vec3 start_position3d;
-in vec2 end_position;
-in vec3 end_position3d;
-
-in float dash_ratio;
-in float dash_opacity;
-in vec4 color;
-
-out float v_dash_ratio;
-out float v_dash_opacity;
-out vec4 v_color;
-
-out vec2 v_limp;
-out float interpolation;
-
-void main() {
-    vec2 longLat;
-
-    v_color = (color.r == -1.0) ? u_color: color;
-    v_dash_ratio = (dash_ratio == -1.0) ? u_dash_ratio : dash_ratio;
-    v_dash_opacity = (dash_opacity == -1.0) ? u_dash_opacity : dash_opacity;
-
-    if (is3D) {
-        interpolation = float(gl_VertexID) / ${GLOBE_MIDPOINT_COUNT - 1}.0;
-        vec3 cartesian = slerp(start_position3d, end_position3d, interpolation);
-        gl_Position = cartesian3DToGLPosition(cartesian);
-        v_limp = vec2(0.0, 0.0);
-    } else {
-        if ( distance( start_position, end_position) > 30000000.0) { return; }
-        interpolation = float(gl_VertexID);
-        if (gl_VertexID % 2 == 0) {
-            longLat = start_position;
-        } else {
-            longLat = end_position;
-        }
-        v_limp = longLat;
-        gl_Position = mercatorXYToGLPosition(longLat);
-    }
-}
-`;
-
-const fragmentShader: string = `#version 300 es
-${POLE}
-precision highp float;
-
-uniform float opacity;
-
-in float interpolation;
-in vec2 v_limp;
-in vec4 v_color;
-in float v_dash_ratio;
-in float v_dash_opacity;
-
-out vec4 color;
-
-void main() {
-    if (v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE) { discard; }
-    color = v_color;
-    color.a *= opacity;
-    if ( v_dash_ratio >= 1.0 ) { return; }
-    if (interpolation > 0.95) { return; }
-    if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5) { color.a *= v_dash_opacity; }
-
-}
-`;
-
-class Logic {
-    public vaosPublished: WebGLVertexArrayObject[] = [];
-    public isFreed: boolean = false;
-
-    private globe: Globe;
-    private gl: WebGL2RenderingContext;
-    private program: WebGLProgram;
-    private _lastOpacity: number;
-    private _opacityLocation: WebGLUniformLocation | null;
-    private cameraBlockTotem: CameraUniformBlockTotem;
-    private _ubosPublished: UBOHandler[];
-    private _defaultFlexibleUBO: UBOHandler;
-
-    constructor(globe: Globe) {
-        this.globe = globe;
-        this.gl = globe.gl;
-        this.program = createProgram(this.gl, vertexShader, fragmentShader);
-        this._lastOpacity = 1.0;
-        const { gl, program } = this;
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(program);
-
-        // assign attribute locations
-        gl.bindAttribLocation(program, 0, "start_position");
-        gl.bindAttribLocation(program, 1, "start_position3d");
-        gl.bindAttribLocation(program, 2, "end_position");
-        gl.bindAttribLocation(program, 3, "end_position3d");
-        gl.bindAttribLocation(program, 4, "dash_ratio");
-        gl.bindAttribLocation(program, 5, "dash_opacity");
-        gl.bindAttribLocation(program, 6, "color");
-        this._opacityLocation = gl.getUniformLocation(program, "opacity");
-
-        gl.uniform1f(this._opacityLocation, this._lastOpacity);
-
-        gl.useProgram(currentProgram);
-
-        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-        this.cameraBlockTotem.assignBindingPoint(program, uniformBindingPoints.camera);
-
-        this._ubosPublished = [];
-        uniformBlockManager.assignBindingPoint(this.gl, this.program);
-        this._defaultFlexibleUBO = this.createUBO();
-    }
-
-    /**
-     * Draw method for rendering lines on globe
-     * @param vao - WebGL Vertex Array Object
-     * @param drawOptions - Draw range index parameters
-     * @param opacity - Opacity value (0-1)
-     * @param flexibleUBO - Optional flexible uniform buffer object
-     */
-    draw(
-        vao: WebGLVertexArrayObject,
-        drawOptions: DrawRangeIndexParams,
-        opacity: number,
-        flexibleUBO: UBOHandler | null = null
-    ): void {
-        const { gl, program, globe, cameraBlockTotem, _defaultFlexibleUBO } = this;
-        gl.useProgram(program);
-        cameraBlockTotem.bind(uniformBindingPoints.camera);
-        gl.bindVertexArray(vao);
-        if (opacity !== this._lastOpacity) {
-            gl.uniform1f(this._opacityLocation, opacity);
-            this._lastOpacity = opacity;
-        }
-        // this._setFlexibleUniforms(flexibleOptions);
-        const vertexCount: number = globe.api_GetCurrentGeometry() === 0 ? GLOBE_MIDPOINT_COUNT : 2;
-        const ubo: UBOHandler = flexibleUBO || _defaultFlexibleUBO;
-        ubo.bind();
-        drawInstanced(gl, gl.LINE_STRIP, drawOptions, vertexCount);
-        ubo.unbind();
-        gl.bindVertexArray(null);
-        cameraBlockTotem.unbind(uniformBindingPoints.camera);
-    }
-
-    createUBO(bufferReadType: string = "STATIC_DRAW"): UBOHandler {
-        const ubo: UBOHandler = uniformBlockManager.createUBO(this.gl, bufferReadType);
-        this._ubosPublished.push(ubo);
-        ubo.update(
-            new Map([
-                ["u_color", [1, 1, 1, 1]],
-                ["u_dash_ratio", [1]],
-                ["u_dash_opacity", [1]]
-            ])
-        );
-        return ubo;
-    }
-
-    createVAO(
-        startPotision2DBufferObj: BufferAndReadInfo | null,
-        startPotision3DBufferObj: BufferAndReadInfo | null,
-        endPosition2DBufferObj: BufferAndReadInfo | null,
-        endPosition3DBufferObj: BufferAndReadInfo | null,
-        dashRatioBufferObj: BufferAndReadInfo | null,
-        dashOpacityBufferObj: BufferAndReadInfo | null,
-        colorBufferObj: BufferAndReadInfo | null
-    ): WebGLVertexArrayObject {
-        const { gl } = this;
-        const vao: WebGLVertexArrayObject | null = gl.createVertexArray();
-        if (!vao) {
-            throw new Error("Failed to create vertex array object");
-        }
-
-        gl.bindVertexArray(vao);
-
-        const divisor: number = 1;
-
-        attributeLoader(gl, startPotision2DBufferObj, 0, 2, { divisor });
-        attributeLoader(gl, startPotision3DBufferObj, 1, 3, { divisor });
-        attributeLoader(gl, endPosition2DBufferObj, 2, 2, { divisor });
-        attributeLoader(gl, endPosition3DBufferObj, 3, 3, { divisor });
-        attributeLoader(gl, dashRatioBufferObj, 4, 1, { divisor, escapeValues: [escapeValue] });
-        attributeLoader(gl, dashOpacityBufferObj, 5, 1, { divisor, escapeValues: [escapeValue] });
-        attributeLoader(gl, colorBufferObj, 6, 4, { divisor, escapeValues: [escapeValue, escapeValue, escapeValue, escapeValue] });
-
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        this.vaosPublished.push(vao);
-        return vao;
-    }
-
-    free(): void {
-        if (this.isFreed) return;
-        CameraUniformBlockTotemCache.release(this.globe);
-        this.gl.deleteProgram(this.program);
-        this.vaosPublished.forEach((vao: WebGLVertexArrayObject) => this.gl.deleteVertexArray(vao));
-        this._ubosPublished.forEach((ubo: UBOHandler) => ubo.free());
-        this.isFreed = true;
-    }
-}
-
-export const LineOnGlobeCache = Object.freeze({
-    get: (globe: Globe): Logic => { return noRegisterGlobeProgramCache.getProgram(globe, Logic) },
-    release: (globe: Globe): void => { return noRegisterGlobeProgramCache.releaseProgram(globe, Logic) }
-});

package/programs/polygon-on-globe/texture-dem-triangle-test-plugin.ts

@@ -1,120 +0,0 @@
-import { Globe, BufferAndReadInfo, LongLat, DrawRangeIndexParams } from "../../types";
-import { TextureDemTriangles } from "./texture-dem-triangles";
-/**
- * Loads a plugin with test data for TextureDemTriangles
- */
-
-
-const TEST_ITEM_COUNT = 1000000;
-
-
-function createTestLongLatArray(): Float32Array {   
-    const arr = new Float32Array(TEST_ITEM_COUNT * 2);
-    for (let i = 0; i < TEST_ITEM_COUNT; i++) {
-        arr[i * 2 + 0] = Math.random() * 360 - 180; // longitude
-        arr[i * 2 + 1] = Math.random() * 180 - 90;  // latitude
-    }
-    return arr;
-}
-
-function createTestPos3dArray(longLatArray: Float32Array): Float32Array {
-    const arr = new Float32Array(TEST_ITEM_COUNT * 3);
-    for (let i = 0; i < TEST_ITEM_COUNT; i++) {
-        const long = longLatArray[i * 2 + 0] / 180 * Math.PI;
-        const lat = longLatArray[i * 2 + 1] / 180 * Math.PI;
-        // Convert long/lat to 3D position (simplified)
-        arr[i * 3 + 0] = Math.cos(lat) * Math.cos(long);
-        arr[i * 3 + 1] = Math.cos(lat) * Math.sin(long);
-        arr[i * 3 + 2] = Math.sin(lat);
-    }
-    return arr;
-}
-
-
-const createTestBBOXES = (): Array<{northWest: LongLat, southEast: LongLat}> => {
-    const bboxes = [];
-    for (let i = 0; i < 6; i++) {
-        const north = Math.random() * 90; // random latitude
-        const west = Math.random() * -180; // random longitude
-        const south = north - 30; // random latitude
-        const east = west + 30; // random longitude
-        const nw: LongLat = [west, north]; // random northWest
-        const se: LongLat = [east, south]; // random southEast
-        bboxes.push({ northWest: nw, southEast: se });
-    }
-
-    return bboxes;
-};
-
-const createTestDemTextures = (): number[][] => {
-    const textures = [];
-
-    for (let i = 0; i < 6; i++) {
-        const texture = [];
-        for (let j = 0; j < 5 * 5; j++) {
-            const value = 1000 * Math.random(); // random elevation value
-            texture.push(value);
-        }
-        textures.push(texture);
-    }
-    return textures;
-};
-
-
-
-export class TextureDemTrianglesTestPlugin {
-
-    globe: Globe | null = null;
-    textureDemTriangles: TextureDemTriangles | null = null;
-    vao: WebGLVertexArrayObject | null = null;
-    drawOptions: DrawRangeIndexParams | null = null;
-    bufferInfo: { pos3dBufferInfo: BufferAndReadInfo, longLatBufferInfo: BufferAndReadInfo, drawOptions: DrawRangeIndexParams } | null = null;  
-    id: string;
-
-    constructor(id: string) {
-        this.id = id;
-    }
-
-    init (globe: Globe) {
-
-        this.globe = globe;
-        this.textureDemTriangles = new TextureDemTriangles(globe);
-        // set bboxes and dem textures
-        const demTextures = createTestDemTextures();
-        const demTextureBBOX = createTestBBOXES();
-        this.textureDemTriangles.setDemTextures(demTextures, demTextureBBOX);
-        // 
-
-        const bufferInfo =  {
-            pos3dBufferInfo: { 
-                buffer: globe.gl.createBuffer()!,
-                stride: 0,
-                offset: 0,
-             },
-            longLatBufferInfo: { 
-                buffer: globe.gl.createBuffer()!,
-                stride: 0,
-                offset: 0,
-            },
-            drawOptions: { drawRange: { count: TEST_ITEM_COUNT, first: 0} }
-       };
-
-        this.vao = this.textureDemTriangles.createVAO(bufferInfo.pos3dBufferInfo, bufferInfo.longLatBufferInfo);
-        
-        const gl = globe.gl;
-        const longLatArray = createTestLongLatArray();
-        const pos3dArray = createTestPos3dArray(longLatArray);
-        gl.bindBuffer(gl.ARRAY_BUFFER, bufferInfo.pos3dBufferInfo.buffer);
-        gl.bufferData(gl.ARRAY_BUFFER, pos3dArray, gl.STATIC_DRAW);
-        gl.bindBuffer(gl.ARRAY_BUFFER, bufferInfo.longLatBufferInfo.buffer);
-        gl.bufferData(gl.ARRAY_BUFFER, longLatArray, gl.STATIC_DRAW);
-
-        this.bufferInfo = bufferInfo;
-    }
-
-       
-    draw3D(){
-        if (!this.globe || !this.textureDemTriangles || !this.vao || !this.bufferInfo) return;
-        this.textureDemTriangles.draw(this.vao, this.bufferInfo.drawOptions);
-    }
-}

package/programs/polygon-on-globe/texture-dem-triangles.ts

@@ -1,207 +0,0 @@
-import { createProgram } from "../../util/webglobjectbuilders";
-import { CameraUniformBlockTotemCache, CameraUniformBlockString, CameraUniformBlockTotem } from "../totems/camerauniformblock";
-import { mercatorXYToGLPosition, cartesian3DToGLPosition, R_3D, R } from "../../util/shaderfunctions/geometrytransformations";
-import { noRegisterGlobeProgramCache } from "../programcache";
-import { drawArrays } from "../../util/gl-util/draw-options/methods";
-import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
-import { WORLD_RADIUS_3D} from "../../Math/constants";
-import { Globe, BufferAndReadInfo, LongLat, DrawRangeIndexParams } from "../../types";
-
-
-
-const uniformBindingPoints = {
-    camera: 0,
-};
-
-const vertexShaderSource = `#version 300 es
-#pragma vscode_glsllint_stage : vert
-
-precision highp float;
-precision highp sampler2DArray;
-
-${CameraUniformBlockString}
-
-${cartesian3DToGLPosition}
-in vec3 a_position;
-in vec2 a_longLat;
-uniform sampler2DArray u_demTexture; // <-- changed from array to single
-uniform vec4 u_demTextureBBOX[6];
-
-
-
-// TODO: light directioni 
-// out vec3 v_position;
-// out vec3 v_normal;
-// out vec2 v_textureCoord;
-
-out vec4 v_color;
-
-bool isPointInBBox(vec2 point, vec4 bbox) {
-    return point.x >= bbox.x && point.x <= bbox.z && point.y >= bbox.y && point.y <= bbox.w;
-}
-
-void main() {
-
-    float elevation = ${WORLD_RADIUS_3D}; // default elevation at sea level
-    v_color = vec4(1.0, 1.0, 1.0, 1.0); // default color white
-    for (int i = 0; i < 6; i++) {
-        if (isPointInBBox(a_longLat, u_demTextureBBOX[i])) {
-            vec2 uv = (a_longLat - u_demTextureBBOX[i].xy) / (u_demTextureBBOX[i].zw - u_demTextureBBOX[i].xy);
-            float altitude = texture(u_demTexture, vec3(uv, float(i))).r;
-            elevation += altitude;
-            v_color = mix(vec4(0.0, 0.0, 1.0, 1.0), vec4(1.0, 0.0, 0.0, 1.0), altitude / 1000.0); // color from blue to red based on altitude
-            // elevation += 1000.0 * float(i); // temporary for testing
-            break;
-     }
-    }
-    
-
-    vec3 position = a_position * elevation;
-    gl_Position = cartesian3DToGLPosition(position);
-    gl_PointSize = 1.0; // for POINTS rendering
-}
-`;
-
-const fragmentShaderSource = `#version 300 es
-#pragma vscode_glsllint_stage : frag
-
-precision highp float;
-in vec4 v_color;
-out vec4 outColor;
-void main() {
-    outColor = v_color; // use the varying color from the vertex shader
-}
-`;
-
-
-export class TextureDemTriangles {
-    globe: Globe
-    gl: WebGL2RenderingContext;
-    program: WebGLProgram;
-    // Later an injection will handle demTextures and demTextureBBOX
-    texture: WebGLTexture;
-    // demTextures: WebGLTexture[] = [];
-    // demTextureBBOX: Float32Array = new Float32Array(6 * 4); // 6 bounding boxes
-
-
-    cameraUniformBlock: CameraUniformBlockTotem;
-
-
-    locations = {
-        attributes: {
-            a_position: -1,
-            a_longLat: -1,
-        },
-        uniforms: {
-            u_demTexture: -1 as unknown as WebGLUniformLocation,
-            u_demTextureBBOX: -1 as unknown as WebGLUniformLocation,
-        }
-    }        
-
-    constructor(globe: Globe) {
-        this.globe = globe;
-        this.gl = globe.gl;
-        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
-        this.cameraUniformBlock = CameraUniformBlockTotemCache.get(this.globe);
-        this.cameraUniformBlock.assignBindingPoint(this.program, uniformBindingPoints.camera);
-
-        // get attribute locations
-        this.locations.attributes.a_position = this.gl.getAttribLocation(this.program, 'a_position');
-        this.locations.attributes.a_longLat = this.gl.getAttribLocation(this.program, 'a_longLat');
-        // get uniform locations
-        this.locations.uniforms.u_demTexture = this.gl.getUniformLocation(this.program, 'u_demTexture')!;
-        this.locations.uniforms.u_demTextureBBOX = this.gl.getUniformLocation(this.program, 'u_demTextureBBOX')!;
-
-
-        // create 3d texture
-
-        const texture = this.gl.createTexture()!;
-        this.gl.bindTexture(this.gl.TEXTURE_2D_ARRAY, texture);
-        // this.gl.texImage3D(this.gl.TEXTURE_2D_ARRAY, 0, this.gl.R32F, 25, 25, 6, 0, this.gl.RED, this.gl.FLOAT, null);
-        this.gl.texStorage3D(this.gl.TEXTURE_2D_ARRAY, 1, this.gl.R32F, 5, 5, 6);
-        // set texture parameters
-        const ext = this.gl.getExtension('OES_texture_float_linear');
-        this.gl.texParameteri(this.gl.TEXTURE_2D_ARRAY, this.gl.TEXTURE_MIN_FILTER, this.gl.LINEAR);
-        this.gl.texParameteri(this.gl.TEXTURE_2D_ARRAY, this.gl.TEXTURE_MAG_FILTER, this.gl.LINEAR);
-        this.gl.texParameteri(this.gl.TEXTURE_2D_ARRAY, this.gl.TEXTURE_WRAP_S, this.gl.CLAMP_TO_EDGE);
-        this.gl.texParameteri(this.gl.TEXTURE_2D_ARRAY, this.gl.TEXTURE_WRAP_T, this.gl.CLAMP_TO_EDGE);
-        this.gl.bindTexture(this.gl.TEXTURE_2D_ARRAY, null);
-        this.texture = texture;
-
-    }
-
-    createVAO(pos3dBufferInfo: BufferAndReadInfo, longLatBufferInfo: BufferAndReadInfo) {
-        const vao = this.gl.createVertexArray()!;
-        this.gl.bindVertexArray(vao);
-        attributeLoader(this.gl,  pos3dBufferInfo, this.locations.attributes.a_position, 3);
-        attributeLoader(this.gl, longLatBufferInfo, this.locations.attributes.a_longLat, 2);
-        this.gl.bindVertexArray(null);
-        return vao;
-    }
-
-    setDemTextures(demTexturesData: number[][] | Array<Float32Array>, demTextureBBOX: Array<{northWest: LongLat, southEast: LongLat}>) {
-        // bind textures to texture units
-
-        const gl = this.gl;
-        gl.bindTexture(gl.TEXTURE_2D_ARRAY, this.texture);
-        gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
-        // turn off premultiply alpha
-        gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
-        // bind and upload each texture to the 3D texture array
-        for (let i = 0; i < demTexturesData.length; i++) {
-            const data = demTexturesData[i];
-            if (data.length === 5 * 5) { // <-- FIXED
-                gl.texSubImage3D(gl.TEXTURE_2D_ARRAY, 0, 0, 0, i, 5, 5, 1, gl.RED, gl.FLOAT,
-                     new Float32Array(data)); 
-            }
-        }
-
-
-
-        // set uniform for texture units
-        
-        const bboxVec4Array = new Float32Array(6 * 4);
-        for (let i = 0; i < demTextureBBOX.length; i++) {
-            const bbox = demTextureBBOX[i];
-            bboxVec4Array[i * 4 + 0] = bbox.northWest[0];
-            bboxVec4Array[i * 4 + 1] = bbox.southEast[1];
-            bboxVec4Array[i * 4 + 2] = bbox.southEast[0];
-            bboxVec4Array[i * 4 + 3] = bbox.northWest[1];
-        }
-
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(this.program);
-        gl.uniform4fv(this.locations.uniforms.u_demTextureBBOX, bboxVec4Array);
-        gl.bindTexture(gl.TEXTURE_2D_ARRAY, null);
-        gl.useProgram(currentProgram);
-    }
-
-
-
-    draw(vao: WebGLVertexArrayObject, drawOptions: DrawRangeIndexParams, ubo = null) {
-        const gl = this.gl;
-        console.log('Drawing TextureDemTriangles drawOptions:', drawOptions);
-        gl.useProgram(this.program);
-        this.cameraUniformBlock.bind(uniformBindingPoints.camera);
-
-
-        // TURN OFF flip y for texture
-        
-
-        gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D_ARRAY, this.texture);
-        gl.uniform1i(this.locations.uniforms.u_demTexture, 0); // texture unit 0
-        // bind VAO and draw
-        gl.bindVertexArray(vao);
-        
-
-        drawArrays(gl, gl.POINTS, drawOptions);
-
-        gl.bindVertexArray(null);
-        gl.bindTexture(gl.TEXTURE_2D_ARRAY, null);
-        gl.useProgram(null);
-        this.cameraUniformBlock.unbind(uniformBindingPoints.camera);
-    }
-}
-
-