x_ite 8.8.1 → 8.8.3

package/docs/_config.yml

@@ -20,7 +20,7 @@ timezone:
 # ↓ --------------------------
 
 title: X_ITE X3D Browser               # the main title
-version: 8.8.1                         # x_ite latest version
+version: 8.8.3                         # x_ite latest version
 size: 283                              # size in kb
 x3d_latest_version: 4.0                # x3d latest version
 

package/docs/_posts/reference/field-services-and-objects.md

@@ -391,9 +391,11 @@ The SFNode object corresponds to an X3D SFNode field.
 
 ### Instance Creation Method(s)
 
-#### *sfNodeObjectName* = new **SFNode** (*x3dsyntax*)
+#### *sfNodeObjectName* = new **SFNode** (*vrmlSyntax*)
 
-*x3dsyntax* is a UTF-8 string containing the definition of an X3D node.
+*vrmlSyntax* is a UTF-8 string containing the definition of an X3D node.
+
+If the specification version is greater than 2.0, SFNode will throw an error when instantiated directly.
 
 ### Properties
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.8.1",
+	"version": "8.8.3",
 	"description": "X_ITE X3D Browser, view and manipulate X3D and VRML scenes in HTML.",
 	"homepage": "https://create3000.github.io/x_ite/",
 	"author": "Holger Seelig <holger.seelig@gmail.com>",

package/src/x_ite/Base/X3DBaseNode.js

@@ -81,8 +81,8 @@ function X3DBaseNode (executionContext)
    this [_childObjects]      = [ ];
    this [_live]              = true;
    this [_initialized]       = false;
-   this [_cloneCount]        = 0;
    this [_private]           = false;
+   this [_cloneCount]        = 0;
 
    if (this .canUserDefinedFields ())
       this [_fieldDefinitions] = new FieldDefinitionArray (this [_fieldDefinitions]);

package/src/x_ite/Browser/Scripting/evaluate.js

@@ -49,11 +49,20 @@ function evaluate (globalObject, sourceText)
 {
    return Function (/* js */ `with (arguments [0])
    {
-      delete arguments [0];
-      arguments .length = 0;
-      ${sourceText}
+      return eval ((() =>
+      {
+         const sourceText = arguments [1];
+
+         delete arguments [0];
+         delete arguments [1];
+
+         arguments .length = 0;
+
+         return sourceText;
+      })
+      ());
    }`)
-   (globalObject);
+   (globalObject, sourceText);
 }
 
 export default evaluate;

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.8.1";
+export default "8.8.3";

package/src/x_ite/Browser/X3DBrowser.js

@@ -384,13 +384,11 @@ Object .assign (Object .setPrototypeOf (X3DBrowser .prototype, X3DBrowserContext
    },
    createVrmlFromString (vrmlSyntax)
    {
-      vrmlSyntax = String (vrmlSyntax);
-
       const
          currentScene = this .currentScene,
          external     = this .isExternal (),
          fileLoader   = new FileLoader (this .getWorld ()),
-         scene        = fileLoader .createX3DFromString (currentScene .getWorldURL (), vrmlSyntax);
+         scene        = fileLoader .createX3DFromString (currentScene .getWorldURL (), `#VRML V2.0 utf8\n\n${vrmlSyntax}`);
 
       if (!external)
       {

package/src/x_ite/Components/Scripting/Script.js

@@ -167,7 +167,7 @@ Object .assign (Object .setPrototypeOf (Script .prototype, X3DScriptNode .protot
             }
          }
 
-         sourceText += "\nreturn [" + callbacks .map (function (c)
+         sourceText += "\n[" + callbacks .map (function (c)
          {
             return `typeof ${c} !== "undefined" ? ${c} : undefined`;
          })
@@ -176,7 +176,7 @@ Object .assign (Object .setPrototypeOf (Script .prototype, X3DScriptNode .protot
          this .globalObject = this .getGlobalObject ();
 
          const
-            result  = evaluate (this .globalObject, sourceText),
+            result  = this .evaluate (sourceText),
             context = new Map ();
 
          for (let i = 0; i < callbacks .length; ++ i)
@@ -193,36 +193,37 @@ Object .assign (Object .setPrototypeOf (Script .prototype, X3DScriptNode .protot
    },
    evaluate (sourceText)
    {
-      return evaluate (this .globalObject, `return (${sourceText})`);
+      const browser = this .getBrowser ();
+
+      browser .getScriptStack () .push (this);
+
+      try
+      {
+         return evaluate (this .globalObject, sourceText);
+      }
+      finally
+      {
+         browser .getScriptStack () .pop ();
+      }
    },
    getGlobalObject ()
    {
-      const
-         browser          = this .getBrowser (),
-         executionContext = this .getExecutionContext (),
-         live             = this .getLive ();
+      const browser = this .getBrowser ();
 
       function SFNode (vrmlSyntax)
       {
-         const
-            scene     = browser .createX3DFromString (String (vrmlSyntax)),
-            rootNodes = scene .getRootNodes ();
+         if (browser .currentScene .specificationVersion > 2.0)
+            throw new Error ("SFNode cannot be instantiated directly.");
 
-         live .addFieldInterest (scene .getLive ());
+         const nodes = browser .createVrmlFromString (vrmlSyntax);
 
-         scene .setLive (live .getValue ());
-         scene .setPrivate (executionContext .isPrivate ());
-         scene .setExecutionContext (executionContext);
-
-         if (rootNodes .length && rootNodes [0])
-         {
-            return rootNodes [0];
-         }
+         if (nodes .length && nodes [0])
+            return nodes [0];
 
-         throw new Error ("SFNode.new: invalid argument, must be 'string' is 'undefined'.");
+         throw new Error ("SFNode.new: invalid argument.");
       }
 
-      Object .setPrototypeOf (SFNode .prototype, Fields .SFNode .prototype);
+      SFNode .prototype = Fields .SFNode .prototype;
 
       const globalObject =
       {

package/src/x_ite/Parser/VRMLParser.js

@@ -359,7 +359,7 @@ Object .assign (Object .setPrototypeOf (VRMLParser .prototype, X3DParser .protot
             this .getScene () .setProfile (this .getBrowser () .getProfile ("Core"));
 
             for (const componentName of VRML)
-               this .getScene () .addComponent (this .getBrowser () .getComponent (componentName));
+               this .getScene () .updateComponent (this .getBrowser () .getComponent (componentName));
          }
 
          if (this .resolve)