x_ite 8.3.2 → 8.3.3

package/src/x_ite/Fields/ArrayFields.js

@@ -64,7 +64,6 @@ import SFVec4              from "./SFVec4.js";
 import X3DObjectArrayField from "../Base/X3DObjectArrayField.js";
 import X3DTypedArrayField  from "../Base/X3DTypedArrayField.js";
 import X3DConstants        from "../Base/X3DConstants.js";
-import Generator           from "../InputOutput/Generator.js";
 
 const
    SFMatrix3d = SFMatrix3 .SFMatrix3d,
@@ -161,25 +160,26 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 
       value .removeCloneCount (this [_cloneCount]);
    },
-   toStream: function (stream)
+   toStream: function (generator)
    {
       const
-         target    = this .getTarget (),
-         array     = target .getValue (),
-         generator = Generator .Get (stream);
+         target = this .getTarget (),
+         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;
@@ -188,19 +188,20 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
          {
             generator .PushUnitCategory (target .getUnit ());
 
-            stream .string += "[\n";
+            generator .string += "[";
+            generator .string += generator .TidyBreak ();
             generator .IncIndent ();
 
             for (let i = 0, length = array .length; i < length; ++ i)
             {
-               stream .string += generator .Indent ();
-               array [i] .toStream (stream);
-               stream .string += "\n";
+               generator .string += generator .Indent ();
+               array [i] .toStream (generator);
+               generator .string += generator .TidyBreak ();
             }
 
             generator .DecIndent ();
-            stream .string += generator .Indent ();
-            stream .string += "]";
+            generator .string += generator .Indent ();
+            generator .string += "]";
 
             generator .PopUnitCategory ();
             break;
@@ -217,25 +218,26 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 
       return string;
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
       const
-         target    = this .getTarget (),
-         array     = target .getValue (),
-         generator = Generator .Get (stream);
+         target = this .getTarget (),
+         array  = target .getValue ();
 
       switch (array .length)
       {
          case 0:
          {
-            stream .string += "[ ]";
+            generator .string += "[";
+            generator .string += generator .TidySpace ();
+            generator .string += "]";
             break;
          }
          case 1:
          {
             generator .EnterScope ();
 
-            array [0] .toVRMLStream (stream);
+            array [0] .toVRMLStream (generator);
 
             generator .LeaveScope ();
             break;
@@ -244,19 +246,20 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
          {
             generator .EnterScope ();
 
-            stream .string += "[\n";
+            generator .string += "[";
+            generator .string += generator .TidyBreak ();
             generator .IncIndent ();
 
             for (const element of array)
             {
-               stream .string += generator .Indent ();
-               element .toVRMLStream (stream);
-               stream .string += "\n";
+               generator .string += generator .Indent ();
+               element .toVRMLStream (generator);
+               generator .string += generator .TidyBreak ();
             }
 
             generator .DecIndent ();
-            stream .string += generator .Indent ();
-            stream .string += "]";
+            generator .string += generator .Indent ();
+            generator .string += "]";
 
             generator .LeaveScope ();
             break;
@@ -273,11 +276,9 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 
       return string;
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const
-         generator = Generator .Get (stream),
-         length    = this .length;
+      const length = this .length;
 
       if (length)
       {
@@ -291,26 +292,26 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 
             if (node)
             {
-               node .toXMLStream (stream);
-               stream .string += "\n";
+               node .toXMLStream (generator);
+               generator .string += generator .TidyBreak ();
             }
             else
             {
-               stream .string += generator .Indent ();
-               stream .string += "<";
-               stream .string += "NULL";
+               generator .string += generator .Indent ();
+               generator .string += "<";
+               generator .string += "NULL";
 
                const containerField = generator .ContainerField ();
 
                if (containerField)
                {
-                  stream .string += " ";
-                  stream .string += "containerField='";
-                  stream .string += generator .XMLEncode (containerField .getName ());
-                  stream .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "containerField='";
+                  generator .string += generator .XMLEncode (containerField .getName ());
+                  generator .string += "'";
                }
 
-               stream .string += "/>";
+               generator .string += "/>";
             }
          }
 
@@ -318,22 +319,22 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 
          if (node)
          {
-            node .toXMLStream (stream);
+            node .toXMLStream (generator);
          }
          else
          {
-            stream .string += generator .Indent ();
-            stream .string += "<";
-            stream .string += "NULL";
+            generator .string += generator .Indent ();
+            generator .string += "<";
+            generator .string += "NULL";
 
             const containerField = generator .ContainerField ();
 
             if (containerField)
             {
-               stream .string += " ";
-               stream .string += "containerField='";
-               stream .string += generator .XMLEncode (containerField .getName ());
-               stream .string += "'";
+               generator .string += generator .Space ();
+               generator .string += "containerField='";
+               generator .string += generator .XMLEncode (containerField .getName ());
+               generator .string += "'";
             }
          }
 
@@ -383,7 +384,7 @@ MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .proto
    {
       return X3DConstants .MFString;
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
       const length = this .length;
 
@@ -393,15 +394,16 @@ MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .proto
 
          for (let i = 0, n = length - 1; i < n; ++ i)
          {
-            stream .string += "\"";
-            value [i] .toXMLStream (stream);
-            stream .string += "\"";
-            stream .string += ", ";
+            generator .string += "\"";
+            value [i] .toXMLStream (generator);
+            generator .string += "\"";
+            generator .string += generator .Comma ();
+            generator .string += generator .TidySpace ();
          }
 
-         stream .string += "\"";
-         value .at (-1) .toXMLStream (stream);
-         stream .string += "\"";
+         generator .string += "\"";
+         value .at (-1) .toXMLStream (generator);
+         generator .string += "\"";
       }
    },
 });

package/src/x_ite/Fields/SFBool.js

@@ -80,17 +80,17 @@ SFBool .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       return this .getValue ();
    },
-   toStream: function (stream)
+   toStream: function (generator)
    {
-      stream .string += this .getValue () ? "TRUE" : "FALSE";
+      generator .string += this .getValue () ? "TRUE" : "FALSE";
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      stream .string += this .getValue () ? "true" : "false";
+      generator .string += this .getValue () ? "true" : "false";
    },
 });
 

