x_ite 8.3.2 → 8.4.0

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,23 +517,66 @@ 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 ();
       }
    },
+   toJSONStream: function (generator)
+   {
+      const
+         target = this [_target],
+         length = target .length;
+
+      if (length)
+      {
+         const value = this .getValue ();
+
+         generator .PushUnitCategory (target .getUnit ());
+
+         generator .string += '[';
+         generator .string += generator .ListBreak ();
+         generator .string += generator .IncIndent ();
+
+         for (let i = 0, n = length - 1; i < n; ++ i)
+         {
+            generator .string += generator .ListIndent ();
+
+            value [i] .toJSONStreamValue (generator);
+
+            generator .string += ',';
+            generator .string += generator .ListBreak ();
+         }
+
+         generator .string += generator .ListIndent ();
+
+         value .at (-1) .toJSONStreamValue (generator);
+
+         generator .string += generator .ListBreak ();
+         generator .string += generator .DecIndent ();
+         generator .string += generator .ListIndent ();
+         generator .string += ']';
+
+         generator .PopUnitCategory ();
+      }
+      else
+      {
+         generator .string += '[';
+         generator .string += generator .TidySpace ();
+         generator .string += ']';
+      }
+   },
    dispose: function ()
    {
       const

package/src/x_ite/Base/X3DTypedArrayField.js

@@ -46,7 +46,6 @@
  ******************************************************************************/
 
 import X3DArrayField from "./X3DArrayField.js";
-import Generator     from "../InputOutput/Generator.js";
 import Algorithm     from "../../standard/Math/Algorithm.js";
 
 const
@@ -688,11 +687,10 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       return newArray;
    },
-   toStream: function (stream)
+   toStream: function (generator)
    {
       const
          target     = this [_target],
-         generator  = Generator .Get (stream),
          array      = target .getValue (),
          length     = target [_length],
          components = target .getComponents (),
@@ -702,7 +700,9 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
       {
          case 0:
          {
-            stream .string += "[ ]";
+            generator .string += "[";
+            generator .string += generator .TidySpace ();
+            generator .string += "]";
             break;
          }
          case 1:
@@ -713,14 +713,14 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
             {
                value .set (array [0]);
 
-               value .toStream (stream);
+               value .toStream (generator);
             }
             else
             {
                for (let c = 0, first = 0; c < components; ++ c, ++ first)
                   value [c] = array [first];
 
-               value .toStream (stream);
+               value .toStream (generator);
             }
 
             generator .PopUnitCategory ();
@@ -730,64 +730,65 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
          {
             generator .PushUnitCategory (target .getUnit ());
 
-            stream .string += "[\n";
+            generator .string += "[";
+            generator .string += generator .ListStart ();
             generator .IncIndent ();
 
             if (components === 1)
             {
                for (let i = 0, n = length - 1; i < n; ++ i)
                {
-                  stream .string += generator .Indent ();
+                  generator .string += generator .ListIndent ();
 
                   value .set (array [i * components]);
-                  value .toStream (stream);
+                  value .toStream (generator);
 
-                  stream .string += ",\n";
+                  generator .string += generator .Comma ();
+                  generator .string += generator .ListBreak ();
                }
 
-               stream .string += generator .Indent ();
+               generator .string += generator .ListIndent ();
                value .set (array [(length - 1) * components]);
-               value .toStream (stream);
-
-               stream .string += "\n";
+               value .toStream (generator);
             }
             else
             {
                for (let i = 0, n = length - 1; i < n; ++ i)
                {
-                  stream .string += generator .Indent ();
+                  generator .string += generator .ListIndent ();
 
                   for (let c = 0, first = i * components; c < components; ++ c, ++ first)
                      value [c] = array [first];
 
-                  value .toStream (stream);
+                  value .toStream (generator);
 
-                  stream .string += ",\n";
+                  generator .string += generator .Comma ();
+                  generator .string += generator .ListBreak ();
                }
 
-               stream .string += generator .Indent ();
+               generator .string += generator .ListIndent ();
 
                for (let c = 0, first = (length - 1) * components; c < components; ++ c, ++ first)
                   value [c] = array [first];
 
-               value .toStream (stream);
-               stream .string += "\n";
+               value .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],
@@ -796,7 +797,6 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
       if (length)
       {
          const
-            generator  = Generator .Get (stream),
             array      = target .getValue (),
             components = target .getComponents (),
             value      = new (target .getSingleType ()) ();
@@ -808,14 +808,15 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
             for (let i = 0, n = length - 1; i < n; ++ i)
             {
                value .set (array [i * components]);
-               value .toXMLStream (stream);
+               value .toXMLStream (generator);
 
-               stream .string += ", ";
+               generator .string += generator .Comma ();
+               generator .string += generator .TidySpace ();
             }
 
             value .set (array [(length - 1) * components]);
 
-            value .toXMLStream (stream);
+            value .toXMLStream (generator);
          }
          else
          {
@@ -824,20 +825,95 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
                for (let c = 0, first = i * components; c < components; ++ c, ++ first)
                   value [c] = array [first];
 
-               value .toXMLStream (stream);
+               value .toXMLStream (generator);
 
-               stream .string += ", ";
+               generator .string += generator .Comma ();
+               generator .string += generator .TidySpace ();
             }
 
             for (let c = 0, first = (length - 1) * components; c < components; ++ c, ++ first)
                value [c] = array [first];
 
-            value .toXMLStream (stream);
+            value .toXMLStream (generator);
          }
 
          generator .PopUnitCategory ();
       }
    },
