sunrize 1.7.7 → 1.7.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.7",
+  "version": "1.7.9",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -90,7 +90,7 @@
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^30.2.0",
+    "electron": "^30.3.1",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -109,7 +109,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.0.0",
-    "x_ite": "^10.0.5"
+    "x_ite": "^10.2.0"
   },
   "config": {
     "forge": {

package/src/Application/Application.js

@@ -593,6 +593,23 @@ module .exports = class Application
                         },
                      ],
                   },
+                  {
+                     label: _("Text Compression"),
+                     submenu: [
+                        {
+                           label: _("Char Spacing"),
+                           type: "radio",
+                           checked: this .menuOptions .textCompression === "CHAR_SPACING",
+                           click: () => this .mainWindow .webContents .send ("text-compression", "CHAR_SPACING"),
+                        },
+                        {
+                           label: _("Scaling"),
+                           type: "radio",
+                           checked: this .menuOptions .textCompression === "SCALING",
+                           click: () => this .mainWindow .webContents .send ("text-compression", "SCALING"),
+                        },
+                     ],
+                  },
                   {
                      label: _("Color Space"),
                      submenu: [

package/src/Application/Document.js

@@ -96,6 +96,7 @@ module .exports = class Document extends Interface
 
       electron .ipcRenderer .on ("primitive-quality",              (event, value) => this .setPrimitiveQuality (value));
       electron .ipcRenderer .on ("texture-quality",                (event, value) => this .setTextureQuality (value));
+      electron .ipcRenderer .on ("text-compression",               (event, value) => this .setTextCompression (value));
       electron .ipcRenderer .on ("color-space",                    (event, value) => this .setColorSpace (value));
       electron .ipcRenderer .on ("tone-mapping",                   (event, value) => this .setToneMapping (value));
       electron .ipcRenderer .on ("order-independent-transparency", (event, value) => this .setOrderIndependentTransparency (value));
@@ -130,6 +131,7 @@ module .exports = class Document extends Interface
       const browserOptions = [
          "PrimitiveQuality",
          "TextureQuality",
+         "TextCompression",
          "ColorSpace",
          "ToneMapping",
          "OrderIndependentTransparency",
@@ -175,6 +177,7 @@ module .exports = class Document extends Interface
          inferProfileAndComponents: true,
          primitiveQuality: "MEDIUM",
          textureQuality: "MEDIUM",
+         textCompression: "CHAR_SPACING",
          colorSpace: "LINEAR_WHEN_PHYSICAL_MATERIAL",
          toneMapping: "NONE",
          orderIndependentTransparency: false,
@@ -189,6 +192,7 @@ module .exports = class Document extends Interface
 
       this .setPrimitiveQuality             (this .config .file .primitiveQuality);
       this .setTextureQuality               (this .config .file .textureQuality);
+      this .setTextCompression              (this .config .file .textCompression);
       this .setColorSpace                   (this .config .file .colorSpace);
       this .setToneMapping                  (this .config .file .toneMapping);
       this .setOrderIndependentTransparency (this .config .file .orderIndependentTransparency);
@@ -634,6 +638,23 @@ Viewpoint {
       this .updateMenu ();
    }
 
+   /**
+    *
+    * @param {string} value
+    */
+   setTextCompression (value)
+   {
+      this .browser .setBrowserOption ("TextCompression", value);
+      this .browser .setDescription (`Text Compression: ${value}`);
+   }
+
+   set_TextCompression ()
+   {
+      this .config .file .textCompression = this .browser .getBrowserOption ("TextCompression");
+
+      this .updateMenu ();
+   }
+
    /**
     *
     * @param {string} value
@@ -741,6 +762,7 @@ Viewpoint {
       {
          primitiveQuality: this .config .file .primitiveQuality,
          textureQuality: this .config .file .textureQuality,
+         textCompression: this .config .file .textCompression,
          colorSpace: this .config .file .colorSpace,
          toneMapping: this .config .file .toneMapping,
          orderIndependentTransparency: this .config .file .orderIndependentTransparency,

package/src/Application/Tabs.js

@@ -88,6 +88,7 @@ module .exports = new class Tabs
 
       this .forwardToActiveTab ("primitive-quality");
       this .forwardToActiveTab ("texture-quality");
+      this .forwardToActiveTab ("text-compression");
       this .forwardToActiveTab ("color-space");
       this .forwardToActiveTab ("tone-mapping");
       this .forwardToActiveTab ("order-independent-transparency");

package/src/Controls/Dialog.js

@@ -23,15 +23,15 @@ module .exports = class Dialog extends Interface
          {
             this .element .dialog ("widget")
                .nextAll (".ui-widget-overlay")
-               .on ("click", () => this .close ())
+               .on ("click", () => this .close ());
 
-            this .onopen ()
+            this .onopen ();
          },
          close: () =>
          {
-            this .onclose ()
+            this .onclose ();
          },
-      })
+      });
 
       this .element .dialog ("widget")
          .draggable ({
@@ -40,7 +40,7 @@ module .exports = class Dialog extends Interface
          .resizable({
             resize: (event, ui) => this .config .file .size = [ui .size .width, ui .size .height],
           })
-         .find (".ui-dialog-titlebar") .remove ()
+         .find (".ui-dialog-titlebar") .remove ();
    }
 
    configure (defaults = { })
@@ -51,7 +51,7 @@ module .exports = class Dialog extends Interface
          position: undefined,
          size: [400, 250],
       },
-      defaults))
+      defaults));
    }
 
    open ()
@@ -63,14 +63,19 @@ module .exports = class Dialog extends Interface
          width: this .config .file .size [0],
          height: this .config .file .size [1],
       })
-      .dialog ("open")
+      .dialog ("open");
+   }
+
+   isOpen ()
+   {
+      return this .element .dialog ("isOpen");
    }
 
    close ()
    {
-      this .element .dialog ("close")
+      this .element .dialog ("close");
    }
 
    onopen () { }
    onclose () { }
-}
+};

package/src/Editors/Library.js

@@ -70,13 +70,15 @@ module .exports = new class Library extends Dialog
          .appendTo (this .element)
          .addClass ("library-output");
 
+      if (!this .isOpen ())
+         return;
+
       // Configure list type.
 
       const button = [... this .buttons .children ()]
          .find (button => $(button) .data ("type") === this .config .file .type);
 
-      if (button)
-         this .button ($(button));
+      this .button ($(button ?? this .buttons .children () [0]));
    }
 
    async open (executionContext, node, field)
@@ -87,7 +89,14 @@ module .exports = new class Library extends Dialog
 
       super .open ();
       this .panes .forEach (pane => pane .open ());
-      this .update ();
+
+      // Configure list type.
+
+      const button = [... this .buttons .children ()]
+         .find (button => $(button) .data ("type") === this .config .file .type);
+
+      this .button ($(button ?? this .buttons .children () [0]));
+
       this .input .trigger ("focus");
    }
 

package/src/Editors/MaterialsLibrary.js

@@ -10,9 +10,6 @@ module .exports = class Materials extends LibraryPane
    id          = "MATERIALS";
    description = "Materials";
 
-   #canvas;
-   #browser;
-   #scene;
    #list;
 
    async update ()
@@ -31,13 +28,14 @@ module .exports = class Materials extends LibraryPane
          .appendTo (this .output)
          .addClass ("library-list");
 
-      this .#canvas  ??= $("<x3d-canvas preserveDrawingBuffer='true''></x3d-canvas>");
-      this .#browser ??= this .#canvas .prop ("browser");
-      this .#scene   ??= await this .#browser .createX3DFromURL (new X3D .MFString (`file://${__dirname}/Materials.x3d`));
+      const
+         canvas  = $("<x3d-canvas preserveDrawingBuffer='true'></x3d-canvas>"),
+         browser = canvas .prop ("browser"),
+         scene   = await browser .createX3DFromURL (new X3D .MFString (`file://${__dirname}/Materials.x3d`));
 
       const
-         materials = this .#scene .getExportedNode ("Materials"),
-         viewpoint = this .#scene .getExportedNode ("Viewpoint"),
+         materials = scene .getExportedNode ("Materials"),
+         viewpoint = scene .getExportedNode ("Viewpoint"),
          nodes     = [ ];
 
       for (const [g, group] of materials .children .entries ())
@@ -63,12 +61,12 @@ module .exports = class Materials extends LibraryPane
 
       // Create icons.
 
-      this .#canvas
+      canvas
          .css ({ "position": "absolute", "visibility": "hidden" })
-         .prependTo (this .element);
+         .prependTo ($("body"));
 
-      await this .#browser .resize (25, 25);
-      await this .#browser .replaceWorld (this .#scene);
+      await browser .resize (25, 25);
+      await browser .replaceWorld (scene);
 
       for (const element of Array .from (this .output .find (".node"), e => $(e)))
       {
@@ -85,12 +83,12 @@ module .exports = class Materials extends LibraryPane
          viewpoint .position .y = node .translation .y;
          viewpoint .position .z = 2.65;
 
-         await this .#browser .nextFrame ();
+         await browser .nextFrame ();
 
-         element .css ("background-image", `url(${this .#canvas [0] .toDataURL ()})`);
+         element .css ("background-image", `url(${canvas [0] .toDataURL ()})`);
       }
 
-      this .#browser .dispose ();
-      this .#canvas .remove ();
+      browser .dispose ();
+      canvas .remove ();
    }
 };

package/src/Editors/Primitives.js

@@ -360,6 +360,26 @@ DEF Sphere Transform {
       geometry Sphere { }
    }
 }
+`
+   },
+   {
+      componentInfo: { name: "Lighting" },
+      typeName: "EnvironmentLight",
+      x3dSyntax: `
+EnvironmentLight {
+   diffuseTexture ImageCubeMapTexture {
+      url "https://create3000.github.io/Library/Tests/Components/images/helipad-diffuse.jpg"
+      textureProperties DEF _1 TextureProperties {
+         generateMipMaps TRUE
+         minificationFilter "NICEST"
+         magnificationFilter "NICEST"
+      }
+   }
+   specularTexture ImageCubeMapTexture {
+      url "https://create3000.github.io/Library/Tests/Components/images/helipad-specular.jpg"
+      textureProperties USE _1
+   }
+}
 `
    },
    {