@mlightcad/cad-simple-viewer 1.6.3 → 1.7.1

package/lib/command/convert/AcApConvertToRasterImageCmd.js

@@ -0,0 +1,161 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { AcGeBox2d, AcGePoint2d } from '@mlightcad/data-model';
+import { AcApDocManager } from '../../app';
+import { AcEdCommand, AcEdPromptBoxOptions, AcEdPromptDoubleOptions, AcEdPromptStatus } from '../../editor';
+import { AcApI18n } from '../../i18n';
+import { AcApRasterImageConvertor } from './AcApRasterImageConvertor';
+var DEFAULT_LONG_SIDE_PX = 1024;
+/**
+ * Shared command logic for exporting the current drawing to a raster image.
+ *
+ * Prompts for an export bounding box and optional long-side pixel size, then
+ * downloads the image via {@link AcApRasterImageConvertor}.
+ */
+var AcApConvertToRasterImageCmd = /** @class */ (function (_super) {
+    __extends(AcApConvertToRasterImageCmd, _super);
+    /**
+     * @param format - Target raster format (`png`, `jpeg`, or `bmp`).
+     * @param jigKey - i18n jig namespace (`pngout`, `jpgout`, or `bmpout`).
+     */
+    function AcApConvertToRasterImageCmd(format, jigKey) {
+        var _this = _super.call(this) || this;
+        _this._format = format;
+        _this._jigKey = jigKey;
+        return _this;
+    }
+    /**
+     * Executes the raster export command.
+     *
+     * Prompts the user for:
+     * 1. Export bounding box
+     * 2. Optional long side pixel value (press Enter for default 1024)
+     *
+     * @param _context - The application context (unused in this command)
+     */
+    AcApConvertToRasterImageCmd.prototype.execute = function (_context) {
+        return __awaiter(this, void 0, void 0, function () {
+            var converter, view, boxOptions, boxResult, bounds, longSidePrompt, longSideResult, longSide;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        converter = new AcApRasterImageConvertor(this._format);
+                        view = AcApDocManager.instance.curView;
+                        this.syncActiveLayoutViewSize(view);
+                        boxOptions = new AcEdPromptBoxOptions(AcApI18n.t("jig.".concat(this._jigKey, ".boundsFirstCorner")), AcApI18n.t("jig.".concat(this._jigKey, ".boundsSecondCorner")));
+                        // Export window corners should follow exact click positions.
+                        boxOptions.disableOSnap = true;
+                        // Empty Enter (script blank line) → use drawing extents.
+                        boxOptions.allowNone = true;
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getBox(boxOptions)];
+                    case 1:
+                        boxResult = _a.sent();
+                        if (boxResult.status === AcEdPromptStatus.OK && boxResult.value) {
+                            bounds = boxResult.value;
+                        }
+                        else if (boxResult.status === AcEdPromptStatus.None) {
+                            bounds = this.getCurrentDrawingBounds();
+                        }
+                        else {
+                            // User canceled or prompt failed: abort command gracefully.
+                            return [2 /*return*/];
+                        }
+                        longSidePrompt = new AcEdPromptDoubleOptions(AcApI18n.t("jig.".concat(this._jigKey, ".longSidePrompt")));
+                        longSidePrompt.allowNone = true;
+                        longSidePrompt.allowNegative = false;
+                        longSidePrompt.allowZero = false;
+                        longSidePrompt.defaultValue = DEFAULT_LONG_SIDE_PX;
+                        longSidePrompt.useDefaultValue = true;
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getDouble(longSidePrompt)];
+                    case 2:
+                        longSideResult = _a.sent();
+                        if (longSideResult.status === AcEdPromptStatus.Cancel ||
+                            longSideResult.status === AcEdPromptStatus.Error) {
+                            return [2 /*return*/];
+                        }
+                        longSide = longSideResult.status === AcEdPromptStatus.OK &&
+                            longSideResult.value !== undefined
+                            ? longSideResult.value
+                            : DEFAULT_LONG_SIDE_PX;
+                        return [4 /*yield*/, converter.convert(bounds, longSide)];
+                    case 3:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Returns the current drawing extents projected to XY bounds.
+     */
+    AcApConvertToRasterImageCmd.prototype.getCurrentDrawingBounds = function () {
+        var db = AcApDocManager.instance.curDocument.database;
+        var ext = db.extents;
+        return new AcGeBox2d(new AcGePoint2d(ext.min.x, ext.min.y), new AcGePoint2d(ext.max.x, ext.max.y));
+    };
+    /**
+     * Keeps active layout-view size in sync with current view size.
+     *
+     * This guards against stale screen-to-world mapping after container layout
+     * changes that do not fire a window resize event.
+     */
+    AcApConvertToRasterImageCmd.prototype.syncActiveLayoutViewSize = function (view) {
+        var layoutView = view.activeLayoutView;
+        if (!layoutView) {
+            return;
+        }
+        layoutView.resize(view.width, view.height);
+    };
+    return AcApConvertToRasterImageCmd;
+}(AcEdCommand));
+export { AcApConvertToRasterImageCmd };
+//# sourceMappingURL=AcApConvertToRasterImageCmd.js.map

package/lib/command/convert/AcApConvertToRasterImageCmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApConvertToRasterImageCmd.js","sourceRoot":"","sources":["../../../src/command/convert/AcApConvertToRasterImageCmd.ts"],"names":[],"mappings":"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"}

package/lib/command/convert/{AcApPngConvertor.d.ts → AcApRasterImageConvertor.d.ts}

@@ -1,21 +1,33 @@
 import { AcGeBox2d } from '@mlightcad/data-model';
+/** Supported raster export formats. */
+export type AcApRasterImageFormat = 'png' | 'jpeg' | 'bmp';
 /**
- * Utility class for converting CAD drawings to PNG format.
+ * Utility class for converting CAD drawings to raster image formats
+ * (PNG, JPEG, or BMP).
  *
  * Offscreen export temporarily adjusts the camera only. It does not resize
  * the layout view or touch OrbitControls so the interactive view stays intact.
  */
-export declare class AcApPngConvertor {
+export declare class AcApRasterImageConvertor {
+    private readonly _format;
     /**
-     * Converts the current CAD drawing to PNG format and initiates download.
+     * @param format - Target image format. Defaults to PNG.
+     */
+    constructor(format?: AcApRasterImageFormat);
+    get format(): AcApRasterImageFormat;
+    /**
+     * Converts the current CAD drawing to the configured format and downloads it.
      *
      * Waits for entity conversion and deferred text/font geometry so scripted
-     * exports (e.g. CLI `pngout`) do not snapshot before glyphs are drawable.
+     * exports (e.g. CLI `pngout` / `jpgout` / `bmpout`) do not snapshot before
+     * glyphs are drawable.
      *
      * @param bounds - Optional world coordinate bounding box to export.
      * @param longSide - Optional maximum dimension (width or height) in pixels.
      */
     convert(bounds?: AcGeBox2d, longSide?: number): Promise<void>;
+    private get logTag();
+    private get fileExtension();
     private resolveOutputSize;
     /**
      * Computes render size using source aspect so final target can be center-cropped.
@@ -53,16 +65,28 @@ export declare class AcApPngConvertor {
      */
     private createCanvasFromPixels;
     /**
-     * Creates a downloadable PNG file and triggers the download.
+     * Creates a downloadable image file and triggers the download.
      *
-     * This method:
-     * - Exports the canvas to a PNG data URL
-     * - Uses the drawing file name as the download file name
-     * - Creates and triggers a download link
-     *
-     * @param canvas - The canvas element containing the image
+     * @param canvas - Canvas used for PNG/JPEG encoding
+     * @param pixels - RGBA pixel buffer used for BMP encoding
+     * @param width - Image width in pixels
+     * @param height - Image height in pixels
      * @private
      */
     private createFileAndDownloadIt;
+    private encodeDataUrl;
+    /**
+     * Encodes JPEG with a white backdrop so transparent pixels do not become black.
+     */
+    private canvasToJpegDataUrl;
+    /**
+     * Encodes a 24-bit Windows BMP data URL from top-down RGBA pixels.
+     *
+     * Canvas `toDataURL` does not support BMP, so pixels are written manually
+     * (BGR, bottom-up rows, 4-byte row padding). Transparent pixels are
+     * composited on white so BMP matches JPEG's opaque backdrop.
+     */
+    private encodeBmpDataUrl;
+    private bytesToBase64;
 }
-//# sourceMappingURL=AcApPngConvertor.d.ts.map
+//# sourceMappingURL=AcApRasterImageConvertor.d.ts.map

package/lib/command/convert/AcApRasterImageConvertor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApRasterImageConvertor.d.ts","sourceRoot":"","sources":["../../../src/command/convert/AcApRasterImageConvertor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAgB,MAAM,uBAAuB,CAAA;AAO/D,uCAAuC;AACvC,MAAM,MAAM,qBAAqB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,CAAA;AAI1D;;;;;;GAMG;AACH,qBAAa,wBAAwB;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAE/C;;OAEG;gBACS,MAAM,GAAE,qBAA6B;IAIjD,IAAI,MAAM,IAAI,qBAAqB,CAElC;IAED;;;;;;;;;OASG;IACG,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM;IAsInD,OAAO,KAAK,MAAM,GASjB;IAED,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,CAAC,iBAAiB;IAqBzB;;OAEG;IACH,OAAO,CAAC,8BAA8B;IAiCtC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAyB1B;;OAEG;IACH,OAAO,CAAC,eAAe;IAQvB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,oBAAoB;IAgB5B;;;;;;;;OAQG;IACH,OAAO,CAAC,sBAAsB;IAe9B;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;IAuB/B,OAAO,CAAC,aAAa;IAgBrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAW3B;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB;IA2CxB,OAAO,CAAC,aAAa;CAStB"}

package/lib/command/convert/{AcApPngConvertor.js → AcApRasterImageConvertor.js}

@@ -34,40 +34,81 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { AcGeVector2d } from '@mlightcad/data-model';
 import * as THREE from 'three';
 import { AcApDocManager } from '../../app';
 import { resolveExportDownloadName } from '../../util/AcApExportFileNameUtil';
+var JPEG_QUALITY = 0.92;
 /**
- * Utility class for converting CAD drawings to PNG format.
+ * Utility class for converting CAD drawings to raster image formats
+ * (PNG, JPEG, or BMP).
  *
  * Offscreen export temporarily adjusts the camera only. It does not resize
  * the layout view or touch OrbitControls so the interactive view stays intact.
  */
-var AcApPngConvertor = /** @class */ (function () {
-    function AcApPngConvertor() {
+var AcApRasterImageConvertor = /** @class */ (function () {
+    /**
+     * @param format - Target image format. Defaults to PNG.
+     */
+    function AcApRasterImageConvertor(format) {
+        if (format === void 0) { format = 'png'; }
+        this._format = format;
     }
+    Object.defineProperty(AcApRasterImageConvertor.prototype, "format", {
+        get: function () {
+            return this._format;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
-     * Converts the current CAD drawing to PNG format and initiates download.
+     * Converts the current CAD drawing to the configured format and downloads it.
      *
      * Waits for entity conversion and deferred text/font geometry so scripted
-     * exports (e.g. CLI `pngout`) do not snapshot before glyphs are drawable.
+     * exports (e.g. CLI `pngout` / `jpgout` / `bmpout`) do not snapshot before
+     * glyphs are drawable.
      *
      * @param bounds - Optional world coordinate bounding box to export.
      * @param longSide - Optional maximum dimension (width or height) in pixels.
      */
-    AcApPngConvertor.prototype.convert = function (bounds, longSide) {
+    AcApRasterImageConvertor.prototype.convert = function (bounds, longSide) {
         return __awaiter(this, void 0, void 0, function () {
-            var view, sceneReady, layoutView, rendererWrapper, renderer, scene, camera, viewAspect, targetAspect, outputWidth, outputHeight, outputSize, renderSize, renderWidth, renderHeight, needsCrop, originalZoom, originalPosition, originalLeft, originalRight, originalTop, originalBottom, savedScissorTest, savedPixelRatio, originalRenderTarget, renderTarget, pixels, flippedPixels, finalPixels, canvas;
+            var tag, view, sceneReady, layoutView, rendererWrapper, renderer, scene, camera, viewAspect, targetAspect, outputWidth, outputHeight, outputSize, renderSize, renderWidth, renderHeight, needsCrop, originalZoom, originalPosition, originalLeft, originalRight, originalTop, originalBottom, savedScissorTest, savedPixelRatio, originalRenderTarget, renderTarget, pixels, flippedPixels, finalPixels, canvas;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        tag = this.logTag;
                         view = AcApDocManager.instance.curView;
                         return [4 /*yield*/, view.waitUntilIdle()];
                     case 1:
                         sceneReady = _a.sent();
                         if (!sceneReady) {
-                            console.warn('[PNGOUT] Timed out waiting for scene idle; exporting current geometry');
+                            console.warn("[".concat(tag, "] Timed out waiting for scene idle; exporting current geometry"));
                         }
                         layoutView = view.activeLayoutView;
                         rendererWrapper = view.renderer;
@@ -75,7 +116,7 @@ var AcApPngConvertor = /** @class */ (function () {
                         scene = view.internalScene;
                         camera = view.internalCamera;
                         if (!scene || !camera || !layoutView) {
-                            console.error('[PNGOUT] Scene or camera not available');
+                            console.error("[".concat(tag, "] Scene or camera not available"));
                             return [2 /*return*/];
                         }
                         viewAspect = view.width / Math.max(view.height, 1);
@@ -126,7 +167,7 @@ var AcApPngConvertor = /** @class */ (function () {
                                 ? this.cropPixelsCentered(flippedPixels, renderWidth, renderHeight, outputWidth, outputHeight)
                                 : flippedPixels;
                             canvas = this.createCanvasFromPixels(finalPixels, outputWidth, outputHeight);
-                            this.createFileAndDownloadIt(canvas);
+                            this.createFileAndDownloadIt(canvas, finalPixels, outputWidth, outputHeight);
                         }
                         finally {
                             renderer.setRenderTarget(originalRenderTarget);
@@ -151,7 +192,28 @@ var AcApPngConvertor = /** @class */ (function () {
             });
         });
     };
-    AcApPngConvertor.prototype.resolveOutputSize = function (longSide, aspect) {
+    Object.defineProperty(AcApRasterImageConvertor.prototype, "logTag", {
+        get: function () {
+            switch (this._format) {
+                case 'jpeg':
+                    return 'JPGOUT';
+                case 'bmp':
+                    return 'BMPOUT';
+                default:
+                    return 'PNGOUT';
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AcApRasterImageConvertor.prototype, "fileExtension", {
+        get: function () {
+            return this._format === 'jpeg' ? 'jpg' : this._format;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    AcApRasterImageConvertor.prototype.resolveOutputSize = function (longSide, aspect) {
         var clampedLongSide = Math.max(1, Math.round(longSide));
         var safeAspect = Number.isFinite(aspect) && aspect > Number.EPSILON ? aspect : 1;
         if (safeAspect >= 1) {
@@ -168,7 +230,7 @@ var AcApPngConvertor = /** @class */ (function () {
     /**
      * Computes render size using source aspect so final target can be center-cropped.
      */
-    AcApPngConvertor.prototype.resolveRenderSizeForCenterCrop = function (targetWidth, targetHeight, sourceAspect) {
+    AcApRasterImageConvertor.prototype.resolveRenderSizeForCenterCrop = function (targetWidth, targetHeight, sourceAspect) {
         var safeSourceAspect = Number.isFinite(sourceAspect) && sourceAspect > Number.EPSILON
             ? sourceAspect
             : 1;
@@ -192,7 +254,7 @@ var AcApPngConvertor = /** @class */ (function () {
     /**
      * Center-crops an RGBA pixel buffer from source to destination size.
      */
-    AcApPngConvertor.prototype.cropPixelsCentered = function (pixels, srcWidth, srcHeight, dstWidth, dstHeight) {
+    AcApRasterImageConvertor.prototype.cropPixelsCentered = function (pixels, srcWidth, srcHeight, dstWidth, dstHeight) {
         if (srcWidth === dstWidth && srcHeight === dstHeight) {
             return pixels;
         }
@@ -210,7 +272,7 @@ var AcApPngConvertor = /** @class */ (function () {
     /**
      * Returns the world-space aspect ratio of bounds.
      */
-    AcApPngConvertor.prototype.getBoundsAspect = function (bounds) {
+    AcApRasterImageConvertor.prototype.getBoundsAspect = function (bounds) {
         var size = new AcGeVector2d();
         bounds.getSize(size);
         var width = Math.max(Math.abs(size.x), Number.EPSILON);
@@ -229,7 +291,7 @@ var AcApPngConvertor = /** @class */ (function () {
      * @returns The vertically flipped pixel data
      * @private
      */
-    AcApPngConvertor.prototype.flipPixelsVertically = function (pixels, width, height) {
+    AcApRasterImageConvertor.prototype.flipPixelsVertically = function (pixels, width, height) {
         var flippedPixels = new Uint8Array(width * height * 4);
         for (var y = 0; y < height; y++) {
             var srcRow = (height - 1 - y) * width * 4;
@@ -249,7 +311,7 @@ var AcApPngConvertor = /** @class */ (function () {
      * @returns A canvas element containing the image
      * @private
      */
-    AcApPngConvertor.prototype.createCanvasFromPixels = function (pixels, width, height) {
+    AcApRasterImageConvertor.prototype.createCanvasFromPixels = function (pixels, width, height) {
         var canvas = document.createElement('canvas');
         canvas.width = width;
         canvas.height = height;
@@ -260,31 +322,100 @@ var AcApPngConvertor = /** @class */ (function () {
         return canvas;
     };
     /**
-     * Creates a downloadable PNG file and triggers the download.
+     * Creates a downloadable image file and triggers the download.
      *
-     * This method:
-     * - Exports the canvas to a PNG data URL
-     * - Uses the drawing file name as the download file name
-     * - Creates and triggers a download link
-     *
-     * @param canvas - The canvas element containing the image
+     * @param canvas - Canvas used for PNG/JPEG encoding
+     * @param pixels - RGBA pixel buffer used for BMP encoding
+     * @param width - Image width in pixels
+     * @param height - Image height in pixels
      * @private
      */
-    AcApPngConvertor.prototype.createFileAndDownloadIt = function (canvas) {
+    AcApRasterImageConvertor.prototype.createFileAndDownloadIt = function (canvas, pixels, width, height) {
         var doc = AcApDocManager.instance.curDocument;
-        var downloadName = resolveExportDownloadName(doc.fileName || doc.docTitle, 'png');
-        // Export canvas to PNG data URL
-        var dataURL = canvas.toDataURL('image/png');
-        // Create a download link and trigger the download
+        var downloadName = resolveExportDownloadName(doc.fileName || doc.docTitle, this.fileExtension);
+        var dataURL = this.encodeDataUrl(canvas, pixels, width, height);
         var downloadLink = document.createElement('a');
         downloadLink.href = dataURL;
         downloadLink.download = downloadName;
-        // Trigger the download
         document.body.appendChild(downloadLink);
         downloadLink.click();
         document.body.removeChild(downloadLink);
     };
-    return AcApPngConvertor;
+    AcApRasterImageConvertor.prototype.encodeDataUrl = function (canvas, pixels, width, height) {
+        switch (this._format) {
+            case 'jpeg':
+                return this.canvasToJpegDataUrl(canvas);
+            case 'bmp':
+                return this.encodeBmpDataUrl(pixels, width, height);
+            default:
+                return canvas.toDataURL('image/png');
+        }
+    };
+    /**
+     * Encodes JPEG with a white backdrop so transparent pixels do not become black.
+     */
+    AcApRasterImageConvertor.prototype.canvasToJpegDataUrl = function (canvas) {
+        var out = document.createElement('canvas');
+        out.width = canvas.width;
+        out.height = canvas.height;
+        var ctx = out.getContext('2d');
+        ctx.fillStyle = '#ffffff';
+        ctx.fillRect(0, 0, out.width, out.height);
+        ctx.drawImage(canvas, 0, 0);
+        return out.toDataURL('image/jpeg', JPEG_QUALITY);
+    };
+    /**
+     * Encodes a 24-bit Windows BMP data URL from top-down RGBA pixels.
+     *
+     * Canvas `toDataURL` does not support BMP, so pixels are written manually
+     * (BGR, bottom-up rows, 4-byte row padding). Transparent pixels are
+     * composited on white so BMP matches JPEG's opaque backdrop.
+     */
+    AcApRasterImageConvertor.prototype.encodeBmpDataUrl = function (pixels, width, height) {
+        var _a, _b, _c, _d;
+        var rowSize = Math.ceil((width * 3) / 4) * 4;
+        var imageSize = rowSize * height;
+        var fileSize = 14 + 40 + imageSize;
+        var buffer = new ArrayBuffer(fileSize);
+        var view = new DataView(buffer);
+        var bytes = new Uint8Array(buffer);
+        // BITMAPFILEHEADER
+        view.setUint16(0, 0x4d42, true); // 'BM'
+        view.setUint32(2, fileSize, true);
+        view.setUint32(10, 54, true);
+        // BITMAPINFOHEADER
+        view.setUint32(14, 40, true);
+        view.setInt32(18, width, true);
+        view.setInt32(22, height, true); // positive = bottom-up
+        view.setUint16(26, 1, true);
+        view.setUint16(28, 24, true);
+        view.setUint32(34, imageSize, true);
+        var offset = 54;
+        for (var y = height - 1; y >= 0; y--) {
+            var rowStart = y * width * 4;
+            for (var x = 0; x < width; x++) {
+                var i = rowStart + x * 4;
+                var alpha = ((_a = pixels[i + 3]) !== null && _a !== void 0 ? _a : 255) / 255;
+                var inv = 1 - alpha;
+                // Composite on white so transparent CAD background stays light.
+                bytes[offset++] = Math.round(((_b = pixels[i + 2]) !== null && _b !== void 0 ? _b : 0) * alpha + 255 * inv); // B
+                bytes[offset++] = Math.round(((_c = pixels[i + 1]) !== null && _c !== void 0 ? _c : 0) * alpha + 255 * inv); // G
+                bytes[offset++] = Math.round(((_d = pixels[i]) !== null && _d !== void 0 ? _d : 0) * alpha + 255 * inv); // R
+            }
+            offset += rowSize - width * 3;
+        }
+        return "data:image/bmp;base64,".concat(this.bytesToBase64(bytes));
+    };
+    AcApRasterImageConvertor.prototype.bytesToBase64 = function (bytes) {
+        var chunkSize = 0x8000;
+        var chunks = [];
+        for (var i = 0; i < bytes.length; i += chunkSize) {
+            var chunk = bytes.subarray(i, i + chunkSize);
+            chunks.push(String.fromCharCode.apply(String, __spreadArray([], __read(chunk), false)));
+        }
+        return btoa(chunks.join(''));
+    };
+    return AcApRasterImageConvertor;
 }());
-export { AcApPngConvertor };
-//# sourceMappingURL=AcApPngConvertor.js.map
+export { AcApRasterImageConvertor };
+//# sourceMappingURL=AcApRasterImageConvertor.js.map

package/lib/command/convert/AcApRasterImageConvertor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApRasterImageConvertor.js","sourceRoot":"","sources":["../../../src/command/convert/AcApRasterImageConvertor.ts"],"names":[],"mappings":"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"}

package/lib/command/convert/index.d.ts

@@ -1,8 +1,11 @@
 export * from './AcApBlockPreviewConvertor';
+export * from './AcApConvertToBmpCmd';
 export * from './AcApConvertToDxfCmd';
+export * from './AcApConvertToJpgCmd';
 export * from './AcApConvertToPngCmd';
+export * from './AcApConvertToRasterImageCmd';
 export * from './AcApEntityPreviewCmd';
 export * from './AcApEntityPreviewConvertor';
-export * from './AcApPngConvertor';
+export * from './AcApRasterImageConvertor';
 export * from './AcApDxfConvertor';
 //# sourceMappingURL=index.d.ts.map

package/lib/command/convert/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,oBAAoB,CAAA"}

package/lib/command/convert/index.js

@@ -1,8 +1,11 @@
 export * from './AcApBlockPreviewConvertor';
+export * from './AcApConvertToBmpCmd';
 export * from './AcApConvertToDxfCmd';
+export * from './AcApConvertToJpgCmd';
 export * from './AcApConvertToPngCmd';
+export * from './AcApConvertToRasterImageCmd';
 export * from './AcApEntityPreviewCmd';
 export * from './AcApEntityPreviewConvertor';
-export * from './AcApPngConvertor';
+export * from './AcApRasterImageConvertor';
 export * from './AcApDxfConvertor';
 //# sourceMappingURL=index.js.map

package/lib/command/convert/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,oBAAoB,CAAA"}

package/lib/command/draw/AcApHatchCmd.js

@@ -458,7 +458,7 @@ var AcApHatchCmd = /** @class */ (function (_super) {
         var _this = this;
         var infos = [];
         loops.forEach(function (loop) {
-            var points = loop.getPoints(128).map(function (p) { return ({ x: p.x, y: p.y }); });
+            var points = loop.tessellate().map(function (p) { return ({ x: p.x, y: p.y }); });
             if (points.length < 3)
                 return;
             infos.push({