x_ite 8.3.2 → 8.4.0

package/src/x_ite/Prototype/X3DProtoDeclaration.js

@@ -52,7 +52,6 @@ import FieldDefinitionArray    from "../Base/FieldDefinitionArray.js";
 import X3DExecutionContext     from "../Execution/X3DExecutionContext.js";
 import X3DProtoDeclarationNode from "./X3DProtoDeclarationNode.js";
 import X3DConstants            from "../Base/X3DConstants.js";
-import Generator               from "../InputOutput/Generator.js";
 
 SupportedNodes .addAbstractType ("X3DProtoDeclaration", X3DProtoDeclaration);
 
@@ -65,8 +64,6 @@ function X3DProtoDeclaration (executionContext)
 
    this .addType (X3DConstants .X3DProtoDeclaration)
 
-   this .addChildObjects ("loadState", new Fields .SFInt32 (X3DConstants .NOT_STARTED_STATE));
-
    this [_body] = new X3DExecutionContext (executionContext);
    this [_body] .setOuterNode (this);
    this [_body] .setLive (false);
@@ -88,8 +85,6 @@ X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclara
       X3DProtoDeclarationNode .prototype .initialize .call (this);
 
       this [_body] .setup ();
-
-      this ._loadState = X3DConstants .COMPLETE_STATE;
    },
    getProtoDeclaration: function ()
    {
@@ -99,108 +94,99 @@ X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclara
    {
       return this [_body];
    },
-   checkLoadState: function ()
-   {
-      return this ._loadState .getValue ();
-   },
    canUserDefinedFields: function ()
    {
       return true;
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
-      stream .string += generator .Indent ();
-      stream .string += "PROTO";
-      stream .string += " ";
-      stream .string += this .getName ();
-      stream .string += " ";
-      stream .string += "[";
+      generator .string += generator .Indent ();
+      generator .string += "PROTO";
+      generator .string += generator .Space ();
+      generator .string += this .getName ();
+      generator .string += generator .TidySpace ();
+      generator .string += "[";
 
       generator .EnterScope ();
 
       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 ();
       }
 
       generator .LeaveScope ();
 
-      stream .string += "]";
-      stream .string += "\n";
+      generator .string += "]";
+      generator .string += generator .TidyBreak ();
 
-      stream .string += generator .Indent ();
-      stream .string += "{";
-      stream .string += "\n";
+      generator .string += generator .Indent ();
+      generator .string += "{";
+      generator .string += generator .TidyBreak ();
 
       generator .IncIndent ();
 
-      this [_body] .toVRMLStream (stream);
+      this [_body] .toVRMLStream (generator);
 
       generator .DecIndent ();
 
-      stream .string += generator .Indent ();
-      stream .string += "}";
+      generator .string += generator .Indent ();
+      generator .string += "}";
    },
-   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 ();
 
       if (field .isInitializable ())
       {
-         stream .string += " ";
+         generator .string += generator .Space ();
 
-         field .toVRMLStream (stream);
+         field .toVRMLStream (generator);
       }
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
-      stream .string += generator .Indent ();
-      stream .string += "<ProtoDeclare";
-      stream .string += " ";
-      stream .string += "name='";
-      stream .string += generator .XMLEncode (this .getName ());
-      stream .string += "'";
-      stream .string += ">";
-      stream .string += "\n";
+      generator .string += generator .Indent ();
+      generator .string += "<ProtoDeclare";
+      generator .string += generator .Space ();
+      generator .string += "name='";
+      generator .string += generator .XMLEncode (this .getName ());
+      generator .string += "'";
+      generator .string += ">";
+      generator .string += generator .TidyBreak ();
 
       // <ProtoInterface>
 
@@ -212,31 +198,33 @@ X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclara
       {
          generator .IncIndent ();
 
-         stream .string += generator .Indent ();
-         stream .string += "<ProtoInterface>\n";
+         generator .string += generator .Indent ();
+         generator .string += "<ProtoInterface>";
+         generator .string += generator .TidyBreak ();
 
          generator .IncIndent ();
 
          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 += "'";
+            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 += "'";
 
             if (field .isDefaultValue ())
             {
-               stream .string += "/>\n";
+               generator .string += "/>";
+               generator .string += generator .TidyBreak ();
             }
             else
             {
@@ -247,31 +235,33 @@ X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclara
                   {
                      generator .PushContainerField (field);
 
-                     stream .string += ">\n";
+                     generator .string += generator .TidyBreak ();
 
                      generator .IncIndent ();
 
-                     field .toXMLStream (stream);
+                     field .toXMLStream (generator);
 
-                     stream .string += "\n";
+                     generator .string += generator .TidyBreak ();
 
                      generator .DecIndent ();
 
-                     stream .string += generator .Indent ();
-                     stream .string += "</field>\n";
+                     generator .string += generator .Indent ();
+                     generator .string += "</field>";
+                     generator .string += generator .TidyBreak ();
 
                      generator .PopContainerField ();
                      break;
                   }
                   default:
                   {
-                     stream .string += " ";
-                     stream .string += "value='";
+                     generator .string += generator .Space ();
+                     generator .string += "value='";
 
-                     field .toXMLStream (stream);
+                     field .toXMLStream (generator);
 
-                     stream .string += "'";
-                     stream .string += "/>\n";
+                     generator .string += "'";
+                     generator .string += "/>";
+                     generator .string += generator .TidyBreak ();
                      break;
                   }
                }
@@ -280,8 +270,9 @@ X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclara
 
          generator .DecIndent ();
 
-         stream .string += generator .Indent ();
-         stream .string += "</ProtoInterface>\n";
+         generator .string += generator .Indent ();
+         generator .string += "</ProtoInterface>";
+         generator .string += generator .TidyBreak ();
 
          generator .DecIndent ();
       }