+   toJSONStream: function (generator)
+   {
+      const
+         target = this [_target],
+         length = target .length;
+
+      if (length)
+      {
+         const
+            array      = target .getValue (),
+            components = target .getComponents (),
+            value      = new (target .getSingleType ()) ();
+
+         generator .PushUnitCategory (target .getUnit ());
+
+         generator .string += '[';
+         generator .string += generator .ListBreak ();
+         generator .string += generator .IncIndent ();
+
+         if (components === 1)
+         {
+            for (let i = 0, n = length - 1; i < n; ++ i)
+            {
+               generator .string += generator .ListIndent ();
+
+               value .set (array [i * components]);
+               value .toJSONStreamValue (generator);
+
+               generator .string += ',';
+               generator .string += generator .ListBreak ();
+            }
+
+            generator .string += generator .ListIndent ();
+
+            value .set (array [(length - 1) * components]);
+            value .toJSONStreamValue (generator);
+         }
+         else
+         {
+            for (let i = 0, n = length - 1; i < n; ++ i)
+            {
+               generator .string += generator .ListIndent ();
+
+               for (let c = 0, first = i * components; c < components; ++ c, ++ first)
+                  value [c] = array [first];
+
+               value .toJSONStreamValue (generator);
+
+               generator .string += ',';
+               generator .string += generator .ListBreak ();
+            }
+
+            generator .string += generator .ListIndent ();
+
+            for (let c = 0, first = (length - 1) * components; c < components; ++ c, ++ first)
+               value [c] = array [first];
+
+            value .toJSONStreamValue (generator);
+         }
+
+         generator .string += generator .ListBreak ();
+         generator .string += generator .DecIndent ();
+         generator .string += generator .ListIndent ();
+         generator .string += ']';
+
+         generator .PopUnitCategory ();
+      }
+      else
+      {
+         generator .string += '[';
+         generator .string += generator .TidySpace ();
+         generator .string += ']';
+      }
+   },
    dispose: function ()
    {
       X3DArrayField .prototype .dispose .call (this [_target]);

package/src/x_ite/Browser/DOMIntegration.js

@@ -25,6 +25,7 @@
 
 import XMLParser    from "../Parser/XMLParser.js"
 import X3DConstants from "../Base/X3DConstants.js";
+import SFNodeCache  from "../Fields/SFNodeCache.js";
 
 class DOMIntegration
 {
@@ -301,7 +302,7 @@ class DOMIntegration
 			{
 				const event = new CustomEvent ("load",
 				{
-					detail: { node: node .valueOf () },
+					detail: { node: SFNodeCache .get (node) },
 				});
 
 				element .dispatchEvent (event);
@@ -311,7 +312,7 @@ class DOMIntegration
 			{
 				const event = new CustomEvent ("error",
 				{
-					detail: { node: node .valueOf () },
+					detail: { node: SFNodeCache .get (node) },
 				});
 
 				element .dispatchEvent (event);
@@ -365,7 +366,7 @@ class DOMIntegration
 		const event = new CustomEvent (field .getName (),
 		{
 			detail: {
-				node: node .valueOf (),
+				node: SFNodeCache .get (node),
 				value: field .valueOf (),
 			},
 		});

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.3.2";
+export default "8.4.0";

package/src/x_ite/Browser/X3DBrowser.js

@@ -72,7 +72,8 @@ import _                   from "../../locale/gettext.js";
 const
    _DOMIntegration   = Symbol (),
    _loader           = Symbol (),
-   _browserCallbacks = Symbol ();
+   _browserCallbacks = Symbol (),
+   _console          = Symbol ();
 
 function X3DBrowser (element)
 {
@@ -86,6 +87,7 @@ function X3DBrowser (element)
    X3DBrowserContext .call (this, element);
 
    this [_browserCallbacks] = new Map ();
+   this [_console]          = document .getElementsByClassName ("x_ite-console");
 
    this .setup ();
 };
@@ -119,25 +121,28 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
       if (this .getInstanceId () > 1) return;
 
-      this .print ("Welcome to " + this .name + " X3D Browser v" + this .version + ":\n" +
-                   "   Current Graphics Renderer\n" +
-                   "      Name: " + this .getVendor () + " " + this .getRenderer () + "\n" +
-                   "      WebGL version: " + this .getWebGLVersion () + "\n" +
-                   "      Shading language: " + this .getShadingLanguageVersion () + "\n" +
-                   "   Rendering Properties\n" +
-                   "      Antialiased: " + this .getAntialiased () + "\n" +
-                   "      Depth size: " + this .getDepthSize () + " bits\n" +
-                   "      Color depth: " + this .getColorDepth () + " bits\n" +
-                   "      Max clip planes per shape: " + this .getMaxClipPlanes () + "\n" +
-                   "      Max lights per shape: " + this .getMaxLights () + "\n" +
-                   "      Max multi textures per shape: " + this .getMaxTextures () + "\n" +
-                   "      Texture units: " + this .getMaxCombinedTextureUnits () + "\n" +
-                   "      Max texture size: " + this .getMaxTextureSize () + " × " + this .getMaxTextureSize () + " pixels\n" +
-                   "      Texture memory: " + this .getTextureMemory () + "\n" +
-                   "      Max vertex uniform vectors: " + this .getMaxVertexUniformVectors () + "\n" +
-                   "      Max fragment uniform vectors: " + this .getMaxFragmentUniformVectors () + "\n" +
-                   "      Max vertex attribs: " + this .getMaxVertexAttribs () + "\n" +
-                   "      Max varying vectors: " + this .getMaxVaryingVectors () + "\n");
+      $(() =>
+      {
+         this .print ("Welcome to " + this .name + " X3D Browser v" + this .version + ":\n" +
+                      "   Current Graphics Renderer\n" +
+                      "      Name: " + this .getVendor () + " " + this .getRenderer () + "\n" +
+                      "      WebGL version: " + this .getWebGLVersion () + "\n" +
+                      "      Shading language: " + this .getShadingLanguageVersion () + "\n" +
+                      "   Rendering Properties\n" +
+                      "      Antialiased: " + this .getAntialiased () + "\n" +
+                      "      Depth size: " + this .getDepthSize () + " bits\n" +
+                      "      Color depth: " + this .getColorDepth () + " bits\n" +
+                      "      Max clip planes per shape: " + this .getMaxClipPlanes () + "\n" +
+                      "      Max lights per shape: " + this .getMaxLights () + "\n" +
+                      "      Max multi textures per shape: " + this .getMaxTextures () + "\n" +
+                      "      Texture units: " + this .getMaxCombinedTextureUnits () + "\n" +
+                      "      Max texture size: " + this .getMaxTextureSize () + " × " + this .getMaxTextureSize () + " pixels\n" +
+                      "      Texture memory: " + this .getTextureMemory () + "\n" +
+                      "      Max vertex uniform vectors: " + this .getMaxVertexUniformVectors () + "\n" +
+                      "      Max fragment uniform vectors: " + this .getMaxFragmentUniformVectors () + "\n" +
+                      "      Max vertex attribs: " + this .getMaxVertexAttribs () + "\n" +
+                      "      Max varying vectors: " + this .getMaxVaryingVectors () + "\n");
+      });
    },
    getName: function ()
    {
@@ -781,23 +786,33 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    print: function ()
    {
-      console .log (Array .prototype .join .call (arguments, " "));
+      const string = Array .prototype .join .call (arguments, "");
+
+      console .log (string);
+
+      for (const element of this [_console])
+         element .append (document .createTextNode (string));
    },
    println: function ()
    {
-      console .log (Array .prototype .join .call (arguments, " "));
+      const string = Array .prototype .join .call (arguments, "");
+
+      console .log (string);
+
+      for (const element of this [_console])
+         element .append (document .createTextNode (string + "\n"));
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .currentScene .toVRMLStream (stream);
+      this .currentScene .toVRMLStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      this .currentScene .toXMLStream (stream);
+      this .currentScene .toXMLStream (generator);
    },
-   toJSONStream: function (stream)
+   toJSONStream: function (generator)
    {
-      this .currentScene .toJSONStream (stream);
+      this .currentScene .toJSONStream (generator);
    },
 });