x_ite 8.3.3 → 8.4.1

package/src/x_ite/Fields/SFImage.js

@@ -201,10 +201,12 @@ SFImage .prototype = Object .assign (Object .create (X3DField .prototype),
       {
          generator .string += generator .ListIndent ();
 
+         const s = y * this .width;
+
          for (let x = 0, w = this .width; x < w; ++ x)
          {
             generator .string += "0x";
-            generator .string += array [y * w + x] .toString (16);
+            generator .string += array [x + s] .toString (16);
 
             if (x !== w - 1)
                generator .string += generator .Space ();
@@ -224,6 +226,64 @@ SFImage .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       this .toStream (generator);
    },
+   toJSONStream: function (generator)
+   {
+      generator .string += '[';
+      generator .string += generator .ListBreak ();
+      generator .string += generator .IncIndent ();
+      generator .string += generator .ListIndent ();
+
+      this .toJSONStreamValue (generator);
+
+      generator .string += generator .DecIndent ();
+      generator .string += generator .ListBreak ();
+      generator .string += generator .ListIndent ();
+      generator .string += ']';
+   },
+   toJSONStreamValue: function (generator)
+   {
+      const
+         array  = this .array,
+         length = array .length;
+
+      generator .string += this .width;
+      generator .string += ',';
+      generator .string += generator .TidySpace ();
+      generator .string += this .height;
+      generator .string += ',';
+      generator .string += generator .TidySpace ();
+      generator .string += this .comp;
+      generator .string += ',';
+
+      if (this .width && this .height)
+      {
+         generator .string += generator .ListBreak ();
+         generator .string += generator .IncIndent ();
+
+         for (let y = 0, h = this .height; y < h; ++ y)
+         {
+            generator .string += generator .ListIndent ();
+
+            const s = y * this .width;
+
+            for (let x = 0, w = this .width; x < w; ++ x)
+            {
+               generator .string += array [x + s];
+
+               if (x + s !== length - 1)
+                  generator .string += ',';
+
+               if (x !== w - 1)
+                  generator .string += generator .TidySpace ();
+            }
+
+            if (y !== h - 1)
+               generator .string += generator .ListBreak ();
+         }
+
+         generator .string += generator .DecIndent ();
+      }
+   },
 });
 
 for (const key of Reflect .ownKeys (SFImage .prototype))

package/src/x_ite/Fields/SFInt32.js

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

package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js

@@ -146,7 +146,7 @@ function SFMatrixPrototypeTemplate (TypeName, Type, Matrix, SFVec, double)
          for (let i = 0; i < last; ++ i)
          {
             generator .string += generator [_formatter] (value [i]);
-            generator .string += generator .Space ();
+            generator .string += generator .TidySpace ();
          }
 
          generator .string += generator [_formatter] (value [last]);
@@ -159,6 +159,31 @@ function SFMatrixPrototypeTemplate (TypeName, Type, Matrix, SFVec, double)
       {
          this .toStream (generator);
       },
+      toJSONStream: function (generator)
+      {
+         generator .string += '[';
+         generator .string += generator .TidySpace ();
+
+         this .toJSONStreamValue (generator);
+
+         generator .string += generator .TidySpace ();
+         generator .string += ']';
+      },
+      toJSONStreamValue: function (generator)
+      {
+         const
+            value = this .getValue (),
+            last  = value .length - 1;
+
+         for (let i = 0; i < last; ++ i)
+         {
+            generator .string += generator .JSONNumber (generator [_formatter] (value [i]));
+            generator .string += ',';
+            generator .string += generator .TidySpace ();
+         }
+
+         generator .string += generator .JSONNumber (generator [_formatter] (value [last]));
+      },
    });
 }
 

package/src/x_ite/Fields/SFNode.js

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

package/src/x_ite/Fields/SFRotation.js

@@ -157,11 +157,11 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
       const rotation = this .getValue ();
 
       generator .string += generator .DoublePrecision (rotation .x);
-      generator .string += generator .Space ();
+      generator .string += generator .TidySpace ();
       generator .string += generator .DoublePrecision (rotation .y);
-      generator .string += generator .Space ();
+      generator .string += generator .TidySpace ();
       generator .string += generator .DoublePrecision (rotation .z);
-      generator .string += generator .Space ();
+      generator .string += generator .TidySpace ();
       generator .string += generator .DoublePrecision (generator .ToUnit ("angle", rotation .angle));
    },
    toVRMLStream: function (generator)
@@ -172,6 +172,31 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       this .toStream (generator);
    },