@@ -294,24 +285,254 @@ X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclara
 
       generator .IncIndent ();
 
-      stream .string += generator .Indent ();
-      stream .string += "<ProtoBody>\n";
+      generator .string += generator .Indent ();
+      generator .string += "<ProtoBody>";
+      generator .string += generator .TidyBreak ();
 
       generator .IncIndent ();
 
-      this [_body] .toXMLStream (stream);
+      this [_body] .toXMLStream (generator);
 
       generator .DecIndent ();
 
-      stream .string += generator .Indent ();
-      stream .string += "</ProtoBody>\n";
+      generator .string += generator .Indent ();
+      generator .string += "</ProtoBody>";
+      generator .string += generator .TidyBreak ();
 
       generator .DecIndent ();
 
       // </ProtoBody>
 
-      stream .string += generator .Indent ();
-      stream .string += "</ProtoDeclare>";
+      generator .string += generator .Indent ();
+      generator .string += "</ProtoDeclare>";
+   },
+   toJSONStream: function (generator)
+   {
+      generator .string += generator .Indent ();
+      generator .string += '{';
+      generator .string += generator .TidySpace ();
+      generator .string += '"';
+      generator .string += "ProtoDeclare";
+      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 ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "ProtoInterface";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += '{';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+
+
+      // Fields
+
+      generator .EnterScope ();
+
+      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 ());
+
+            if (field .isDefaultValue ())
+            {
+               generator .string += generator .TidyBreak ();
+            }
+            else
+            {
+               generator .string += ',';
+               generator .string += generator .TidyBreak ();
+
+               // Output value
+
+               switch (field .getType ())
+               {
+                  case X3DConstants .SFNode:
+                  {
+                     generator .string += generator .Indent ();
+                     generator .string += '"';
+                     generator .string += "-children";
+                     generator .string += '"';
+                     generator .string += ':';
+                     generator .string += generator .TidySpace ();
+                     generator .string += '[';
+                     generator .string += generator .TidyBreak ();
+                     generator .string += generator .IncIndent ();
+                     generator .string += generator .Indent ();
+
+                     field .toJSONStream (generator);
+
+                     generator .string += generator .TidyBreak ();
+                     generator .string += generator .DecIndent ();
+                     generator .string += generator .Indent ();
+                     generator .string += ']';
+                     generator .string += generator .TidyBreak ();
+                     break;
+                  }
+                  case X3DConstants .MFNode:
+                  {
+                     generator .string += generator .Indent ();
+                     generator .string += '"';
+                     generator .string += "-children";
+                     generator .string += '"';
+                     generator .string += ':';
+                     generator .string += generator .TidySpace ();
+
+                     field .toJSONStream (generator);
+
+                     generator .string += generator .TidyBreak ();
+                     break;
+                  }
+                  default:
+                  {
+                     generator .string += generator .Indent ();
+                     generator .string += '"';
+                     generator .string += "@value";
+                     generator .string += '"';
+                     generator .string += ':';
+                     generator .string += generator .TidySpace ();
+
+                     field .toJSONStream (generator);
+
+                     generator .string += generator .TidyBreak ();
+                     break;
+                  }
+               }
+            }
+
+            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 .DecIndent ();
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
+      generator .string += ',';
+      generator .string += generator .TidyBreak ();
+
+      generator .LeaveScope ();
+
+
+      // ProtoBody
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "ProtoBody";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += '{';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "-children";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += '[';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+
+      this [_body] .toJSONStream (generator);
+
+      generator .string = generator .string .replace (/,(\s*)$/s, "$1");
+
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += ']';
+      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 += '}';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
    },
 });
 

package/src/x_ite/Rendering/X3DRenderObject.js

@@ -82,6 +82,7 @@ function X3DRenderObject (executionContext)
    this .localShadows             = [ false ];
    this .localFogs                = [ null ];
    this .layouts                  = [ ];
+   this .jointNodes               = [ ];
    this .textureProjectors        = [ ];
    this .generatedCubeMapTextures = [ ];
    this .collisions               = [ ];
@@ -219,6 +220,10 @@ X3DRenderObject .prototype =
    {
       return this .layouts;
    },
+   getJoints: function ()
+   {
+      return this .jointNodes;
+   },
    getParentLayout: function ()
    {
       return this .layouts .at (-1);
@@ -837,7 +842,7 @@ X3DRenderObject .prototype =
          globalShadows              = this .globalShadows,
          shadows                    = globalShadows .at (-1),
          headlight                  = this .getNavigationInfo () ._headlight .getValue (),
-         numGlobalLights            = globalObjects .reduce ((v, c) => v + !!c .lightNode, +headlight),
+         numGlobalLights            = globalObjects .reduce ((v, c) => v + !!c .lightNode, 0),
          numGlobalTextureProjectors = globalObjects .reduce ((v, c) => v + !!c .textureProjectorNode, 0);