x_ite 8.3.2 → 8.3.3

package/docs/_posts/reference/scene-services.md

@@ -144,14 +144,25 @@ Creates or updates the exported node *exportedName.*
 
 Removes the exported node *exportedName.*
 
-#### String **toVRMLString** ()
+#### String **toVRMLString** (\[options\])
 
 Returns the X3D VRML-encoded string that, if parsed as the value of createX3DFromString () of X3DBrowser, produce this scene.
 
-#### String **toXMLString** ()
+##### Options
+
+An object with one or more of these properties:
+
+* **scene:** scene to use for units (default: current scene)
+* **style:** string, output style (one of: **"TIDY"**, "COMPACT", "SMALL", "CLEAN")
+* **precision:** integer, float precision (default: 6)
+* **doublePrecision:** integer, double precision (default: 14)
+
+#### String **toXMLString** (\[options\])
 
 Returns the X3D XML-encoded string that, if parsed as the value of createX3DFromString () of X3DBrowser, produce this scene.
 
+For options see toVRMLString.
+
 ## ProfileInfo
 
 This object stores information about a particular X3D profile.

package/docs/_posts/what's-new.md

@@ -5,6 +5,24 @@ nav: main
 categories: []
 tags: [new, releases]
 ---
+## X_ITE v8.3.3 Released
+
+### New Features
+
+- Added to*String options (scene, style, precision, doublePrecision).
+- Added output styles (CLEAN, SMALL, COMPACT, TIDY).
+- Prefer PROTO's during parse.
+- Collect joint nodes if no provided (HAnim).
+- Relaxed VRML parser (parse top level statements in MFNode).
+- XML short syntax of prototype instances.
+
+### Bug Fixes
+
+- Fixed bug when floating point numbers are printed.
+- Fixed bug when MFImage is printed.
+- Fixed component's highest levels.
+- Fixed double count of headlight.
+
 ## X_ITE v8.3.0 Released
 
 *Leipzig, 14st December 2022:* We right now released a new version.
@@ -512,7 +530,7 @@ This release also increased pure rendering speed (without routing and scripting)
 - Fixed picking and Layout node.
 - Fixed bug with composite glyphs in Text node.
 - Fixed bug with data URLs.
-- Fixed bug in toXMLString and toVRMLString when outputing protos.
+- Fixed bug in toXMLString and toVRMLString when outputting protos.
 
 ## X_ITE v4.4.7 Released
 
@@ -552,7 +570,7 @@ This release also increased pure rendering speed (without routing and scripting)
 - Fixed bug when parsing SFMatrix3d/f values.
 - Fixed bug when parsing data URLs.
 - Fixed shadow handling.
-- Fixed bug in MF\* fields pop and shift.
+- Fixed bug in MF* fields pop and shift.
 
 ## X_ITE v4.4.3 Released
 
@@ -879,7 +897,7 @@ You can tune the *shadowIntensity*. It is the intensity of the shadow. 0 means n
 - Optimizations in IndexedQuadSet and QuadSet
 - Optimized CoordinateInterpolator, NormalInterpolator, and CoordinateInterpolator2D
 - Support for more textures for custom shaders
-- New »StraigtenHorizon« browser option
+- New »StraightenHorizon« browser option
 - Better rendering of Text in some cases
 
 ### Bug Fixes

package/docs/_tabs/playground.html

@@ -5,7 +5,7 @@ order: 3
 icon: fas fa-rocket
 ---
 <style>
