@hubol/smooch 1.0.0-beta.19 → 1.0.0-beta.20

package/index.js

@@ -29059,7 +29059,7 @@ TestStream._logger = new logger_1.Logger(TestStream, "green");
 
 /***/ }),
 
-/***/ 3186:
+/***/ 4558:
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -29074,15 +29074,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.readImageFileDimensions = void 0;
+exports.readImage = void 0;
 const native_module_1 = __webpack_require__(4828);
-function readImageFileDimensions(filePath) {
+function readImage(filePath) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { width, height } = yield native_module_1.Native.Sharp(filePath).metadata();
-        return { width, height };
+        const image = native_module_1.Native.Sharp(filePath);
+        const [buffer, { width, height },] = yield Promise.all([
+            image.raw().ensureAlpha().toBuffer(),
+            image.metadata(),
+        ]);
+        return { buffer, width, height };
     });
 }
-exports.readImageFileDimensions = readImageFileDimensions;
+exports.readImage = readImage;
 
 
 /***/ }),
@@ -30702,11 +30706,11 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.packTextures = void 0;
 const bin_pack_1 = __webpack_require__(3934);
 const logger_1 = __webpack_require__(6266);
-const read_image_file_dimensions_1 = __webpack_require__(3186);
+const read_image_1 = __webpack_require__(4558);
 const native_module_1 = __webpack_require__(4828);
 const logger = new logger_1.Logger("RawPacker", "magenta");
 const filePathToBlocks = (filePath) => __awaiter(void 0, void 0, void 0, function* () {
-    const result = yield (0, read_image_file_dimensions_1.readImageFileDimensions)(filePath);
+    const result = yield (0, read_image_1.readImage)(filePath);
     if (!result) {
         logger.error(`Failed to read dimensions of image file: ${filePath}`);
         return [];
@@ -30715,23 +30719,17 @@ const filePathToBlocks = (filePath) => __awaiter(void 0, void 0, void 0, functio
         logger.error(`Read malformed dimensions (${result.width}, ${result.height}) for image file: ${filePath}`);
         return [];
     }
-    const { width, height } = result;
-    return [{ width, height, filePath }];
+    const { buffer, height, width } = result;
+    return [{ buffer, filePath, height, width }];
 });
-const computeMainImage = (width, height, blocks) => __awaiter(void 0, void 0, void 0, function* () {
-    const create = {
-        width,
-        height,
-        channels: 4,
-        background: { r: 0, g: 0, b: 0, alpha: 0 },
-    };
-    const overlayOptions = blocks.map(block => ({
-        left: block.x,
-        top: block.y,
-        input: block.filePath,
-    }));
-    return yield native_module_1.Native.Sharp({ create })
-        .composite(overlayOptions)
+const compositeBinImage = (width, height, blocks) => __awaiter(void 0, void 0, void 0, function* () {
+    const binBuffer = new Uint8Array(4 * width * height);
+    for (const block of blocks) {
+        for (let y = 0; y < block.height; y++) {
+            block.buffer.copy(binBuffer, (block.x + ((block.y + y) * width)) * 4, y * block.width * 4, (y + 1) * block.width * 4);
+        }
+    }
+    return yield native_module_1.Native.Sharp(binBuffer, { raw: { channels: 4, width, height, premultiplied: true } })
         .png()
         .toBuffer();
 });
@@ -30739,7 +30737,7 @@ const packTextures = (filePaths, options) => __awaiter(void 0, void 0, void 0, f
     const { pack: packOptions } = options;
     const blocks = (yield Promise.all(filePaths.map(filePathToBlocks))).flat();
     const bins = (0, bin_pack_1.binPack)(blocks, packOptions);
-    yield Promise.all(bins.map((bin) => __awaiter(void 0, void 0, void 0, function* () { return bin.imageBuffer = yield computeMainImage(bin.width, bin.height, bin.rects); })));
+    yield Promise.all(bins.map((bin) => __awaiter(void 0, void 0, void 0, function* () { return bin.imageBuffer = yield compositeBinImage(bin.width, bin.height, bin.rects); })));
     logger.log(`Created ${bins.length} image buffer(s) for ${filePaths.length} texture(s)`);
     return bins;
 });
@@ -52963,7 +52961,7 @@ class MaxRectsPacker {
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@hubol/smooch","version":"1.0.0-beta.19","description":"Generate texture atlases, browser-compatible audio, and source code from directories","scripts":{"build":"npm run build:json-schema && npm run build:template-api-dts && npm run build:bundle && npm run build:distributable-package-json && npm run build:npm-readme && npm run build:npm-pack","build:json-schema":"ts-node ./tools/generate-config-schema.ts","build:template-api-dts":"npx tsup lib/template-api.ts --dts-only --dts-resolve","build:bundle":"webpack","build:distributable-package-json":"ts-node ./tools/generate-distributable-package-json.ts","build:npm-readme":"ts-node ./tools/generate-npm-readme.ts","build:npm-pack":"ts-node ./tools/pack.ts ../smooch.tgz","dev:build-and-test":"npm run build && npm run test","dev:start":"node --nolazy -r ts-node/register ./lib/main/dev.ts","dev:update-readme":"ts-node ./lib/main/dev.ts ../../tools/update-readme-md.ts","test":"ts-node --transpileOnly test/test.ts"},"bin":{"smooch":"index.js"},"author":"Hubol","license":"ISC","repository":{"type":"git","url":"https://github.com/hubol/smooch.git"},"devDependencies":{"@types/archiver":"^5.3.2","@types/fluent-ffmpeg":"^2.1.21","@types/sharp":"^0.31.1","archiver":"^6.0.0","chalk":"^4.1.2","change-case":"^4.1.2","dprint":"^0.47.6","fluent-ffmpeg":"^2.1.2","glob":"^10.3.3","maxrects-packer":"^2.7.3","minimatch":"^9.0.3","superstruct":"^0.15.5","tree-kill":"^1.2.2","ts-loader":"^9.4.4","ts-node":"^10.9.1","tsup":"^7.2.0","typescript":"^5.0.4","typescript-json-schema":"^0.56.0","webpack":"^5.88.2","webpack-cli":"^5.1.4","webpack-shebang-plugin":"^1.1.8"}}');
+module.exports = JSON.parse('{"name":"@hubol/smooch","version":"1.0.0-beta.20","description":"Generate texture atlases, browser-compatible audio, and source code from directories","scripts":{"build":"npm run build:json-schema && npm run build:template-api-dts && npm run build:bundle && npm run build:distributable-package-json && npm run build:npm-readme && npm run build:npm-pack","build:json-schema":"ts-node ./tools/generate-config-schema.ts","build:template-api-dts":"npx tsup lib/template-api.ts --dts-only --dts-resolve","build:bundle":"webpack","build:distributable-package-json":"ts-node ./tools/generate-distributable-package-json.ts","build:npm-readme":"ts-node ./tools/generate-npm-readme.ts","build:npm-pack":"ts-node ./tools/pack.ts ../smooch.tgz","dev:build-and-test":"npm run build && npm run test","dev:start":"node --nolazy -r ts-node/register ./lib/main/dev.ts","dev:update-readme":"ts-node ./lib/main/dev.ts ../../tools/update-readme-md.ts","test":"ts-node --transpileOnly test/test.ts"},"bin":{"smooch":"index.js"},"author":"Hubol","license":"ISC","repository":{"type":"git","url":"https://github.com/hubol/smooch.git"},"devDependencies":{"@types/archiver":"^5.3.2","@types/fluent-ffmpeg":"^2.1.21","@types/sharp":"^0.31.1","archiver":"^6.0.0","chalk":"^4.1.2","change-case":"^4.1.2","dprint":"^0.47.6","fluent-ffmpeg":"^2.1.2","glob":"^10.3.3","maxrects-packer":"^2.7.3","minimatch":"^9.0.3","superstruct":"^0.15.5","tree-kill":"^1.2.2","ts-loader":"^9.4.4","ts-node":"^10.9.1","tsup":"^7.2.0","typescript":"^5.0.4","typescript-json-schema":"^0.56.0","webpack":"^5.88.2","webpack-cli":"^5.1.4","webpack-shebang-plugin":"^1.1.8"}}');
 
 /***/ })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubol/smooch",
-  "version": "1.0.0-beta.19",
+  "version": "1.0.0-beta.20",
   "description": "Generate texture atlases, browser-compatible audio, and source code from directories",
   "bin": {
     "smooch": "index.js"

package/template-api.d.ts

@@ -466,9 +466,10 @@ type GlobRoot = string & {
 };
 
 declare function createAtlases(imageFilePaths: Path.File.t[], options: Infer<typeof PackerOptions>): Promise<(Bin<{
-    width: number;
-    height: number;
+    buffer: Buffer;
     filePath: Path.File.t;
+    height: number;
+    width: number;
 } & {
     x: number;
     y: number;
@@ -480,9 +481,10 @@ declare function createAtlases(imageFilePaths: Path.File.t[], options: Infer<typ
 type Atlases = AsyncReturnType<typeof createAtlases>;
 declare function createTemplateContext(atlases: Atlases, globRoot: GlobRoot): {
     atlases: (Bin<{
-        width: number;
-        height: number;
+        buffer: Buffer;
         filePath: Path.File.t;
+        height: number;
+        width: number;
     } & {
         x: number;
         y: number;