fcs-core-viewer 0.10.5 → 0.11.1

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

@@ -72,7 +72,7 @@ export declare class BackendEvents implements IBackendEvents {
         center_view: any;
         set_object_color: any;
         refresh_viewer: any;
-        clear_document: any;
+        clear_model: any;
         sync_model: any;
         commit_to_document: any;
         remove_from_model: any;
@@ -154,7 +154,7 @@ export declare class BackendEvents implements IBackendEvents {
     /**
      * Clears all entities in the document. Basically, a new empty document is open.
      */
-    private clear_document;
+    private clear_model;
     /**
      * This method is called both times when we are spawning the progress
      * tracker or updating an existing one. To close down the progress tracker,

package/fcs-core-viewer@types/BackendEvents/FileGetter.d.ts

@@ -0,0 +1 @@
+export declare function getFileAsset(fileRelativeUrl: string): Promise<Response>;

package/fcs-core-viewer@types/CloudViewer/FcsViewer.d.ts

@@ -13,6 +13,12 @@ export declare namespace CloudViewer {
      * Engulf all settings to initialise a viewer.
      */
     class ViewerSettings {
+        /**
+         * The base URL for all assets and endpoints.
+         * This needs to be specified when the viewer is access from a third-party
+         * client application.
+         */
+        ViewerServerBaseUrl: string;
         /**
          * Contains settings that are responsible for styling of the viewer.
          */
@@ -41,7 +47,7 @@ export declare namespace CloudViewer {
         /**
          * Constructor to instantiate viewer.
          */
-        constructor(container: HTMLDivElement, initSettings?: ViewerSettings, licenseToken?: string, disallowSocketCallbacks?: boolean);
+        constructor(container: HTMLDivElement, initSettings: ViewerSettings, licenseToken?: string, disallowSocketCallbacks?: boolean);
         /**
          * Generates a unique id in the viewer
          */

package/fcs-core-viewer@types/Common/CommsChannels/Socket.d.ts

@@ -3,22 +3,33 @@ import { Socket } from 'socket.io-client';
  * Socket Class
  */
 export declare class CurrentUserSocket {
+    private static _viewerBaseUrl;
     private static _instance;
     socket: Socket;
     private static _authToken;
     private static _activeModelPath;
+    /**
+     * This promise resolves when the socket connects
+     */
+    static connectionPromise: any;
+    /**
+     *  Resolver function for the promise
+     */
+    static connectionResolve: any;
     /**
      * By default, we allow and expect to get callbacks from the backend.
      */
     private static _allowBackendCallbacks;
     private constructor();
+    static setViewerBaseUrl(baseUrl: string): void;
+    static getViewerBaseUrl(): string;
     static disallowSocketCallbacks(): void;
     static getInstance(authToken?: string): CurrentUserSocket;
     static getAuthToken(): string | null;
     /**
      * Handle socket errors and log them to console
      */
-    private _handleErrors;
+    private _handleSocketConnectionStates;
     /**
      * Get socket instance of socket
      */

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

@@ -110,7 +110,7 @@ export declare namespace ModelData {
             static instance: PointContainer;
             sceneWrapper: SceneWrapper;
             shapeVIDs: number[];
-            cntPoint: THREE.Point;
+            cntObject: THREE.Point;
             generalPointMaterial: THREE.ShaderMaterial;
             sharedPositionBuffer: ArrayBuffer;
             sharedTextureIDBuffer: ArrayBuffer;
@@ -194,7 +194,7 @@ export declare namespace ModelData {
             static title: string;
             hash: string;
             segmentsXYZ: number[];
-            provokingVertexIndex: number;
+            provokingVertexIndices: number[];
             elements: Element[];
             nodes: Node[];
             baseColor: number[];
@@ -263,6 +263,7 @@ export declare namespace ModelData {
             objectVID: number;
             objectUIDs: number[];
             positionXYZ: number[];
+            avgNodeXYZ: number[];
             vertexIndex: number;
             count: number;
             edges: Edge[];
@@ -280,6 +281,8 @@ export declare namespace ModelData {
             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
@@ -401,6 +404,7 @@ export declare namespace ModelData {
         class Shape {
             private static shapeIDs_used;
             private static shapeIDs_unused;
+            boundingBox: THREE.Box3;
             subShapes: {
                 faces: {};
                 edges: {};
@@ -411,6 +415,12 @@ export declare namespace ModelData {
             itemUID: number;
             constructor(shapeUID: number);
             private createVID;
+            /**
+             * Create oriented bounding box from array of vertex XYZ coordinates
+             * @param position
+             * @returns
+             */
+            createBoundingBox(position: number[]): any;
         }
         export class TopoFace extends Shape {
             static title: string;
@@ -468,7 +478,14 @@ export declare namespace ModelData {
         export class TopoSolid extends Shape {
             static title: string;
             constructor(shapeUID: number);
-            setColor(r: number, g: number, b: number, alpha: number): void;
+            setColor(colorData: any[]): void;
+            /**
+             * Olyan mint a setColor, de a baseColor-t nem valtoztatja.
+             * Ez azert fontos, hogy unselect-nel visszakapja az eredeti szinet
+             * @param colorData
+             */
+            highlight(): void;
+            select(): void;
             setOpacity(): void;
             setVisibility(): void;
             remove(): void;

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

@@ -0,0 +1,7 @@
+import { GeomLoader } from "./GeomLoader";
+export declare class VertexLoader {
+    geomLoader: GeomLoader;
+    constructor(geomLoader: GeomLoader);
+    loadVertex(iShape: any, line: string, itemVID: number, shapeVID: number): void;
+    loadEdge(iShape: any, line: string, itemVID: number, shapeVID: number): void;
+}

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

@@ -0,0 +1,8 @@
+import { GeomLoader } from "./GeomLoader";
+export declare class FaceLoader {
+    geomLoader: GeomLoader;
+    constructor(geomLoader: GeomLoader);
+    loadVertex(iShape: any, line: string, itemVID: number, shapeVID: number): void;
+    loadEdge(iShape: any, line: string, itemVID: number, shapeVID: number): void;
+    loadFace(iShape: any, line: string, itemVID: number, shapeVID: number): void;
+}

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

@@ -2,13 +2,30 @@ import { ModelData } from "../../DataStorage/ModelData";
 export declare class GeomLoader {
     private _fileUrl;
     components: {};
+    shapeVIDs: any[];
     uniqueID_To_Instance: {};
     meshMaterialGeom: any;
     meshMaterialFEMesh: any;
     generalLineMaterial: any;
     generalPointMaterial: any;
+    iFaces: ModelData.SubShapes.Face[];
+    iEdges: ModelData.SubShapes.Edge[];
+    iVertices: ModelData.SubShapes.Vertex[];
+    hashToVertex: {};
+    vertexIndex: number;
+    vertexPositionAll: number[];
+    vertexPositionShape: number[];
+    verticesIndex: number[];
+    startIndex: number;
+    hashToEdge: {};
+    vertexIdxToCoords: {};
+    linePosition: number[];
+    polygonVerticesIdx: number[];
+    facePosition: number[];
+    faceUIDToVertices: {};
+    faceUIDToEdges: {};
     constructor(fileUrl: string);
-    perform(itemName: string, itemUID: number, parentUID: number, shapeUID: number, shapeType: ModelData.dataTypes): Promise<void>;
+    perform(itemName: string, itemUID: number, parentUID: number, /*shapeUID: number,*/ shapeType: ModelData.dataTypes): Promise<void>;
     private createShape;
     private createItem;
 }

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

@@ -0,0 +1,6 @@
+import { GeomLoader } from "./GeomLoader";
+export declare class VertexLoader {
+    geomLoader: GeomLoader;
+    constructor(geomLoader: GeomLoader);
+    loadVertex(iShape: any, line: string, itemVID: number, shapeVID: number): void;
+}

package/package.json

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