package/src/x_ite/Fields/SFColor.js

@@ -48,7 +48,6 @@
 import Color3       from "../../standard/Math/Numbers/Color3.js";
 import X3DField     from "../Base/X3DField.js";
 import X3DConstants from "../Base/X3DConstants.js";
-import Generator    from "../InputOutput/Generator.js";
 
 function SFColor (r, g, b)
 {
@@ -127,28 +126,27 @@ SFColor .prototype = Object .assign (Object .create (X3DField .prototype),
          return result;
       };
    })(),
-   toStream: function (stream)
+   toStream: function (generator)
    {
       const
-         generator = Generator .Get (stream),
-         value     = this .getValue (),
-         last      = value .length - 1;
+         value = this .getValue (),
+         last  = value .length - 1;
 
       for (let i = 0; i < last; ++ i)
       {
-         stream .string += generator .Precision (value [i]);
-         stream .string += " ";
+         generator .string += generator .Precision (value [i]);
+         generator .string += generator .Space ();
       }
 
-      stream .string += generator .Precision (value [last]);
+      generator .string += generator .Precision (value [last]);
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
 });
 

package/src/x_ite/Fields/SFDouble.js

@@ -47,7 +47,6 @@
 
 import X3DField     from "../Base/X3DField.js";
 import X3DConstants from "../Base/X3DConstants.js";
-import Generator    from "../InputOutput/Generator.js";
 
 function SFDouble (value)
 {
@@ -78,21 +77,19 @@ SFDouble .prototype = Object .assign (Object .create (X3DField .prototype),
       X3DField .prototype .set .call (this, +value);
    },
    valueOf: X3DField .prototype .getValue,
-   toStream: function (stream)
+   toStream: function (generator)
    {
-      const
-         generator = Generator .Get (stream),
-         category  = generator .Unit (this .getUnit ());
+      const category = generator .Unit (this .getUnit ());
 
-      stream .string += generator .DoublePrecision (generator .ToUnit (category, this .getValue ()));
+      generator .string += generator .DoublePrecision (generator .ToUnit (category, this .getValue ()));
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
 });
 

