x_ite 8.3.2 → 8.3.3

package/src/x_ite/Fields/SFString.js

@@ -47,7 +47,6 @@
 
 import X3DField     from "../Base/X3DField.js";
 import X3DConstants from "../Base/X3DConstants.js";
-import Generator    from "../InputOutput/Generator.js";
 
 const
    unescape = /\\(.)/g,
@@ -98,17 +97,17 @@ SFString .prototype = Object .assign (Object .create (X3DField .prototype),
       X3DField .prototype .set .call (this, "" + value);
    },
    valueOf: X3DField .prototype .getValue,
-   toStream: function (stream)
+   toStream: function (generator)
    {
-      stream .string += '"' + SFString .escape (this .getValue ()) + '"';
+      generator .string += '"' + SFString .escape (this .getValue ()) + '"';
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      this .toStream (stream);
+      this .toStream (generator);
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      stream .string += Generator .Get (stream) .XMLEncode (this .getValue ());
+      generator .string += generator .XMLEncode (this .getValue ());
    },
 });
 

package/src/x_ite/Fields/SFTime.js

@@ -77,17 +77,17 @@ SFTime .prototype = Object .assign (Object .create (X3DField .prototype),
       X3DField .prototype .set .call (this, +value);
    },
    valueOf: X3DField .prototype .getValue,
