x_ite 8.6.1 → 8.6.2

package/src/x_ite/Execution/X3DImportedNode.js

@@ -350,7 +350,9 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          generator .string += '"';
          generator .string += ':';
          generator .string += generator .TidySpace ();
+         generator .string += '"';
          generator .string += generator .JSONEncode (generator .Name (this .getInlineNode ()));
+         generator .string += '"';
          generator .string += ',';
          generator .string += generator .TidyBreak ();
 
@@ -360,7 +362,9 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          generator .string += '"';
          generator .string += ':';
          generator .string += generator .TidySpace ();
+         generator .string += '"';
          generator .string += generator .JSONEncode (this .getExportedName ());
+         generator .string += '"';
 
          if (this .getImportedName () !== this .getExportedName ())
          {
@@ -372,7 +376,9 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
             generator .string += '"';
             generator .string += ':';
             generator .string += generator .TidySpace ();
+            generator .string += '"';
             generator .string += generator .JSONEncode (this .getImportedName ());
+            generator .string += '"';
             generator .string += generator .TidyBreak ();
          }
          else
@@ -437,7 +443,9 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
                   generator .string += '"';
                   generator .string += ':';
                   generator .string += generator .TidySpace ();
+                  generator .string += '"';
                   generator .string += generator .JSONEncode (sourceNodeName);
+                  generator .string += '"';
                   generator .string += ',';
                   generator .string += generator .TidyBreak ();
 
@@ -447,7 +455,9 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
                   generator .string += '"';
                   generator .string += ':';
                   generator .string += generator .TidySpace ();
+                  generator .string += '"';
                   generator .string += generator .JSONEncode (sourceField);
+                  generator .string += '"';
                   generator .string += ',';
                   generator .string += generator .TidyBreak ();
 
@@ -457,7 +467,9 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
                   generator .string += '"';
                   generator .string += ':';
                   generator .string += generator .TidySpace ();
+                  generator .string += '"';
                   generator .string += generator .JSONEncode (destinationNodeName);
+                  generator .string += '"';
                   generator .string += ',';
                   generator .string += generator .TidyBreak ();
 
@@ -467,7 +479,9 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
                   generator .string += '"';
                   generator .string += ':';
                   generator .string += generator .TidySpace ();
+                  generator .string += '"';
                   generator .string += generator .JSONEncode (destinationField);
+                  generator .string += '"';
                   generator .string += generator .TidyBreak ();
 
                   generator .string += generator .DecIndent ();

package/src/x_ite/Execution/X3DScene.js

@@ -762,7 +762,9 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
                   generator .string += '"';
                   generator .string += ':';
                   generator .string += generator .TidySpace ();
+                  generator .string += '"';
                   generator .string += generator .JSONEncode (key);
+                  generator .string += '"';
                   generator .string += ',';
                   generator .string += generator .TidyBreak ();
 
@@ -772,7 +774,9 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
                   generator .string += '"';
                   generator .string += ':';
                   generator .string += generator .TidySpace ();
+                  generator .string += '"';
                   generator .string += generator .JSONEncode (value);
+                  generator .string += '"';
                   generator .string += generator .TidyBreak ();
 
                   generator .string += generator .DecIndent ();

package/src/x_ite/Fields/SFString.js

@@ -48,10 +48,6 @@
 import X3DField     from "../Base/X3DField.js";
 import X3DConstants from "../Base/X3DConstants.js";
 