package/src/x_ite/Fields/SFFloat.js

@@ -47,7 +47,6 @@
 
 import X3DField     from "../Base/X3DField.js";
 import X3DConstants from "../Base/X3DConstants.js";
-import Generator    from "../InputOutput/Generator.js";
 
 function SFFloat (value)
 {
@@ -78,21 +77,19 @@ SFFloat .prototype = Object .assign (Object .create (X3DField .prototype),
       X3DField .prototype .set .call (this, +value);
    },
    valueOf: X3DField .prototype .getValue,
-   toStream: function (stream)
+   toStream: function (generator)
    {
-      const
-         generator = Generator .Get (stream),
-         category  = generator .Unit (this .getUnit ());
+      const category = generator .Unit (this .getUnit ());
 
-      stream .string += generator .Precision (generator .ToUnit (category, this .getValue ()));
+      generator .string += generator .Precision (generator .ToUnit (category, this .getValue ()));
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
 });
 

package/src/x_ite/Fields/SFImage.js

@@ -184,20 +184,45 @@ SFImage .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       return X3DConstants .SFImage;
    },
-   toStream: function (stream)
+   toStream: function (generator)
    {
-      stream .string += this .width + " " + this .height + " " + this .comp;
+      const array = this .array;
 
-      for (const value of this .array)
-         stream .string += " 0x" + value .toString (16);
+      generator .string += this .width;
+      generator .string += generator .Space ();
+      generator .string += this .height;
+      generator .string += generator .Space ();
+      generator .string += this .comp;
+      generator .string += generator .AttribBreak ();
+
+      generator .IncIndent ();
+
+      for (let y = 0, h = this .height; y < h; ++ y)
+      {
+         generator .string += generator .ListIndent ();
+
+         for (let x = 0, w = this .width; x < w; ++ x)
+         {
+            generator .string += "0x";
+            generator .string += array [y * w + x] .toString (16);
+
+            if (x !== w - 1)
+               generator .string += generator .Space ();
+         }
+
+         if (y !== h - 1)
+            generator .string += generator .AttribBreak ();
+      }
+
+      generator .DecIndent ();
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
 });
 

package/src/x_ite/Fields/SFInt32.js

@@ -77,17 +77,17 @@ SFInt32 .prototype = Object .assign (Object .create (X3DField .prototype),
       X3DField .prototype .set .call (this, ~~value);
    },
    valueOf: X3DField .prototype .getValue,
-   toStream: function (stream, base)
+   toStream: function (generator, base)
    {
-      stream .string += this .getValue () .toString (base);
+      generator .string += this .getValue () .toString (base);
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      stream .string += this .getValue () .toString ();
+      generator .string += this .getValue () .toString ();
    },
 });
 

package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js

@@ -45,11 +45,12 @@
  *
  ******************************************************************************/
 
-import X3DField  from "../Base/X3DField.js";
-import Generator from "../InputOutput/Generator.js";
+import X3DField from "../Base/X3DField.js";
 
 function SFMatrixPrototypeTemplate (TypeName, Type, Matrix, SFVec, double)
 {
+   const _formatter = double ? "DoublePrecision" : "Precision";
+
    return Object .assign (Object .create (X3DField .prototype),
    {
       [Symbol .iterator]: function* ()
@@ -136,28 +137,27 @@ function SFMatrixPrototypeTemplate (TypeName, Type, Matrix, SFVec, double)
       {
          return new SFVec (this .getValue () .multMatrixDir (vector .getValue () .copy ()));
       },
-      toStream: function (stream)
+      toStream: function (generator)
       {
          const
-            generator = Generator .Get (stream),
-            value     = this .getValue (),
-            last      = value .length - 1;
+            value = this .getValue (),
+            last  = value .length - 1;
 
          for (let i = 0; i < last; ++ i)
          {
-            stream .string += double ? generator .DoublePrecision (value [i]) : generator .Precision (value [i]);
-            stream .string += " ";
+            generator .string += generator [_formatter] (value [i]);
+            generator .string += generator .Space ();
          }
 
-         stream .string += double ? generator .DoublePrecision (value [last]) : generator .Precision (value [last]);
+         generator .string += generator [_formatter] (value [last]);
       },
-      toVRMLStream: function (stream)
+      toVRMLStream: function (generator)
       {
-         this .toStream (stream);
+         this .toStream (generator);
       },
-      toXMLStream: function (stream)
+      toXMLStream: function (generator)
       {
-         this .toStream (stream);
+         this .toStream (generator);
       },
    });
 }

