x_ite 8.3.3 → 8.4.1

package/src/x_ite/Components/Core/X3DPrototypeInstance.js

@@ -476,14 +476,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
             {
                if (field .getAccessType () === X3DConstants .inputOutput && field .getReferences () .size !== 0)
                {
-                  let initializableReference = false;
-
-                  field .getReferences () .forEach (function (fieldReference)
-                  {
-                     initializableReference = initializableReference || fieldReference .isInitializable ();
-                  });
-
-                  if (!initializableReference)
+                  if (![... field .getReferences ()] .some (reference => reference .isInitializable ()))
                      mustOutputValue = !this .isDefaultValue (field);
                }
             }
@@ -607,7 +600,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
             {
                const protoFields = field .getReferences ();
 
-               protoFields .forEach (function (protoField)
+               for (const protoField of protoFields)
                {
                   generator .string += generator .Indent ();
                   generator .string += "<connect";
@@ -621,7 +614,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
                   generator .string += "'";
                   generator .string += "/>";
                   generator .string += generator .TidyBreak ();
-               });
+               }
             }
 
             generator .DecIndent ();
@@ -639,6 +632,374 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
       generator .LeaveScope ();
    },
+   toJSONStream: function (generator)
+   {
+      const sharedNode = generator .IsSharedNode (this);
+
+      generator .EnterScope ();
+
+      const name = generator .Name (this);
+
+      if (name .length)
+      {
+         if (generator .ExistsNode (this))
+         {
+            generator .string += '{';
+            generator .string += generator .TidySpace ();
+            generator .string += '"';
+            generator .string += "ProtoInstance";
+            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 .TidySpace ();
+            generator .string += generator .JSONEncode (this .getTypeName ());
+            generator .string += ',';
+            generator .string += generator .TidyBreak ();
+
+            generator .string += generator .Indent ();
+            generator .string += '"';
+            generator .string += "@USE";
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidySpace ();
+            generator .string += generator .JSONEncode (name);
+            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 += '}';
+
+            generator .LeaveScope ();
+            return;
+         }
+      }
+
+      // Type name
+
+      generator .string += '{';
+      generator .string += generator .TidySpace ();
+      generator .string += '"';
+      generator .string += "ProtoInstance";
+      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 ();
+
+
+      // DEF name
+
+      if (name .length)
+      {
+         generator .AddNode (this);
+
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "@DEF";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += generator .JSONEncode (name);
+         generator .string += ',';
+         generator .string += generator .TidyBreak ();
+      }
+
+
+      // Type name
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@name";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += generator .JSONEncode (this .getTypeName ());
+      generator .string += ',';
+      generator .string += generator .TidyBreak ();
+
+
+      // Fields
+
+      const
+         fields     = this .getChangedFields (),
+         references = [ ];
+
+      if (fields .length)
+      {
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "fieldValue";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += '[';
+         generator .string += generator .TidyBreak ();
+         generator .string += generator .IncIndent ();
+
+         const outputFields = [ ];
+
+         for (const field of fields)
+         {
+            // If the field is a inputOutput and we have as reference only inputOnly or outputOnly we must output the value
+            // for this field.
+
+            let mustOutputValue = false;
+
+            if (generator .ExecutionContext ())
+            {
+               if (field .getAccessType () === X3DConstants .inputOutput && field .getReferences () .size !== 0)
+               {
+                  if (![... field .getReferences ()] .some (reference => reference .isInitializable ()))
+                     mustOutputValue = !this .isDefaultValue (field);
+               }
+            }
+
+            // If we have no execution context we are not in a proto and must not generate IS references the same is true
+            // if the node is a shared node as the node does not belong to the execution context.
+
+            if (field .getReferences () .size === 0 || !generator .ExecutionContext () || sharedNode || mustOutputValue)
+            {
+               if (mustOutputValue)
+                  references .push (field);
+
+               outputFields .push (field);
+            }
+            else
+            {
+               references .push (field);
+            }
+         }
+
+         for (const field of outputFields)
+         {
+            switch (field .getType ())
+            {
+               case X3DConstants .SFNode:
+               {
+                  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 .TidySpace ();
+                  generator .string += generator .JSONEncode (field .getName ());
+                  generator .string += ',';
+                  generator .string += generator .TidyBreak ();
+                  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 ();
+                  generator .string += generator .DecIndent ();
+                  generator .string += generator .Indent ();
+                  generator .string += '}';
+                  break;
+               }
+               case X3DConstants .MFNode:
+               {
+                  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 .TidySpace ();
+                  generator .string += generator .JSONEncode (field .getName ());
+                  generator .string += ',';
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .Indent ();
+                  generator .string += '"';
+                  generator .string += "-children";
+                  generator .string += '"';
+                  generator .string += ':';
+                  generator .string += generator .TidySpace ();
+
+                  field .toJSONStream (generator);
+
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .DecIndent ();
+                  generator .string += generator .Indent ();
+                  generator .string += '}';
+                  break;
+               }
+               default:
+               {
+                  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 .TidySpace ();
+                  generator .string += generator .JSONEncode (field .getName ());
+                  generator .string += ',';
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .Indent ();
+                  generator .string += '"';
+                  generator .string += "@value";
+                  generator .string += '"';
+                  generator .string += ':';
+                  generator .string += generator .TidySpace ();
+
+                  field .toJSONStream (generator);
+
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .DecIndent ();
+                  generator .string += generator .Indent ();
+                  generator .string += '}';
+                  break;
+               }
+            }
+
+            if (field !== outputFields .at (-1))
+               generator .string += ',';
+
+            generator .string += generator .TidyBreak ();
+         }
+
+         generator .string += generator .DecIndent ();
+         generator .string += generator .Indent ();
+         generator .string += ']';
+         generator .string += ',';
+         generator .string += generator .TidyBreak ();
+
+
+         // IS references
+
+         if (references .length && ! sharedNode)
+         {
+            generator .string += generator .Indent ();
+            generator .string += '"';
+            generator .string += "IS";
+            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 += "connect";
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidySpace ();
+            generator .string += '[';
+            generator .string += generator .TidyBreak ();
+            generator .string += generator .IncIndent ();
+
+            for (const field of references)
+            {
+               const protoFields = [... field .getReferences ()];
+
+               for (const protoField of protoFields)
+               {
+                  generator .string += generator .Indent ();
+                  generator .string += '{';
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .IncIndent ();
+
+                  generator .string += generator .Indent ();
+                  generator .string += '"';
+                  generator .string += "@nodeField";
+                  generator .string += '"';
+                  generator .string += ':';
+                  generator .string += generator .TidySpace ();
+                  generator .string += generator .JSONEncode (field .getName ());
+                  generator .string += ',';
+                  generator .string += generator .TidyBreak ();
+
+                  generator .string += generator .Indent ();
+                  generator .string += '"';
+                  generator .string += "@protoField";
+                  generator .string += '"';
+                  generator .string += ':';
+                  generator .string += generator .TidySpace ();
+                  generator .string += generator .JSONEncode (protoField .getName ());
+                  generator .string += generator .TidyBreak ();
+
+                  generator .string += generator .DecIndent ();
+                  generator .string += generator .Indent ();
+                  generator .string += '}';
+
+                  if (field === references .at (-1) && protoField === protoFields .at (-1))
+                     ;
+                  else
+                  {
+                     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 += '}';
+            generator .string += ',';
+            generator .string += generator .TidyBreak ();
+         }
+      }
+
+      generator .string = generator .string .replace (/,(\s*)$/s, "$1");
+
+
+      // 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 .LeaveScope ();
+   },
    dispose: function ()
    {
       this [_protoNode] ._updateInstances .removeInterest ("construct", this);

package/src/x_ite/Components/HAnim/HAnimHumanoid.js

@@ -239,7 +239,9 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
       renderObject .getJoints () .length = 0;
 
       this .transformNode .traverse (type, renderObject);
-      this .skinning (type, renderObject);
+
+      if (this .isLive () .getValue ())
+         this .skinning (type, renderObject);
    },
    skinning: (function ()
    {

package/src/x_ite/Components/Rendering/X3DGeometryNode.js

@@ -401,7 +401,8 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          if ((Xsize >= Ysize) && (Xsize >= Zsize))
          {
             // X size largest
-            texCoordParams .Ssize = Xsize; texCoordParams .Sindex = 0;
+            texCoordParams .Ssize  = Xsize;
+            texCoordParams .Sindex = 0;
 
             if (Ysize >= Zsize)
                texCoordParams .Tindex = 1;
@@ -411,7 +412,8 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          else if ((Ysize >= Xsize) && (Ysize >= Zsize))
          {
             // Y size largest
-            texCoordParams .Ssize = Ysize; texCoordParams .Sindex = 1;
+            texCoordParams .Ssize  = Ysize;
+            texCoordParams .Sindex = 1;
 
             if (Xsize >= Zsize)
                texCoordParams .Tindex = 0;
@@ -421,7 +423,8 @@ X3DGeometryNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          else
          {
             // Z is the largest
-            texCoordParams .Ssize = Zsize; texCoordParams .Sindex = 2;
+            texCoordParams .Ssize  = Zsize;
+            texCoordParams .Sindex = 2;
 
             if (Xsize >= Ysize)
                texCoordParams .Tindex = 0;

package/src/x_ite/Configuration/ComponentInfo.js

@@ -90,6 +90,38 @@ ComponentInfo .prototype = Object .assign (Object .create (X3DObject .prototype)
       generator .string += "'";
       generator .string += "/>";
    },
+   toJSONStream: function (generator)
+   {
+      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 .TidySpace ();
+      generator .string += '"';
+      generator .string += this .name;
+      generator .string += '"';
+      generator .string += ',';
+      generator .string += generator .TidyBreak ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@level";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += this .level;
+      generator .string += generator .TidyBreak ();
+
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
+   },
 });
 
 for (const key of Reflect .ownKeys (ComponentInfo .prototype))

package/src/x_ite/Configuration/ProfileInfo.js

@@ -72,6 +72,10 @@ ProfileInfo .prototype = Object .assign (Object .create (X3DObject .prototype),
    {
       generator .string += this .name;
    },
+   toJSONStream: function (generator)
+   {
+      generator .string += this .name;
+   },
 });
 
 for (const key of Reflect .ownKeys (ProfileInfo .prototype))

package/src/x_ite/Configuration/UnitInfo.js

@@ -93,6 +93,52 @@ UnitInfo .prototype = Object .assign (Object .create (X3DObject .prototype),
       generator .string += "'";
       generator .string += "/>";
    },
+   toJSONStream: function (generator, _throw)
+   {
+      if (this .conversionFactor === 1)
+         throw new Error ("conversionFactor is 1");
+
+      generator .string += generator .Indent ();
+
+      generator .string += '{';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@category";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += '"';
+      generator .string += this .category;
+      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 (this .name);
+      generator .string += ',';
+      generator .string += generator .TidyBreak ();
+
+      generator .string += generator .Indent ();
+      generator .string += '"';
+      generator .string += "@conversionFactor";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += generator .DoublePrecision (this .conversionFactor);
+      generator .string += generator .TidyBreak ();
+
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
+   },
 });
 
 for (const key of Reflect .ownKeys (UnitInfo .prototype))

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -849,6 +849,60 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
 
       this .getRoutes () .toXMLStream (generator);
 
+      generator .LeaveScope ();
+      generator .PopExecutionContext ();
+   },
+   toJSONStream: function (generator)
+   {
+      generator .PushExecutionContext (this);
+      generator .EnterScope ();
+      generator .ImportedNodes (this .getImportedNodes ());
+
+
+      // Extern proto declarations
+
+      this .getExternProtoDeclarations () .toJSONStream (generator, true);
+
+
+      // Proto declarations
+
+      this .getProtoDeclarations () .toJSONStream (generator, true);
+
+
+      // Root nodes
+
+      if (this .getRootNodes () .length)
+      {
+         for (const rootNode of this .getRootNodes ())
+         {
+            generator .string += generator .Indent ();
+
+            if (rootNode)
+            {
+               rootNode .toJSONStream (generator);
+            }
+            else
+            {
+               generator .string += generator .Indent ();
+               generator .string += "null";
+            }
+
+            generator .string += ',';
+            generator .string += generator .TidyBreak ();
+         }
+      }
+
+
+      // Imported nodes
+
+      this .getImportedNodes () .toJSONStream (generator, true);
+
+
+      // Routes
+
+      this .getRoutes () .toJSONStream (generator, true);
+
+
       generator .LeaveScope ();
       generator .PopExecutionContext ();
    },

package/src/x_ite/Execution/X3DExportedNode.js

@@ -109,6 +109,58 @@ X3DExportedNode .prototype = Object .assign (Object .create (X3DObject .prototyp
 
       generator .string += "/>";
    },
+   toJSONStream: function (generator)
+   {
+      const localName = generator .LocalName (this [_localNode]);
+
+      generator .string += generator .Indent ();
+      generator .string += '{';
+      generator .string += generator .TidySpace ();
+      generator .string += '"';
+      generator .string += "EXPORT";
+      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 += "@localDEF";
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidySpace ();
+      generator .string += generator .JSONEncode (localName);
+
+      if (this [_exportedName] !== localName)
+      {
+         generator .string += ',';
+         generator .string += generator .TidyBreak ();
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "@AS";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += generator .JSONEncode (this [_exportedName]);
+         generator .string += generator .TidyBreak ();
+      }
+      else
+      {
+         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 += '}';
+   },
 });
 
 for (const key of Reflect .ownKeys (X3DExportedNode .prototype))