x3d-image 1.0.95 → 1.0.96

package/README.md

@@ -10,19 +10,19 @@ Render image files from X3D.
 
 You can run *x3d-image* without installing it using **npx**:
 
-**npx x3d-image** \[options\]
+**npx x3d-image** \[options\] input-file output-file [input-file output-file ...]
 
 ## Options
 
 **x3d-image** interprets the following options when it is invoked:
 
-### -i *file*
+### -i *file* ...
 
-Set input file. This can be either a local file path or a URL.
+Set input file(s). This can be either a local file path or a URL. If there are less input files than output files, the last input file is used for the remaining output files.
 
-### -o *file*
+### -o *file* ...
 
-Set output file.
+Set output file(s).
 
 ### -s WIDTHxHEIGHT
 
@@ -74,7 +74,13 @@ Show help.
 Render an JPEG image from X3D with size 1600x900.
 
 ```sh
-$ npx x3d-image -s 1600x900 -i file.x3d -o file.jpg
+$ npx x3d-image -s 1600x900 file.x3d file.jpg
+```
+
+Render an two PNG image from two X3D files.
+
+```sh
+$ npx x3d-image -s 1600x900 file1.x3d file1.png file2.x3d file2.png
 ```
 
 ## See Also

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x3d-image",
-  "version": "1.0.95",
+  "version": "1.0.96",
   "description": "Render image files from X3D",
   "main": "src/main.js",
   "bin": {
@@ -53,7 +53,7 @@
   "dependencies": {
     "colors": "^1.4.0",
     "electron": "^33.2.1",
-    "x_ite": "^10.5.15",
+    "x_ite": "^11.0.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {

package/src/image.js

@@ -36,10 +36,10 @@ async function main (argv)
 
 async function generate (argv)
 {
-   const args = yargs (argv)
+   const args = yargs (argv .slice (2))
    .scriptName ("x3d-image")
-   .usage ("$0 args")
-   .command ("x3d-image", "Render image files from X3D")
+   .usage ("$0 [options] input-file output-file [input-file output-file ...]")
+   .command ("Render image files from X3D")
    .version (pkg .version)
    .alias ("v", "version")
    .fail ((msg, error, yargs) =>
@@ -51,15 +51,17 @@ async function generate (argv)
    {
       type: "string",
       alias: "i",
-      description: "Set input file.",
-      demandOption: true,
+      description: "Set input file(s). If there are less input files than output files, the last input file is used for the remaining output files.",
+      array: true,
+      implies: "output",
    })
    .option ("output",
    {
       type: "string",
       alias: "o",
-      description: "Set output file. To output it to stdout use only the extension, e.g. '.x3dv'.",
-      demandOption: true,
+      description: "Set output file(s). To output it to stdout use only the extension, e.g. '.x3dv'.",
+      array: true,
+      implies: "input",
    })
    .option ("size",
    {
@@ -97,34 +99,54 @@ async function generate (argv)
    if (args .help)
       return;
 
+   args .input  ??= [ ];
+   args .output ??= [ ];
+
+   if (args .input .length === 0 && args .output .length === 0)
+   {
+      if (args ._ .length % 2 === 0)
+      {
+         for (let i = 0; i < args ._ .length; i += 2)
+         {
+            args .input  .push (args ._ [i + 0]);
+            args .output .push (args ._ [i + 1]);
+         }
+      }
+   }
    const
       canvas   = document .getElementById ("browser"),
       Browser  = canvas .browser,
-      input    = new URL (args .input, url .pathToFileURL (path .join (process .cwd (), "/"))),
-      output   = path .resolve (process .cwd (), args .output),
       size     = args .size .split ("x"),
       width    = parseInt (size [0]) || 1280,
-      height   = parseInt (size [1]) || 720,
-      mimeType = mimeTypeFromPath (output);
+      height   = parseInt (size [1]) || 720;
 
    Browser .setBrowserOption ("PrimitiveQuality", "HIGH");
    Browser .setBrowserOption ("TextureQuality",   "HIGH");
 
    await Browser .resize (width, height);
-   await Browser .loadURL (new X3D .MFString (input));
 
-   if (args ["view-all"])
+   for (const i of args .output .keys ())
    {
-      Browser .viewAll (0);
-      await Browser .nextFrame ();
-   }
+      const
+         input    = new URL (args .input [i] ?? args .input .at (-1), url .pathToFileURL (path .join (process .cwd (), "/"))),
+         output   = path .resolve (process .cwd (), args .output [i]),
+         mimeType = mimeTypeFromPath (output);
 
-   if (args .delay)
-      await sleep (args .delay * 1000);
+      await Browser .loadURL (new X3D .MFString (input));
 
-   const blob = await generateImage (canvas, mimeType, args .quality);
+      if (args ["view-all"])
+      {
+         Browser .viewAll (0);
+         await Browser .nextFrame ();
+      }
 
-   fs .writeFileSync (output, new DataView (await blob .arrayBuffer ()));
+      if (args .delay)
+         await sleep (args .delay * 1000);
+
+      const blob = await generateImage (canvas, mimeType, args .quality);
+
+      fs .writeFileSync (output, new DataView (await blob .arrayBuffer ()));
+   }
 
    Browser .dispose ();
 }

package/src/main.js

@@ -5,18 +5,26 @@ const
    path     = require ("path"),
    colors   = require ("colors");
 
+// Restore argv.
+
 process .argv = process .argv .concat (JSON .parse (atob (process .argv .pop ())));
 process .chdir (process .argv .pop ());
 
+// Set env vars for Electron.
+
 process .env .ELECTRON_DISABLE_SECURITY_WARNINGS = "true";
 // process .env .ELECTRON_ENABLE_LOGGING            = 1;
 
+// Hide Electron.
+
 if (process .platform === "darwin")
 {
    electron .app .setActivationPolicy ("accessory");
    electron .app .dock .hide ();
 }
 
+// Start app and handle events.
+
 electron .app .whenReady () .then (async () =>
 {
    const window = new electron .BrowserWindow ({