x_ite 8.7.8 → 8.8.0

package/src/x_ite/Fields/SFNode.js

@@ -51,13 +51,13 @@ import Generator    from "../InputOutput/Generator.js";
 import SFNodeCache  from "./SFNodeCache.js";
 
 const
-   _target     = Symbol .for ("X_ITE.SFNode.target"),
+   _target     = Symbol (),
    _proxy      = Symbol (),
    _cloneCount = Symbol ();
 
 const handler =
 {
-   get: function (target, key)
+   get (target, key)
    {
       try
       {
@@ -78,12 +78,12 @@ const handler =
 
          return field .valueOf ();
       }
-      catch (error)
+      catch
       {
          return undefined;
       }
    },
-   set: function (target, key, value)
+   set (target, key, value)
    {
       if (key in target)
       {
@@ -109,18 +109,18 @@ const handler =
          return false;
       }
    },
-   has: function (target, key)
+   has (target, key)
    {
       try
       {
          return !! target .getValue () .getField (key);
       }
-      catch (error)
+      catch
       {
          return key in target;
       }
    },
-   ownKeys: function (target)
+   ownKeys (target)
    {
       const
          value   = target .getValue (),
@@ -134,7 +134,7 @@ const handler =
 
       return ownKeys;
    },
-   getOwnPropertyDescriptor: function (target, key)
+   getOwnPropertyDescriptor (target, key)
    {
       const value = target .getValue ();
 
@@ -178,13 +178,12 @@ function SFNode (value)
    return proxy;
 }
 
-SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
+Object .assign (Object .setPrototypeOf (SFNode .prototype, X3DField .prototype),
 {
-   constructor: SFNode,
    [_target]: null,
    [_proxy]: null,
    [_cloneCount]: 0,
-   copy: function (instance)
+   copy (instance)
    {
       const
          target = this [_target],
@@ -195,15 +194,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 
       return new SFNode ();
    },
-   getTypeName: function ()
-   {
-      return "SFNode";
-   },
-   getType: function ()
-   {
-      return X3DConstants .SFNode;
-   },
-   equals: function (node)
+   equals (node)
    {
       const target = this [_target];
 
@@ -212,13 +203,13 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 
       return target .getValue () === null;
    },
-   isDefaultValue: function ()
+   isDefaultValue ()
    {
       const target = this [_target];
 
       return target .getValue () === null;
    },
-   set: function (value)
+   set (value)
    {
       const
          target  = this [_target],
@@ -244,7 +235,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
          X3DField .prototype .set .call (target, null);
       }
    },
-   getNodeTypeName: function ()
+   getNodeTypeName ()
    {
       const
          target = this [_target],
@@ -255,7 +246,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 
       throw new Error ("SFNode.getNodeTypeName: node is null.");
    },
-   getNodeName: function ()
+   getNodeName ()
    {
       const
          target = this [_target],
@@ -266,7 +257,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 
       throw new Error ("SFNode.getNodeName: node is null.");
    },
-   getNodeDisplayName: function ()
+   getNodeDisplayName ()
    {
       const
          target = this [_target],
@@ -277,7 +268,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 
       throw new Error ("SFNode.getNodeDisplayName: node is null.");
    },
-   getNodeType: function ()
+   getNodeType ()
    {
       const
          target = this [_target],
@@ -288,7 +279,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 
       throw new Error ("SFNode.getNodeType: node is null.");
    },
-   getFieldDefinitions: function ()
+   getFieldDefinitions ()
    {
       const
          target = this [_target],
@@ -299,7 +290,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 
       throw new Error ("SFNode.getFieldDefinitions: node is null.");
    },
-   addFieldCallback: function (name, key, object)
+   addFieldCallback (name, key, object)
    {
       const target = this [_target];
 
@@ -320,7 +311,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
          }
       }
    },
-   removeFieldCallback: function (name, key)
+   removeFieldCallback (name, key)
    {
       const target = this [_target];
 
@@ -341,89 +332,58 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
          }
       }
    },
-   addCloneCount: function (count)
+   addCloneCount (count)
    {
-      const
-         target = this [_target],
-         value  = target .getValue ();
+      const target = this [_target];
 
       target [_cloneCount] += count;
 
-      value ?.addCloneCount (count);
+      target .getValue () ?.addCloneCount (count);
    },
