x_ite 8.3.0 → 8.3.2

package/src/x_ite/Parser/XMLParser.js

@@ -73,6 +73,8 @@ function XMLParser (scene)
    this .parents           = [ ];
    this .parser            = new VRMLParser (scene);
    this .url               = new Fields .MFString ();
+   this .protoNames        = new Map ();
+   this .protoFields       = new WeakMap ();
 
    try
    {
@@ -102,12 +104,23 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             xmlElement = $.parseXML (xmlElement);
 
          this .input = xmlElement;
+         this .xml   = this .isXML (xmlElement);
+
+         if (! this .xml)
+            Object .assign (this, HTMLParser);
       }
       catch (error)
       {
          this .input = undefined;
       }
    },
+   isXML: function (element)
+   {
+      if (element instanceof HTMLElement)
+         return false;
+      else
+         return true;
+   },
    parseIntoScene: function (success, error)
    {
       this .success = success;
@@ -118,16 +131,6 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       this .xmlElement (this .input);
    },
-   parseIntoNode: function (node, xmlElement)
-   {
-      this .pushExecutionContext (node .getExecutionContext ());
-      this .pushParent (node);
-
-      this .childElement (xmlElement);
-
-      this .popParent ();
-      this .popExecutionContext ();
-   },
    xmlElement: function (xmlElement)
    {
       if (xmlElement === null)
@@ -480,8 +483,9 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          var externproto = new X3DExternProtoDeclaration (this .getExecutionContext (), this .url);
 
          this .pushParent (externproto);
-         this .protoInterfaceElement (xmlElement); // parse fields
+         this .protoInterfaceElement (xmlElement);
          this .popParent ();
+         this .addProtoFieldNames (externproto);
 
          externproto .setup ();
 
@@ -495,6 +499,8 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          { }
 
          this .getExecutionContext () .updateExternProtoDeclaration (name, externproto);
+
+         this .addProtoName (name);
       }
    },
    protoDeclareElement: function (xmlElement)
@@ -519,6 +525,7 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
                   this .pushParent (proto);
                   this .protoInterfaceElement (child);
                   this .popParent ();
+                  this .addProtoFieldNames (proto);
                   break;
                }
                default:
@@ -565,6 +572,8 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          { }
 
          this .getExecutionContext () .updateProtoDeclaration (name, proto);
+
+         this .addProtoName (name);
       }
    },
    protoInterfaceElement: function (xmlElement)
@@ -715,7 +724,7 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             if (! node)
                throw new Error ("Unknown proto or externproto type '" + name + "'.");
 
-            //AP: attach node to DOM xmlElement for access from DOM.
+            ///DOMIntegration: attach node to DOM xmlElement for access from DOM.
             $.data (xmlElement, "node", node);
 
             this .defAttribute (xmlElement, node);
@@ -786,12 +795,19 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
          var node = this .getExecutionContext () .createNode (this .nodeNameToCamelCase (xmlElement .nodeName), false);
 
+         if (! node)
+            var node = this .getExecutionContext () .createProto (this .protoNameToCamelCase (xmlElement .nodeName), false);
+
          if (! node)
             throw new Error ("Unknown node type '" + xmlElement .nodeName + "', you probably have insufficient component/profile statements.");
 
-         //AP: attach node to DOM xmlElement for access from DOM.
+         ///DOMIntegration: attach node to DOM xmlElement for access from DOM.
          $.data (xmlElement, "node", node);
 
+         //DOMIntegration: Script node support for HTML.
+         if (xmlElement .nodeName === "SCRIPT")
+            this .scriptElement (xmlElement);
+
          this .defAttribute (xmlElement, node);
          this .addNode (xmlElement, node);
          this .pushParent (node);
@@ -819,6 +835,22 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             console .error (error);
       }
    },
+   scriptElement (element)
+	{
+		const
+			domParser      = new DOMParser (),
+			scriptDocument = domParser .parseFromString (element .outerHTML, "application/xml"),
+			childNodes     = scriptDocument .children [0] .childNodes;
+
+      element .textContent = "// Content moved into childNodes.";
+
+		for (const childNode of childNodes)
+		{
+         // Add elements and cdata.
+			if (childNode .nodeType === 1 || childNode .nodeType === 4)
+         	element .appendChild (childNode);
+		}
+	},
    routeElement: function (xmlElement)
    {
       try
@@ -847,7 +879,7 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             destinationNode  = executionContext .getLocalNode (destinationNodeName),
             route            = executionContext .addRoute (sourceNode, sourceField, destinationNode, destinationField);
 
-         //AP: attach node to DOM xmlElement for access from DOM.
+         ///DOMIntegration: attach node to DOM xmlElement for access from DOM.
          $.data (xmlElement, "node", route);
       }
       catch (error)
@@ -988,11 +1020,9 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
    {
       try
       {
-         var
-            field      = node .getField (this .attributeToCamelCase (xmlAttribute .name)),
-            accessType = field .getAccessType ();
+         const field = node .getField (this .attributeToCamelCase (node, xmlAttribute .name));
 
-         if (accessType & X3DConstants .initializeOnly)
+         if (field .isInitializable ())
             this .fieldValue (field, xmlAttribute .value);
       }
       catch (error)
@@ -1012,6 +1042,32 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
 
       this .parser .popExecutionContext ();
    },
+   id: function (string)
+   {
+      if (string === null)
+         return false;
+
+      if (string .length === 0)
+         return false;
+
+      return true;
+   },
+   getParents: function ()
+   {
+      return this .parents;
+   },
+   getParent: function ()
+   {
+      return this .parents .at (-1);
+   },
+   pushParent: function (parent)
+   {
+      return this .parents .push (parent);
+   },
+   popParent: function ()
+   {
+      this .parents .pop ();
+   },
    addNode: function (xmlElement, node)
    {
       if (this .parents .length === 0 || this .getParent () instanceof X3DProtoDeclaration)
@@ -1070,41 +1126,22 @@ XMLParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          //console .warn (error .message);
       }
    },
