@equinor/esv-intersection 1.6.0 → 2.0.0

package/dist/interfaces.d.ts

@@ -1,5 +1,5 @@
 import { ZoomTransform } from 'd3-zoom';
-import { Graphics } from 'pixi.js';
+import { Graphics, IApplicationOptions } from 'pixi.js';
 import { Layer } from './layers/base/Layer';
 import { IntersectionReferenceSystem } from './control/IntersectionReferenceSystem';
 import Vector2 from '@equinor/videx-vector2';
@@ -55,7 +55,7 @@ export interface WellborepathLayerOptions extends LayerOptions {
 }
 export interface GeomodelLayerOptions extends LayerOptions {
 }
-export interface CompletionLayerOptions extends LayerOptions {
+export interface CompletionLayerOptions extends PixiLayerOptions {
 }
 export interface GeomodelLayerLabelsOptions extends LayerOptions {
     margins?: number;
@@ -77,7 +77,10 @@ export interface CementLayerOptions extends WellComponentBaseOptions {
     firstColor?: string;
     secondColor?: string;
 }
-export interface WellComponentBaseOptions extends LayerOptions {
+export interface PixiLayerOptions extends LayerOptions {
+    pixiApplicationOptions?: IApplicationOptions;
+}
+export interface WellComponentBaseOptions extends PixiLayerOptions {
     exaggerationFactor?: number;
 }
 export interface ZoomAndPanOptions {

package/dist/layers/CasingLayer.d.ts

@@ -12,7 +12,7 @@ export interface CasingRenderObject {
 }
 export declare class CasingLayer extends WellboreBaseComponentLayer {
     constructor(id?: string, options?: CasingLayerOptions);
-    render(): void;
+    preRender(): void;
     prepareCasingRenderObject: (casing: Casing) => CasingRenderObject;
     drawCasing: (zippedRenderObject: [Casing, CasingRenderObject]) => void;
     drawShoe(casingEnd: number, casingRadius: number): void;

package/dist/layers/CementLayer.d.ts

@@ -8,7 +8,7 @@ interface CementShape {
 }
 export declare class CementLayer extends WellboreBaseComponentLayer {
     constructor(id?: string, options?: CementLayerOptions);
-    render(): void;
+    preRender(): void;
     createCementShape: (cement: Cement, casings: Casing[], holes: HoleSize[]) => CementShape;
     createTexture(): Texture;
 }

package/dist/layers/CompletionLayer.d.ts

@@ -1,13 +1,15 @@
 import { Graphics } from 'pixi.js';
 import { PixiLayer } from './base/PixiLayer';
 import { OnUpdateEvent } from '..';
-import { CompletionLayerOptions } from '../interfaces';
+import { CompletionLayerOptions, OnRescaleEvent } from '../interfaces';
 interface CompletionItem {
 }
 export declare class CompletionLayer extends PixiLayer {
     constructor(id: string, options: CompletionLayerOptions);
+    onRescale(event: OnRescaleEvent): void;
     onUpdate(event: OnUpdateEvent): void;
-    render(): void;
+    preRender(): void;
+    clearStage(): void;
     getShape(type: string): Graphics;
     getScale(type: string, length: number, width: number): {
         scaleX: number;

package/dist/layers/GeomodelLayerV2.d.ts

@@ -2,11 +2,11 @@ import { PixiLayer } from './base/PixiLayer';
 import { OnRescaleEvent, OnUpdateEvent } from '../interfaces';
 import { SurfaceArea, SurfaceLine } from '../datautils';
 export declare class GeomodelLayerV2 extends PixiLayer {
-    private isRendered;
+    private isPreRendered;
     onRescale(event: OnRescaleEvent): void;
     onUpdate(event: OnUpdateEvent): void;
-    cleanUpStage(): void;
-    render(): void;
+    clearStage(): void;
+    preRender(): void;
     createPolygons: (data: any) => number[][];
     generateAreaPolygon: (s: SurfaceArea) => void;
     generateSurfaceLine: (s: SurfaceLine) => void;

package/dist/layers/HoleSizeLayer.d.ts

@@ -4,7 +4,7 @@ import { HoleSizeLayerOptions, HoleSize } from '..';
 export declare class HoleSizeLayer extends WellboreBaseComponentLayer {
     maxDiameter: number;
     constructor(id?: string, options?: HoleSizeLayerOptions);
-    render(): void;
+    preRender(): void;
     drawHoleSize: (holeObject: HoleSize) => void;
     createTexture(diameter: number): Texture;
     createBaseTexture(width: number, height: number): Texture;

package/dist/layers/WellboreBaseComponentLayer.d.ts

@@ -5,11 +5,11 @@ export declare abstract class WellboreBaseComponentLayer extends PixiLayer {
     _textureCache: Texture;
     rescaleEvent: OnRescaleEvent;
     constructor(id?: string, options?: WellComponentBaseOptions);
+    abstract preRender(): void;
     onUnmount(event?: OnUnmountEvent): void;
     onUpdate(event: OnUpdateEvent): void;
     onRescale(event: OnRescaleEvent): void;
-    clear(): void;
-    abstract render(): void;
+    clearStage(): void;
     /**
      * Calculate yRatio without zFactor
      * TODO consider to move this into ZoomPanHandler

package/dist/layers/base/PixiLayer.d.ts

@@ -1,10 +1,20 @@
-import { Application, RENDERER_TYPE } from 'pixi.js';
+import { AbstractRenderer, Container, IRendererOptionsAuto, RENDERER_TYPE } from 'pixi.js';
 import { Layer } from './Layer';
-import { OnMountEvent, OnRescaleEvent, OnResizeEvent, OnUnmountEvent } from '../../interfaces';
+import { OnMountEvent, OnRescaleEvent, OnResizeEvent, OnUnmountEvent, PixiLayerOptions } from '../../interfaces';
+declare class PixiRenderApplication {
+    stage: Container;
+    renderer: AbstractRenderer;
+    constructor(pixiRenderOptions: IRendererOptionsAuto);
+    destroy(): void;
+    get view(): HTMLCanvasElement;
+    render(): void;
+}
 export declare abstract class PixiLayer extends Layer {
     elm: HTMLElement;
-    ctx: Application;
+    ctx: PixiRenderApplication;
+    constructor(id?: string, options?: PixiLayerOptions);
     onMount(event: OnMountEvent): void;
+    render(): void;
     onUnmount(event?: OnUnmountEvent): void;
     onResize(event: OnResizeEvent): void;
     onRescale(event: OnRescaleEvent): void;
@@ -15,3 +25,4 @@ export declare abstract class PixiLayer extends Layer {
     onInteractivityChanged(interactive: boolean): void;
     renderType(): RENDERER_TYPE;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/esv-intersection",
-  "version": "1.6.0",
+  "version": "2.0.0",
   "description": "Intersection component package with testing and automatic documentation.",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -43,9 +43,9 @@
     "@babel/core": "^7.16.7",
     "@babel/preset-env": "^7.16.8",
     "@babel/preset-typescript": "^7.16.7",
-    "@storybook/addon-docs": "^6.4.18",
-    "@storybook/addon-storysource": "^6.4.18",
-    "@storybook/html": "^6.4.18",
+    "@storybook/addon-docs": "^6.4.22",
+    "@storybook/addon-storysource": "^6.4.22",
+    "@storybook/html": "^6.4.22",
     "@types/d3": "^7.1.0",
     "@types/jest": "^27.4.0",
     "@types/mock-raf": "^1.0.2",
@@ -56,20 +56,21 @@
     "eslint": "^7.20.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-storybook": "^0.5.10",
     "jest": "^27.4.7",
     "jest-canvas-mock": "^2.3.1",
     "mock-raf": "^1.0.1",
-    "pixi.js": "^5.3.8",
-    "prettier": "^2.2.1",
+    "pixi.js": "^6.4.2",
+    "prettier": "^2.6.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.39.1",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.30.0",
-    "storybook-dark-mode": "^1.0.8",
+    "storybook-dark-mode": "^1.0.9",
     "tslib": "^2.1.0",
-    "typedoc": "^0.20.28",
+    "typedoc": "^0.22.13",
     "typescript": "^4.2.2"
   },
   "jest": {
@@ -83,16 +84,18 @@
       "js"
     ],
     "testEnvironment": "jsdom",
-    "transformIgnorePatterns": ["/node_modules/(?!d3)"]
+    "transformIgnorePatterns": [
+      "/node_modules/(?!d3)"
+    ]
   },
   "peerDependencies": {
-    "pixi.js": "^5.2.1"
+    "pixi.js": "^6.4.2"
   },
   "dependencies": {
     "@equinor/videx-math": "^1.0.12",
     "@equinor/videx-vector2": "^1.0.44",
     "curve-interpolator": "2.0.8",
-    "d3-array": "^3.1.1",
+    "d3-array": "^3.1.6",
     "d3-axis": "^3.0.0",
     "d3-scale": "^4.0.2",
     "d3-selection": "^3.0.0",