x_ite 4.2.17 → 4.7.7

package/src/x_ite/Fields/SFFloat.js

@@ -60,10 +60,7 @@ function (X3DField,
 
 	function SFFloat (value)
 	{
-		if (this instanceof SFFloat)
-			return X3DField .call (this, arguments .length ? +value : 0);
-		
-		return X3DField .call (Object .create (SFFloat .prototype), arguments .length ? +value : 0);
+		return X3DField .call (this, arguments .length ? value * 1 : 0);
 	}
 
 	SFFloat .prototype = Object .assign (Object .create (X3DField .prototype),
@@ -87,17 +84,21 @@ function (X3DField,
 		},
 		set: function (value)
 		{
-			X3DField .prototype .set .call (this, +value);
+			X3DField .prototype .set .call (this, value * 1);
 		},
 		valueOf: X3DField .prototype .getValue,
 		toStream: function (stream)
 		{
-			var
+			const
 				generator = Generator .Get (stream),
 				category  = generator .Unit (this .getUnit ());
 
 			stream .string += String (generator .ToUnit (category, this .getValue ()));
 		},
+		toVRMLStream: function (stream)
+		{
+			this .toStream (stream);
+		},
 		toXMLStream: function (stream)
 		{
 			this .toStream (stream);

package/src/x_ite/Fields/SFImage.js

@@ -64,16 +64,16 @@ function (X3DField,
 
 	function Image (width, height, comp, array)
 	{
-	   var MFInt32 = require ("x_ite/Fields/ArrayFields") .MFInt32;
-	   
-		this .width  = width;
-		this .height = height;
-		this .comp   = comp;
+	   const MFInt32 = require ("x_ite/Fields/ArrayFields") .MFInt32;
+
+		this .width  = ~~width;
+		this .height = ~~height;
+		this .comp   = ~~comp;
 		this .array  = new MFInt32 ();
 		this .array .setValue (array);
-		this .array .length = width * height;
+		this .array .length = this .width * this .height;
 	}
-	
+
 	Image .prototype =
 	{
 		constructor: Image,
@@ -97,15 +97,15 @@ function (X3DField,
 		},
 		set: function (width, height, comp, array)
 		{
-			this .width  = width;
-			this .height = height;
-			this .comp   = comp;
+			this .width  = ~~width;
+			this .height = ~~height;
+			this .comp   = ~~comp;
 			this .array .assign (array);
 		},
 		setWidth: function (value)
 		{
-			this .width = value;
-			this .array .length = this .width  * this .height;	
+			this .width = ~~value;
+			this .array .length = this .width  * this .height;
 		},
 		getWidth: function ()
 		{
@@ -113,8 +113,8 @@ function (X3DField,
 		},
 		setHeight: function (value)
 		{
-			this .height = value;
-			this .array .length = this .width  * this .height;	
+			this .height = ~~value;
+			this .array .length = this .width  * this .height;
 		},
 		getHeight: function ()
 		{
@@ -122,7 +122,7 @@ function (X3DField,
 		},
 		setComp: function (value)
 		{
-			this .comp = value;
+			this .comp = ~~value;
 		},
 		getComp: function ()
 		{
@@ -131,7 +131,7 @@ function (X3DField,
 		setArray: function (value)
 		{
 			this .array .assign (value);
-			this .array .length = this .width  * this .height;	
+			this .array .length = this .width  * this .height;
 		},
 		getArray: function ()
 		{
@@ -145,21 +145,18 @@ function (X3DField,
 
 	function SFImage (width, height, comp, array)
 	{
-	   if (this instanceof SFImage)
-	   {
-	   	var MFInt32 = require ("x_ite/Fields/ArrayFields") .MFInt32;
-	   
-			if (arguments .length === 4)
-				X3DField .call (this, new Image (+width, +height, +comp, array));
-			else
-				X3DField .call (this, new Image (0, 0, 0, new MFInt32 ()));
+		const MFInt32 = require ("x_ite/Fields/ArrayFields") .MFInt32;
 
-			this .getValue () .getArray () .addParent (this);
-			this .addInterest ("set_size__", this);
-			return this;
-		}
+		if (arguments [0] instanceof Image)
+			X3DField .call (this, arguments [0]);
+		else if (arguments .length === 4)
+			X3DField .call (this, new Image (width, height, comp, array));
+		else
+			X3DField .call (this, new Image (0, 0, 0, new MFInt32 ()));
 
-		return SFImage .apply (Object .create (SFImage .prototype), arguments);
+		this .getValue () .getArray () .addParent (this);
+		this .addInterest ("set_size__", this);
+		return this;
 	}
 
 	SFImage .prototype = Object .assign (Object .create (X3DField .prototype),
@@ -171,7 +168,7 @@ function (X3DField,
 		},
 		copy: function ()
 		{
-			return new SFImage (this .getValue ());
+			return new SFImage (this .getValue () .copy ());
 		},
 		equals: function (image)
 		{
@@ -198,13 +195,13 @@ function (X3DField,
 		},
 		toStream: function (stream)
 		{
-		   var
+		   const
 				array = this .array,
 				int   = new SFInt32 ();
 
 			stream .string += this .width + " " + this .height + " " + this .comp;
 
-			for (var i = 0, length = this .width * this .height; i < length; ++ i)
+			for (let i = 0, length = this .width * this .height; i < length; ++ i)
 			{
 				stream .string += " 0x";
 
@@ -212,13 +209,17 @@ function (X3DField,
 				int .toXMLStream (stream);
 			}
 		},
+		toVRMLStream: function (stream)
+		{
+			this .toStream (stream);
+		},
 		toXMLStream: function (stream)
 		{
 			this .toStream (stream);
 		},
 	});
 
-	var width = {
+	const width = {
 		get: function ()
 		{
 			return this .getValue () .getWidth ();
@@ -232,7 +233,7 @@ function (X3DField,
 		configurable: false
 	};
 
-	var height = {
+	const height = {
 		get: function ()
 		{
 			return this .getValue () .getHeight ();
@@ -246,7 +247,7 @@ function (X3DField,
 		configurable: false
 	};
 
-	var comp = {
+	const comp = {
 		get: function ()
 		{
 			return this .getValue () .getComp ();
@@ -260,7 +261,7 @@ function (X3DField,
 		configurable: false
 	};
 
-	var array = {
+	const array = {
 		get: function ()
 		{
 			return this .getValue () .getArray ();

package/src/x_ite/Fields/SFInt32.js

@@ -58,10 +58,7 @@ function (X3DField,
 
 	function SFInt32 (value)
 	{
-		if (this instanceof SFInt32)
-			return X3DField .call (this, ~~value);
-		
-		return X3DField .call (Object .create (SFInt32 .prototype), ~~value);
+		return X3DField .call (this, ~~value);
 	}
 
 	SFInt32 .prototype = Object .assign (Object .create (X3DField .prototype),
@@ -92,6 +89,10 @@ function (X3DField,
 		{
 			stream .string += this .getValue () .toString (base);
 		},
+		toVRMLStream: function (stream)
+		{
+			this .toStream (stream);
+		},
 		toXMLStream: function (stream)
 		{
 			stream .string += this .getValue () .toString ();

package/src/x_ite/Fields/SFMatrix3.js

@@ -66,22 +66,26 @@ function (X3DField,
 	function SFMatrix3Template (TypeName, Type, SFVec2)
 	{
 		function SFMatrix3 (m00, m01, m02,
-	                       m10, m11, m12,
-	                       m20, m21, m22)
+		                    m10, m11, m12,
+		                    m20, m21, m22)
 		{
-			if (arguments .length)
+			switch (arguments .length)
 			{
-				if (arguments [0] instanceof Matrix3)
+				case 0:
+					return X3DField .call (this, new Matrix3 ());
+
+				case 1:
 					return X3DField .call (this, arguments [0]);
-	
-				return X3DField .call (this, new Matrix3 (+m00, +m01, +m02,
-	                                                   +m10, +m11, +m12,
-	                                                   +m20, +m21, +m22));
+
+				case 9:
+					return X3DField .call (this, new Matrix3 (m00 * 1, m01 * 1, m02 * 1,
+					                                          m10 * 1, m11 * 1, m12 * 1,
+					                                          m20 * 1, m21 * 1, m22 * 1));
 			}
 
-			return X3DField .call (this, new Matrix3 ());
+			throw new Error ("Invalid arguments.");
 		}
-	
+
 		SFMatrix3 .prototype = Object .assign (Object .create (X3DField .prototype),
 			SFMatrixPrototypeTemplate (Matrix3, SFVec2),
 		{
@@ -101,11 +105,11 @@ function (X3DField,
 				scale            = scale            ? scale            .getValue () : null;
 				scaleOrientation = scaleOrientation ? scaleOrientation              : 0;
 				center           = center           ? center           .getValue () : null;
-	
+
 				this .getValue () .set (translation, rotation, scale, scaleOrientation, center);
 			},
 		});
-	
+
 		function defineProperty (i)
 		{
 			Object .defineProperty (SFMatrix3 .prototype, i,
@@ -116,15 +120,15 @@ function (X3DField,
 				},
 				set: function (value)
 				{
-					this .getValue () [i] = value;
+					this .getValue () [i] = value * 1;
 					this .addEvent ();
 				},
 				enumerable: false,
 				configurable: false
 			});
 		}
-	
-		for (var i = 0; i < Matrix3 .prototype .length; ++ i)
+
+		for (let i = 0; i < Matrix3 .prototype .length; ++ i)
 			defineProperty (i);
 
 		return SFMatrix3;

package/src/x_ite/Fields/SFMatrix4.js

@@ -65,24 +65,28 @@ function (X3DField,
 	function SFMatrix4Template (TypeName, Type, SFVec3)
 	{
 		function SFMatrix4 (m00, m01, m02, m03,
-	                       m10, m11, m12, m13,
-	                       m20, m21, m22, m23,
-	                       m30, m31, m32, m33)
+		                    m10, m11, m12, m13,
+		                    m20, m21, m22, m23,
+		                    m30, m31, m32, m33)
 		{
-			if (arguments .length)
+			switch (arguments .length)
 			{
-				if (arguments [0] instanceof Matrix4)
+				case 0:
+					return X3DField .call (this, new Matrix4 ());
+
+				case 1:
 					return X3DField .call (this, arguments [0]);
-	
-				return X3DField .call (this, new Matrix4 (+m00, +m01, +m02, +m03,
-	                                                   +m10, +m11, +m12, +m13,
-	                                                   +m20, +m21, +m22, +m23,
-	                                                   +m30, +m31, +m32, +m33));
+
+				case 16:
+					return X3DField .call (this, new Matrix4 (m00 * 1, m01 * 1, m02 * 1, m03 * 1,
+					                                          m10 * 1, m11 * 1, m12 * 1, m13 * 1,
+					                                          m20 * 1, m21 * 1, m22 * 1, m23 * 1,
+					                                          m30 * 1, m31 * 1, m32 * 1, m33 * 1));
 			}
 
-			return X3DField .call (this, new Matrix4 ());
+			throw new Error ("Invalid arguments.");
 		}
-	
+
 		SFMatrix4 .prototype = Object .assign (Object .create (X3DField .prototype),
 			SFMatrixPrototypeTemplate (Matrix4, SFVec3),
 		{
@@ -96,7 +100,7 @@ function (X3DField,
 				return Type;
 			},
 		});
-	
+
 		function defineProperty (i)
 		{
 			Object .defineProperty (SFMatrix4 .prototype, i,
@@ -114,8 +118,8 @@ function (X3DField,
 				configurable: false
 			});
 		}
-	
-		for (var i = 0; i < Matrix4 .prototype .length; ++ i)
+
+		for (let i = 0; i < Matrix4 .prototype .length; ++ i)
 			defineProperty (i);
 
 		return SFMatrix4;

package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js

@@ -81,7 +81,7 @@ function (X3DField)
 				scale            = scale            ? scale            .getValue () : null;
 				scaleOrientation = scaleOrientation ? scaleOrientation .getValue () : null;
 				center           = center           ? center           .getValue () : null;
-	
+
 				this .getValue () .set (translation, rotation, scale, scaleOrientation, center);
 			},
 			getTransform: function (translation, rotation, scale, scaleOrientation, center)
@@ -91,9 +91,13 @@ function (X3DField)
 				scale            = scale            ? scale            .getValue () : null;
 				scaleOrientation = scaleOrientation ? scaleOrientation .getValue () : null;
 				center           = center           ? center           .getValue () : null;
-	
+
 				this .getValue () .get (translation, rotation, scale, scaleOrientation, center);
 			},
+			determinant: function ()
+			{
+				return this .getValue () .determinant ();
+			},
 			transpose: function ()
 			{
 				return new (this .constructor) (Matrix .transpose (this .getValue ()));
@@ -130,6 +134,10 @@ function (X3DField)
 			{
 				stream .string += this .getValue () .toString ();
 			},
+			toVRMLStream: function (stream)
+			{
+				this .toStream (stream);
+			},
 			toXMLStream: function (stream)
 			{
 				this .toStream (stream);

package/src/x_ite/Fields/SFNode.js

@@ -51,25 +51,27 @@ define ([
 	"x_ite/Basic/X3DField",
 	"x_ite/Bits/X3DConstants",
 	"x_ite/InputOutput/Generator",
+	"x_ite/Fields/SFNodeCache",
 ],
 function (X3DField,
           X3DConstants,
-          Generator)
+          Generator,
+          SFNodeCache)
 {
 "use strict";
 
-	var handler =
+	const handler =
 	{
 		get: function (target, key)
 		{
 			try
 			{
-				var value = target [key];
+				const value = target [key];
 
 				if (value !== undefined)
 					return value;
 
-				var
+				const
 					field      = target .getValue () .getField (key),
 					accessType = field .getAccessType ();
 
@@ -95,7 +97,7 @@ function (X3DField,
 
 			try
 			{
-				var
+				const
 					field      = target .getValue () .getField (key),
 					accessType = field .getAccessType ();
 
@@ -110,25 +112,35 @@ function (X3DField,
 				return false;
 			}
 		},
+		has: function (target, key)
+		{
+			try
+			{
+				return Boolean (target .getValue () .getField (key));
+			}
+			catch (error)
+			{
+				return key in target;
+			}
+		},
 	};
 
 	function SFNode (value)
 	{
-	   if (this instanceof SFNode)
-	   {
-			if (value)
-			{
-				value .addParent (this);
+		// Node need to test for X3DBaseNode, because there is a special version of SFNode in Script.
 
-				X3DField .call (this, value);
-			}
-			else
-				X3DField .call (this, null);
+		if (value)
+		{
+			value .addParent (this);
 
-			return new Proxy (this, handler);
+			X3DField .call (this, value);
+		}
+		else
+		{
+			X3DField .call (this, null);
 		}
 
-		return SFNode .call (Object .create (SFNode .prototype), value);
+		return new Proxy (this, handler);
 	}
 
 	SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
@@ -139,12 +151,12 @@ function (X3DField,
 		{
 			return new SFNode (this .getValue ());
 		},
-		copy: function (executionContext)
+		copy: function (instance)
 		{
-			var value = this .getValue ();
-			
+			const value = this .getValue ();
+
 			if (value)
-				return new SFNode (value .copy (executionContext));
+				return new SFNode (value .copy (instance));
 
 			return new SFNode ();
 		},
@@ -169,27 +181,31 @@ function (X3DField,
 		},
 		set: function (value)
 		{
-			var current = this .getValue ();
+			const current = this .getValue ();
 
 			if (current)
 			{
-				current .removeClones (this ._cloneCount);
+				current .removeCloneCount (this ._cloneCount);
 				current .removeParent (this);
 			}
 
+			// Node need to test for X3DBaseNode, because there is a special version of SFNode in Script.
+
 			if (value)
 			{
 				value .addParent (this);
-				value .addClones (this ._cloneCount);
+				value .addCloneCount (this ._cloneCount);
 
 				X3DField .prototype .set .call (this, value);
 			}
 			else
+			{
 				X3DField .prototype .set .call (this, null);
+			}
 		},
 		getNodeTypeName: function ()
 		{
-			var value = this .getValue ();
+			const value = this .getValue ();
 
 			if (value)
 				return value .getTypeName ();
@@ -198,7 +214,7 @@ function (X3DField,
 		},
 		getNodeName: function ()
 		{
-			var value = this .getValue ();
+			const value = this .getValue ();
 
 			if (value)
 				return value .getName ();
@@ -207,7 +223,7 @@ function (X3DField,
 		},
 		getNodeType: function ()
 		{
-			var value = this .getValue ();
+			const value = this .getValue ();
 
 			if (value)
 				return value .getType () .slice ();
@@ -216,68 +232,104 @@ function (X3DField,
 		},
 		getFieldDefinitions: function ()
 		{
-			var value = this .getValue ();
+			const value = this .getValue ();
 
 			if (value)
 				return value .getFieldDefinitions ();
 
 			throw new Error ("SFNode.getFieldDefinitions: node is null.");
 		},
-		addClones: function (count)
+		addFieldCallback: function (name, string, object)
 		{
-			var value = this .getValue ();
+			switch (arguments .length)
+			{
+				case 2:
+				{
+					return X3DField .prototype .addFieldCallback .apply (this, arguments);
+				}
+				case 3:
+				{
+					const value = this .getValue ();
+
+					if (value)
+						return value .getField (name) .addFieldCallback (string, object);
+
+					throw new Error ("SFNode.addFieldCallback: node is null.");
+				}
+			}
+		},
+		removeFieldCallback: function (name, string)
+		{
+			switch (arguments .length)
+			{
+				case 1:
+				{
+					return X3DField .prototype .removeFieldCallback .apply (this, arguments);
+				}
+				case 2:
+				{
+					const value = this .getValue ();
+
+					if (value)
+						return value .getField (name) .removeFieldCallback (string);
+
+					throw new Error ("SFNode.removeFieldCallback: node is null.");
+				}
+			}
+		},
+		addCloneCount: function (count)
+		{
+			const value = this .getValue ();
 
 			this ._cloneCount += count;
 
 			if (value)
-				value .addClones (count);
+				value .addCloneCount (count);
 		},
-		removeClones: function (count)
+		removeCloneCount: function (count)
 		{
-			var value = this .getValue ();
+			const value = this .getValue ();
 
 			this ._cloneCount -= count;
 
 			if (value)
-				value .removeClones (count);
+				value .removeCloneCount (count);
 		},
 		valueOf: function ()
 		{
-			if (this .getValue ())
-				return this;
+			const value = this .getValue ();
+
+			if (value)
+				return SFNodeCache .get (value);
 
-			return null;	
+			return null;
 		},
 		toStream: function (stream)
 		{
-			var node = this .getValue ();
+			const value = this .getValue ();
 
-			if (node)
-				node .toStream (stream);
+			if (value)
+				value .toStream (stream);
 			else
 				stream .string += "NULL";
-		},
-		toVRMLString: function ()
-		{
-			
 		},
 		toVRMLStream: function (stream)
 		{
-			var node = this .getValue ();
+			const value = this .getValue ();
 
-			if (node)
-				node .toVRMLStream (stream);
+			if (value)
+				value .toVRMLStream (stream);
 			else
 				stream .string += "NULL";
 		},
 		toXMLString: function ()
 		{
-			var
+			const
 				stream    = { string: "" },
 				generator = Generator .Get (stream),
-				node      = this .getValue ();
+				value     = this .getValue ();
 
-			generator .PushExecutionContext (node .getExecutionContext ());
+			generator .PushExecutionContext (value .getExecutionContext ());
 
 			this .toXMLStream (stream);
 
@@ -287,12 +339,12 @@ function (X3DField,
 		},
 		toXMLStream: function (stream)
 		{
-			var node = this .getValue ();
+			const value = this .getValue ();
 
-			if (node)
-				node .toXMLStream (stream);
+			if (value)
+				value .toXMLStream (stream);
 			else
-				stream .string += "NULL";
+				stream .string += "<!-- NULL -->";
 		},
 		dispose: function ()
 		{