-const
-   unescape = /\\([\\"])/g,
-   escape   = /([\\"])/g;
-
 function SFString (value)
 {
    return X3DField .call (this, arguments .length ? "" + value : "");
@@ -61,11 +57,11 @@ Object .assign (SFString,
 {
    unescape: function (string)
    {
-      return string .replace (unescape, "$1");
+      return string .replace (/\\([\\"])/g, "$1");
    },
    escape: function (string)
    {
-      return string .replace (escape, "\\$1");
+      return string .replace (/([\\"])/g, "\\$1");
    },
 });
 
@@ -115,7 +111,9 @@ SFString .prototype = Object .assign (Object .create (X3DField .prototype),
    },
    toJSONStreamValue: function (generator)
    {
+      generator .string += '"';
       generator .string += generator .JSONEncode (this .getValue ());
+      generator .string += '"';
    },
 });
 

package/src/x_ite/InputOutput/FileLoader.js

@@ -282,7 +282,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
 
       const
          options     = { cache: this .node .getCache () ? "default" : "reload" },
-         response    = this .handleErrors (await fetch (decodeURI (this .URL .href), options)),
+         response    = this .handleErrors (await fetch (this .URL .href, options)),
          contentType = response .headers .get ("content-type") .replace (/;.*$/, "");
 
       if (this .foreign)

package/src/x_ite/InputOutput/Generator.js

@@ -499,68 +499,48 @@ Generator .prototype =
 
       return value;
    },
-   XMLEncode: function (string)
-   {
-      return string
-         .replace (/&/g, "&")
-         .replace (/\\/g, "\\\\")
-         .replace (/\t/g, "	")
-         .replace (/\n/g, "
")
-         .replace (/\r/g, "
")
-         .replace (/</g, "&lt;")
-         .replace (/>/g, "&gt;")
-         .replace (/'/g, "&apos;")
-         .replace (/"/g, "\\\"");
-   },
+   XMLEncode: (function ()
+   {
+      const map = {
+         "\\": "\\\\",
+         "\r": "&#xD;",
+         "\n": "&#xA;",
+         "\t": "&#x9;",
+         "\"": "\\\"",
+         "'": "&apos;",
+         "<": "&lt;",
+         ">": "&gt;",
+         "&": "&amp;",
+      };
+
+      const regex = /([\\\r\n\t"'<>&])/g;
+
+      return function (string)
+      {
+         return string .replace (regex, char => map [char]);
+      };
+   })(),
    escapeCDATA: function (string)
    {
       return string .replace (/\]\]\>/g, "\\]\\]\\>");
    },
-   JSONEncode: function (string)
+   JSONEncode: (function ()
    {
-      let result = '"';
-
-      for (const character of string)
-      {
-         switch (character)
-         {
-            case '\r':
-            {
-               result += "\\r";
-               break;
-            }
-            case '\n':
-            {
-               result += "\\n";
-               break;
-            }
-            case '\t':
-            {
-               result += "\\t";
-               break;
-            }
-            case '"':
-            {
-               result += "\\\"";
-               break;
-            }
-            case '\\':
-            {
-               result += "\\\\";
-               break;
-            }
-            default:
-            {
-               result += character;
-               break;
-            }
-         }
-      }
+      const map = {
+         "\\": "\\\\",
+         "\r": "\\r",
+         "\n": "\\n",
+         "\t": "\\t",
+         "\"": "\\\"",
+      };
 
-      result += '"';
+      const regex = /([\\\t\n\r"])/g;
 
-      return result;
-   },
+      return function (string)
+      {
+         return string .replace (regex, char => map [char]);
+      };
+   })(),
    JSONNumber: function (value)
    {
       switch (value)

package/src/x_ite/Parser/SVGParser.js

@@ -103,9 +103,9 @@ const
    PICA          = INCH / 6,  // One pica in meters.
    PIXEL         = INCH / 90, // One pixel in meters.
    EM            = 16,        // One em in pixels,
-   BEZIER_STEPS  = 10,
-   CIRCLE_STEPS  = 64,
-   GRADIENT_SIZE = 256; // In pixels.
+   BEZIER_STEPS  = 10,        // Subdivisions of a span.
+   CIRCLE_STEPS  = 64,        // Subdivisions of a circle, used for arc.
+   GRADIENT_SIZE = 256;       // In pixels.
 
 /*
  *  Parser
@@ -124,7 +124,7 @@ function SVGParser (scene)
 
    // Options
 
-   this .solid = false;
+   this .solid = false; // Are 2D primitives solid.
 
    // Globals
 
@@ -1026,6 +1026,9 @@ SVGParser .prototype = Object .assign (Object .create (X3DParser .prototype),
    },
    hrefAttribute: function (attribute)
    {
+      if (!attribute)
+         return;
+         
       const
          scene = this .getExecutionContext (),
          hash  = new URL (attribute, scene .getWorldURL ()) .hash .slice (1);
@@ -1169,8 +1172,6 @@ SVGParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             {
                // moveto
 
-               points = this .removeConsecutiveIdenticalPoints (points);
-
                if (points .length > 2)
                {
                   contours .push (Object .assign (points, { index: index, closed: false }));
@@ -1342,7 +1343,7 @@ SVGParser .prototype = Object .assign (Object .create (X3DParser .prototype),
                                  y  += ay;
                               }
 
-                              points .push (... Bezier .quadric (ax, ay, 0, x1, y1, 0, x, y, 0, BEZIER_STEPS));
+                              Bezier .quadric (ax, ay, 0, x1, y1, 0, x, y, 0, BEZIER_STEPS, points);
 
                               ax = x;
                               ay = y;
@@ -1403,7 +1404,7 @@ SVGParser .prototype = Object .assign (Object .create (X3DParser .prototype),
                            }
                         }
 
-                        points .push (... Bezier .quadric (ax, ay, 0, x1, y1, 0, x, y, 0, BEZIER_STEPS));
+                        Bezier .quadric (ax, ay, 0, x1, y1, 0, x, y, 0, BEZIER_STEPS, points);
 
                         ax = x;
                         ay = y;
@@ -1469,7 +1470,7 @@ SVGParser .prototype = Object .assign (Object .create (X3DParser .prototype),
                                        y  += ay;
                                     }
 
-                                    points .push (... Bezier .cubic (ax, ay, 0, x1, y1, 0, x2, y2, 0, x, y, 0, BEZIER_STEPS));
+                                    Bezier .cubic (ax, ay, 0, x1, y1, 0, x2, y2, 0, x, y, 0, BEZIER_STEPS, points);
 
                                     ax = x;
                                     ay = y;
@@ -1546,7 +1547,7 @@ SVGParser .prototype = Object .assign (Object .create (X3DParser .prototype),
                                  }
                               }
 
-                              points .push (... Bezier .cubic (ax, ay, 0, x1, y1, 0, x2, y2, 0, x, y, 0, BEZIER_STEPS));
+                              Bezier .cubic (ax, ay, 0, x1, y1, 0, x2, y2, 0, x, y, 0, BEZIER_STEPS, points);
 
                               ax = x;
                               ay = y;
@@ -1618,7 +1619,7 @@ SVGParser .prototype = Object .assign (Object .create (X3DParser .prototype),
                                           y += ay;
                                        }
 
-                                       points .push (... Bezier .arc (ax, ay, rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y, CIRCLE_STEPS));
+                                       Bezier .arc (ax, ay, rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y, CIRCLE_STEPS, points);
 
                                        ax = x;
                                        ay = y;
@@ -1643,8 +1644,6 @@ SVGParser .prototype = Object .assign (Object .create (X3DParser .prototype),
             {
                // closepath
 
-               points = this .removeConsecutiveIdenticalPoints (points);
-
                if (points .length > 2)
                {
                   ax = points [0] .x;
@@ -1665,17 +1664,11 @@ SVGParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          break;
       }
 
-      points = this .removeConsecutiveIdenticalPoints (points);
-
       if (points .length > 2)
 		   contours .push (Object .assign (points, { index: index, closed: false }));
 
       return !! contours .length;
    },
-   removeConsecutiveIdenticalPoints: function (points)
-   {
-      return points .filter ((p, i, a) => !p .equals (a [(i + 1) % a .length]));
-   },
    transformAttribute: function (attribute)
    {
       const matrix = new Matrix3 ();

package/src/x_ite/Parser/X3DParser.js

@@ -142,7 +142,7 @@ X3DParser .prototype = {
    convertColor: function (value)
    {
       const
-         div    = $("<div></div>") .css ("color", value) .appendTo (this .getBrowser () .getShadow ()),
+         div    = $("<div></div>") .hide () .css ("color", value) .appendTo ($("body")),
          rgb    = window .getComputedStyle (div [0]) .color,
          values = rgb .replace (/^rgba?\(|\)$/g, "") .split (/[\s,]+/) .map (s => parseFloat (s));
 

package/src/x_ite/Prototype/X3DExternProtoDeclaration.js

@@ -296,7 +296,9 @@ X3DExternProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoD
       generator .string += "@name";
       generator .string += '"';
       generator .string += ':';
+      generator .string += '"';
       generator .string += generator .JSONEncode (this .getName ());
+      generator .string += '"';
       generator .string += ',';
       generator .string += generator .TidyBreak ();
 
@@ -354,7 +356,9 @@ X3DExternProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoD
             generator .string += '"';
             generator .string += ':';
             generator .string += generator .TidySpace ();
+            generator .string += '"';
             generator .string += generator .JSONEncode (field .getName ());
+            generator .string += '"';
             generator .string += generator .TidyBreak ();
 
             generator .string += generator .DecIndent ();

package/src/x_ite/Prototype/X3DProtoDeclaration.js

@@ -326,7 +326,9 @@ X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclara
       generator .string += "@name";
       generator .string += '"';
       generator .string += ':';
+      generator .string += '"';
       generator .string += generator .JSONEncode (this .getName ());
+      generator .string += '"';
       generator .string += ',';
       generator .string += generator .TidyBreak ();
 
@@ -396,7 +398,9 @@ X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclara
             generator .string += '"';
             generator .string += ':';
             generator .string += generator .TidySpace ();
+            generator .string += '"';
             generator .string += generator .JSONEncode (field .getName ());
+            generator .string += '"';
 
             if (field .isDefaultValue ())
             {

package/src/x_ite/Routing/X3DRoute.js

@@ -198,7 +198,9 @@ X3DRoute .prototype = Object .assign (Object .create (X3DObject .prototype),
       generator .string += '"';
       generator .string += ':';
       generator .string += generator .TidySpace ();
+      generator .string += '"';
       generator .string += generator .JSONEncode (sourceNodeName);
+      generator .string += '"';
       generator .string += ',';
       generator .string += generator .TidyBreak ();
 
@@ -208,7 +210,9 @@ X3DRoute .prototype = Object .assign (Object .create (X3DObject .prototype),
       generator .string += '"';
       generator .string += ':';
       generator .string += generator .TidySpace ();
+      generator .string += '"';
       generator .string += generator .JSONEncode (this [_sourceField] .getName ());
+      generator .string += '"';
       generator .string += ',';
       generator .string += generator .TidyBreak ();
 
@@ -218,7 +222,9 @@ X3DRoute .prototype = Object .assign (Object .create (X3DObject .prototype),
       generator .string += '"';
       generator .string += ':';
       generator .string += generator .TidySpace ();
+      generator .string += '"';
       generator .string += generator .JSONEncode (destinationNodeName);
+      generator .string += '"';
       generator .string += ',';
       generator .string += generator .TidyBreak ();
 
@@ -228,7 +234,9 @@ X3DRoute .prototype = Object .assign (Object .create (X3DObject .prototype),
       generator .string += '"';
       generator .string += ':';
       generator .string += generator .TidySpace ();
+      generator .string += '"';
       generator .string += generator .JSONEncode (this [_destinationField] .getName ());
+      generator .string += '"';
       generator .string += generator .TidyBreak ();
 
       generator .string += generator .DecIndent ();