+   toJSONStream: function (generator)
+   {
+      generator .string += '[';
+      generator .string += generator .TidySpace ();
+
+      this .toJSONStreamValue (generator);
+
+      generator .string += generator .TidySpace ();
+      generator .string += ']';
+   },
+   toJSONStreamValue: function (generator)
+   {
+      const rotation = this .getValue ();
+
+      generator .string += generator .JSONNumber (generator .DoublePrecision (rotation .x));
+      generator .string += ',';
+      generator .string += generator .TidySpace ();
+      generator .string += generator .JSONNumber (generator .DoublePrecision (rotation .y));
+      generator .string += ',';
+      generator .string += generator .TidySpace ();
+      generator .string += generator .JSONNumber (generator .DoublePrecision (rotation .z));
+      generator .string += ',';
+      generator .string += generator .TidySpace ();
+      generator .string += generator .JSONNumber (generator .DoublePrecision (generator .ToUnit ("angle", rotation .angle)));
+   },
 });
 
 for (const key of Reflect .ownKeys (SFRotation .prototype))

package/src/x_ite/Fields/SFString.js

@@ -109,6 +109,14 @@ SFString .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       generator .string += generator .XMLEncode (this .getValue ());
    },
+   toJSONStream: function (generator)
+   {
+      this .toJSONStreamValue (generator)
+   },
+   toJSONStreamValue: function (generator)
+   {
+      generator .string += generator .JSONEncode (this .getValue ());
+   },
 });
 
 for (const key of Reflect .ownKeys (SFString .prototype))

package/src/x_ite/Fields/SFTime.js

@@ -89,6 +89,14 @@ SFTime .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       this .toStream (generator);
    },
+   toJSONStream: function (generator)
+   {
+      this .toJSONStreamValue (generator);
+   },
+   toJSONStreamValue: function (generator)
+   {
+      generator .string += generator .JSONNumber (generator .DoublePrecision (this .getValue ()));
+   },
 });
 
 for (const key of Reflect .ownKeys (SFTime .prototype))

package/src/x_ite/Fields/SFVecPrototypeTemplate.js

@@ -148,14 +148,14 @@ function SFVecPrototypeTemplate (TypeName, Type, ValueType, double)
       toStream: function (generator)
       {
          const
-            value     = this .getValue (),
-            category  = generator .Unit (this .getUnit ()),
-            last      = value .length - 1;
+            value    = this .getValue (),
+            last     = value .length - 1,
+            category = generator .Unit (this .getUnit ());
 
          for (let i = 0; i < last; ++ i)
          {
             generator .string += generator [_formatter] (generator .ToUnit (category, value [i]));
-            generator .string += generator .Space ();
+            generator .string += generator .TidySpace ();
          }
 
          generator .string += generator [_formatter] (generator .ToUnit (category, value [last]));
@@ -168,6 +168,32 @@ function SFVecPrototypeTemplate (TypeName, Type, ValueType, double)
       {
          this .toStream (generator);
       },
+      toJSONStream: function (generator)
+      {
+         generator .string += '[';
+         generator .string += generator .TidySpace ();
+
+         this .toJSONStreamValue (generator);
+
+         generator .string += generator .TidySpace ();
+         generator .string += ']';
+      },
+      toJSONStreamValue: function (generator)
+      {
+         const
+            value = this .getValue (),
+            last  = value .length - 1,
+            category  = generator .Unit (this .getUnit ());
+
+         for (let i = 0; i < last; ++ i)
+         {
+            generator .string += generator .JSONNumber (generator [_formatter] (generator .ToUnit (category, value [i])));
+            generator .string += ',';
+            generator .string += generator .TidySpace ();
+         }
+
+         generator .string += generator .JSONNumber (generator [_formatter] (generator .ToUnit (category, value [last])));
+      },
    });
 }
 

package/src/x_ite/InputOutput/Generator.js

@@ -47,7 +47,7 @@
 
 import X3DConstants from "../Base/X3DConstants.js";
 
