fcs-core-viewer 0.10.4 → 0.10.5

package/fcs-core-viewer@types/DataStorage/ModelData.d.ts

@@ -9,7 +9,7 @@ export declare namespace ModelData {
             static instance: ElementContainer;
             sceneWrapper: SceneWrapper;
             shapeVIDs: number[];
-            cntElement: THREE.Mesh;
+            cntObject: THREE.Mesh;
             meshMaterialFEMesh: THREE.MeshPhongMaterial;
             sharedPositionBuffer: ArrayBuffer;
             sharedColorBuffer: ArrayBuffer;
@@ -19,6 +19,7 @@ export declare namespace ModelData {
             sharedColorArray: Float32Array;
             sharedVisibilityArray: Float32Array;
             sharedIsSelectedArray: Float32Array;
+            controls: THREE.TrackballControls;
             constructor(sceneWrapper: SceneWrapper);
             static getInstance(): ElementContainer;
             updateIsSelectedAttribute(): void;
@@ -32,6 +33,24 @@ export declare namespace ModelData {
          * Egy THREE.Point objektum az osszes FE Node-nak
          */
         class NodeContainer {
+            static instance: NodeContainer;
+            sceneWrapper: SceneWrapper;
+            shapeVIDs: number[];
+            cntObject: THREE.Point;
+            generalPointMaterial: THREE.ShaderMaterial;
+            sharedPositionBuffer: ArrayBuffer;
+            sharedTextureIDBuffer: ArrayBuffer;
+            sharedVisibilityBuffer: ArrayBuffer;
+            sharedPositionArray: Float32Array;
+            sharedTextureIDArray: Float32Array;
+            sharedVisibilityArray: Float32Array;
+            controls: THREE.TrackballControls;
+            constructor(sceneWrapper: SceneWrapper);
+            static getInstance(): NodeContainer;
+            updateColorAttribute(): void;
+            updateVisibilityAttribute(): void;
+            createContainer(): any;
+            addNodeToScene(data: {}): void;
         }
         /**
          * Egy THREE.Mesh objektum az osszes Face-nek
@@ -40,18 +59,22 @@ export declare namespace ModelData {
             static instance: MeshContainer;
             sceneWrapper: SceneWrapper;
             shapeVIDs: number[];
-            cntMesh: THREE.Mesh;
+            cntObject: THREE.Mesh;
             meshMaterialGeom: THREE.MeshPhongMaterial;
             sharedPositionBuffer: ArrayBuffer;
             sharedNormalBuffer: ArrayBuffer;
             sharedColorBuffer: ArrayBuffer;
             sharedVisibilityBuffer: ArrayBuffer;
+            sharedIsSelectedBuffer: ArrayBuffer;
             sharedPositionArray: Float32Array;
             sharedNormalArray: Float32Array;
             sharedColorArray: Float32Array;
             sharedVisibilityArray: Float32Array;
+            sharedIsSelectedArray: Float32Array;
+            controls: THREE.TrackballControls;
             constructor(sceneWrapper: SceneWrapper);
             static getInstance(): MeshContainer;
+            updateIsSelectedAttribute(): void;
             updateColorAttribute(): void;
             updateVisibilityAttribute(): void;
             private createContainer;
@@ -62,18 +85,22 @@ export declare namespace ModelData {
             static instance: LineContainer;
             sceneWrapper: SceneWrapper;
             shapeVIDs: number[];
-            cntLine: THREE.Line;
+            cntObject: THREE.Line;
             generalLineMaterial: THREE.LineMaterial;
             sharedPositionBuffer: ArrayBuffer;
             sharedColorBuffer: ArrayBuffer;
             sharedWidthBuffer: ArrayBuffer;
             sharedVisibilityBuffer: ArrayBuffer;
+            sharedIsSelectedBuffer: ArrayBuffer;
             sharedPositionArray: Float32Array;
             sharedColorArray: Float32Array;
             sharedWidthArray: Float32Array;
             sharedVisibilityArray: Float32Array;
+            sharedIsSelectedArray: Float32Array;
+            controls: THREE.TrackballControls;
             constructor(sceneWrapper: SceneWrapper);
             static getInstance(): LineContainer;
+            updateIsSelectedAttribute(): void;
             updateColorAttribute(): void;
             updateVisibilityAttribute(): void;
             createContainer(): any;
@@ -91,6 +118,7 @@ export declare namespace ModelData {
             sharedPositionArray: Float32Array;
             sharedTextureIDArray: Float32Array;
             sharedVisibilityArray: Float32Array;
+            controls: THREE.TrackballControls;
             constructor(sceneWrapper: SceneWrapper);
             static getInstance(): PointContainer;
             updateColorAttribute(): void;
@@ -127,8 +155,10 @@ export declare namespace ModelData {
             shapeUID: number;
             objectVID: number;
             objectUIDs: number[];
-            count: number;
-            polygonsXYZ: [];
+            verticesCount: number;
+            polygonsXYZ: number[];
+            polygonVertexIndices: number[];
+            provokingVertexIndices: number[];
             edges: Edge[];
             baseColor: number[];
             baseOpacity: number;
@@ -142,10 +172,11 @@ export declare namespace ModelData {
             lengthNormal: number;
             lengthColor: number;
             lengthVisibility: number;
-            constructor(itemVID: number, itemUID: number, shapeVID: number, shapeUID: number, faceUID: number, countVertices: number, polygonsXYZ: []);
+            constructor(itemVID: number, itemUID: number, shapeVID: number, shapeUID: number, faceUID: number, /*verticesCount: number,*/ polygonsXYZ: number[], polygonVertexIndices: number[], provokingVertexIndices: number[]);
             private createVID;
             select(): void;
             unselect(): void;
+            static raycaster(event: MouseEvent): any[];
             /**
              * Csak a szinet valtoztatja ha kijeloljuk.
              * A baseColor-t nem valtoztatja
@@ -161,7 +192,11 @@ export declare namespace ModelData {
         }
         export class Border {
             static title: string;
+            hash: string;
             segmentsXYZ: number[];
+            provokingVertexIndex: number;
+            elements: Element[];
+            nodes: Node[];
             baseColor: number[];
             lineWidth: number;
             isVisible: number;
@@ -173,7 +208,9 @@ export declare namespace ModelData {
             lengthColor: number;
             lengthWidth: number;
             lengthVisibility: number;
-            constructor(segmentsXYZ: number[]);
+            constructor(hash: string, segmentsXYZ: number[], elements: Element[]);
+            hide(): void;
+            show(): void;
         }
         export class Edge {
             static title: string;
@@ -188,6 +225,7 @@ export declare namespace ModelData {
             vertices: Vertex[];
             elements: Element[];
             nodes: Node[];
+            provokingVertexIndices: number[];
             baseColor: number[];
             lineWidth: number;
             isVisible: number;
@@ -200,10 +238,11 @@ export declare namespace ModelData {
             lengthColor: number;
             lengthWidth: number;
             lengthVisibility: number;
-            constructor(itemVID: number, shapeVID: number, edgeUID: number, segmentsXYZ: number[], count: number, faces?: Face[], elements?: Element[]);
+            constructor(itemVID: number, shapeVID: number, edgeUID: number, segmentsXYZ: number[], count: number, faces: Face[], provokingVertexIndices: number[]);
             private createVID;
             select(): void;
             unselect(): void;
+            static raycaster(event: MouseEvent): any[];
             /**
              * Csak a szinet valtoztatja ha kijeloljuk.
              * A baseColor-t nem valtoztatja
@@ -224,6 +263,7 @@ export declare namespace ModelData {
             objectVID: number;
             objectUIDs: number[];
             positionXYZ: number[];
+            vertexIndex: number;
             count: number;
             edges: Edge[];
             faces: Face[];
@@ -236,7 +276,7 @@ export declare namespace ModelData {
             lengthPosition: number;
             lengthTextureID: number;
             lengthVisibility: number;
-            constructor(itemVID: number, shapeVID: number, vertexUID: number, positionXYZ: number[], edges?: Edge[], faces?: Face[]);
+            constructor(itemVID: number, shapeVID: number, vertexUID: number, positionXYZ: number[], vertexIndex: number, edges?: Edge[], faces?: Face[]);
             private createVID;
             select(): void;
             unselect(): void;
@@ -263,19 +303,24 @@ export declare namespace ModelData {
             objectUIDs: number[];
             startIndex: number;
             provokingVertexIndex: number;
-            elementIndex: number[];
+            triaVertexIndices: number[];
             polygonsXYZ: number[];
             polygonsCount: number;
             nodesCount: number;
+            avgNodeXYZ: number[];
+            borders: Border[];
+            nodes: Node[];
             edges: Edge[];
             baseColor: number[];
             baseOpacity: number;
             isVisible: number;
             isSelected: boolean;
-            constructor(itemVID: number, itemUID: number, shapeVID: number, shapeUID: number, elementUID: number, polygonsXYZ: number[], startIndex: number, provokingVertexIndex?: number, elementIndex?: number[]);
+            constructor(itemVID: number, itemUID: number, shapeVID: number, shapeUID: number, elementUID: number, polygonsXYZ: number[], avgNodeXYZ: number[], startIndex: number, provokingVertexIndex?: number, triaVertexIndices?: number[]);
             private createVID;
             select(): void;
             unselect(): void;
+            static boxcaster(event: MouseEvent, startPoint: THREE.Vector3, endPoint: THREE.Vector3): any[];
+            static raycaster(event: MouseEvent): any[];
             /**
              * Csak a szinet valtoztatja ha kijeloljuk.
              * A baseColor-t nem valtoztatja
@@ -291,7 +336,7 @@ export declare namespace ModelData {
         }
         export class Tria_3N extends Element {
             static title: string;
-            constructor(itemVID: number, itemUID: number, shapeVID: number, shapeUID: number, elementUID: number, polygonsXYZ: number[], startIndex: number, provokingVertexIndex: number, elementIndex: number[]);
+            constructor(itemVID: number, itemUID: number, shapeVID: number, shapeUID: number, elementUID: number, polygonsXYZ: number[], avgNodeXYZ: number[], startIndex: number, iNodes: ModelData.SubShapes.Node[], provokingVertexIndex: number, triaVertexIndices: number[]);
             /**
              * Az .msh file-ból kigyujti a nodeUID-kat es a hozza tartozo xyt koordinatakat
              */
@@ -301,8 +346,8 @@ export declare namespace ModelData {
              * osszekoti a node-okat haromszogekke, mintha STL lenne. Ez a megjelenites miatt fontos, hiszen a three.js
              * háromszogeket tud megjeleniteni
              */
-            static extractElement(data: string[], nodesIdx: number[], nodesXYZ: number[], nodeUID_To_coords: {}, nodeUID_To_index: {}): number[][];
-            drawBorder(nodeUIDs: number[], nodeUID_To_coords: {}, hash_To_iBorder: {}): void;
+            static extractElement(nodeUIDs: number[], nodesIdx: number[], nodesXYZ: number[], nodeUID_To_coords: {}, nodeUID_To_index: {}): number[][];
+            drawBorder(iElement: Element, iNodes: Node[], nodeUIDs: number[], nodeUID_To_coords: {}, hash_To_iBorder: {}): void;
         }
         export class Tria_6N extends Element {
             static title: string;
@@ -324,21 +369,20 @@ export declare namespace ModelData {
             objectVID: number;
             objectUIDs: number[];
             positionXYZ: number[];
+            avgNodeXYZ: number[];
             count: number;
+            borders: Border[];
             elements: Element[];
             baseColor: number;
+            nodeIndex: number;
             isVisible: number;
             isSelected: boolean;
-            byteOffsetPosition: number;
-            byteOffsetTextureID: number;
-            byteOffsetVisibility: number;
-            lengthPosition: number;
-            lengthTextureID: number;
-            lengthVisibility: number;
-            constructor(itemVID: number, shapeVID: number, nodeUID: number, positionXYZ: number[], elements?: Element[]);
+            constructor(itemVID: number, shapeVID: number, nodeUID: number, positionXYZ: number[], nodeIndex?: number);
             private createVID;
             select(): void;
             unselect(): void;
+            static boxcaster(event: MouseEvent, startPoint: THREE.Vector3, endPoint: THREE.Vector3): any[];
+            static raycaster(event: MouseEvent): any[];
             /**
              * Csak a szinet valtoztatja ha kijeloljuk.
              * A baseColor-t nem valtoztatja
@@ -545,7 +589,16 @@ export declare namespace ModelData {
                 private static meshIDs_unused;
                 itemVID: number;
                 constructor(data: {});
+                /**
+                 * summary vagy UID alapjan kijelol egy part osszes shape-jenek az osszes megfelelo subshape-jet
+                 * @param summary
+                 */
+                select(): void;
                 private createVID;
+                highlight(): void;
+                setColor(): void;
+                setOpacity(): void;
+                setVisibility(): void;
             }
             export {};
         }

package/fcs-core-viewer@types/Loader/GEOMLoader/GeomLoader.d.ts

@@ -0,0 +1,14 @@
+import { ModelData } from "../../DataStorage/ModelData";
+export declare class GeomLoader {
+    private _fileUrl;
+    components: {};
+    uniqueID_To_Instance: {};
+    meshMaterialGeom: any;
+    meshMaterialFEMesh: any;
+    generalLineMaterial: any;
+    generalPointMaterial: any;
+    constructor(fileUrl: string);
+    perform(itemName: string, itemUID: number, parentUID: number, shapeUID: number, shapeType: ModelData.dataTypes): Promise<void>;
+    private createShape;
+    private createItem;
+}

package/fcs-core-viewer@types/Loader/Loader.d.ts

@@ -1,7 +1,6 @@
 import { VertexLoader } from "./STEPLoader/VertexLoader";
 import { EdgeLoader } from "./STEPLoader/EdgeLoader";
 import { FaceLoader } from "./STEPLoader/FaceLoader";
-import { TriangleLoader } from "./STLLoader/ElementLoader";
 import { BackendManager } from "../Common/CommsChannels/BackendClient";
 import { TaskUtils } from "../TaskHandler/TaskUtils";
 import { TreeView } from "../UserInterface/UIComponents/TreeView/TreeView";
@@ -24,7 +23,6 @@ export declare class Loader {
     vertexLoader: VertexLoader;
     edgeLoader: EdgeLoader;
     faceLoader: FaceLoader;
-    triangleLoader: TriangleLoader;
     taskUtils: TaskUtils;
     name: any;
     stlPath: any;
@@ -39,7 +37,7 @@ export declare class Loader {
      * @param loadEdge
      * @param stepLoader
      */
-    constructor(vertexLoader: VertexLoader, edgeLoader: EdgeLoader, faceLoader: FaceLoader, triangleLoader: TriangleLoader, taskUtils: TaskUtils, meshWrapper: MeshWrapper, treeView: TreeView);
+    constructor(vertexLoader: VertexLoader, edgeLoader: EdgeLoader, faceLoader: FaceLoader, taskUtils: TaskUtils, meshWrapper: MeshWrapper, treeView: TreeView);
     importModelFrontend(backendManager: BackendManager): void;
     /**
      * This method serves to save the current document locally.
@@ -55,6 +53,7 @@ export declare class Loader {
      */
     private _guessFileType;
     importSTLBackend(itemName: string, itemUID: number, parentUID: number, shapeUID: number, shapeTypeID: number, msh_path_static: string): Promise<void>;
+    importGeomBackend(itemName: string, itemUID: number, parentUID: number, shapeUID: number, shapeTypeID: number, t2gPathStatic: string): Promise<void>;
     /**
      * Import model from console
      * @param name

package/fcs-core-viewer@types/Loader/STLLoader/ElementLoader.d.ts

@@ -1,47 +0,0 @@
-import * as THREE from "../../three/build/three.module";
-import { SceneWrapper } from "../../Model/SceneWrapper";
-import { MeshWrapper } from "../../Model/MeshWrapper";
-import { LoaderUtils, LoaderTools } from "../LoaderUtils";
-import { ModelData } from "../../DataStorage/ModelData";
-import { TreeView } from '../../UserInterface/UIComponents/TreeView/TreeView';
-/**
- * Itt tortenik a STEP model importja.
- * Egyedi ID-t generalunk a beimportalni kivant mdoellnek
- * Belerakjuk a Register-be (ez a treeJSON, amit a meshWrapper.js-ben keszitunk/modositunk)
- * Belerakjuk a model tree-be is. (a tree szerkezetenek manipulalasaval kapcsolatos funkciok a tree.js-ben vannak)
- */
-export declare class TriangleLoader {
-    meshMaterialGeom: any;
-    generalLineMaterial: any;
-    generalPointMaterial: any;
-    loaderTools: LoaderTools;
-    loaderUtils: LoaderUtils;
-    sceneWrapper: SceneWrapper;
-    meshWrapper: MeshWrapper;
-    treeView: TreeView;
-    mesh: any;
-    line: any;
-    point: any;
-    promise: any;
-    itemUID: any;
-    meshGeometry: any;
-    scene: any;
-    currentCamera: any;
-    renderer: any;
-    uniqueToViewer: {};
-    vertexToUnique: {};
-    components: {};
-    /**
-     *
-     * @param loaderTools
-     * @param loaderUtils
-     * @param sceneWrapper
-     * @param meshWrapper
-     */
-    constructor(loaderTools: LoaderTools, loaderUtils: LoaderUtils, sceneWrapper: SceneWrapper, meshWrapper: MeshWrapper, treeView: TreeView);
-    perform(name: string, itemUID: number, parentUID: number, shapeUID: any, objParsed: {
-        tElements: any;
-        tEdges: any;
-    }, objectURL: string, shapeType: ModelData.dataTypes): Promise<string>;
-    loadSTL(meshGeometry: THREE.BufferGeometry, name: string, itemUID: number, parentUID: number, shapeUID: number, objParsed: any, shapeType: ModelData.dataTypes): Promise<string>;
-}

package/fcs-core-viewer@types/Model/SceneWrapper.d.ts

@@ -50,7 +50,7 @@ export declare class SceneWrapper {
     topbarSections_L1: any[];
     topbarSections_L2: any[];
     a_entities: any[];
-    readonly CANVAS: HTMLCanvasElement;
+    readonly canvas: HTMLCanvasElement;
     enclosingBox: {
         min: number;
         max: number;

package/fcs-core-viewer@types/TaskHandler/Tree/Request/TreeViewEventHandler.d.ts

@@ -1,3 +1,4 @@
+import * as THREE from '../../../three/build/three.module';
 import { SceneWrapper } from "../../../Model/SceneWrapper";
 import { TreeStructure } from "../../../Tree/TreeStructure/TreeStructure";
 import { TreeCore } from "../../../Tree/TreeView/TreeCore";
@@ -9,6 +10,9 @@ export declare class TreeViewEventHandler {
     treeStructure: TreeStructure;
     treeCore: TreeCore;
     treeOperations: TreeOperations;
+    renderer: THREE.Renderer;
+    scene: THREE.Scene;
+    currentCamera: THREE.OrthographicCamera;
     selected: {};
     constructor();
     onClickFile(event: MouseEvent, summary: HTMLElement): void;

package/fcs-core-viewer@types/UserInterface/EventListeners/EventListeners.d.ts

@@ -12,6 +12,7 @@ export declare class EventListeners {
     uiComponents: UIComponents;
     div_treeHTML: HTMLElement;
     div_leftSidebar: HTMLElement;
+    div_fcs_viewer: HTMLDivElement;
     selected: {};
     myCanvas: HTMLCanvasElement;
     scene: THREE.Scene;
@@ -25,6 +26,8 @@ export declare class EventListeners {
     startY: number;
     endX: number;
     endY: number;
+    startPoint: THREE.Vector3;
+    endPoint: THREE.Vector3;
     intersectionsByClick: any[];
     intersectionsByBox: any[];
     constructor(sceneWrapper: SceneWrapper, selectionData: SelectionData, validateOnSelection: ValidateOnSelection, selectionUtils: SelectionUtils);

package/fcs-core-viewer@types/Workspace/ViewerWrapper.d.ts

@@ -13,7 +13,6 @@ import { TreeOperations } from '../TaskHandler/Tree/Tree';
 import { TaskUtils } from '../TaskHandler/TaskUtils';
 import { Loader } from '../Loader/Loader';
 import { FaceLoader } from '../Loader/STEPLoader/FaceLoader';
-import { TriangleLoader } from '../Loader/STLLoader/ElementLoader';
 import { VertexLoader } from '../Loader/STEPLoader/VertexLoader';
 import { EdgeLoader } from '../Loader/STEPLoader/EdgeLoader';
 import { OptionsEvents } from '../FrontendEvents/OptionsEvents';
@@ -127,7 +126,6 @@ export declare class ViewerWrapper {
     TaskUtils: TaskUtils;
     LoaderUtils: LoaderUtils;
     FaceLoader: FaceLoader;
-    TriangleLoader: TriangleLoader;
     EdgeLoader: EdgeLoader;
     VertexLoader: VertexLoader;
     Loader: Loader;
@@ -154,6 +152,7 @@ export declare class ViewerWrapper {
     UIDGenerator: UIDGenerator;
     MaterialData: MaterialData;
     ElementContainer: ModelData.ContainerType.ElementContainer;
+    NodeContainer: ModelData.ContainerType.NodeContainer;
     MeshContainer: ModelData.ContainerType.MeshContainer;
     LineContainer: ModelData.ContainerType.LineContainer;
     PointContainer: ModelData.ContainerType.PointContainer;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fcs-core-viewer",
-    "version": "0.10.4",
+    "version": "0.10.5",
     "description": "3D Viewer in the Cloud",
     "author": {
         "name": "Femsolve Kft."