@vitrosoftware/common-ui-ts 1.1.257 → 1.1.258

package/dist/index.js

@@ -67699,7 +67699,7 @@ var Viewer = function Viewer(props) {
 };
 
 var name = "@vitrosoftware/common-ui-ts";
-var version$1 = "1.1.257";
+var version$1 = "1.1.258";
 var description = "vitro software common ui ts";
 var author = "";
 var license = "MIT";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.257",
+    "version": "1.1.258",
     "description": "vitro software common ui ts",
     "author": "",
     "license": "MIT",

package/src/controls/BimViewer/js/bim-viewer.js

@@ -1,11 +1,11 @@
-import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.257';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.258';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
     GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers, buildVectorTextGeometry
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.257';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.258';
 
 
 //----------------------------------------------------------------------------------------------------------------------

package/src/controls/DxfViewer/js/dxf-viewer.js

@@ -1,18 +1,18 @@
-import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.257';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.257';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.257';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.257';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.257';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.257';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.257';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.257';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.257';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.257';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.257';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.257';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.257';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.257';
-import * as fflate from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.257'
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.258';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.258';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.258';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.258';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.258';
+import { DxfScene, Entity, ColorCode, PdMode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.258';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.258';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.258';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.258';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.258';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.258';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.258';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.258';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.258';
+import * as fflate from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.258'
 
 let treeViewData = [];
 let notes = [];
@@ -387,6 +387,9 @@ export class VitroBlock extends SceneBlock {
         }
     }
 }
