x_ite 4.2.17 → 4.7.7

package/src/x_ite/Fields/ArrayFields.js

@@ -92,7 +92,7 @@ function (SFBool,
 {
 "use strict";
 
-	var
+	const
 		SFMatrix3d = SFMatrix3 .SFMatrix3d,
 		SFMatrix3f = SFMatrix3 .SFMatrix3f,
 		SFMatrix4d = SFMatrix4 .SFMatrix4d,
@@ -110,10 +110,7 @@ function (SFBool,
 
 	function MFNode (value)
 	{
-		if (this instanceof MFNode)
-			return X3DObjectArrayField .call (this, arguments);
-		
-		return X3DObjectArrayField .call (Object .create (MFNode .prototype), arguments);
+		return X3DObjectArrayField .call (this, arguments);
 	}
 
 	MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
@@ -146,54 +143,163 @@ function (SFBool,
 		},
 		clone: function ()
 		{
-			var clone = new MFNode ();
+			const clone = new MFNode ();
 			clone .setValue (this);
+			clone .setModificationTime (0);
 			return clone;
 		},
-		copy: function (executionContext)
+		copy: function (instance)
 		{
-			var
-				copy  = new MFNode (),
-				array = this .getValue ();
+			const copy = new MFNode ();
+
+			for (const node of this .getValue ())
+				copy .push (node .copy (instance));
 
-			for (var i = 0, length = array .length; i < length; ++ i)
-				copy .push (array [i] .copy (executionContext));
+			copy .setModificationTime (0);
 
 			return copy;
 		},
-		addClones: function (count)
+		addCloneCount: function (count)
 		{
-			var array = this .getValue ();
-
 			this ._cloneCount += count;
 
-			for (var i = 0, length = array .length; i < length; ++ i)
-				array [i] .addClones (count);
+			for (const element of this .getValue ())
+				element .addCloneCount (count);
 		},
-		removeClones: function (count)
+		removeCloneCount: function (count)
 		{
-			var array = this .getValue ();
-
 			this ._cloneCount += count;
 
-			for (var i = 0, length = array .length; i < length; ++ i)
-				array [i] .removeClones (count);
+			for (const element of this .getValue ())
+				element .removeCloneCount (count);
 		},
 		addChildObject: function (value)
 		{
 			X3DObjectArrayField .prototype .addChildObject .call (this, value);
 
-			value .addClones (this ._cloneCount);
+			value .addCloneCount (this ._cloneCount);
 		},
 		removeChildObject: function (value)
 		{
 			X3DObjectArrayField .prototype .removeChildObject .call (this, value);
 
-			value .removeClones (this ._cloneCount);
+			value .removeCloneCount (this ._cloneCount);
+		},
+		toStream: function (stream)
+		{
+			const
+				target    = this ._target,
+				array     = target .getValue (),
+				generator = Generator .Get (stream);
+
+			switch (array .length)
+			{
+				case 0:
+				{
+					stream .string += "[ ]";
+					break;
+				}
+				case 1:
+				{
+					generator .PushUnitCategory (target .getUnit ());
+
+					array [0] .toStream (stream);
+
+					generator .PopUnitCategory ();
+					break;
+				}
+				default:
+				{
+					generator .PushUnitCategory (target .getUnit ());
+
+					stream .string += "[\n";
+					generator .IncIndent ();
+
+					for (let i = 0, length = array .length; i < length; ++ i)
+					{
+						stream .string += generator .Indent ();
+						array [i] .toStream (stream);
+						stream .string += "\n";
+					}
+
+					generator .DecIndent ();
+					stream .string += generator .Indent ();
+					stream .string += "]";
+
+					generator .PopUnitCategory ();
+					break;
+				}
+			}
+		},
+		toVRMLString: function ()
+		{
+			this .addCloneCount (1);
+
+			const string = X3DObjectArrayField .prototype .toVRMLString .call (this);
+
+			this .removeCloneCount (1);
+
+			return string;
+		},
+		toVRMLStream: function (stream)
+		{
+			const
+				target    = this ._target,
+				array     = target .getValue (),
+				generator = Generator .Get (stream);
+
+			switch (array .length)
+			{
+				case 0:
+				{
+					stream .string += "[ ]";
+					break;
+				}
+				case 1:
+				{
+					generator .EnterScope ();
+
+					array [0] .toVRMLStream (stream);
+
+					generator .LeaveScope ();
+					break;
+				}
+				default:
+				{
+					generator .EnterScope ();
+
+					stream .string += "[\n";
+					generator .IncIndent ();
+
+					for (const element of array)
+					{
+						stream .string += generator .Indent ();
+						element .toVRMLStream (stream);
+						stream .string += "\n";
+					}
+
+					generator .DecIndent ();
+					stream .string += generator .Indent ();
+					stream .string += "]";
+
+					generator .LeaveScope ();
+					break;
+				}
+			}
+		},
+		toXMLString: function ()
+		{
+			this .addCloneCount (1);
+
+			const string = X3DObjectArrayField .prototype .toXMLString .call (this);
+
+			this .removeCloneCount (1);
+
+			return string;
 		},
 		toXMLStream: function (stream)
 		{
-			var
+			const
 				generator = Generator .Get (stream),
 				length    = this .length;
 
@@ -201,11 +307,11 @@ function (SFBool,
 			{
 				generator .EnterScope ();
 
-				var value = this .getValue ();
+				const array = this .getValue ();
 
-				for (var i = 0, n = length - 1; i < n; ++ i)
+				for (let i = 0, n = length - 1; i < n; ++ i)
 				{
-					var node = value [i] .getValue ();
+					const node = array [i] .getValue ();
 
 					if (node)
 					{
@@ -215,11 +321,24 @@ function (SFBool,
 					else
 					{
 						stream .string += generator .Indent ();
-						stream .string += "<!-- NULL -->\n";
+                  stream .string += "<";
+						stream .string += "NULL";
+
+						const containerField = generator .ContainerField ();
+
+                  if (containerField)
+                  {
+                     stream .string += " ";
+                     stream .string += "containerField='";
+                     stream .string += generator .XMLEncode (containerField .getName ());
+                     stream .string += "'";
+                  }
+
+                  stream .string += "/>";
 					}
 				}
 
-				var node = value [n] .getValue ();
+				const node = array .at (-1) .getValue ();
 
 				if (node)
 				{
@@ -228,7 +347,18 @@ function (SFBool,
 				else
 				{
 					stream .string += generator .Indent ();
-					stream .string += "<!-- NULL -->";
+					stream .string += "<";
+					stream .string += "NULL";
+
+					const containerField = generator .ContainerField ();
+
+					if (containerField)
+					{
+						stream .string += " ";
+						stream .string += "containerField='";
+						stream .string += generator .XMLEncode (containerField .getName ());
+						stream .string += "'";
+					}
 				}
 
 				generator .LeaveScope ();
@@ -238,10 +368,7 @@ function (SFBool,
 
 	function MFString (value)
 	{
-		if (this instanceof MFString)
-			return X3DObjectArrayField .call (this, arguments);
-		
-		return X3DObjectArrayField .call (Object .create (MFString .prototype), arguments);
+		return X3DObjectArrayField .call (this, arguments);
 	}
 
 	MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
@@ -273,13 +400,13 @@ function (SFBool,
 		},
 		toXMLStream: function (stream)
 		{
-			var length = this .length;
+			const length = this .length;
 
 			if (length)
 			{
-				var value = this .getValue ();
+				const value = this .getValue ();
 
-				for (var i = 0, n = length - 1; i < n; ++ i)
+				for (let i = 0, n = length - 1; i < n; ++ i)
 				{
 					stream .string += "\"";
 					value [i] .toXMLStream (stream);
@@ -288,20 +415,17 @@ function (SFBool,
 				}
 
 				stream .string += "\"";
-				value [n] .toXMLStream (stream);
+				value .at (-1) .toXMLStream (stream);
 				stream .string += "\"";
 			}
 		},
 	});
-	
+
 	function ArrayTemplate (TypeName, Type, SingleType, ValueType, ArrayType, Components)
 	{
 		function ArrayField (value)
 		{
-			if (this instanceof ArrayField)
-				return X3DObjectArrayField .call (this, arguments);
-			
-			return X3DObjectArrayField .call (Object .create (ArrayField .prototype), arguments);
+			return X3DObjectArrayField .call (this, arguments);
 		}
 
 		ArrayField .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
@@ -340,10 +464,7 @@ function (SFBool,
 	{
 		function ArrayField (value)
 		{
-			if (this instanceof ArrayField)
-				return X3DTypedArrayField .call (this, arguments);
-
-			return X3DTypedArrayField .call (Object .create (ArrayField .prototype), arguments);
+			return X3DTypedArrayField .call (this, arguments);
 		}
 
 		ArrayField .prototype = Object .assign (Object .create (X3DTypedArrayField .prototype),
@@ -378,15 +499,17 @@ function (SFBool,
 		return ArrayField;
 	}
 
-	var ArrayFields =
+	function Value (value) { return value; }
+
+	const ArrayFields =
 	{
 		MFBool:      TypedArrayTemplate ("MFBool",      X3DConstants .MFBool,      SFBool,      Boolean,     Uint8Array,   1),
 		MFColor:     TypedArrayTemplate ("MFColor",     X3DConstants .MFColor,     SFColor,     SFColor,     Float32Array, 3),
 		MFColorRGBA: TypedArrayTemplate ("MFColorRGBA", X3DConstants .MFColorRGBA, SFColorRGBA, SFColorRGBA, Float32Array, 4),
-		MFDouble:    TypedArrayTemplate ("MFDouble",    X3DConstants .MFDouble,    SFDouble,    Number,      Float64Array, 1),
-		MFFloat:     TypedArrayTemplate ("MFFloat",     X3DConstants .MFFloat,     SFFloat,     Number,      Float32Array, 1),
+		MFDouble:    TypedArrayTemplate ("MFDouble",    X3DConstants .MFDouble,    SFDouble,    Value,       Float64Array, 1),
+		MFFloat:     TypedArrayTemplate ("MFFloat",     X3DConstants .MFFloat,     SFFloat,     Value,       Float32Array, 1),
 		MFImage:     ArrayTemplate      ("MFImage",     X3DConstants .MFImage,     SFImage,     SFImage,     Array,        1),
-		MFInt32:     TypedArrayTemplate ("MFInt32",     X3DConstants .MFInt32,     SFInt32,     Number,      Int32Array,   1),
+		MFInt32:     TypedArrayTemplate ("MFInt32",     X3DConstants .MFInt32,     SFInt32,     Value,       Int32Array,   1),
 		MFMatrix3d:  TypedArrayTemplate ("MFMatrix3d",  X3DConstants .MFMatrix3d,  SFMatrix3d,  SFMatrix3d,  Float64Array, 9),
 		MFMatrix3f:  TypedArrayTemplate ("MFMatrix3f",  X3DConstants .MFMatrix3f,  SFMatrix3f,  SFMatrix3f,  Float32Array, 9),
 		MFMatrix4d:  TypedArrayTemplate ("MFMatrix4d",  X3DConstants .MFMatrix4d,  SFMatrix4d,  SFMatrix4d,  Float64Array, 16),
@@ -394,7 +517,7 @@ function (SFBool,
 		MFNode:      MFNode,
 		MFRotation:  TypedArrayTemplate ("MFRotation",  X3DConstants .MFRotation,  SFRotation,  SFRotation,  Float64Array, 4),
 		MFString:    MFString,
-		MFTime:      TypedArrayTemplate ("MFTime",      X3DConstants .MFTime,      SFTime,      Number,      Float64Array, 1),
+		MFTime:      TypedArrayTemplate ("MFTime",      X3DConstants .MFTime,      SFTime,      Value,       Float64Array, 1),
 		MFVec2d:     TypedArrayTemplate ("MFVec2d",     X3DConstants .MFVec2d,     SFVec2d,     SFVec2d,     Float64Array, 2),
 		MFVec2f:     TypedArrayTemplate ("MFVec2f",     X3DConstants .MFVec2f,     SFVec2f,     SFVec2f,     Float32Array, 2),
 		MFVec3d:     TypedArrayTemplate ("MFVec3d",     X3DConstants .MFVec3d,     SFVec3d,     SFVec3d,     Float64Array, 3),
@@ -403,9 +526,5 @@ function (SFBool,
 		MFVec4f:     TypedArrayTemplate ("MFVec4f",     X3DConstants .MFVec4f,     SFVec4f,     SFVec4f,     Float32Array, 4),
 	};
 
-	Object .preventExtensions (ArrayFields);
-	Object .freeze (ArrayFields);
-	Object .seal (ArrayFields);
-
 	return ArrayFields;
 });

package/src/x_ite/Fields/SFBool.js

@@ -58,10 +58,7 @@ function (X3DField,
 
 	function SFBool (value)
 	{
-		if (this instanceof SFBool)
-			return X3DField .call (this, Boolean (value));
-		
-		return X3DField .call (Object .create (SFBool .prototype), Boolean (value));
+		return X3DField .call (this, !! value);
 	}
 
 	SFBool .prototype = Object .assign (Object .create (X3DField .prototype),
@@ -77,7 +74,7 @@ function (X3DField,
 		},
 		set: function (value)
 		{
-			X3DField .prototype .set .call (this, Boolean (value));
+			X3DField .prototype .set .call (this, !! value);
 		},
 		getTypeName: function ()
 		{
@@ -95,6 +92,10 @@ function (X3DField,
 		{
 			stream .string += this .getValue () ? "TRUE" : "FALSE";
 		},
+		toVRMLStream: function (stream)
+		{
+			this .toStream (stream);
+		},
 		toXMLStream: function (stream)
 		{
 			stream .string += this .getValue () ? "true" : "false";

package/src/x_ite/Fields/SFColor.js

@@ -60,20 +60,19 @@ function (Color3,
 
 	function SFColor (r, g, b)
 	{
-		if (this instanceof SFColor)
+		switch (arguments .length)
 		{
-			if (arguments .length)
-			{
-				if (arguments [0] instanceof Color3)
-					return X3DField .call (this, arguments [0]);
-				else
-					return X3DField .call (this, new Color3 (+r, +g, +b));
-			}
+			case 0:
+				return X3DField .call (this, new Color3 ());
+
+			case 1:
+				return X3DField .call (this, arguments [0]);
 
-			return X3DField .call (this, new Color3 ());
+			case 3:
+				return X3DField .call (this, new Color3 (r * 1, g * 1, b * 1));
 		}
 
-		return SFColor .apply (Object .create (SFColor .prototype), arguments);
+		throw new Error ("Invalid arguments.");
 	}
 
 	SFColor .prototype = Object .assign (Object .create (X3DField .prototype),
@@ -117,21 +116,21 @@ function (Color3,
 		},
 		lerp: (function ()
 		{
-			var	
+			const
 				s = [ ],
 				d = [ ],
 				r = [ ];
-     
+
 			return function (destination, t)
 			{
-				var result = new SFColor ();
+				const result = new SFColor ();
 
 				this .getValue () .getHSV (s),
 				destination .getValue () .getHSV (d),
 				Color3 .lerp (s, d, t, r),
-	
+
 				result .setHSV (r [0], r [1], r [2], r [3]);
-	
+
 				return result;
 			};
 		})(),
@@ -139,48 +138,52 @@ function (Color3,
 		{
 			stream .string += this .getValue () .toString ();
 		},
+		toVRMLStream: function (stream)
+		{
+			this .toStream (stream);
+		},
 		toXMLStream: function (stream)
 		{
 			this .toStream (stream);
 		},
 	});
 
-	var r = {
+	const r = {
 		get: function ()
 		{
 			return this .getValue () .r;
 		},
 		set: function (value)
 		{
-			this .getValue () .r = value;
+			this .getValue () .r = value * 1;
 			this .addEvent ();
 		},
 		enumerable: true,
 		configurable: false
 	};
 
-	var g = {
+	const g = {
 		get: function ()
 		{
 			return this .getValue () .g;
 		},
 		set: function (value)
 		{
-			this .getValue () .g = value;
+			this .getValue () .g = value * 1;
 			this .addEvent ();
 		},
 		enumerable: true,
 		configurable: false
 	};
 
-	var b = {
+	const b = {
 		get: function ()
 		{
 			return this .getValue () .b;
 		},
 		set: function (value)
 		{
-			this .getValue () .b = value;
+			this .getValue () .b = value * 1;
 			this .addEvent ();
 		},
 		enumerable: true,

package/src/x_ite/Fields/SFColorRGBA.js

@@ -62,20 +62,19 @@ function (X3DField,
 
 	function SFColorRGBA (r, g, b, a)
 	{
-		if (this instanceof SFColorRGBA)
+		switch (arguments .length)
 		{
-			if (arguments .length)
-			{
-				if (arguments [0] instanceof Color4)
-					return X3DField .call (this, arguments [0]);
-				else
-					return X3DField .call (this, new Color4 (+r, +g, +b, +a));
-			}
+			case 0:
+				return X3DField .call (this, new Color4 ());
+
+			case 1:
+				return X3DField .call (this, arguments [0]);
 
-			return X3DField .call (this, new Color4 ());
+			case 4:
+				return X3DField .call (this, new Color4 (r * 1, g * 1, b * 1, a * 1));
 		}
 
-		return SFColorRGBA .apply (Object .create (SFColorRGBA .prototype), arguments);
+		throw new Error ("Invalid arguments.");
 	}
 
 	SFColorRGBA .prototype = Object .assign (Object .create (X3DField .prototype),
@@ -114,78 +113,79 @@ function (X3DField,
 		},
 		lerp: (function ()
 		{
-			var	
+			const
 				s = [ ],
 				d = [ ],
 				r = [ ];
-     
+
 			return function (destination, t)
 			{
-				var result = new SFColorRGBA ();
+				const result = new SFColorRGBA ();
 
 				this .getValue () .getHSVA (s),
 				destination .getValue () .getHSVA (d),
 				Color4 .lerp (s, d, t, r),
-	
+
 				result .setHSVA (r [0], r [1], r [2], r [3]);
-	
+
 				return result;
 			};
 		})(),
 		toStream: SFColor .prototype .toStream,
+		toVRMLStream: SFColor .prototype .toVRMLStream,
 		toXMLStream: SFColor .prototype .toXMLStream,
 	});
 
-	var r = {
+	const r = {
 		get: function ()
 		{
 			return this .getValue () .r;
 		},
 		set: function (value)
 		{
-			this .getValue () .r = value;
+			this .getValue () .r = value * 1;
 			this .addEvent ();
 		},
 		enumerable: true,
 		configurable: false
 	};
 
-	var g = {
+	const g = {
 		get: function ()
 		{
 			return this .getValue () .g;
 		},
 		set: function (value)
 		{
-			this .getValue () .g = value;
+			this .getValue () .g = value * 1;
 			this .addEvent ();
 		},
 		enumerable: true,
 		configurable: false
 	};
 
-	var b = {
+	const b = {
 		get: function ()
 		{
 			return this .getValue () .b;
 		},
 		set: function (value)
 		{
-			this .getValue () .b = value;
+			this .getValue () .b = value * 1;
 			this .addEvent ();
 		},
 		enumerable: true,
 		configurable: false
 	};
 
-	var a = {
+	const a = {
 		get: function ()
 		{
 			return this .getValue () .a;
 		},
 		set: function (value)
 		{
-			this .getValue () .a = value;
+			this .getValue () .a = value * 1;
 			this .addEvent ();
 		},
 		enumerable: true,

package/src/x_ite/Fields/SFDouble.js

@@ -60,10 +60,7 @@ function (X3DField,
 
 	function SFDouble (value)
 	{
-		if (this instanceof SFDouble)
-			return X3DField .call (this, arguments .length ? +value : 0);
-		
-		return X3DField .call (Object .create (SFDouble .prototype), arguments .length ? +value : 0);
+		return X3DField .call (this, arguments .length ? value * 1 : 0);
 	}
 
 	SFDouble .prototype = Object .assign (Object .create (X3DField .prototype),
@@ -92,12 +89,16 @@ function (X3DField,
 		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);