-   removeCloneCount: function (count)
+   removeCloneCount (count)
    {
-      const
-         target = this [_target],
-         value  = target .getValue ();
+      const target = this [_target];
 
       target [_cloneCount] -= count;
 
-      value ?.removeCloneCount (count);
+      target .getValue () ?.removeCloneCount (count);
    },
-   getNodeUserData: function (key)
+   getNodeUserData (key)
    {
-      return this [_target] .getValue () .getUserData (key);
-   },
-   setNodeUserData: function (key, value)
-   {
-      this [_target] .getValue () .setUserData (key, value);
-   },
-   removeNodeUserData: function (key)
-   {
-      this [_target] .getValue () .removeUserData (key);
-   },
-   valueOf: function ()
-   {
-      const
-         target = this [_target],
-         value  = target .getValue ();
+      const value = this [_target] .getValue ();
 
       if (value)
-         return SFNodeCache .get (value);
+         return value .getUserData (key);
 
-      return null;
+      throw new Error ("SFNode.getNodeUserData: node is null.");
    },
-   toVRMLString: function (options = Object .prototype)
+   setNodeUserData (key, data)
    {
-      const
-         generator = new Generator (options),
-         value     = this .getValue ();
+      const value = this [_target] .getValue ();
 
       if (value)
-         generator .PushExecutionContext (value .getExecutionContext ());
+         return value .setUserData (key, data);
 
-      this .toVRMLStream (generator);
-
-      return generator .string;
+      throw new Error ("SFNode.setNodeUserData: node is null.");
    },
-   toXMLString: function (options = Object .prototype)
+   removeNodeUserData (key)
    {
-      const
-         generator = new Generator (options),
-         value     = this .getValue ();
+      const value = this [_target] .getValue ();
 
       if (value)
-         generator .PushExecutionContext (value .getExecutionContext ());
+         return value .removeUserData (key);
 
-      this .toXMLStream (generator);
-
-      return generator .string;
+      throw new Error ("SFNode.removeNodeUserData: node is null.");
    },
-   toJSONString: function (options = Object .prototype)
+   valueOf ()
    {
       const
-         generator = new Generator (options),
-         value     = this .getValue ();
-
-      if (value)
-         generator .PushExecutionContext (value .getExecutionContext ());
-
-      this .toJSONStream (generator);
+         target = this [_target],
+         value  = target .getValue ();
 
-      return generator .string;
+      return value ? SFNodeCache .get (value) : null;
    },
-   toStream: function (generator)
+   toStream (generator)
    {
       const
          target = this [_target],
@@ -434,7 +394,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
       else
          generator .string += "NULL";
    },
-   toVRMLStream: function (generator)
+   toVRMLStream (generator)
    {
       const
          target = this [_target],
@@ -445,7 +405,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
       else
          generator .string += "NULL";
    },
-   toXMLStream: function (generator)
+   toXMLStream (generator)
    {
       const
          target = this [_target],
@@ -456,11 +416,11 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
       else
          generator .string += "<!-- NULL -->";
    },
-   toJSONStream: function (generator)
+   toJSONStream (generator)
    {
       this .toJSONStreamValue (generator);
    },
-   toJSONStreamValue: function (generator)
+   toJSONStreamValue (generator)
    {
       const
          target = this [_target],
@@ -471,7 +431,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
       else
          generator .string += "null";
    },
-   dispose: function ()
+   dispose ()
    {
       const target = this [_target];
 
@@ -485,4 +445,13 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
 for (const key of Reflect .ownKeys (SFNode .prototype))
    Object .defineProperty (SFNode .prototype, key, { enumerable: false });
 
+Object .defineProperties (SFNode,
+{
+   typeName:
+   {
+      value: "SFNode",
+      enumerable: true,
+   },
+});
+
 export default SFNode;

package/src/x_ite/Fields/SFNodeCache.js

@@ -50,9 +50,9 @@ import X3DField from "../Base/X3DField.js";
 
 const cache = new WeakMap ();
 
-class SFNodeCache
+const SFNodeCache =
 {
-   static get (baseNode)
+   get (baseNode)
    {
       const node = cache .get (baseNode);
 
@@ -70,21 +70,17 @@ class SFNodeCache
 
          return node;
       }
-   }
-}
-
-const _target = Symbol .for ("X_ITE.SFNode.target");
+   },
+};
 
 function dispose ()
 {
-   const
-      target = this [_target],
-      value  = target .getValue ();
-
-   X3DField .prototype .dispose .call (target);
+   const value = this .getValue ();
 
    value ?.dispose ();
 
+   SFNode .prototype .dispose .call (this);
+
    cache .delete (value);
 }
 