+const POINT_SHAPE_BLOCK_NAME = "__point_shape"
+const POINT_CIRCLE_TESSELLATION_ANGLE = 15 * Math.PI / 180
+
 export class VitroDxfScene extends DxfScene {
 
     constructor(options) {
@@ -755,63 +758,6 @@ export class VitroDxfScene extends DxfScene {
         return !blockCtx || blockCtx.block.IsSpace()
     }
 
-
-    _CreatePointShapeBlock() {//to override to new VitroBlock
-        if (this.pointShapeBlock) {
-            return
-        }
-        /* This mimics DXF block entity. */
-        this.pointShapeBlock = new VitroBlock({
-            name: POINT_SHAPE_BLOCK_NAME,
-            position: { x: 0, y: 0 }
-        })
-        /* Fix block origin at zero. */
-        this.pointShapeBlock.offset = new Vector2(0, 0)
-        const blockCtx = this.pointShapeBlock.DefinitionContext()
-
-        const markType = this.pdMode & PdMode.MARK_MASK
-        if (markType !== PdMode.DOT && markType !== PdMode.NONE) {
-            const vertices = []
-            this._CreatePointMarker(vertices, markType)
-            const entity = new Entity({
-                type: Entity.Type.LINE_SEGMENTS,
-                vertices,
-                color: ColorCode.BY_BLOCK
-            })
-            this._ProcessEntity(entity, blockCtx)
-        }
-
-        if (this.pdMode & PdMode.SQUARE) {
-            const r = this.pdSize * 0.5
-            const vertices = [
-                { x: -r, y: r },
-                { x: r, y: r },
-                { x: r, y: -r },
-                { x: -r, y: -r }
-            ]
-            const entity = new Entity({
-                type: Entity.Type.POLYLINE, vertices,
-                color: ColorCode.BY_BLOCK,
-                shape: true
-            })
-            this._ProcessEntity(entity, blockCtx)
-        }
-        if (this.pdMode & PdMode.CIRCLE) {
-            const vertices = []
-            this._GenerateArcVertices({
-                vertices, center: { x: 0, y: 0 },
-                radius: this.pdSize * 0.5,
-                tessellationAngle: POINT_CIRCLE_TESSELLATION_ANGLE
-            })
-            const entity = new Entity({
-                type: Entity.Type.POLYLINE, vertices,
-                color: ColorCode.BY_BLOCK,
-                shape: true
-            })
-            this._ProcessEntity(entity, blockCtx)
-        }
-    }
-
     _ProcessDxfEntity(entity, blockCtx = null) {
         let renderEntities
         switch (entity.type) {
@@ -1041,7 +987,7 @@ export class VitroDxfScene extends DxfScene {
             const name = entity.name
             entity.name = entity.block
             entity.position = { x: 0, y:0, z: 0 }
-            this._ProcessInsert(entity, blockCtx)
+            this._ProcessInsert(entity, blockCtx)//block insertion simulation
             entity.name = name
             return
         }
@@ -1074,6 +1020,110 @@ export class VitroDxfScene extends DxfScene {
         yield* super._DecomposeLine(entity, blockCtx)
     }
 
+    *_DecomposePoint(entity, blockCtx) {
+        if (this.pdMode === PdMode.NONE) {
+            /* Points not displayed. */
+            return
+        }
+        if (this.pdMode !== PdMode.DOT && this.pdSize <= 0) {
+            /* Currently not supported. */
+            return
+        }
+        const color = this._GetEntityColor(entity, blockCtx)
+        const layer = this._GetEntityLayer(entity, blockCtx)
+        const markType = this.pdMode & PdMode.MARK_MASK
+        const isShaped = (this.pdMode & PdMode.SHAPE_MASK) !== 0
+
+        if (isShaped) {
+            /* Shaped mark should be instanced. */
+            const key = new BatchingKey(layer, POINT_SHAPE_BLOCK_NAME,
+                BatchingKey.GeometryType.POINT_INSTANCE, color, 0)
+            const batch = this._GetBatch(key)
+            batch.PushVertex(this._TransformVertex(entity.position, blockCtx))
+            this._CreatePointShapeBlock(entity)
+
+            const name = entity.name
+            entity.name = POINT_SHAPE_BLOCK_NAME
+            this._ProcessInsert(entity, blockCtx)//block insertion simulation
+            entity.name = name
+            return
+        }
+
+        if (markType === PdMode.DOT) {
+            yield new Entity({
+                type: Entity.Type.POINTS,
+                vertices: [entity.position],
+                layer, color,
+                lineType: null
+            })
+            return
+        }
+
+        const vertices = []
+        this._CreatePointMarker(vertices, markType, entity.position)
+        yield new Entity({
+            type: Entity.Type.LINE_SEGMENTS,
+            vertices, layer, color,
+            lineType: null
+        })
+    }
+
+    _CreatePointShapeBlock() {//to override to new VitroBlock
+        if (this.pointShapeBlock) {
+            return
+        }
+        /* This mimics DXF block entity. */
+        this.pointShapeBlock = new VitroBlock({
+            name: POINT_SHAPE_BLOCK_NAME,
+            position: { x: 0, y: 0 }
+        })
+        /* Fix block origin at zero. */
+        this.pointShapeBlock.offset = new Vector2(0, 0)
+        const blockCtx = this.pointShapeBlock.DefinitionContext()
+
+        const markType = this.pdMode & PdMode.MARK_MASK
+        if (markType !== PdMode.DOT && markType !== PdMode.NONE) {
+            const vertices = []
+            this._CreatePointMarker(vertices, markType)
+            const entity = new Entity({
+                type: Entity.Type.LINE_SEGMENTS,
+                vertices,
+                color: ColorCode.BY_BLOCK
+            })
+            this._ProcessEntity(entity, blockCtx)
+        }
+
+        if (this.pdMode & PdMode.SQUARE) {
+            const r = this.pdSize * 0.5
+            const vertices = [
+                { x: -r, y: r },
+                { x: r, y: r },
+                { x: r, y: -r },
+                { x: -r, y: -r }
+            ]
+            const entity = new Entity({
+                type: Entity.Type.POLYLINE, vertices,
+                color: ColorCode.BY_BLOCK,
+                shape: true
+            })
+            this._ProcessEntity(entity, blockCtx)
+        }
+        if (this.pdMode & PdMode.CIRCLE) {
+            const vertices = []
+            this._GenerateArcVertices({
+                vertices, center: { x: 0, y: 0 },
+                radius: this.pdSize * 0.5,
+                tessellationAngle: POINT_CIRCLE_TESSELLATION_ANGLE
+            })
+            const entity = new Entity({
+                type: Entity.Type.POLYLINE, vertices,
+                color: ColorCode.BY_BLOCK,
+                shape: true
+            })
+            this._ProcessEntity(entity, blockCtx)
+        }
+    }
+
 
     /**
  * Updates batches directly.
@@ -1588,7 +1638,9 @@ export class Viewer extends DxfViewer {
 		//render current space entities (viewport borders (for layouts) and etc.)
 		this.renderer.setViewport(0, 0, this.canvasWidth, this.canvasHeight);
 		this.renderer.setScissor(0, 0, this.canvasWidth, this.canvasHeight);
+
 		console.log("Start render")
+		this.CheckCullingObj(space.scene)
 		this.renderer.render(space.scene, this.camera)
 		console.log("Finish render")
 
@@ -1597,6 +1649,94 @@ export class Viewer extends DxfViewer {
 		}
 	}
 
+	CheckCullingObj(scene) {
+		let culed = 0;
+		let maxVisibleObj;
+		let maxVisibleLen = 0;
+		for (const obj of scene.children) {
+			if (obj.visible) {
+				const isFrustumCulled = !this.IsObjectInFrustum(obj, this.camera)
+				if (!isFrustumCulled) {
+					const state = this.GetObjectVisibleState(obj, this.camera, this.renderer)
+					obj.layers.set(!state.visible ? 1 : 0)
+					if (!state.visible) {
+						culed++
+						if (state.length > maxVisibleLen && obj.type !== 'Mesh') {
+							maxVisibleLen = state.length
+							maxVisibleObj = obj;
+						}
+					}
+				}
+			}
+		}
+		if (maxVisibleObj) {
+			maxVisibleObj.layers.set(0)//retain maxlen object
+			culed--
+		}
+		console.info(`Objects culed ${culed}`)
+	}
+
+
+	IsObjectInFrustum(object, camera) {
+		// 1. Update the camera's matrices
+		camera.updateMatrix();
+		camera.updateMatrixWorld();
+
+		// 2. Create a Frustum object
+		const frustum = new three.Frustum();
+		// 3. Set the frustum from the camera's projection matrix
+		frustum.setFromProjectionMatrix(
+			new three.Matrix4().multiplyMatrices(
+				camera.projectionMatrix,
+				camera.matrixWorldInverse
+			)
+		);
+
+		// 4. Check if the object intersects the frustum
+		// This uses the object's bounding sphere/box for the test
+		return frustum.intersectsObject(object);
+	}
+
+	GetObjectVisibleState(object, camera, renderer) {
+		// 1. Get the bounding box in world coordinates
+		const bbox = new three.Box3().setFromObject(object);
+		const distance = bbox.min.distanceTo(bbox.max);
+		if (distance <= 1) {
+			return {
+				visible: true,
+				length: distance
+			}
+		}
+
+		// 2. Get the canvas dimensions
+		const canvas = renderer.domElement;
+		const width = canvas.clientWidth;
+		const height = canvas.clientHeight;
+
+		// 3. Project the min and max corners of the bounding box to screen space
+		const min = bbox.min.clone();
+		const max = bbox.max.clone();
+
+		// Project method mutates the vector in place to Normalized Device Coordinates (NDC)
+		min.project(camera);
+		max.project(camera);
+
+		// 4. Convert NDC values to canvas pixel coordinates
+		const minX = (min.x + 1) * width / 2;
+		const minY = -(min.y - 1) * height / 2; // Y is inverted in screen space (top is 0)
+		const maxX = (max.x + 1) * width / 2;
+		const maxY = -(max.y - 1) * height / 2;
+
+		// 5. Calculate pixel width and height
+		const pixelWidth = Math.abs(maxX - minX);
+		const pixelHeight = Math.abs(maxY - minY);
+
+		return {
+			visible: pixelWidth > 5 || pixelHeight > 5,
+			length: distance
+		}
+	}
+
 	CreateDxfWorker(workerFactory) {
 		return new VitroDxfWorker(workerFactory ? workerFactory() : null)
 	}

package/src/controls/PdfViewer/js/pdf-viewer.js

@@ -21208,7 +21208,7 @@ const defaultOptions = {
     kind: OptionKind.WORKER
   },
   workerSrc: {
-    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.257",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.258",
     kind: OptionKind.WORKER
   }
 };