package/src/x_ite/Fields/SFNode.js

@@ -372,54 +372,77 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 
       return null;
    },
-   toStream: function (stream)
+   toStream: function (generator)
    {
       const
          target = this [_target],
          value  = target .getValue ();
 
       if (value)
-         value .toStream (stream);
+         value .toStream (generator);
       else
-         stream .string += "NULL";
+         generator .string += "NULL";
    },
-   toVRMLStream: function (stream)
+   toVRMLString: function (options)
    {
       const
-         target = this [_target],
-         value  = target .getValue ();
+         generator = new Generator (options),
+         target    = this [_target],
+         value     = target .getValue ();
 
-      if (value)
-         value .toVRMLStream (stream);
-      else
-         stream .string += "NULL";
+      generator .PushExecutionContext (value .getExecutionContext ());
+
+      target .toVRMLStream (generator);
+
+      return generator .string;
    },
-   toXMLString: function ()
+   toXMLString: function (options)
    {
       const
+         generator = new Generator (options),
          target    = this [_target],
-         stream    = { string: "" },
-         generator = Generator .Get (stream),
          value     = target .getValue ();
 
       generator .PushExecutionContext (value .getExecutionContext ());
 
-      target .toXMLStream (stream);
+      target .toXMLStream (generator);
 
-      generator .PopExecutionContext ();
+      return generator .string;
+   },
+   toJSONString: function (options)
+   {
+      const
+         generator = new Generator (options),
+         target    = this [_target],
+         value     = target .getValue ();
+
+      generator .PushExecutionContext (value .getExecutionContext ());
+
+      target .toJSONStream (generator);
+
+      return generator .string;
+   },
+   toVRMLStream: function (generator)
+   {
+      const
+         target = this [_target],
+         value  = target .getValue ();
 
-      return stream .string;
+      if (value)
+         value .toVRMLStream (generator);
+      else
+         generator .string += "NULL";
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
       const
          target = this [_target],
          value  = target .getValue ();
 
       if (value)
-         value .toXMLStream (stream);
+         value .toXMLStream (generator);
       else
-         stream .string += "<!-- NULL -->";
+         generator .string += "<!-- NULL -->";
    },
    dispose: function ()
    {

package/src/x_ite/Fields/SFRotation.js

@@ -49,7 +49,6 @@ import X3DField     from "../Base/X3DField.js";
 import SFVec3       from "./SFVec3.js";
 import SFMatrix3    from "./SFMatrix3.js";
 import X3DConstants from "../Base/X3DConstants.js";
-import Generator    from "../InputOutput/Generator.js";
 import Rotation4    from "../../standard/Math/Numbers/Rotation4.js";
 import Matrix3      from "../../standard/Math/Numbers/Matrix3.js";
 
@@ -153,24 +152,25 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       return new SFRotation (Rotation4 .slerp (this .getValue (), rotation .getValue (), t));
    },
-   toStream: function (stream)
+   toStream: function (generator)
    {
-      const
-         generator = Generator .Get (stream),
-         rotation  = this .getValue ();
+      const rotation = this .getValue ();
 
-      stream .string += generator .DoublePrecision (rotation .x) + " " +
-                        generator .DoublePrecision (rotation .y) + " " +
-                        generator .DoublePrecision (rotation .z) + " " +
-                        generator .DoublePrecision (generator .ToUnit ("angle", rotation .angle));
+      generator .string += generator .DoublePrecision (rotation .x);
+      generator .string += generator .Space ();
+      generator .string += generator .DoublePrecision (rotation .y);
+      generator .string += generator .Space ();
+      generator .string += generator .DoublePrecision (rotation .z);
+      generator .string += generator .Space ();
+      generator .string += generator .DoublePrecision (generator .ToUnit ("angle", rotation .angle));
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
 });