package/src/x_ite/Fields/SFRotation.js

@@ -45,14 +45,15 @@
  *
  ******************************************************************************/
 
-import X3DField     from "../Base/X3DField.js";
-import SFVec3       from "./SFVec3.js";
-import SFMatrix3    from "./SFMatrix3.js";
-import X3DConstants from "../Base/X3DConstants.js";
-import Rotation4    from "../../standard/Math/Numbers/Rotation4.js";
+import X3DField  from "../Base/X3DField.js";
+import SFVec3    from "./SFVec3.js";
+import SFMatrix3 from "./SFMatrix3.js";
+import Rotation4 from "../../standard/Math/Numbers/Rotation4.js";
 
 const
+   SFVec3d    = SFVec3 .SFVec3d,
    SFVec3f    = SFVec3 .SFVec3f,
+   SFMatrix3d = SFMatrix3 .SFMatrix3d,
    SFMatrix3f = SFMatrix3 .SFMatrix3f;
 
 function SFRotation (x, y, z, angle)
@@ -61,117 +62,118 @@ function SFRotation (x, y, z, angle)
    {
       case 0:
       {
-         return X3DField .call (this, new Rotation4 ());
+         X3DField .call (this, new Rotation4 ());
+         break;
       }
       case 1:
       {
-         if (arguments [0] instanceof SFMatrix3f)
-            return X3DField .call (this, new Rotation4 () .setMatrix (arguments [0] .getValue ()));
+         if ((arguments [0] instanceof SFMatrix3d) || (arguments [0] instanceof SFMatrix3f))
+         {
+            X3DField .call (this, new Rotation4 () .setMatrix (arguments [0] .getValue ()));
+            break;
+         }
 
-         return X3DField .call (this, arguments [0]);
+         X3DField .call (this, arguments [0]);
+         break;
       }
       case 2:
       {
-         if (arguments [1] instanceof SFVec3f)
-            return X3DField .call (this, new Rotation4 (arguments [0] .getValue (), arguments [1] .getValue ()));
+         if ((arguments [1] instanceof SFVec3d) || (arguments [1] instanceof SFVec3f))
+         {
+            X3DField .call (this, new Rotation4 (arguments [0] .getValue (), arguments [1] .getValue ()));
+            break;
+         }
 
-         return X3DField .call (this, new Rotation4 (arguments [0] .getValue (), +arguments [1]));
+         X3DField .call (this, new Rotation4 (arguments [0] .getValue (), +arguments [1]));
+         break;
       }
       case 4:
       {
-         return X3DField .call (this, new Rotation4 (+x, +y, +z, +angle));
+         X3DField .call (this, new Rotation4 (+x, +y, +z, +angle));
+         break;
       }
+      default:
+         throw new Error ("Invalid arguments.");
    }
-
-   throw new Error ("Invalid arguments.");
 }
 
-SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
+Object .assign (Object .setPrototypeOf (SFRotation .prototype, X3DField .prototype),
 {
-   constructor: SFRotation,
-   [Symbol .iterator]: function* ()
+   *[Symbol .iterator] ()
    {
       yield* this .getValue ();
    },
-   copy: function ()
+   copy ()
    {
       return new SFRotation (this .getValue () .copy ());
    },
-   equals: function (rotation)
+   equals (rotation)
    {
       return this .getValue () .equals (rotation .getValue ());
    },
-   isDefaultValue: function ()
+   isDefaultValue ()
    {
       return this .getValue () .equals (Rotation4 .Identity);
    },
-   getTypeName: function ()
-   {
-      return "SFRotation";
-   },
-   getType: function ()
-   {
-      return X3DConstants .SFRotation;
-   },
-   set: function (value)
+   set (value)
    {
       this .getValue () .assign (value);
    },
-   setAxis: function (vector)
+   setAxis (vector)
    {
       this .getValue () .setAxis (vector .getValue ());
       this .addEvent ();
    },
-   getAxis: function ()
+   getAxis ()
    {
       return new SFVec3f (this .getValue () .getAxis ());
    },
-   setMatrix: function (matrix)
+   setMatrix (matrix)
    {
       this .getValue () .setMatrix (matrix .getValue ());
       this .addEvent ();
    },
-   getMatrix: function ()
+   getMatrix ()
    {
       return new SFMatrix3f (this .getValue () .getMatrix ());
    },
-   inverse: function ()
+   inverse ()
    {
       return new SFRotation (this .getValue () .copy () .inverse ());
    },
-   multiply: function (rotation)
+   multiply (rotation)
    {
       return new SFRotation (this .getValue () .copy () .multRight (rotation .getValue ()));
    },
-   multVec: function (vector)
+   multVec (vector)
    {
-      return new SFVec3f (this .getValue () .multVecRot (vector .getValue () .copy ()));
+      return new (vector .constructor) (this .getValue () .multVecRot (vector .getValue () .copy ()));
    },
-   slerp: function (rotation, t)
+   slerp (rotation, t)
    {
       return new SFRotation (this .getValue () .copy () .slerp (rotation .getValue (), t));
    },
-   toStream: function (generator)
+   toStream (generator)
    {
-      const rotation = this .getValue ();
+      const { x, y, z, angle } = this .getValue ();
 
-      generator .string += generator .DoubleFormat (rotation .x);
+      generator .string += generator .DoubleFormat (x);
       generator .string += generator .TidySpace ();
-      generator .string += generator .DoubleFormat (rotation .y);
+      generator .string += generator .DoubleFormat (y);
       generator .string += generator .TidySpace ();
-      generator .string += generator .DoubleFormat (rotation .z);
+      generator .string += generator .DoubleFormat (z);
       generator .string += generator .TidySpace ();
-      generator .string += generator .DoubleFormat (generator .ToUnit ("angle", rotation .angle));
+      generator .string += generator .DoubleFormat (generator .ToUnit ("angle", angle));
    },
-   toVRMLStream: function (generator)
+   toVRMLStream (generator)
    {
       this .toStream (generator);
    },
-   toXMLStream: function (generator)
+   toXMLStream (generator)
    {
       this .toStream (generator);
    },
-   toJSONStream: function (generator)
+   toJSONStream (generator)
    {
       generator .string += '[';
       generator .string += generator .TidySpace ();
@@ -181,20 +183,20 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
       generator .string += generator .TidySpace ();
       generator .string += ']';
    },
-   toJSONStreamValue: function (generator)
+   toJSONStreamValue (generator)
    {
-      const rotation = this .getValue ();
+      const { x, y, z, angle } = this .getValue ();
 
-      generator .string += generator .JSONNumber (generator .DoubleFormat (rotation .x));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (x));
       generator .string += ',';
       generator .string += generator .TidySpace ();
-      generator .string += generator .JSONNumber (generator .DoubleFormat (rotation .y));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (y));
       generator .string += ',';
       generator .string += generator .TidySpace ();
-      generator .string += generator .JSONNumber (generator .DoubleFormat (rotation .z));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (z));
       generator .string += ',';
       generator .string += generator .TidySpace ();
-      generator .string += generator .JSONNumber (generator .DoubleFormat (generator .ToUnit ("angle", rotation .angle)));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (generator .ToUnit ("angle", angle)));
    },
 });
 
@@ -202,11 +204,11 @@ for (const key of Reflect .ownKeys (SFRotation .prototype))
    Object .defineProperty (SFRotation .prototype, key, { enumerable: false });
 
 const x = {
-   get: function ()
+   get ()
    {
       return this .getValue () .x;
    },
-   set: function (value)
+   set (value)
    {
       this .getValue () .x = +value;
       this .addEvent ();
@@ -214,11 +216,11 @@ const x = {
 };
 
 const y = {
-   get: function ()
+   get ()
    {
       return this .getValue () .y;
    },
-   set: function (value)
+   set (value)
    {
       this .getValue () .y = +value;
       this .addEvent ();
@@ -226,11 +228,11 @@ const y = {
 };
 
 const z = {
-   get: function ()
+   get ()
    {
       return this .getValue () .z;
    },
-   set: function (value)
+   set (value)
    {
       this .getValue () .z = +value;
       this .addEvent ();
@@ -238,11 +240,11 @@ const z = {
 };
 
 const angle = {
-   get: function ()
+   get ()
    {
       return this .getValue () .angle;
    },
-   set: function (value)
+   set (value)
    {
       this .getValue () .angle = +value;
       this .addEvent ();
@@ -261,4 +263,13 @@ Object .defineProperties (SFRotation .prototype,
    angle: Object .assign ({ enumerable: true }, angle),
 });
 
+Object .defineProperties (SFRotation,
+{
+   typeName:
+   {
+      value: "SFRotation",
+      enumerable: true,
+   },
+});
+
 export default SFRotation;