-function Generator ({ style = "TIDY", precision = 6, doublePrecision = 14 })
+function Generator ({ style = "TIDY", precision = 7, doublePrecision = 15 })
 {
    this .Style (style);
 
@@ -115,7 +115,7 @@ Generator .prototype =
             this .tidyBreak      = "\n";
             this .tidySpace      = " ";
             this .indentChar     = "  ";
-            this .listEnclosure  = "";
+            this .listEnclosure  = " ";
             this .listBreak      = " ";
             this .listIndentChar = "";
             this .attribBreak    = " ";
@@ -189,11 +189,15 @@ Generator .prototype =
    {
       this .indent     += this .indentChar;
       this .listIndent += this .listIndentChar;
+
+      return "";
    },
    DecIndent: function ()
    {
       this .indent = this .indent .slice (0, this .indent .length - this .indentChar .length);
       this .listIndent = this .listIndent .slice (0, this .listIndent .length - this .listIndentChar .length);
+
+      return "";
    },
    PadRight: function (string, pad)
    {
@@ -519,6 +523,63 @@ Generator .prototype =
    {
       return string .replace (/\]\]\>/g, "\\]\\]\\>");
    },
+   JSONEncode: function (string)
+   {
+      let result = '"';
+
+      for (const character of string)
+      {
+         switch (character)
+         {
+            case '\r':
+            {
+               result += "\\r";
+               break;
+            }
+            case '\n':
+            {
+               result += "\\n";
+               break;
+            }
+            case '\t':
+            {
+               result += "\\t";
+               break;
+            }
+            case '"':
+            {
+               result += "\\\"";
+               break;
+            }
+            case '\\':
+            {
+               result += "\\\\";
+               break;
+            }
+            default:
+            {
+               result += character;
+               break;
+            }
+         }
+      }
+
+      result += '"';
+
+      return result;
+   },
+   JSONNumber: function (value)
+   {
+      switch (value)
+      {
+         case "NaN":
+         case "Infinity":
+         case "-Infinity":
+            return '"' + value + '"';
+         default:
+            return value;
+      }
+   },
 };
 
 for (const key of Reflect .ownKeys (Generator .prototype))

package/src/x_ite/Parser/JSONParser.js

@@ -73,7 +73,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
       try
       {
          if (typeof json === "string")
-            json = JSON .parse (json)
+            json = JSON .parse (json);
 
          this .input = json;
       }

package/src/x_ite/Prototype/X3DExternProtoDeclaration.js

@@ -276,6 +276,129 @@ X3DExternProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoD
       generator .string += generator .Indent ();
       generator .string += "</ExternProtoDeclare>";
    },
+   toJSONStream: function (generator)
+   {
+      generator .string += generator .Indent ();
+      generator .string += '{';
+      generator .string += generator .TidySpace ();
+      generator .string += '"';
+      generator .string += "ExternProtoDeclare";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '{';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@name";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .JSONEncode (this .getName ());
+      generator .string += ',';
+      generator .string += generator .TidyBreak ();
+
+
+      // Fields
+
+      const userDefinedFields = this .getUserDefinedFields ();
+
+      if (userDefinedFields .length)
+      {
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "field";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += '[';
+         generator .string += generator .TidyBreak ();
+         generator .string += generator .IncIndent ();
+
+         for (const field of userDefinedFields)
+         {
+            generator .string += generator .Indent ();
+            generator .string += '{';
+            generator .string += generator .TidyBreak ();
+            generator .string += generator .IncIndent ();
+
+            generator .string += generator .Indent ();
+            generator .string += '"';
+            generator .string += "@accessType";
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidySpace ();
+            generator .string += '"';
+            generator .string += generator .AccessType (field .getAccessType ());
+            generator .string += '"';
+            generator .string += ',';
+            generator .string += generator .TidyBreak ();
+
+            generator .string += generator .Indent ();
+            generator .string += '"';
+            generator .string += "@type";
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidySpace ();
+            generator .string += '"';
+            generator .string += field .getTypeName ();
+            generator .string += '"';
+            generator .string += ',';
+            generator .string += generator .TidyBreak ();
+
+            generator .string += generator .Indent ();
+            generator .string += '"';
+            generator .string += "@name";
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidySpace ();
+            generator .string += generator .JSONEncode (field .getName ());
+            generator .string += generator .TidyBreak ();
+
+            generator .string += generator .DecIndent ();
+            generator .string += generator .Indent ();
+            generator .string += '}';
+
+            if (field !== userDefinedFields .at (-1))
+               generator .string += ',';
+
+            generator .string += generator .TidyBreak ();
+         }
+
+         generator .string += generator .DecIndent ();
+         generator .string += generator .Indent ();
+         generator .string += ']';
+         generator .string += ',';
+         generator .string += generator .TidyBreak ();
+      }
+
+
+      // URL
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@url";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+
+      this ._url .toJSONStream (generator);
+
+      generator .string += generator .TidyBreak ();
+
+
+      // End
+
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
+   },
 });
 
 for (const key of Reflect .ownKeys (X3DExternProtoDeclaration .prototype))