x3d-image 2.0.30 → 2.0.32

package/README.md

@@ -14,7 +14,7 @@ You can run *x3d-image* without installing it using **npx**:
 
 ## Overview
 
-*x3d-image* is a command-line tool that renders image files from X3D (Extensible 3D) and other 3D file formats. It allows users to convert 3D scenes into 2D images, supporting various input formats such as X3D (XML, JSON, Classic VRML), VRML, glTF, OBJ, STL, PLY, and SVG. The output can be in PNG or JPEG formats.
+*x3d-image* is a command-line tool based on [X_ITE](https://create3000.github.io/x_ite/) that renders image files from X3D (Extensible 3D) and other 3D file formats. It allows users to convert 3D scenes into 2D images, supporting various input formats such as X3D (XML, JSON, Classic VRML), VRML, glTF, OBJ, STL, PLY, and SVG. Output can be in PNG or JPEG formats.
 
 Key Features:
 
@@ -66,6 +66,22 @@ Add an EnvironmentLight node to scene. Useful when rendering glTF files with Phy
 
 Creates a parent group with the model as children and sets the specified X3D rotation value.
 
+### -c *[SRGB, **LINEAR_WHEN_PHYSICAL_MATERIAL**, LINEAR]*
+
+The color space in which color calculations take place.
+
+### -x *exposure*
+
+The exposure of an image describes the amount of light that is captured.
+
+### -m *[**NONE**, ACES_NARKOWICZ, ACES_HILL, ACES_HILL_EXPOSURE_BOOST, KHR_PBR_NEUTRAL]*
+
+Whether tone mapping should be applied.
+
+### -t *[**CHAR_SPACING**, SCALING]*
+
+Controls how Text.length and Text.maxExtent are handled. Either by adjusting char spacing or by scaling text letters.
+
 ### -v
 
 Show version.
@@ -117,4 +133,4 @@ $ npx x3d-image -a -e CANNON -i file.gltf -o file.png
 
 ## See Also
 
-x3d-image is based on [X_ITE](https://create3000.github.io/x_ite/), so check it out.
+* [x3d-tidy](https://www.npmjs.com/package/x3d-tidy) — X3D converter, beautifier and minimizer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x3d-image",
-  "version": "2.0.30",
+  "version": "2.0.32",
   "description": "Render image files from X3D",
   "main": "src/main.js",
   "bin": {

package/src/image.js

@@ -123,6 +123,40 @@ async function generate (argv)
       array: true,
       default: [ ],
    })
+   .option ("colorSpace",
+   {
+      type: "string",
+      alias: "c",
+      description: `The color space in which color calculations take place.`,
+      choices: ["SRGB", "LINEAR_WHEN_PHYSICAL_MATERIAL", "LINEAR"],
+      array: true,
+      default: ["LINEAR_WHEN_PHYSICAL_MATERIAL"],
+   })
+   .option ("exposure",
+   {
+      type: "number",
+      alias: "x",
+      description: `The exposure of an image describes the amount of light that is captured.`,
+      array: true,
+      default: [1],
+   })
+   .option ("tone-mapping",
+   {
+      type: "string",
+      alias: "m",
+      description: `Whether tone mapping should be applied.`,
+      choices: ["NONE", "ACES_NARKOWICZ", "ACES_HILL", "ACES_HILL_EXPOSURE_BOOST", "KHR_PBR_NEUTRAL"],
+      array: true,
+      default: ["NONE"],
+   })
+   .option ("text-compression",
+   {
+      type: "string",
+      alias: "t",
+      description: `Controls how Text.length and Text.maxExtent are handled. Either by adjusting char spacing or by scaling text letters.`,
+      array: true,
+      default: ["CHAR_SPACING"],
+   })
    .example ([
       [
          "npx x3d-image -s 1600x900 -i file.x3d -o file.jpg",
@@ -172,26 +206,37 @@ async function generate (argv)
       await browser .resize (width, height);
       await browser .loadURL (new X3D .MFString (input)) .catch (Function .prototype);
 
-      if (arg (args .rotation, i))
-         await addTransform (browser, browser .currentScene, arg (args .rotation, i));
-
       if (arg (args .background, i))
          await addBackground (browser, browser .currentScene, arg (args .background, i));
 
       if (arg (args ["environment-light"], i))
          await addEnvironmentLight (browser, browser .currentScene, arg (args ["environment-light"], i));
 
+      if (arg (args .rotation, i))
+         await addTransform (browser, browser .currentScene, arg (args .rotation, i));
+
+      if (arg (args .colorSpace, i))
+         browser .setBrowserOption ("ColorSpace", arg (args .colorSpace, i));
+
+      if (arg (args .exposure, i))
+         browser .setBrowserOption ("Exposure", arg (args .exposure, i));
+
+      if (arg (args ["tone-mapping"], i))
+         browser .setBrowserOption ("ToneMapping", arg (args ["tone-mapping"], i));
+
+      if (arg (args ["text-compression"], i))
+         browser .setBrowserOption ("TextCompression", arg (args ["text-compression"], i));
+
       if (arg (args ["view-all"], i))
-      {
          browser .viewAll (0);
-         await browser .nextFrame ();
-      }
 
       browser .beginUpdate ();
 
       if (arg (args .delay, i))
          await sleep (arg (args .delay, i) * 1000);
 
+      await browser .nextFrame ();
+
       const blob = await generateImage (canvas, mimeType, arg (args .quality, i));
 
       fs .writeFileSync (output, new DataView (await blob .arrayBuffer ()));
@@ -243,8 +288,6 @@ async function addTransform (browser, scene, rotation)
    transform .rotation = r;
 
    scene .rootNodes = new X3D .MFNode (transform);
-
-   await browser .nextFrame ();
 }
 
 let background = null;
@@ -271,8 +314,6 @@ async function addBackground (browser, scene, color)
    background .transparency = 1 - c .a;
 
    scene .addRootNode (background);
-
-   await browser .nextFrame ();
 }
 
 const EnvironmentLights = new Map ([
@@ -330,7 +371,6 @@ async function addEnvironmentLight (browser, scene, name)
    scene .addRootNode (environmentLight);
 
    await Promise .all ([
-      browser .nextFrame (),
       environmentLight .diffuseTexture  .getValue () .requestImmediateLoad (),
       environmentLight .specularTexture .getValue () .requestImmediateLoad (),
    ]);