-.row, .post, .post-content {
+.post, .post-content {
    height: 100%;
 }
 
@@ -15,15 +15,15 @@ icon: fas fa-rocket
 
 /* Table */
 
-table {
-  width: 100%;
-  height: 100%;
-  table-layout: fixed;
+.row {
+  display: flex;
+  height: calc(100vh - 180px);
 }
 
-table td {
-   width: 50%;
-   vertical-align: top;
+.column {
+  flex: 50%;
+  width: 50%;
+  height: 100%;
 }
 
 /* Editor */
@@ -86,6 +86,17 @@ html[data-mode=light] {
    white-space: pre;
 }
 
+.console {
+   height: 50%;
+}
+
+.post x3d-canvas {
+   display: block;
+   width: 100%;
+   height: 50%;
+   aspect-ratio: unset;
+}
+
 .ace_gutter {
    background: var(--editor-gutter) !important;
 }
@@ -164,21 +175,13 @@ span.info {
    color: var(--system-blue);
 }
 
-span.warning {
+span.warn {
    color: var(--system-yellow);
 }
 
 span.error {
    color: var(--system-red);
 }
-
-/* Canvas */
-
-.post x3d-canvas {
-   width: 100%;
-   height: 100%;
-   aspect-ratio: unset;
-}
 </style>
 
 <pre style="display:none">
@@ -239,7 +242,7 @@ $(function ()
       <Shape>
          <Appearance>
             <Material
-               diffuseColor='0 0.5 1'></Material>
+                  diffuseColor='0 0.5 1'></Material>
          </Appearance>
          <Box></Box>
       </Shape>
@@ -268,6 +271,9 @@ $(function ()
                text    = Array .prototype .slice .call (args) .join ("") + "\n",
                element = $("<span></span>") .addClass (classes) .text (text);
 
+            if (text .includes ("No suitable"))
+               return;
+
             log .apply (this, args);
 
             $(".console") .append (element);
@@ -276,28 +282,18 @@ $(function ()
       }
    }
 
-   console .log     = output (console .log,     "log");
-   console .info    = output (console .info,    "info");
-   console .warning = output (console .warning, "warning");
-   console .error   = output (console .error,   "error");
-   console .debug   = output (console .debug,   "debug");
+   console .log   = output (console .log,   "log");
+   console .info  = output (console .info,  "info");
+   console .warn  = output (console .warn,  "warn");
+   console .error = output (console .error, "error");
+   console .debug = output (console .debug, "debug");
 })();
 </script>
 
-<table>
-   <tr>
-      <td>
-         <table>
-            <tr>
-               <td><x3d-canvas splashScreen="false"></x3d-canvas></td>
-            </tr>
-            <tr>
-               <td><div class="console"></div></td>
-            </tr>
-         </table>
-      </td>
-      <td>
-         <div id="editor"></div>
-      </td>
-   </tr>
-</table>
+<div class="row">
+   <div class="column">
+      <x3d-canvas splashScreen="false"></x3d-canvas>
+      <div class="console"></div>
+   </div>
+   <div class="column"><div id="editor"></div></div>
+</div>

package/docs/assets/css/style.scss

@@ -106,6 +106,24 @@ a {
   font-size: 0;
 }
 
+.table-wrapper > table.examples a.popup {
+  margin: 0;
+}
+
+.table-wrapper > table.examples a:hover::before {
+  content: "";
+  position: absolute;
+  background: var(--shimmer-bg);
+  height: 100%;
+  width: 100%;
+  -webkit-animation: shimmer 1s infinite;
+  animation: shimmer 1s infinite;
+}
+
+.table-wrapper > table.examples .shimmer::before {
+  all: unset;
+}
+
 @media all and (max-width: 849px) {
   .table-wrapper > table.examples tbody tr td {
     border-width: 2px;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.3.2",
+	"version": "8.3.3",
 	"description": "X_ITE X3D Browser, view and manipulate X3D and VRML scenes in HTML.",
 	"homepage": "https://create3000.github.io/x_ite/",
 	"author": "Holger Seelig <holger.seelig@gmail.com>",

package/src/assets/components/{ProjectiveTextureMapping.js → TextureProjector.js}

@@ -46,15 +46,15 @@
  ******************************************************************************/
 
 import Components               from "../../x_ite/Components.js";
-import TextureProjector         from "../../x_ite/Components/ProjectiveTextureMapping/TextureProjector.js";
-import TextureProjectorParallel from "../../x_ite/Components/ProjectiveTextureMapping/TextureProjectorParallel.js";
-import X3DTextureProjectorNode  from "../../x_ite/Components/ProjectiveTextureMapping/X3DTextureProjectorNode.js";
+import TextureProjector         from "../../x_ite/Components/TextureProjector/TextureProjector.js";
+import TextureProjectorParallel from "../../x_ite/Components/TextureProjector/TextureProjectorParallel.js";
+import X3DTextureProjectorNode  from "../../x_ite/Components/TextureProjector/X3DTextureProjectorNode.js";
 
 Components .addComponent ({
-   name: "ProjectiveTextureMapping",
+   name: "TextureProjector",
    types:
    {
-      TextureProjector:  TextureProjector,
+      TextureProjector:         TextureProjector,
       TextureProjectorParallel: TextureProjectorParallel,
    },
    abstractTypes:

package/src/examples.js

@@ -78,7 +78,6 @@ const X_ITE_EXAMPLES = [
    { component: "Picking", test: "PrimitivePickSensor" },
    { component: "PointingDeviceSensor", test: "CylinderSensor" },
    { component: "PointingDeviceSensor", test: "PlaneSensor" },
-   { component: "ProjectiveTextureMapping", test: "TextureProjector" },
    { component: "Rendering", test: "ClipPlane" },
    { component: "Rendering", test: "Color" },
    { component: "Rendering", test: "ColorRGBA" },
@@ -106,6 +105,7 @@ const X_ITE_EXAMPLES = [
    { component: "Sound", test: "AudioClip" },
    { component: "Text", test: "FontStyle" },
    { component: "Text", test: "Text" },
+   { component: "TextureProjector", test: "TextureProjector" },
    { component: "Texturing", test: "ImageTexture" },
    { component: "Texturing", test: "MovieTexture" },
    { component: "Texturing", test: "MultiTexture" },

package/src/tests.js

@@ -215,11 +215,6 @@ const X_ITE_TESTS = [
    { path: "PointingDeviceSensor/TouchBeethoven.x3dz" },
    { path: "PointingDeviceSensor/TouchLines.x3dv" },
    { path: "PointingDeviceSensor/TouchPoints.x3dv" },
-   { component: "ProjectiveTextureMapping" },
-   { path: "ProjectiveTextureMapping/apple.x3d" },
-   { path: "ProjectiveTextureMapping/Local.x3d" },
-   { path: "ProjectiveTextureMapping/Parallel.x3d" },
-   { path: "ProjectiveTextureMapping/Perspective.x3d" },
    { component: "PROTO" },
    { path: "PROTO/27cubes.x3d" },
    { path: "PROTO/cbx.wrl" },
@@ -326,6 +321,11 @@ const X_ITE_TESTS = [
    { path: "Text/scrolling-text.x3d" },
    { path: "Text/test.x3d" },
    { path: "Text/vertical.x3d" },
+   { component: "TextureProjector" },
+   { path: "TextureProjector/apple.x3d" },
+   { path: "TextureProjector/Local.x3d" },
+   { path: "TextureProjector/Parallel.x3d" },
+   { path: "TextureProjector/Perspective.x3d" },
    { component: "Texturing" },
    { path: "Texturing/ColorManagement.x3d" },
    { path: "Texturing/ColorMaterial.x3d" },

package/src/x_ite/Base/X3DInfoArray.js

@@ -45,7 +45,7 @@
  *
  ******************************************************************************/
 
-import X3DBaseNode from "../Base/X3DBaseNode.js";
+import Generator from "../InputOutput/Generator.js";
 
 const
    _array = Symbol (),
@@ -223,56 +223,56 @@ X3DInfoArray .prototype = {
    slice: Array .prototype .slice,
    some: Array .prototype .some,
    values: Array .prototype .values,
-   toString: function (scene)
+   toString: function (options = Object .prototype)
    {
-      const stream = { string: "" };
+      const generator = new Generator (options);
 
-      if (scene)
-         Generator .Get (stream) .PushExecutionContext (scene);
+      if (options .scene)
+         generator .PushExecutionContext (options .scene);
 
-      this .toStream (stream);
+      this .toStream (generator);
 
-      return stream .string;
+      return generator .string;
    },
-   toVRMLStream: function (stream)
+   toStream: function (generator)
+   {
+      generator .string = "[object " + this .getTypeName () + "]";
+   },
+   toVRMLStream: function (generator)
    {
       for (const value of this [_array])
       {
          try
          {
-            value .toVRMLStream (stream);
+            value .toVRMLStream (generator);
 
-            stream .string += "\n";
+            generator .string += generator .Break ();
 
-            if (value instanceof X3DBaseNode)
-               stream .string += "\n";
+            if (this .getTypeName () .match (/Proto/))
+               generator .string += generator .TidyBreak ();
          }
          catch (error)
          {
-            console .error (error);
+            // console .error (error);
          }
       }
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
       for (const value of this [_array])
       {
          try
          {
-            value .toXMLStream (stream);
+            value .toXMLStream (generator);
 
-            stream .string += "\n";
+            generator .string += generator .TidyBreak ();
          }
          catch (error)
          {
-            console .error (error);
+            // console .error (error);
          }
       }
    },
-   toStream: function (stream)
-   {
-      stream .string = "[object " + this .getTypeName () + "]";
-   },
 };
 
 for (const key of Reflect .ownKeys (X3DInfoArray .prototype))

package/src/x_ite/Base/X3DObject.js

@@ -131,44 +131,53 @@ X3DObject .prototype =
             interest ();
       }
    },
-   toString: function (scene)
+   toString: function (options = Object .prototype)
    {
-      const stream = { string: "" };
+      const generator = new Generator (options);
 
-      if (scene)
-         Generator .Get (stream) .PushExecutionContext (scene);
+      if (options .scene)
+         generator .PushExecutionContext (options .scene);
 
-      this .toStream (stream);
+      this .toStream (generator);
 
-      return stream .string;
+      return generator .string;
    },
-   toVRMLString: function ()
+   toVRMLString: function  (options = Object .prototype)
    {
-      const stream = { string: "" };
+      const generator = new Generator (options);
 
-      this .toVRMLStream (stream);
+      if (options .scene)
+         generator .PushExecutionContext (options .scene);
 
-      return stream .string;
+      this .toVRMLStream (generator);
+
+      return generator .string;
    },
-   toXMLString: function ()
+   toXMLString: function  (options = Object .prototype)
    {
-      const stream = { string: "" };
+      const generator = new Generator (options);
+
+      if (options .scene)
+         generator .PushExecutionContext (options .scene);
 
-      this .toXMLStream (stream);
+      this .toXMLStream (generator);
 
-      return stream .string;
+      return generator .string;
    },
-   toJSONString: function ()
+   toJSONString: function (options = Object .prototype)
    {
-      const stream = { string: "" };
+      const generator = new Generator (options);
+
+      if (options .scene)
+         generator .PushExecutionContext (options .scene);
 
-      this .toVRMLStream (stream); // TODO.
+      this .toVRMLStream (generator); // TODO.
 
-      return stream .string;
+      return generator .string;
    },
-   toStream: function (stream)
+   toStream: function (generator)
    {
-      stream .string = "[object " + this .getTypeName () + "]";
+      generator .string = "[object " + this .getTypeName () + "]";
    },
    dispose: function () { },
 };

package/src/x_ite/Base/X3DObjectArrayField.js

@@ -47,7 +47,6 @@
 
 import X3DField      from "./X3DField.js";
 import X3DArrayField from "./X3DArrayField.js";
-import Generator     from "../InputOutput/Generator.js";
 
 const
    _target = Symbol (),
@@ -453,25 +452,26 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
    {
       value .removeParent (this [_proxy]);
    },
-   toStream: function (stream)
+   toStream: function (generator)
    {
       const
-         target    = this [_target],
-         array     = target .getValue (),
-         generator = Generator .Get (stream);
+         target = this [_target],
+         array  = target .getValue ();
 
       switch (array .length)
       {
          case 0:
          {
-            stream .string += "[ ]";
+            generator .string += "[";
+            generator .string += generator .TidySpace ();
+            generator .string += "]";
             break;
          }
          case 1:
          {
             generator .PushUnitCategory (target .getUnit ());
 
-            array [0] .toStream (stream);
+            array [0] .toStream (generator);
 
             generator .PopUnitCategory ();
             break;
@@ -480,34 +480,36 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          {
             generator .PushUnitCategory (target .getUnit ());
 
-            stream .string += "[\n";
+            generator .string += "[";
+            generator .string += generator .ListStart ();
             generator .IncIndent ();
 
             for (let i = 0, length = array .length - 1; i < length; ++ i)
             {
-               stream .string += generator .Indent ();
-               array [i] .toStream (stream);
-               stream .string += ",\n";
+               generator .string += generator .ListIndent ();
+               array [i] .toStream (generator);
+               generator .string += generator .Comma ();
+               generator .string += generator .ListBreak ();
             }
 
-            stream .string += generator .Indent ();
-            array .at (-1) .toStream (stream);
-            stream .string += "\n";
+            generator .string += generator .ListIndent ();
+            array .at (-1) .toStream (generator);
 
+            generator .string += generator .ListEnd ();
             generator .DecIndent ();
-            stream .string += generator .Indent ();
-            stream .string += "]";
+            generator .string += generator .ListIndent ();
+            generator .string += "]";
 
             generator .PopUnitCategory ();
             break;
          }
       }
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
       const
          target = this [_target],
@@ -515,19 +517,18 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       if (length)
       {
-         const
-            generator = Generator .Get (stream),
-            array     = target .getValue ();
+         const array = target .getValue ();
 
          generator .PushUnitCategory (target .getUnit ());
 
-         for (const element of array)
+         for (let i = 0, length = array .length - 1; i < length; ++ i)
          {
-            element .toXMLStream (stream);
-            stream .string += ", ";
+            array [i] .toXMLStream (generator);
+            generator .string += generator .Comma ();
+            generator .string += generator .TidySpace ();
          }
 
-         array .at (-1) .toXMLStream (stream);
+         array .at (-1) .toXMLStream (generator);
 
          generator .PopUnitCategory ();
       }