@mlightcad/cad-simple-viewer 1.1.11 → 1.1.12

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.
@@ -26,6 +26,8 @@ export declare class AcApDocManager {
26
26
  private _context;
27
27
  /** Font loader for managing CAD text fonts */
28
28
  private _fontLoader;
29
+ /** Base URL to get fonts, templates, and example files */
30
+ private _baseUrl;
29
31
  /** Singleton instance */
30
32
  private static _instance?;
31
33
  /** Events fired during document lifecycle */
@@ -104,6 +106,11 @@ export declare class AcApDocManager {
104
106
  * @returns The current editor instance
105
107
  */
106
108
  get editor(): import("../editor").AcEditor;
109
+ /**
110
+ * Base URL to load fonts
111
+ */
112
+ get baseUrl(): string;
113
+ set baseUrl(value: string);
107
114
  /**
108
115
  * Gets the list of available fonts that can be loaded.
109
116
  *
@@ -1 +1 @@
1
- {"version":3,"file":"AcApDocManager.d.ts","sourceRoot":"","sources":["../../src/app/AcApDocManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,uBAAuB,EAExB,MAAM,uBAAuB,CAAA;AAa9B,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,yCAAyC;IACzC,GAAG,EAAE,YAAY,CAAA;CAClB;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,cAAc;IACzB,gEAAgE;IAChE,OAAO,CAAC,QAAQ,CAAa;IAC7B,8CAA8C;IAC9C,OAAO,CAAC,WAAW,CAAgB;IACnC,yBAAyB;IACzB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAgB;IAEzC,6CAA6C;IAC7C,SAAgB,MAAM;QACpB,2CAA2C;;QAE3C,2CAA2C;;MAE5C;IAED;;;;;;;;OAQG;IACH,OAAO;IA0BP;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,iBAAiB;IAOhD;;;;;;OAMG;IACH,MAAM,KAAK,QAAQ,mBAKlB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,gBAEV;IAED;;;;OAIG;IACH,IAAI,WAAW,iBAEd;IAED;;;;;;;OAOG;IACH,IAAI,iBAAiB,iBAEpB;IAED;;;;OAIG;IACH,IAAI,OAAO,IACoB,UAAU,CACxC;IAED;;;;OAIG;IACH,IAAI,MAAM,iCAET;IAED;;;;;;OAMG;IACH,IAAI,aAAa,mDAEhB;IAED;;;;;;;;;;OAUG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE;IAI/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACG,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE;IAQvC;;;;;;;;;;;;;;;;;OAiBG;IACG,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,uBAAuB;IAS5D;;;;;;;;;;;;;;;;;OAiBG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,WAAW,EAC7B,OAAO,EAAE,uBAAuB;IAclC;;;;;;;;;;;;;OAaG;IACH,gBAAgB;IA8ChB;;;;;;;;;;;;;OAaG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAMlC;;;;;OAKG;IACH,eAAe;IAMf;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB;IAI9B;;;;;;;;;OASG;IACH,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO;IAgBhD;;;;;;;;;;OAUG;IACH,OAAO,CAAC,UAAU;CAQnB"}
1
+ {"version":3,"file":"AcApDocManager.d.ts","sourceRoot":"","sources":["../../src/app/AcApDocManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,uBAAuB,EAExB,MAAM,uBAAuB,CAAA;AAa9B,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,yCAAyC;IACzC,GAAG,EAAE,YAAY,CAAA;CAClB;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,cAAc;IACzB,gEAAgE;IAChE,OAAO,CAAC,QAAQ,CAAa;IAC7B,8CAA8C;IAC9C,OAAO,CAAC,WAAW,CAAgB;IACnC,0DAA0D;IAC1D,OAAO,CAAC,QAAQ,CAAQ;IACxB,yBAAyB;IACzB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAgB;IAEzC,6CAA6C;IAC7C,SAAgB,MAAM;QACpB,2CAA2C;;QAE3C,2CAA2C;;MAE5C;IAED;;;;;;;;OAQG;IACH,OAAO;IA4BP;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,iBAAiB;IAOhD;;;;;;OAMG;IACH,MAAM,KAAK,QAAQ,mBAKlB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,gBAEV;IAED;;;;OAIG;IACH,IAAI,WAAW,iBAEd;IAED;;;;;;;OAOG;IACH,IAAI,iBAAiB,iBAEpB;IAED;;;;OAIG;IACH,IAAI,OAAO,IACoB,UAAU,CACxC;IAED;;;;OAIG;IACH,IAAI,MAAM,iCAET;IAED;;OAEG;IACH,IAAI,OAAO,IAGQ,MAAM,CADxB;IACD,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,EAGxB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,mDAEhB;IAED;;;;;;;;;;OAUG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE;IAI/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACG,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE;IAQvC;;;;;;;;;;;;;;;;;OAiBG;IACG,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,uBAAuB;IAS5D;;;;;;;;;;;;;;;;;OAiBG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,WAAW,EAC7B,OAAO,EAAE,uBAAuB;IAclC;;;;;;;;;;;;;OAaG;IACH,gBAAgB;IA8ChB;;;;;;;;;;;;;OAaG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAMlC;;;;;OAKG;IACH,eAAe;IAMf;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB;IAI9B;;;;;;;;;OASG;IACH,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO;IAgBhD;;;;;;;;;;OAUG;IACH,OAAO,CAAC,UAAU;CAQnB"}
@@ -71,6 +71,7 @@ var AcApDocManager = /** @class */ (function () {
71
71
  /** Fired when a document becomes active */
72
72
  documentActivated: new AcCmEventManager()
73
73
  };
74
+ this._baseUrl = 'https://mlightcad.gitlab.io/cad-data/';
74
75
  // Create one empty drawing
75
76
  var doc = new AcApDocument();
76
77
  doc.database.events.openProgress.addEventListener(function (args) {
@@ -91,7 +92,8 @@ var AcApDocManager = /** @class */ (function () {
91
92
  };
92
93
  var view = new AcTrView2d({ canvas: canvas, calculateSizeCallback: callback });
93
94
  this._context = new AcApContext(view, doc);
94
- this._fontLoader = new AcApFontLoader(view.renderer);
95
+ this._fontLoader = new AcApFontLoader();
96
+ this._fontLoader.baseUrl = this._baseUrl + 'fonts/';
95
97
  acdbHostApplicationServices().workingDatabase = doc.database;
96
98
  this.registerCommands();
97
99
  }
@@ -198,6 +200,20 @@ var AcApDocManager = /** @class */ (function () {
198
200
  enumerable: false,
199
201
  configurable: true
200
202
  });
203
+ Object.defineProperty(AcApDocManager.prototype, "baseUrl", {
204
+ /**
205
+ * Base URL to load fonts
206
+ */
207
+ get: function () {
208
+ return this._baseUrl;
209
+ },
210
+ set: function (value) {
211
+ this._baseUrl = value;
212
+ this._fontLoader.baseUrl = value + 'fonts/';
213
+ },
214
+ enumerable: false,
215
+ configurable: true
216
+ });
201
217
  Object.defineProperty(AcApDocManager.prototype, "avaiableFonts", {
202
218
  /**
203
219
  * Gets the list of available fonts that can be loaded.
@@ -1 +1 @@
1
- {"version":3,"file":"AcApDocManager.js","sourceRoot":"","sources":["../../src/app/AcApDocManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AcApDocManager.js","sourceRoot":"","sources":["../../src/app/AcApDocManager.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,4 @@
1
1
  import { AcDbFontInfo, AcDbFontLoader } from '@mlightcad/data-model';
2
- import { AcTrRenderer } from '@mlightcad/three-renderer';
3
2
  /**
4
3
  * Font loader implementation for CAD text rendering.
5
4
  *
@@ -26,8 +25,8 @@ import { AcTrRenderer } from '@mlightcad/three-renderer';
26
25
  * ```
27
26
  */
28
27
  export declare class AcApFontLoader implements AcDbFontLoader {
29
- /** The Three.js renderer used for font loading */
30
- private _cadRenderer;
28
+ /** Font loader in mtext-render */
29
+ private _loader;
31
30
  /** Cache of available fonts fetched from the CDN */
32
31
  private _avaiableFonts;
33
32
  /**
@@ -35,7 +34,12 @@ export declare class AcApFontLoader implements AcDbFontLoader {
35
34
  *
36
35
  * @param renderer - The Three.js renderer that will use the loaded fonts
37
36
  */
38
- constructor(renderer: AcTrRenderer);
37
+ constructor();
38
+ /**
39
+ * Base URL to load fonts
40
+ */
41
+ get baseUrl(): string;
42
+ set baseUrl(value: string);
39
43
  /**
40
44
  * Avaiable fonts to load.
41
45
  */
@@ -1 +1 @@
1
- {"version":3,"file":"AcApFontLoader.d.ts","sourceRoot":"","sources":["../../src/app/AcApFontLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKxD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,qBAAa,cAAe,YAAW,cAAc;IACnD,kDAAkD;IAClD,OAAO,CAAC,YAAY,CAAc;IAClC,oDAAoD;IACpD,OAAO,CAAC,cAAc,CAAgB;IAEtC;;;;OAIG;gBACS,QAAQ,EAAE,YAAY;IAKlC;;OAEG;IACH,IAAI,aAAa,mBAEhB;IAED;;OAEG;IACG,gBAAgB;IAoBtB;;OAEG;IACG,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE;CAyB/B"}
1
+ {"version":3,"file":"AcApFontLoader.d.ts","sourceRoot":"","sources":["../../src/app/AcApFontLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAKpE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,qBAAa,cAAe,YAAW,cAAc;IACnD,kCAAkC;IAClC,OAAO,CAAC,OAAO,CAAgB;IAC/B,oDAAoD;IACpD,OAAO,CAAC,cAAc,CAAgB;IAEtC;;;;OAIG;;IAMH;;OAEG;IACH,IAAI,OAAO,IAGQ,MAAM,CADxB;IACD,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,EAExB;IAED;;OAEG;IACH,IAAI,aAAa,mBAEhB;IAED;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAOjD;;OAEG;IACG,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE;CAyB/B"}
@@ -34,7 +34,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
34
34
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
35
35
  }
36
36
  };
37
- import { find, findIndex } from 'lodash-es';
37
+ import { AcTrFontLoader } from '@mlightcad/three-renderer';
38
38
  import { eventBus } from '../editor';
39
39
  /**
40
40
  * Font loader implementation for CAD text rendering.
@@ -67,10 +67,23 @@ var AcApFontLoader = /** @class */ (function () {
67
67
  *
68
68
  * @param renderer - The Three.js renderer that will use the loaded fonts
69
69
  */
70
- function AcApFontLoader(renderer) {
71
- this._cadRenderer = renderer;
70
+ function AcApFontLoader() {
71
+ this._loader = new AcTrFontLoader();
72
72
  this._avaiableFonts = [];
73
73
  }
74
+ Object.defineProperty(AcApFontLoader.prototype, "baseUrl", {
75
+ /**
76
+ * Base URL to load fonts
77
+ */
78
+ get: function () {
79
+ return this._loader.baseUrl;
80
+ },
81
+ set: function (value) {
82
+ this._loader.baseUrl = value;
83
+ },
84
+ enumerable: false,
85
+ configurable: true
86
+ });
74
87
  Object.defineProperty(AcApFontLoader.prototype, "avaiableFonts", {
75
88
  /**
76
89
  * Avaiable fonts to load.
@@ -86,36 +99,17 @@ var AcApFontLoader = /** @class */ (function () {
86
99
  */
87
100
  AcApFontLoader.prototype.getAvaiableFonts = function () {
88
101
  return __awaiter(this, void 0, void 0, function () {
89
- var baseUrl_1, fontMetaDataUrl, response, _a, _1;
102
+ var _a;
90
103
  return __generator(this, function (_b) {
91
104
  switch (_b.label) {
92
105
  case 0:
93
- if (!(this._avaiableFonts.length == 0)) return [3 /*break*/, 6];
94
- baseUrl_1 = 'https://mlightcad.gitlab.io/cad-data/fonts/';
95
- fontMetaDataUrl = baseUrl_1 + 'fonts.json';
96
- _b.label = 1;
97
- case 1:
98
- _b.trys.push([1, 4, , 5]);
99
- return [4 /*yield*/, fetch(fontMetaDataUrl)];
100
- case 2:
101
- response = _b.sent();
106
+ if (!(this._avaiableFonts.length == 0)) return [3 /*break*/, 2];
102
107
  _a = this;
103
- return [4 /*yield*/, response.json()];
104
- case 3:
105
- _a._avaiableFonts = (_b.sent());
106
- return [3 /*break*/, 5];
107
- case 4:
108
- _1 = _b.sent();
109
- eventBus.emit('failed-to-get-avaiable-fonts', {
110
- url: fontMetaDataUrl
111
- });
112
- return [3 /*break*/, 5];
113
- case 5:
114
- this._avaiableFonts.forEach(function (font) {
115
- font.url = baseUrl_1 + font.file;
116
- });
117
- _b.label = 6;
118
- case 6: return [2 /*return*/, this._avaiableFonts];
108
+ return [4 /*yield*/, this._loader.getAvaiableFonts()];
109
+ case 1:
110
+ _a._avaiableFonts = _b.sent();
111
+ _b.label = 2;
112
+ case 2: return [2 /*return*/, this._avaiableFonts];
119
113
  }
120
114
  });
121
115
  });
@@ -125,35 +119,35 @@ var AcApFontLoader = /** @class */ (function () {
125
119
  */
126
120
  AcApFontLoader.prototype.load = function (fontNames) {
127
121
  return __awaiter(this, void 0, void 0, function () {
128
- var urls, loadStatus;
129
- var _this = this;
122
+ var loadStatus, fontsNotFound, fontsNotLoaded;
130
123
  return __generator(this, function (_a) {
131
124
  switch (_a.label) {
132
- case 0: return [4 /*yield*/, this.getAvaiableFonts()];
125
+ case 0: return [4 /*yield*/, this._loader.load(fontNames)];
133
126
  case 1:
134
- _a.sent();
135
- urls = [];
136
- fontNames.forEach(function (font) {
137
- var lowerCaseFontName = font.toLowerCase();
138
- var result = find(_this._avaiableFonts, function (item) {
139
- return (findIndex(item.name, function (name) {
140
- return name.toLowerCase() == lowerCaseFontName;
141
- }) >= 0);
142
- });
143
- if (result)
144
- urls.push(result.url);
145
- });
146
- return [4 /*yield*/, this._cadRenderer.loadFonts(urls)];
147
- case 2:
148
127
  loadStatus = _a.sent();
128
+ fontsNotFound = [];
129
+ fontsNotLoaded = [];
149
130
  loadStatus.forEach(function (item) {
150
- if (!item.status) {
151
- eventBus.emit('font-not-loaded', {
131
+ if (item.status === 'NotFound') {
132
+ fontsNotFound.push(item.fontName);
133
+ }
134
+ else if (item.status === 'FailedToLoad') {
135
+ fontsNotLoaded.push({
152
136
  fontName: item.fontName,
153
137
  url: item.url
154
138
  });
155
139
  }
156
140
  });
141
+ if (fontsNotFound.length > 0) {
142
+ eventBus.emit('fonts-not-found', {
143
+ fonts: fontsNotFound
144
+ });
145
+ }
146
+ if (fontsNotLoaded.length > 0) {
147
+ eventBus.emit('fonts-not-loaded', {
148
+ fonts: fontsNotLoaded
149
+ });
150
+ }
157
151
  return [2 /*return*/];
158
152
  }
159
153
  });
@@ -1 +1 @@
1
- {"version":3,"file":"AcApFontLoader.js","sourceRoot":"","sources":["../../src/app/AcApFontLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAE3C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH;IAME;;;;OAIG;IACH,wBAAY,QAAsB;QAChC,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAA;QAC5B,IAAI,CAAC,cAAc,GAAG,EAAE,CAAA;IAC1B,CAAC;IAKD,sBAAI,yCAAa;QAHjB;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,cAAc,CAAA;QAC5B,CAAC;;;OAAA;IAED;;OAEG;IACG,yCAAgB,GAAtB;;;;;;6BACM,CAAA,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,CAAA,EAA/B,wBAA+B;wBAC3B,YAAU,6CAA6C,CAAA;wBACvD,eAAe,GAAG,SAAO,GAAG,YAAY,CAAA;;;;wBAE3B,qBAAM,KAAK,CAAC,eAAe,CAAC,EAAA;;wBAAvC,QAAQ,GAAG,SAA4B;wBAC7C,KAAA,IAAI,CAAA;wBAAmB,qBAAM,QAAQ,CAAC,IAAI,EAAE,EAAA;;wBAA5C,GAAK,cAAc,GAAG,CAAC,SAAqB,CAAmB,CAAA;;;;wBAE/D,QAAQ,CAAC,IAAI,CAAC,8BAA8B,EAAE;4BAC5C,GAAG,EAAE,eAAe;yBACrB,CAAC,CAAA;;;wBAGJ,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAA,IAAI;4BAC9B,IAAI,CAAC,GAAG,GAAG,SAAO,GAAG,IAAI,CAAC,IAAI,CAAA;wBAChC,CAAC,CAAC,CAAA;;4BAEJ,sBAAO,IAAI,CAAC,cAAc,EAAA;;;;KAC3B;IAED;;OAEG;IACG,6BAAI,GAAV,UAAW,SAAmB;;;;;;4BAC5B,qBAAM,IAAI,CAAC,gBAAgB,EAAE,EAAA;;wBAA7B,SAA6B,CAAA;wBAEvB,IAAI,GAAa,EAAE,CAAA;wBACzB,SAAS,CAAC,OAAO,CAAC,UAAA,IAAI;4BACpB,IAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;4BAC5C,IAAM,MAAM,GAAG,IAAI,CAAC,KAAI,CAAC,cAAc,EAAE,UAAC,IAAkB;gCAC1D,OAAO,CACL,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,UAAA,IAAI;oCACvB,OAAO,IAAI,CAAC,WAAW,EAAE,IAAI,iBAAiB,CAAA;gCAChD,CAAC,CAAC,IAAI,CAAC,CACR,CAAA;4BACH,CAAC,CAAC,CAAA;4BACF,IAAI,MAAM;gCAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;wBACnC,CAAC,CAAC,CAAA;wBACiB,qBAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,EAAA;;wBAApD,UAAU,GAAG,SAAuC;wBAC1D,UAAU,CAAC,OAAO,CAAC,UAAA,IAAI;4BACrB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gCACjB,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE;oCAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;oCACvB,GAAG,EAAE,IAAI,CAAC,GAAG;iCACd,CAAC,CAAA;4BACJ,CAAC;wBACH,CAAC,CAAC,CAAA;;;;;KACH;IACH,qBAAC;AAAD,CAAC,AA1ED,IA0EC"}
1
+ {"version":3,"file":"AcApFontLoader.js","sourceRoot":"","sources":["../../src/app/AcApFontLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE1D,OAAO,EAAyB,QAAQ,EAAE,MAAM,WAAW,CAAA;AAE3D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH;IAME;;;;OAIG;IACH;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,EAAE,CAAA;QACnC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAA;IAC1B,CAAC;IAKD,sBAAI,mCAAO;QAHX;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;QAC7B,CAAC;aACD,UAAY,KAAa;YACvB,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAA;QAC9B,CAAC;;;OAHA;IAQD,sBAAI,yCAAa;QAHjB;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,cAAc,CAAA;QAC5B,CAAC;;;OAAA;IAED;;OAEG;IACG,yCAAgB,GAAtB;;;;;;6BACM,CAAA,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,CAAA,EAA/B,wBAA+B;wBACjC,KAAA,IAAI,CAAA;wBAAkB,qBAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAA;;wBAA3D,GAAK,cAAc,GAAG,SAAqC,CAAA;;4BAE7D,sBAAO,IAAI,CAAC,cAAc,EAAA;;;;KAC3B;IAED;;OAEG;IACG,6BAAI,GAAV,UAAW,SAAmB;;;;;4BACT,qBAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAA;;wBAA/C,UAAU,GAAG,SAAkC;wBAC/C,aAAa,GAAa,EAAE,CAAA;wBAC5B,cAAc,GAA4B,EAAE,CAAA;wBAClD,UAAU,CAAC,OAAO,CAAC,UAAA,IAAI;4BACrB,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;gCAC/B,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;4BACnC,CAAC;iCAAM,IAAI,IAAI,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;gCAC1C,cAAc,CAAC,IAAI,CAAC;oCAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oCACvB,GAAG,EAAE,IAAI,CAAC,GAAG;iCACd,CAAC,CAAA;4BACJ,CAAC;wBACH,CAAC,CAAC,CAAA;wBACF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAC7B,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE;gCAC/B,KAAK,EAAE,aAAa;6BACrB,CAAC,CAAA;wBACJ,CAAC;wBACD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAC9B,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE;gCAChC,KAAK,EAAE,cAAc;6BACtB,CAAC,CAAA;wBACJ,CAAC;;;;;KACF;IACH,qBAAC;AAAD,CAAC,AAvED,IAuEC"}
@@ -47,8 +47,8 @@ var AcApQNewCmd = /** @class */ (function (_super) {
47
47
  * @param _context - The application context (unused in this command)
48
48
  */
49
49
  AcApQNewCmd.prototype.execute = function (_context) {
50
- var baseUrl = 'https://cdn.jsdelivr.net/gh/mlight-lee/cad-data/templates/';
51
- AcApDocManager.instance.openUrl(baseUrl + 'acadiso.dxf');
50
+ var baseUrl = AcApDocManager.instance.baseUrl;
51
+ AcApDocManager.instance.openUrl(baseUrl + 'templates/acadiso.dxf');
52
52
  };
53
53
  return AcApQNewCmd;
54
54
  }(AcEdCommand));
@@ -1 +1 @@
1
- {"version":3,"file":"AcApQNewCmd.js","sourceRoot":"","sources":["../../src/command/AcApQNewCmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC;;;;;;;;;;;;;;;;;GAiBG;AACH;IAAiC,+BAAW;IAA5C;;IAaA,CAAC;IAZC;;;;;;;OAOG;IACH,6BAAO,GAAP,UAAQ,QAAqB;QAC3B,IAAM,OAAO,GAAG,4DAA4D,CAAA;QAC5E,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,GAAG,aAAa,CAAC,CAAA;IAC1D,CAAC;IACH,kBAAC;AAAD,CAAC,AAbD,CAAiC,WAAW,GAa3C"}
1
+ {"version":3,"file":"AcApQNewCmd.js","sourceRoot":"","sources":["../../src/command/AcApQNewCmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC;;;;;;;;;;;;;;;;;GAiBG;AACH;IAAiC,+BAAW;IAA5C;;IAaA,CAAC;IAZC;;;;;;;OAOG;IACH,6BAAO,GAAP,UAAQ,QAAqB;QAC3B,IAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAA;QAC/C,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,GAAG,uBAAuB,CAAC,CAAA;IACpE,CAAC;IACH,kBAAC;AAAD,CAAC,AAbD,CAAiC,WAAW,GAa3C"}
@@ -6,6 +6,12 @@ import { type Emitter } from 'mitt';
6
6
  * Used to categorize messages shown to users with appropriate visual styling.
7
7
  */
8
8
  export type AcEdMessageType = 'success' | 'warning' | 'info' | 'error';
9
+ export interface AcEdFontNotLoadedInfo {
10
+ /** Font name */
11
+ fontName: string;
12
+ /** URL where the font was attempted to be loaded from */
13
+ url: string;
14
+ }
9
15
  /**
10
16
  * Type definition for all events that can be emitted through the global event bus.
11
17
  *
@@ -14,7 +20,7 @@ export type AcEdMessageType = 'success' | 'warning' | 'info' | 'error';
14
20
  *
15
21
  * ## Event Categories
16
22
  * - **File Operations**: `open-file`, `open-file-progress`, `failed-to-open-file`
17
- * - **Font Management**: `font-not-loaded`, `failed-to-get-avaiable-fonts`, `font-not-found`
23
+ * - **Font Management**: `fonts-not-loaded`, `failed-to-get-avaiable-fonts`, `font-not-found`
18
24
  * - **User Messages**: `message`
19
25
  */
20
26
  export type AcEdEvents = {
@@ -29,12 +35,13 @@ export type AcEdEvents = {
29
35
  /** The severity/type of the message */
30
36
  type: AcEdMessageType;
31
37
  };
32
- /** Emitted when a font fails to load */
33
- 'font-not-loaded': {
34
- /** Name of the font that failed to load */
35
- fontName: string;
36
- /** URL where the font was attempted to be loaded from */
37
- url: string;
38
+ /** Emitted when some fonts can not be found in font repository */
39
+ 'fonts-not-found': {
40
+ fonts: string[];
41
+ };
42
+ /** Emitted when some fonts fails to load */
43
+ 'fonts-not-loaded': {
44
+ fonts: AcEdFontNotLoadedInfo[];
38
45
  };
39
46
  /** Emitted when the available fonts list cannot be retrieved */
40
47
  'failed-to-get-avaiable-fonts': {
@@ -1 +1 @@
1
- {"version":3,"file":"eventBus.d.ts","sourceRoot":"","sources":["../../../src/editor/global/eventBus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAa,EAAE,KAAK,OAAO,EAAE,MAAM,MAAM,CAAA;AAEzC;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAA;AAEtE;;;;;;;;;;GAUG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,+CAA+C;IAC/C,WAAW,EAAE,EAAE,CAAA;IACf,qDAAqD;IACrD,oBAAoB,EAAE,sBAAsB,CAAA;IAC5C,+CAA+C;IAC/C,OAAO,EAAE;QACP,kCAAkC;QAClC,OAAO,EAAE,MAAM,CAAA;QACf,uCAAuC;QACvC,IAAI,EAAE,eAAe,CAAA;KACtB,CAAA;IACD,wCAAwC;IACxC,iBAAiB,EAAE;QACjB,2CAA2C;QAC3C,QAAQ,EAAE,MAAM,CAAA;QAChB,yDAAyD;QACzD,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;IACD,gEAAgE;IAChE,8BAA8B,EAAE;QAC9B,kEAAkE;QAClE,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;IACD,wCAAwC;IACxC,qBAAqB,EAAE;QACrB,gDAAgD;QAChD,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;IACD,gDAAgD;IAChD,gBAAgB,EAAE;QAChB,+BAA+B;QAC/B,QAAQ,EAAE,MAAM,CAAA;QAChB,gDAAgD;QAChD,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;CACF,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAsB,CAAA"}
1
+ {"version":3,"file":"eventBus.d.ts","sourceRoot":"","sources":["../../../src/editor/global/eventBus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAa,EAAE,KAAK,OAAO,EAAE,MAAM,MAAM,CAAA;AAEzC;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAA;AAEtE,MAAM,WAAW,qBAAqB;IACpC,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,yDAAyD;IACzD,GAAG,EAAE,MAAM,CAAA;CACZ;AAED;;;;;;;;;;GAUG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,+CAA+C;IAC/C,WAAW,EAAE,EAAE,CAAA;IACf,qDAAqD;IACrD,oBAAoB,EAAE,sBAAsB,CAAA;IAC5C,+CAA+C;IAC/C,OAAO,EAAE;QACP,kCAAkC;QAClC,OAAO,EAAE,MAAM,CAAA;QACf,uCAAuC;QACvC,IAAI,EAAE,eAAe,CAAA;KACtB,CAAA;IACD,kEAAkE;IAClE,iBAAiB,EAAE;QACjB,KAAK,EAAE,MAAM,EAAE,CAAA;KAChB,CAAA;IACD,4CAA4C;IAC5C,kBAAkB,EAAE;QAClB,KAAK,EAAE,qBAAqB,EAAE,CAAA;KAC/B,CAAA;IACD,gEAAgE;IAChE,8BAA8B,EAAE;QAC9B,kEAAkE;QAClE,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;IACD,wCAAwC;IACxC,qBAAqB,EAAE;QACrB,gDAAgD;QAChD,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;IACD,gDAAgD;IAChD,gBAAgB,EAAE;QAChB,+BAA+B;QAC/B,QAAQ,EAAE,MAAM,CAAA;QAChB,gDAAgD;QAChD,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;CACF,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAsB,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"eventBus.js","sourceRoot":"","sources":["../../../src/editor/global/eventBus.ts"],"names":[],"mappings":"AACA,OAAO,IAAsB,MAAM,MAAM,CAAA;AA0DzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,CAAC,IAAM,QAAQ,GAAwB,IAAI,EAAc,CAAA"}
1
+ {"version":3,"file":"eventBus.js","sourceRoot":"","sources":["../../../src/editor/global/eventBus.ts"],"names":[],"mappings":"AACA,OAAO,IAAsB,MAAM,MAAM,CAAA;AAkEzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,CAAC,IAAM,QAAQ,GAAwB,IAAI,EAAc,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mlightcad/cad-simple-viewer",
3
- "version": "1.1.11",
3
+ "version": "1.1.12",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "repository": {
@@ -33,21 +33,21 @@
33
33
  "require": "./dist/index.umd.cjs"
34
34
  },
35
35
  "devDependencies": {
36
- "@mlightcad/mtext-renderer": "0.6.2",
36
+ "@mlightcad/mtext-renderer": "0.6.5",
37
37
  "@mlightcad/three-viewcube": "0.0.9",
38
38
  "@types/lodash-es": "^4.17.12",
39
39
  "@types/rbush": "^3.0.4",
40
40
  "@types/three": "^0.172.0",
41
- "@mlightcad/svg-renderer": "0.0.22",
42
- "@mlightcad/three-renderer": "1.1.10"
41
+ "@mlightcad/svg-renderer": "0.0.23",
42
+ "@mlightcad/three-renderer": "1.1.11"
43
43
  },
44
44
  "dependencies": {
45
- "@mlightcad/libredwg-converter": "3.0.24",
45
+ "@mlightcad/libredwg-converter": "3.0.25",
46
46
  "mitt": "^3.0.1",
47
47
  "rbush": "^4.0.1"
48
48
  },
49
49
  "peerDependencies": {
50
- "@mlightcad/data-model": "1.2.24",
50
+ "@mlightcad/data-model": "1.2.25",
51
51
  "three": "^0.172.0",
52
52
  "lodash-es": "4.17.21"
53
53
  },