-   getParents: function ()
+   // Overloaded by HTMLParser.
+   addProtoName: function (name)
+   { },
+   addProtoFieldNames: function (protoNode)
+   { },
+   protoNameToCamelCase: function (typeName)
    {
-      return this .parents;
+      return typeName;
    },
-   getParent: function ()
+   nodeNameToCamelCase: function (typeName)
    {
-      return this .parents .at (-1);
+      return typeName;
    },
-   pushParent: function (parent)
+   attributeToCamelCase: function (node, name)
    {
-      return this .parents .push (parent);
-   },
-   popParent: function ()
-   {
-      this .parents .pop ();
-   },
-   id: function (string)
-   {
-      if (string === null)
-         return false;
-
-      if (string .length === 0)
-         return false;
-
-      return true;
-   },
-   nodeNameToCamelCase: function (nodeName)
-   {
-      // Function also needed by X_ITE DOM.
-      return HTMLSupport .getNodeTypeName (nodeName);
-   },
-   attributeToCamelCase: function (name)
-   {
-      // Function also needed by X_ITE DOM.
-      return HTMLSupport .getFieldName (name);
+      return name;
    },
 });
 
@@ -1157,7 +1194,7 @@ XMLParser .prototype .fieldTypes [X3DConstants .MFVec4f]     = VRMLParser .proto
  * Lazy parse functions.
  */
 
-var
+const
    infs            = /\binf\b/g,
    nans            = /\bnan\b/g,
    trimWhitespaces = /^[\x20\n,\t\r"]+|[\x20\n,\t\r"]+$/g,
@@ -1254,4 +1291,69 @@ XMLParser .prototype .fieldTypes [X3DConstants .MFString] = function (field)
    field .setValue (prepareStrings (this .getInput ()));
 };
 
+// HTML Support
+
+const HTMLParser =
+{
+   addProtoName: function (name)
+   {
+      //DOMIntegration: add uppercase versions of proto name.
+
+      this .protoNames .set (name,                 name);
+      this .protoNames .set (name .toUpperCase (), name);
+   },
+   addProtoFieldNames: (function ()
+   {
+      const reservedAttributes = new Set ();
+
+      for (const reservedAttribute of [
+         "DEF",
+         "USE",
+         "containerField",
+      ])
+      {
+         reservedAttributes
+            .add (reservedAttribute)
+            .add (reservedAttribute .toLowerCase ());
+      }
+
+      return function (protoNode)
+      {
+         //DOMIntegration: handle lowercase versions of field names.
+
+         const fields = new Map ();
+
+         this .protoFields .set (protoNode, fields);
+
+         for (const { name } of protoNode .getFieldDefinitions ())
+         {
+            if (reservedAttributes .has (name))
+               continue;
+
+            fields .set (name,                 name);
+            fields .set (name .toLowerCase (), name);
+         }
+      };
+   })(),
+   protoNameToCamelCase: function (typeName)
+   {
+      //DOMIntegration: handle uppercase versions of node names.
+      return this .protoNames .get (typeName);
+   },
+   nodeNameToCamelCase: function (typeName)
+   {
+      //DOMIntegration: handle uppercase versions of node names.
+      return HTMLSupport .getNodeTypeName (typeName);
+   },
+   attributeToCamelCase: function (node, name)
+   {
+      //DOMIntegration: handle lowercase versions of field names.
+
+      if (node instanceof X3DPrototypeInstance)
+         return this .protoFields .get (node .getProtoNode ()) .get (name);
+
+      return HTMLSupport .getFieldName (name);
+   },
+};
+
 export default XMLParser;

package/src/x_ite.html

@@ -14,11 +14,11 @@
    <!-- Text -->
    <script src="../node_modules/opentype.js/dist/opentype.js"></script>
    <!-- Texturing3D -->
-   <script src="../node_modules/CharLS.js/dist/charLS-FixedMemory-browser.js"></script>
+   <script src="../node_modules/CharLS.js/dist/charLS-DynamicMemory-browser.js"></script>
    <script src="../node_modules/dicom-parser/dist/dicomParser.js"></script>
    <script src="../node_modules/jpeg-js/lib/decoder.js"></script>
    <script src="../node_modules/jpeg-lossless-decoder-js/release/current/lossless.js"></script>
-   <script src="../node_modules/OpenJPEG.js/dist/openJPEG-FixedMemory-browser.js"></script>
+   <script src="../node_modules/OpenJPEG.js/dist/openJPEG-DynamicMemory-browser.js"></script>
    <!-- X_ITE END -->
    <!-- JQUERY -->
 

package/webpack.config.js

@@ -223,10 +223,10 @@ export default __default__;`;
                      opentype: "opentype.js/dist/opentype.js",
                   },
                   Texturing3D: {
-                     CharLS: "CharLS.js/dist/charLS-FixedMemory-browser.js",
+                     CharLS: "CharLS.js/dist/charLS-DynamicMemory-browser.js",
                      dicomParser: "dicom-parser/dist/dicomParser.js",
                      jpeg: "jpeg-lossless-decoder-js/release/current/lossless.js",
-                     OpenJPEG: "OpenJPEG.js/dist/openJPEG-FixedMemory-browser.js",
+                     OpenJPEG: "OpenJPEG.js/dist/openJPEG-DynamicMemory-browser.js",
                      JpegImage: "jpeg-js/lib/decoder.js",
                   },
                }