x_ite 8.3.2 → 8.4.0

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";
+      generator .string += "]";
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .Indent ();
 
-      stream .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,151 @@ 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>";
+   },
+   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 += '}';
    },
 });