@xeokit/xeokit-sdk 2.5.2-beta-10 → 2.5.2-beta-13

package/src/src/viewer/scene/webgl/convertConstant.js

@@ -0,0 +1,244 @@
+import {
+    RGBA_ASTC_4x4_Format,
+    RGBA_ASTC_5x4_Format,
+    RGBA_ASTC_5x5_Format,
+    RGBA_ASTC_6x5_Format,
+    RGBA_ASTC_6x6_Format,
+    RGBA_ASTC_8x5_Format,
+    RGBA_ASTC_8x6_Format,
+    RGBA_ASTC_8x8_Format,
+    RGBA_ASTC_10x5_Format,
+    RGBA_ASTC_10x6_Format,
+    RGBA_ASTC_10x8_Format,
+    RGBA_ASTC_10x10_Format,
+    RGBA_ASTC_12x10_Format,
+    RGBA_ASTC_12x12_Format,
+    RGB_ETC1_Format,
+    RGB_ETC2_Format,
+    RGBA_ETC2_EAC_Format,
+    RGBA_PVRTC_2BPPV1_Format,
+    RGBA_PVRTC_4BPPV1_Format,
+    RGB_PVRTC_2BPPV1_Format,
+    RGB_PVRTC_4BPPV1_Format,
+    RGBA_S3TC_DXT5_Format,
+    RGBA_S3TC_DXT3_Format,
+    RGBA_S3TC_DXT1_Format,
+    RGB_S3TC_DXT1_Format,
+    DepthFormat,
+    DepthStencilFormat,
+    LuminanceAlphaFormat,
+    LuminanceFormat,
+    RedFormat,
+    RGBFormat,
+    RGBAFormat,
+    AlphaFormat,
+    RedIntegerFormat,
+    RGFormat,
+    RGIntegerFormat,
+    RGBAIntegerFormat,
+    HalfFloatType,
+    FloatType,
+    UnsignedIntType,
+    IntType,
+    UnsignedShortType,
+    ShortType,
+    ByteType,
+    UnsignedInt248Type,
+    UnsignedShort5551Type,
+    UnsignedShort4444Type,
+    UnsignedByteType,
+    RGBA_BPTC_Format,
+    sRGBEncoding,
+    // _SRGBAFormat,
+    RepeatWrapping,
+    ClampToEdgeWrapping,
+    NearestFilter,
+    LinearFilter,
+    NearestMipMapNearestFilter,
+    LinearMipMapNearestFilter,
+    NearestMipMapLinearFilter, LinearMipMapLinearFilter
+} from '../constants/constants.js';
+
+import {getExtension} from "./getExtension.js";
+
+/**
+ * @private
+ */
+function convertConstant(gl, constantVal, encoding = null) {
+
+    let extension;
+    const p = constantVal;
+
+    if (p === UnsignedByteType) return gl.UNSIGNED_BYTE;
+    if (p === UnsignedShort4444Type) return gl.UNSIGNED_SHORT_4_4_4_4;
+    if (p === UnsignedShort5551Type) return gl.UNSIGNED_SHORT_5_5_5_1;
+
+    if (p === ByteType) return gl.BYTE;
+    if (p === ShortType) return gl.SHORT;
+    if (p === UnsignedShortType) return gl.UNSIGNED_SHORT;
+    if (p === IntType) return gl.INT;
+    if (p === UnsignedIntType) return gl.UNSIGNED_INT;
+    if (p === FloatType) return gl.FLOAT;
+
+    if (p === HalfFloatType) {
+        return gl.HALF_FLOAT;
+    }
+
+    if (p === AlphaFormat) return gl.ALPHA;
+    if (p === RGBAFormat) return gl.RGBA;
+    if (p === LuminanceFormat) return gl.LUMINANCE;
+    if (p === LuminanceAlphaFormat) return gl.LUMINANCE_ALPHA;
+    if (p === DepthFormat) return gl.DEPTH_COMPONENT;
+    if (p === DepthStencilFormat) return gl.DEPTH_STENCIL;
+    if (p === RedFormat) return gl.RED;
+
+    if (p === RGBFormat) {
+        return gl.RGBA;
+    }
+
+    // WebGL2 formats.
+
+    if (p === RedIntegerFormat) return gl.RED_INTEGER;
+    if (p === RGFormat) return gl.RG;
+    if (p === RGIntegerFormat) return gl.RG_INTEGER;
+    if (p === RGBAIntegerFormat) return gl.RGBA_INTEGER;
+
+    // S3TC
+
+    if (p === RGB_S3TC_DXT1_Format || p === RGBA_S3TC_DXT1_Format || p === RGBA_S3TC_DXT3_Format || p === RGBA_S3TC_DXT5_Format) {
+        if (encoding === sRGBEncoding) {
+            const extension = getExtension(gl, 'WEBGL_compressed_texture_s3tc_srgb');
+            if (extension !== null) {
+                if (p === RGB_S3TC_DXT1_Format) return extension.COMPRESSED_SRGB_S3TC_DXT1_EXT;
+                if (p === RGBA_S3TC_DXT1_Format) return extension.COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
+                if (p === RGBA_S3TC_DXT3_Format) return extension.COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
+                if (p === RGBA_S3TC_DXT5_Format) return extension.COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
+            } else {
+                return null;
+            }
+        } else {
+            extension = getExtension(gl, 'WEBGL_compressed_texture_s3tc');
+            if (extension !== null) {
+                if (p === RGB_S3TC_DXT1_Format) return extension.COMPRESSED_RGB_S3TC_DXT1_EXT;
+                if (p === RGBA_S3TC_DXT1_Format) return extension.COMPRESSED_RGBA_S3TC_DXT1_EXT;
+                if (p === RGBA_S3TC_DXT3_Format) return extension.COMPRESSED_RGBA_S3TC_DXT3_EXT;
+                if (p === RGBA_S3TC_DXT5_Format) return extension.COMPRESSED_RGBA_S3TC_DXT5_EXT;
+            } else {
+                return null;
+            }
+        }
+    }
+
+    // PVRTC
+
+    if (p === RGB_PVRTC_4BPPV1_Format || p === RGB_PVRTC_2BPPV1_Format || p === RGBA_PVRTC_4BPPV1_Format || p === RGBA_PVRTC_2BPPV1_Format) {
+        const extension = getExtension(gl, 'WEBGL_compressed_texture_pvrtc');
+        if (extension !== null) {
+            if (p === RGB_PVRTC_4BPPV1_Format) return extension.COMPRESSED_RGB_PVRTC_4BPPV1_IMG;
+            if (p === RGB_PVRTC_2BPPV1_Format) return extension.COMPRESSED_RGB_PVRTC_2BPPV1_IMG;
+            if (p === RGBA_PVRTC_4BPPV1_Format) return extension.COMPRESSED_RGBA_PVRTC_4BPPV1_IMG;
+            if (p === RGBA_PVRTC_2BPPV1_Format) return extension.COMPRESSED_RGBA_PVRTC_2BPPV1_IMG;
+        } else {
+            return null;
+        }
+    }
+
+    // ETC1
+
+    if (p === RGB_ETC1_Format) {
+        const extension = getExtension(gl, 'WEBGL_compressed_texture_etc1');
+        if (extension !== null) {
+            return extension.COMPRESSED_RGB_ETC1_WEBGL;
+        } else {
+            return null;
+        }
+    }
+
+    // ETC2
+
+    if (p === RGB_ETC2_Format || p === RGBA_ETC2_EAC_Format) {
+        const extension = getExtension(gl, 'WEBGL_compressed_texture_etc');
+        if (extension !== null) {
+            if (p === RGB_ETC2_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ETC2 : extension.COMPRESSED_RGB8_ETC2;
+            if (p === RGBA_ETC2_EAC_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ETC2_EAC : extension.COMPRESSED_RGBA8_ETC2_EAC;
+        } else {
+            return null;
+        }
+    }
+
+    // ASTC
+
+    if (p === RGBA_ASTC_4x4_Format || p === RGBA_ASTC_5x4_Format || p === RGBA_ASTC_5x5_Format ||
+        p === RGBA_ASTC_6x5_Format || p === RGBA_ASTC_6x6_Format || p === RGBA_ASTC_8x5_Format ||
+        p === RGBA_ASTC_8x6_Format || p === RGBA_ASTC_8x8_Format || p === RGBA_ASTC_10x5_Format ||
+        p === RGBA_ASTC_10x6_Format || p === RGBA_ASTC_10x8_Format || p === RGBA_ASTC_10x10_Format ||
+        p === RGBA_ASTC_12x10_Format || p === RGBA_ASTC_12x12_Format) {
+        const extension = getExtension(gl, 'WEBGL_compressed_texture_astc');
+        if (extension !== null) {
+            if (p === RGBA_ASTC_4x4_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR : extension.COMPRESSED_RGBA_ASTC_4x4_KHR;
+            if (p === RGBA_ASTC_5x4_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR : extension.COMPRESSED_RGBA_ASTC_5x4_KHR;
+            if (p === RGBA_ASTC_5x5_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR : extension.COMPRESSED_RGBA_ASTC_5x5_KHR;
+            if (p === RGBA_ASTC_6x5_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR : extension.COMPRESSED_RGBA_ASTC_6x5_KHR;
+            if (p === RGBA_ASTC_6x6_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR : extension.COMPRESSED_RGBA_ASTC_6x6_KHR;
+            if (p === RGBA_ASTC_8x5_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR : extension.COMPRESSED_RGBA_ASTC_8x5_KHR;
+            if (p === RGBA_ASTC_8x6_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR : extension.COMPRESSED_RGBA_ASTC_8x6_KHR;
+            if (p === RGBA_ASTC_8x8_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR : extension.COMPRESSED_RGBA_ASTC_8x8_KHR;
+            if (p === RGBA_ASTC_10x5_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR : extension.COMPRESSED_RGBA_ASTC_10x5_KHR;
+            if (p === RGBA_ASTC_10x6_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR : extension.COMPRESSED_RGBA_ASTC_10x6_KHR;
+            if (p === RGBA_ASTC_10x8_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR : extension.COMPRESSED_RGBA_ASTC_10x8_KHR;
+            if (p === RGBA_ASTC_10x10_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR : extension.COMPRESSED_RGBA_ASTC_10x10_KHR;
+            if (p === RGBA_ASTC_12x10_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR : extension.COMPRESSED_RGBA_ASTC_12x10_KHR;
+            if (p === RGBA_ASTC_12x12_Format) return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR : extension.COMPRESSED_RGBA_ASTC_12x12_KHR;
+        } else {
+            return null;
+        }
+    }
+
+    // BPTC
+
+    if (p === RGBA_BPTC_Format) {
+        const extension = getExtension(gl, 'EXT_texture_compression_bptc');
+        if (extension !== null) {
+            if (p === RGBA_BPTC_Format) {
+                return (encoding === sRGBEncoding) ? extension.COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT : extension.COMPRESSED_RGBA_BPTC_UNORM_EXT;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    //
+
+    if (p === UnsignedInt248Type) {
+        return gl.UNSIGNED_INT_24_8;
+    }
+    if (p === RepeatWrapping) {
+        return gl.REPEAT;
+    }
+    if (p === ClampToEdgeWrapping) {
+        return gl.CLAMP_TO_EDGE;
+    }
+    if (p === NearestMipMapNearestFilter) {
+        return gl.NEAREST_MIPMAP_LINEAR;
+    }
+    if (p === NearestMipMapLinearFilter) {
+        return gl.NEAREST_MIPMAP_LINEAR;
+    }
+    if (p === LinearMipMapNearestFilter) {
+        return gl.LINEAR_MIPMAP_NEAREST;
+    }
+    if (p === LinearMipMapLinearFilter) {
+        return gl.LINEAR_MIPMAP_LINEAR;
+    }
+    if (p === NearestFilter) {
+        return gl.NEAREST;
+    }
+    if (p === LinearFilter) {
+        return gl.LINEAR;
+    }
+
+    return null;
+}
+
+
+export {convertConstant};

package/src/src/viewer/scene/webgl/getExtension.js

@@ -0,0 +1,32 @@
+/**
+ * @private
+ */
+function getExtension (gl, name) {
+    if (gl._cachedExtensions === undefined) {
+        gl._cachedExtensions = {};
+    }
+    if (gl._cachedExtensions[name] !== undefined) {
+        return gl._cachedExtensions[name];
+    }
+    let extension;
+    switch (name) {
+        case 'WEBGL_depth_texture':
+            extension = gl.getExtension('WEBGL_depth_texture') || gl.getExtension('MOZ_WEBGL_depth_texture') || gl.getExtension('WEBKIT_WEBGL_depth_texture');
+            break;
+        case 'EXT_texture_filter_anisotropic':
+            extension = gl.getExtension('EXT_texture_filter_anisotropic') || gl.getExtension('MOZ_EXT_texture_filter_anisotropic') || gl.getExtension('WEBKIT_EXT_texture_filter_anisotropic');
+            break;
+        case 'WEBGL_compressed_texture_s3tc':
+            extension = gl.getExtension('WEBGL_compressed_texture_s3tc') || gl.getExtension('MOZ_WEBGL_compressed_texture_s3tc') || gl.getExtension('WEBKIT_WEBGL_compressed_texture_s3tc');
+            break;
+        case 'WEBGL_compressed_texture_pvrtc':
+            extension = gl.getExtension('WEBGL_compressed_texture_pvrtc') || gl.getExtension('WEBKIT_WEBGL_compressed_texture_pvrtc');
+            break;
+        default:
+            extension = gl.getExtension(name);
+    }
+    gl._cachedExtensions[name] = extension;
+    return extension;
+}
+
+export {getExtension};

package/src/src/viewer/scene/webgl/occlusion/OcclusionLayer.js

@@ -0,0 +1,214 @@
+import {math} from "../../math/math.js";
+import {ArrayBuf} from "../ArrayBuf.js";
+
+class OcclusionLayer {
+
+    constructor(scene, origin) {
+
+        this.scene = scene;
+        this.aabb = math.AABB3();
+        this.origin = math.vec3(origin);
+        this.originHash = this.origin.join();
+        this.numMarkers = 0;
+        this.markers = {};
+        this.markerList = [];                  // Ordered array of Markers
+        this.markerIndices = {};               // ID map of Marker indices in _markerList
+        this.positions = [];                   // Packed array of World-space marker positions
+        this.indices = [];                     // Indices corresponding to array above
+        this.positionsBuf = null;
+        this.lenPositionsBuf = 0;
+        this.indicesBuf = null;
+        this.sectionPlanesActive = [];
+        this.culledBySectionPlanes = false;
+        this.occlusionTestList = [];           // List of
+        this.lenOcclusionTestList = 0;
+        this.pixels = [];
+        this.aabbDirty = false;
+        this.markerListDirty = false;
+        this.positionsDirty = true;
+        this.occlusionTestListDirty = false;
+    }
+
+    addMarker(marker) {
+        this.markers[marker.id] = marker;
+        this.markerListDirty = true;
+        this.numMarkers++;
+    }
+
+    markerWorldPosUpdated(marker) {
+        if (!this.markers[marker.id]) { // Not added
+            return;
+        }
+        const i = this.markerIndices[marker.id];
+        this.positions[i * 3 + 0] = marker.worldPos[0];
+        this.positions[i * 3 + 1] = marker.worldPos[1];
+        this.positions[i * 3 + 2] = marker.worldPos[2];
+        this.positionsDirty = true; // TODO: avoid reallocating VBO each time
+    }
+
+    removeMarker(marker) {
+        delete this.markers[marker.id];
+        this.markerListDirty = true;
+        this.numMarkers--;
+    }
+
+    update() {
+        if (this.markerListDirty) {
+            this._buildMarkerList();
+            this.markerListDirty = false;
+            this.positionsDirty = true;
+            this.occlusionTestListDirty = true;
+        }
+        if (this.positionsDirty) { //////////////  TODO: Don't rebuild this when positions change, very wasteful
+            this._buildPositions();
+            this.positionsDirty = false;
+            this.aabbDirty = true;
+            this.vbosDirty = true;
+        }
+        if (this.aabbDirty) {
+            this._buildAABB();
+            this.aabbDirty = false;
+        }
+        if (this.vbosDirty) {
+            this._buildVBOs();
+            this.vbosDirty = false;
+        }
+        if (this.occlusionTestListDirty) {
+            this._buildOcclusionTestList();
+        }
+        this._updateActiveSectionPlanes();
+    }
+
+    _buildMarkerList() {
+        this.numMarkers = 0;
+        for (var id in this.markers) {
+            if (this.markers.hasOwnProperty(id)) {
+                this.markerList[this.numMarkers] = this.markers[id];
+                this.markerIndices[id] = this.numMarkers;
+                this.numMarkers++;
+            }
+        }
+        this.markerList.length = this.numMarkers;
+    }
+
+    _buildPositions() {
+        let j = 0;
+        for (let i = 0; i < this.numMarkers; i++) {
+            if (this.markerList[i]) {
+                const marker = this.markerList[i];
+                const worldPos = marker.worldPos;
+                this.positions[j++] = worldPos[0];
+                this.positions[j++] = worldPos[1];
+                this.positions[j++] = worldPos[2];
+                this.indices[i] = i;
+            }
+        }
+        this.positions.length = this.numMarkers * 3;
+        this.indices.length = this.numMarkers;
+    }
+
+    _buildAABB() {
+        const aabb = this.aabb;
+        math.collapseAABB3(aabb);
+        math.expandAABB3Points3(aabb, this.positions);
+        const origin = this.origin;
+        aabb[0] += origin[0];
+        aabb[1] += origin[1];
+        aabb[2] += origin[2];
+        aabb[3] += origin[0];
+        aabb[4] += origin[1];
+        aabb[5] += origin[2];
+    }
+
+    _buildVBOs() {
+        if (this.positionsBuf) {
+            if (this.lenPositionsBuf === this.positions.length) { // Just updating buffer elements, don't need to reallocate
+                this.positionsBuf.setData(this.positions); // Indices don't need updating
+                return;
+            }
+            this.positionsBuf.destroy();
+            this.positionsBuf = null;
+            this.indicesBuf.destroy();
+            this.indicesBuf = null;
+        }
+        const gl = this.scene.canvas.gl;
+        const lenPositions = this.numMarkers * 3;
+        const lenIndices = this.numMarkers;
+        this.positionsBuf = new ArrayBuf(gl, gl.ARRAY_BUFFER, new Float32Array(this.positions), lenPositions, 3, gl.STATIC_DRAW);
+        this.indicesBuf = new ArrayBuf(gl, gl.ELEMENT_ARRAY_BUFFER, new Uint16Array(this.indices), lenIndices, 1, gl.STATIC_DRAW);
+        this.lenPositionsBuf = this.positions.length;
+    }
+
+    _buildOcclusionTestList() {
+        const canvas = this.scene.canvas;
+        const near = this.scene.camera.perspective.near; // Assume near enough to ortho near
+        const boundary = canvas.boundary;
+        const canvasWidth = boundary[2];
+        const canvasHeight = boundary[3];
+        let lenPixels = 0;
+        this.lenOcclusionTestList = 0;
+        for (let i = 0; i < this.numMarkers; i++) {
+            const marker = this.markerList[i];
+            const viewPos = marker.viewPos;
+            if (viewPos[2] > -near) { // Clipped by near plane
+                marker._setVisible(false);
+                continue;
+            }
+            const canvasPos = marker.canvasPos;
+            const canvasX = canvasPos[0];
+            const canvasY = canvasPos[1];
+            if ((canvasX + 10) < 0 || (canvasY + 10) < 0 || (canvasX - 10) > canvasWidth || (canvasY - 10) > canvasHeight) {
+                marker._setVisible(false);
+                continue;
+            }
+            if (marker.entity && !marker.entity.visible) {
+                marker._setVisible(false);
+                continue;
+            }
+            if (marker.occludable) {
+                this.occlusionTestList[this.lenOcclusionTestList++] = marker;
+                this.pixels[lenPixels++] = canvasX;
+                this.pixels[lenPixels++] = canvasY;
+                continue;
+            }
+            marker._setVisible(true);
+        }
+    }
+
+    _updateActiveSectionPlanes() {
+        const sectionPlanes = this.scene._sectionPlanesState.sectionPlanes;
+        const numSectionPlanes = sectionPlanes.length;
+        if (numSectionPlanes > 0) {
+            for (let i = 0; i < numSectionPlanes; i++) {
+                const sectionPlane = sectionPlanes[i];
+                if (!sectionPlane.active) {
+                    this.sectionPlanesActive[i] = false;
+                } else {
+                    const intersect = math.planeAABB3Intersect(sectionPlane.dir, sectionPlane.dist, this.aabb);
+                    const outside = (intersect === -1);
+                    if (outside) {
+                        this.culledBySectionPlanes = true;
+                        return;
+                    }
+                    const intersecting = (intersect === 0);
+                    this.sectionPlanesActive[i] = intersecting;
+                }
+            }
+        }
+        this.culledBySectionPlanes = false;
+    }
+
+    destroy() {
+        this.markers = {};
+        this.markerList.length = 0;
+        if (this.positionsBuf) {
+            this.positionsBuf.destroy();
+        }
+        if (this.indicesBuf) {
+            this.indicesBuf.destroy();
+        }
+    }
+}
+
+
+export {OcclusionLayer};