-   toStream: function (stream)
+   toStream: function (generator)
    {
-      stream .string += this .getValue ();
+      generator .string += 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/SFVecPrototypeTemplate.js

@@ -46,10 +46,11 @@
  ******************************************************************************/
 
 import X3DField  from "../Base/X3DField.js";
-import Generator from "../InputOutput/Generator.js";
 
 function SFVecPrototypeTemplate (TypeName, Type, ValueType, double)
 {
+   const _formatter = double ? "DoublePrecision" : "Precision";
+
    return Object .assign (Object .create (X3DField .prototype),
    {
       [Symbol .iterator]: function* ()
@@ -144,29 +145,28 @@ function SFVecPrototypeTemplate (TypeName, Type, ValueType, double)
       {
          return new (this .constructor) (ValueType .subtract (this .getValue (), vector .getValue ()));
       },
-      toStream: function (stream)
+      toStream: function (generator)
       {
          const
-            generator = Generator .Get (stream),
             value     = this .getValue (),
             category  = generator .Unit (this .getUnit ()),
             last      = value .length - 1;
 
          for (let i = 0; i < last; ++ i)
          {
-            stream .string += double ? generator .DoublePrecision (generator .ToUnit (category, value [i])) : generator .Precision (generator .ToUnit (category, value [i]));
-            stream .string += " ";
+            generator .string += generator [_formatter] (generator .ToUnit (category, value [i]));
+            generator .string += generator .Space ();
          }
 
-         stream .string += double ? generator .DoublePrecision (generator .ToUnit (category, value [last])) : generator .Precision (generator .ToUnit (category, value [last]));
+         generator .string += generator [_formatter] (generator .ToUnit (category, 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/InputOutput/FileLoader.js

@@ -101,7 +101,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    {
       return this .URL;
    },
-   createX3DFromString: function (worldURL, string, success, error)
+   createX3DFromString: function (worldURL, string = "", success, error)
    {
       try
       {

package/src/x_ite/InputOutput/Generator.js

@@ -47,13 +47,16 @@
 
 import X3DConstants from "../Base/X3DConstants.js";
 
-function Generator ()
+function Generator ({ style = "TIDY", precision = 6, doublePrecision = 14 })
 {
+   this .Style (style);
+
+   this .string              = "";
    this .indent              = "";
-   this .indentChar          = "  ";
-   this .precision           = 6;
-   this .doublePrecision     = 14;
-   this .removeTrailingZeros = /\.?0*(?=$|[eE])/;
+   this .listIndent          = "";
+   this .precision           = precision;
+   this .doublePrecision     = doublePrecision;
+   this .removeTrailingZeros = /(?:\.|(\.[0-9]*?))0*(?=[eE]|$)/;
 
    this .executionContextStack = [ null ];
    this .importedNodesIndex    = new Map ();
@@ -75,17 +78,122 @@ function Generator ()
 Generator .prototype =
 {
    constructor: Generator,
+   Style: function (style)
+   {
+      switch (style)
+      {
+         case "CLEAN":
+         {
+            this .comma          = " ";
+            this .break          = " ";
+            this .tidyBreak      = "";
+            this .tidySpace      = "";
+            this .indentChar     = "";
+            this .listEnclosure  = "";
+            this .listBreak      = "";
+            this .listIndentChar = "";
+            this .attribBreak    = " ";
+            break;
+         }
+         case "SMALL":
+         {
+            this .comma          = ",";
+            this .break          = "\n";
+            this .tidyBreak      = "\n";
+            this .tidySpace      = "";
+            this .indentChar     = "";
+            this .listEnclosure  = "";
+            this .listBreak      = "";
+            this .listIndentChar = "";
+            this .attribBreak    = " ";
+            break;
+         }
+         case "COMPACT":
+         {
+            this .comma          = ",";
+            this .break          = "\n";
+            this .tidyBreak      = "\n";
+            this .tidySpace      = " ";
+            this .indentChar     = "  ";
+            this .listEnclosure  = "";
+            this .listBreak      = " ";
+            this .listIndentChar = "";
+            this .attribBreak    = " ";
+            break;
+         }
+         case "TIDY":
+         default:
+         {
+            this .comma          = ",";
+            this .break          = "\n";
+            this .tidyBreak      = "\n";
+            this .tidySpace      = " ";
+            this .indentChar     = "  ";
+            this .listEnclosure  = "\n";
+            this .listBreak      = "\n";
+            this .listIndentChar = "  ";
+            this .attribBreak    = "\n";
+            break;
+         }
+      }
+   },
+   Comma: function ()
+   {
+      return this .comma;
+   },
+   Break: function ()
+   {
+      return this .break;
+   },
+   TidyBreak: function ()
+   {
+      return this .tidyBreak;
+   },
+   ForceBreak: function ()
+   {
+      return "\n";
+   },
+   Space: function ()
+   {
+      return " ";
+   },
+   TidySpace: function ()
+   {
+      return this .tidySpace;
+   },
+   ListStart: function ()
+   {
+      return this .listEnclosure;
+   },
+   ListEnd: function ()
+   {
+      return this .listEnclosure;
+   },
+   ListBreak: function ()
+   {
+      return this .listBreak;
+   },
+   AttribBreak: function ()
+   {
+      return this .attribBreak;
+   },
    Indent: function ()
    {
       return this .indent;
    },
+   ListIndent: function ()
+   {
+      return this .listIndent;
+   },
    IncIndent: function ()
    {
-      this .indent += this .indentChar;
+      this .indent     += this .indentChar;
+      this .listIndent += this .listIndentChar;
    },
    DecIndent: function ()
    {
-      this .indent = this .indent .substr (0, this .indent .length - this .indentChar .length);
+      this .indent = this .indent .slice (0, this .indent .length - this .indentChar .length);
+      this .listIndent = this .listIndent .slice (0, this .listIndent .length - this .listIndentChar .length);
    },
    PadRight: function (string, pad)
    {
@@ -96,11 +204,11 @@ Generator .prototype =
    },
    Precision: function (value)
    {
-      return Math .fround (value) .toPrecision (this .precision) .replace (this .removeTrailingZeros, "");
+      return Math .fround (value) .toPrecision (this .precision) .replace (this .removeTrailingZeros, "$1");
    },
    DoublePrecision: function (value)
    {
-      return value .toPrecision (this .doublePrecision) .replace (this .removeTrailingZeros, "");
+      return value .toPrecision (this .doublePrecision) .replace (this .removeTrailingZeros, "$1");
    },
    PushExecutionContext: function (executionContext)
    {
@@ -416,12 +524,4 @@ Generator .prototype =
 for (const key of Reflect .ownKeys (Generator .prototype))
    Object .defineProperty (Generator .prototype, key, { enumerable: false });
 
-Generator .Get = function (stream)
-{
-   if (! stream .generator)
-      stream .generator = new Generator ();
-
-   return stream .generator;
-};
-
 export default Generator;

package/src/x_ite/Parser/VRMLParser.js

@@ -443,11 +443,11 @@ VRMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       if (this .success)
       {
-         this .loadComponents () .then (function ()
+         this .loadComponents () .then (() =>
          {
             try
             {
-               this .statements ();
+               this .statements (this .getScene () .rootNodes);
 
                if (this .lastIndex < this .input .length)
                   throw new Error ("Unknown statement.");
@@ -459,17 +459,12 @@ VRMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
                //console .error (error);
                this .error (new Error (this .getError (error)));
             }
-         }
-         .bind (this))
-         .catch (function (error)
-         {
-            this .error (error);
-         }
-         .bind (this));
+         })
+         .catch (this .error .bind (this));
       }
       else
       {
-         this .statements ();
+         this .statements (this .getScene () .rootNodes);
 
          if (this .lastIndex < this .input .length)
             throw new Error ("Unknown statement.");
@@ -730,12 +725,12 @@ VRMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
       }
       return false;
    },
-   statements: function ()
+   statements: function (field)
    {
-      while (this .statement ())
+      while (this .statement (field))
          ;
    },
-   statement: function ()
+   statement: function (field)
    {
       if (this .protoStatement ())
          return true;
@@ -753,7 +748,7 @@ VRMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       if (node !== false)
       {
-         this .addRootNode (node);
+         field .push (node);
          return true;
       }
 
@@ -835,7 +830,7 @@ VRMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
                      this .pushPrototype (proto);
                      this .pushExecutionContext (proto .getBody ());
 
-                     this .protoBody ();
+                     this .protoBody (proto .getBody () .rootNodes);
 
                      this .popExecutionContext ();
                      this .popPrototype ();
@@ -877,16 +872,16 @@ VRMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       return false;
    },
-   protoBody: function ()
+   protoBody: function (rootNodes)
    {
       this .protoStatements ();
 
-      var rootNodeStatement = this .rootNodeStatement ();
+      const rootNodeStatement = this .rootNodeStatement ();
 
       if (rootNodeStatement !== false)
-         this .addRootNode (rootNodeStatement);
+         rootNodes .push (rootNodeStatement);
 
-      this .statements ();
+      this .statements (rootNodes);
    },
    rootNodeStatement: function ()
    {
@@ -1323,11 +1318,11 @@ VRMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
       {
          var
             nodeTypeId = this .result [1],
-            baseNode   = this .getExecutionContext () .createNode (nodeTypeId, false);
+            baseNode   = this .getExecutionContext () .createProto (nodeTypeId, false);
 
          if (! baseNode)
          {
-            baseNode = this .getExecutionContext () .createProto (nodeTypeId, false);
+            baseNode = this .getExecutionContext () .createNode (nodeTypeId, false);
 
             if (! baseNode)
                throw new Error ("Unknown node type or proto '" + nodeTypeId + "', you probably have insufficient component/profile statements.");
@@ -2409,14 +2404,16 @@ VRMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
    },
    nodeStatements: function (field)
    {
-      var node = this .nodeStatement ();
+      this .statements (field);
 
-      while (node !== false)
-      {
-         field .push (node);
+      // var node = this .nodeStatement ();
 
-         node = this .nodeStatement ();
-      }
+      // while (node !== false)
+      // {
+      //    field .push (node);
+
+      //    node = this .nodeStatement ();
+      // }
    },
    sfrotationValue: function (field)
    {

package/src/x_ite/Parser/X3DParser.js

@@ -91,10 +91,6 @@ X3DParser .prototype = {
    {
       return Boolean (this .prototypes .length);
    },
-   addRootNode: function (node)
-   {
-      this .getExecutionContext () .rootNodes .push (node);
-   },
    loadComponents: (function ()
    {
       const VRML =

package/src/x_ite/Parser/XMLParser.js

@@ -793,10 +793,10 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          if (this .useAttribute (xmlElement))
             return;
 
-         var node = this .getExecutionContext () .createNode (this .nodeNameToCamelCase (xmlElement .nodeName), false);
+         var node = this .getExecutionContext () .createProto (this .protoNameToCamelCase (xmlElement .nodeName), false);
 
          if (! node)
-            var node = this .getExecutionContext () .createProto (this .protoNameToCamelCase (xmlElement .nodeName), false);
+            node = this .getExecutionContext () .createNode (this .nodeNameToCamelCase (xmlElement .nodeName), false);
 
          if (! node)
             throw new Error ("Unknown node type '" + xmlElement .nodeName + "', you probably have insufficient component/profile statements.");

package/src/x_ite/Prototype/X3DExternProtoDeclaration.js

@@ -53,7 +53,6 @@ import X3DUrlObject            from "../Components/Networking/X3DUrlObject.js";
 import X3DProtoDeclarationNode from "./X3DProtoDeclarationNode.js";
 import X3DConstants            from "../Base/X3DConstants.js";
 import FileLoader              from "../InputOutput/FileLoader.js";
-import Generator               from "../InputOutput/Generator.js";
 
 SupportedNodes .addAbstractType ("X3DExternProtoDeclaration", X3DExternProtoDeclaration);
 
@@ -173,85 +172,80 @@ X3DExternProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoD
       this .setLoadState (X3DConstants .FAILED_STATE);
       this .setProtoDeclaration (null);
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
-      stream .string += generator .Indent ();
-      stream .string += "EXTERNPROTO";
-      stream .string += " ";
-      stream .string += this .getName ();
-      stream .string += " ";
-      stream .string += "[";
+      generator .string += generator .Indent ();
+      generator .string += "EXTERNPROTO";
+      generator .string += generator .Space ();
+      generator .string += this .getName ();
+      generator .string += generator .TidySpace ();
+      generator .string += "[";
 
       const userDefinedFields = this .getUserDefinedFields ();
 
-      let
-         fieldTypeLength   = 0,
-         accessTypeLength  = 0;
-
       if (userDefinedFields .length === 0)
       {
-         stream .string += " ";
+         generator .string += generator .TidySpace ();
       }
       else
       {
+         let
+            fieldTypeLength   = 0,
+            accessTypeLength  = 0;
+
          for (const field of userDefinedFields)
          {
             fieldTypeLength  = Math .max (fieldTypeLength, field .getTypeName () .length);
             accessTypeLength = Math .max (accessTypeLength, generator .AccessType (field .getAccessType ()) .length);
          }
 
-         stream .string += "\n";
+         generator .string += generator .TidyBreak ();
 
          generator .IncIndent ();
 
          for (const field of userDefinedFields)
          {
-            this .toVRMLStreamUserDefinedField (stream, field, fieldTypeLength, accessTypeLength);
-            stream .string += "\n";
+            this .toVRMLStreamUserDefinedField (generator, field, fieldTypeLength, accessTypeLength);
+
+            generator .string += generator .Break ();
          }
 
          generator .DecIndent ();
 
-         stream .string += generator .Indent ();
+         generator .string += generator .Indent ();
       }
 
-      stream .string += "]";
-      stream .string += "\n";
-
-      stream .string += generator .Indent ();
+      generator .string += "]";
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .Indent ();
 
-      this ._url .toVRMLStream (stream);
+      this ._url .toVRMLStream (generator);
    },
-   toVRMLStreamUserDefinedField: function (stream, field, fieldTypeLength, accessTypeLength)
+   toVRMLStreamUserDefinedField: function (generator, field, fieldTypeLength, accessTypeLength)
    {
-      const generator = Generator .Get (stream);
-
-      stream .string += generator .Indent ();
-      stream .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
-      stream .string += " ";
-      stream .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
-      stream .string += " ";
-      stream .string += field .getName ();
+      generator .string += generator .Indent ();
+      generator .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+      generator .string += generator .Space ();
+      generator .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+      generator .string += generator .Space ();
+      generator .string += field .getName ();
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
-      stream .string += generator .Indent ();
-      stream .string += "<ExternProtoDeclare";
-      stream .string += " ";
-      stream .string += "name='";
-      stream .string += generator .XMLEncode (this .getName ());
-      stream .string += "'";
-      stream .string += " ";
-      stream .string += "url='";
+      generator .string += generator .Indent ();
+      generator .string += "<ExternProtoDeclare";
+      generator .string += generator .Space ();
+      generator .string += "name='";
+      generator .string += generator .XMLEncode (this .getName ());
+      generator .string += "'";
+      generator .string += generator .Space ();
+      generator .string += "url='";
 
-      this ._url .toXMLStream (stream);
+      this ._url .toXMLStream (generator);
 
-      stream .string += "'";
-      stream .string += ">\n";
+      generator .string += "'";
+      generator .string += ">";
+      generator .string += generator .TidyBreak ();
 
       generator .IncIndent ();
 
@@ -259,27 +253,28 @@ X3DExternProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoD
 
       for (const field of userDefinedFields)
       {
-         stream .string += generator .Indent ();
-         stream .string += "<field";
-         stream .string += " ";
-         stream .string += "accessType='";
-         stream .string += generator .AccessType (field .getAccessType ());
-         stream .string += "'";
-         stream .string += " ";
-         stream .string += "type='";
-         stream .string += field .getTypeName ();
-         stream .string += "'";
-         stream .string += " ";
-         stream .string += "name='";
-         stream .string += generator .XMLEncode (field .getName ());
-         stream .string += "'";
-         stream .string += "/>\n";
+         generator .string += generator .Indent ();
+         generator .string += "<field";
+         generator .string += generator .Space ();
+         generator .string += "accessType='";
+         generator .string += generator .AccessType (field .getAccessType ());
+         generator .string += "'";
+         generator .string += generator .Space ();
+         generator .string += "type='";
+         generator .string += field .getTypeName ();
+         generator .string += "'";
+         generator .string += generator .Space ();
+         generator .string += "name='";
+         generator .string += generator .XMLEncode (field .getName ());
+         generator .string += "'";
+         generator .string += "/>";
+         generator .string += generator .TidyBreak ();
       }
 
       generator .DecIndent ();
 
-      stream .string += generator .Indent ();
-      stream .string += "</ExternProtoDeclare>";
+      generator .string += generator .Indent ();
+      generator .string += "</ExternProtoDeclare>";
    },
 });