@shapediver/viewer.rendering-engine.canvas-engine 2.7.9 → 2.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,9 @@ import { ICanvasEngine } from '../interfaces/ICanvasEngine';
3
3
  import { ICanvas } from '../interfaces/ICanvas';
4
4
  export declare class CanvasEngine implements ICanvasEngine {
5
5
  private readonly _canvasDictionary;
6
+ private static _instance;
6
7
  protected readonly _uuidGenerator: UuidGenerator;
8
+ static get instance(): CanvasEngine;
7
9
  /**
8
10
  * Creates a canvas object that could in the future be expanded to hold more information
9
11
  * The definition of the canvas can be:
@@ -1 +1 @@
1
- {"version":3,"file":"CanvasEngine.d.ts","sourceRoot":"","sources":["../../src/implementation/CanvasEngine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAE/C,qBACa,YAAa,YAAW,aAAa;IAG9C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAE3B;IAEP,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAmD;IAMnG;;;;;;;;;;;OAWG;IACI,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,iBAAiB,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAmC7F,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;CAK/C"}
1
+ {"version":3,"file":"CanvasEngine.d.ts","sourceRoot":"","sources":["../../src/implementation/CanvasEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAE/C,qBAAa,YAAa,YAAW,aAAa;IAG9C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAE3B;IAEP,OAAO,CAAC,MAAM,CAAC,SAAS,CAAe;IAEvC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,aAAa,CAA0B;IAM1E,WAAkB,QAAQ,iBAEzB;IAMD;;;;;;;;;;;OAWG;IACI,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,iBAAiB,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAmC7F,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;CAK/C"}
@@ -1,23 +1,21 @@
1
1
  "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
2
  Object.defineProperty(exports, "__esModule", { value: true });
9
3
  exports.CanvasEngine = void 0;
10
- const tsyringe_1 = require("tsyringe");
11
4
  const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
12
5
  const Canvas_1 = require("./Canvas");
13
- let CanvasEngine = class CanvasEngine {
6
+ class CanvasEngine {
14
7
  constructor() {
15
- // #region Properties (4)
8
+ // #region Properties (3)
16
9
  this._canvasDictionary = {};
17
- this._uuidGenerator = tsyringe_1.container.resolve(viewer_shared_services_1.UuidGenerator);
10
+ this._uuidGenerator = viewer_shared_services_1.UuidGenerator.instance;
18
11
  // #endregion Public Methods (2)
19
12
  }
20
- // #endregion Properties (4)
13
+ // #endregion Properties (3)
14
+ // #region Public Static Accessors (1)
15
+ static get instance() {
16
+ return this._instance || (this._instance = new this());
17
+ }
18
+ // #endregion Public Static Accessors (1)
21
19
  // #region Public Methods (2)
22
20
  /**
23
21
  * Creates a canvas object that could in the future be expanded to hold more information
@@ -64,9 +62,6 @@ let CanvasEngine = class CanvasEngine {
64
62
  getCanvas(storageId) {
65
63
  return this._canvasDictionary[storageId];
66
64
  }
67
- };
68
- CanvasEngine = __decorate([
69
- (0, tsyringe_1.singleton)()
70
- ], CanvasEngine);
65
+ }
71
66
  exports.CanvasEngine = CanvasEngine;
72
67
  //# sourceMappingURL=CanvasEngine.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"CanvasEngine.js","sourceRoot":"","sources":["../../src/implementation/CanvasEngine.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uCAA+C;AAC/C,+EAAkE;AAElE,qCAAiC;AAKjC,IAAa,YAAY,GAAzB,MAAa,YAAY;IAAzB;QACI,yBAAyB;QAER,sBAAiB,GAE9B,EAAE,CAAC;QAEY,mBAAc,GAAiC,oBAAS,CAAC,OAAO,CAAC,sCAAa,CAAC,CAAC;QAyDnG,gCAAgC;IACpC,CAAC;IAxDG,4BAA4B;IAE5B,6BAA6B;IAE7B;;;;;;;;;;;OAWG;IACI,kBAAkB,CAAC,gBAA6C,EAAE,SAAkB;QACvF,SAAS,GAAG,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAE1H,IAAI,gBAAgB,YAAY,iBAAiB,EAAE;YAC/C,wBAAwB;YACxB,MAAM,aAAa,GAAuB,gBAAiB,CAAC;YAC5D,IAAI,CAAC,aAAa,CAAC,EAAE;gBACjB,aAAa,CAAC,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;YACpD,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,IAAI,eAAM,CAAC,aAAa,CAAC,EAAE,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;YAClG,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,gBAAgB,EAAE;YAClB,MAAM,EAAE,GAAW,gBAAgB,CAAC;YACpC,MAAM,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YAElD,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,iBAAiB;gBACvC,IAAI,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE;oBAC1C,OAAO,QAAQ,CAAC;YAExB,IAAI,aAAa,YAAY,iBAAiB,EAAE;gBAC5C,8BAA8B;gBAC9B,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,IAAI,eAAM,CAAC,EAAE,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;gBACpF,OAAO,SAAS,CAAC;aACpB;iBAAM,IAAG,CAAC,aAAa,EAAE;gBACtB,2DAA2D;gBAC3D,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,IAAI,eAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;gBACrE,OAAO,SAAS,CAAC;aACpB;SACJ;QAED,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,IAAI,eAAM,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAC5E,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,SAAS,CAAC,SAAiB;QAC9B,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;CAGJ,CAAA;AAjEY,YAAY;IADxB,IAAA,oBAAS,GAAE;GACC,YAAY,CAiExB;AAjEY,oCAAY"}
1
+ {"version":3,"file":"CanvasEngine.js","sourceRoot":"","sources":["../../src/implementation/CanvasEngine.ts"],"names":[],"mappings":";;;AAAA,+EAAkE;AAElE,qCAAiC;AAIjC,MAAa,YAAY;IAAzB;QACI,yBAAyB;QAER,sBAAiB,GAE9B,EAAE,CAAC;QAIY,mBAAc,GAAkB,sCAAa,CAAC,QAAQ,CAAC;QAiE1E,gCAAgC;IACpC,CAAC;IAhEG,4BAA4B;IAE5B,sCAAsC;IAE/B,MAAM,KAAK,QAAQ;QACtB,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,yCAAyC;IAEzC,6BAA6B;IAE7B;;;;;;;;;;;OAWG;IACI,kBAAkB,CAAC,gBAA6C,EAAE,SAAkB;QACvF,SAAS,GAAG,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAE1H,IAAI,gBAAgB,YAAY,iBAAiB,EAAE;YAC/C,wBAAwB;YACxB,MAAM,aAAa,GAAuB,gBAAiB,CAAC;YAC5D,IAAI,CAAC,aAAa,CAAC,EAAE;gBACjB,aAAa,CAAC,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;YACpD,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,IAAI,eAAM,CAAC,aAAa,CAAC,EAAE,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;YAClG,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,gBAAgB,EAAE;YAClB,MAAM,EAAE,GAAW,gBAAgB,CAAC;YACpC,MAAM,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YAElD,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,iBAAiB;gBACvC,IAAI,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE;oBAC1C,OAAO,QAAQ,CAAC;YAExB,IAAI,aAAa,YAAY,iBAAiB,EAAE;gBAC5C,8BAA8B;gBAC9B,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,IAAI,eAAM,CAAC,EAAE,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;gBACpF,OAAO,SAAS,CAAC;aACpB;iBAAM,IAAG,CAAC,aAAa,EAAE;gBACtB,2DAA2D;gBAC3D,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,IAAI,eAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;gBACrE,OAAO,SAAS,CAAC;aACpB;SACJ;QAED,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,IAAI,eAAM,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAC5E,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,SAAS,CAAC,SAAiB;QAC9B,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;CAGJ;AA3ED,oCA2EC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shapediver/viewer.rendering-engine.canvas-engine",
3
- "version": "2.7.9",
3
+ "version": "2.8.0",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "author": "Michael Oppitz <michael@shapediver.com>",
@@ -39,10 +39,9 @@
39
39
  "testEnvironment": "jsdom"
40
40
  },
41
41
  "dependencies": {
42
- "@shapediver/viewer.rendering-engine.rendering-engine": "2.7.9",
43
- "@shapediver/viewer.shared.services": "2.7.9",
44
- "gl-matrix": "3.3.0",
45
- "tsyringe": "^4.5.0"
42
+ "@shapediver/viewer.rendering-engine.rendering-engine": "2.8.0",
43
+ "@shapediver/viewer.shared.services": "2.8.0",
44
+ "gl-matrix": "3.3.0"
46
45
  },
47
- "gitHead": "eeddc9b2e9837296a03711e7f5b5bfcab9b50d82"
46
+ "gitHead": "9caee20107c5d71e43de33edc14ee19d62ec268b"
48
47
  }
@@ -1,21 +1,29 @@
1
- import { container, singleton } from 'tsyringe'
2
1
  import { UuidGenerator } from '@shapediver/viewer.shared.services'
3
2
 
4
3
  import { Canvas } from './Canvas'
5
4
  import { ICanvasEngine } from '../interfaces/ICanvasEngine'
6
5
  import { ICanvas } from '../interfaces/ICanvas'
7
6
 
8
- @singleton()
9
7
  export class CanvasEngine implements ICanvasEngine {
10
- // #region Properties (4)
8
+ // #region Properties (3)
11
9
 
12
10
  private readonly _canvasDictionary: {
13
11
  [key: string]: Canvas
14
12
  } = {};
15
13
 
16
- protected readonly _uuidGenerator: UuidGenerator = <UuidGenerator>container.resolve(UuidGenerator);
14
+ private static _instance: CanvasEngine;
17
15
 
18
- // #endregion Properties (4)
16
+ protected readonly _uuidGenerator: UuidGenerator = UuidGenerator.instance;
17
+
18
+ // #endregion Properties (3)
19
+
20
+ // #region Public Static Accessors (1)
21
+
22
+ public static get instance() {
23
+ return this._instance || (this._instance = new this());
24
+ }
25
+
26
+ // #endregion Public Static Accessors (1)
19
27
 
20
28
  // #region Public Methods (2)
21
29