x_ite 4.2.17 → 4.7.7

package/src/x_ite/Basic/X3DTypedArrayField.js

@@ -54,27 +54,33 @@ define ([
 	"standard/Math/Algorithm",
 ],
 function (X3DArrayField,
-          X3DConstants, 
+          X3DConstants,
           Generator,
           Algorithm)
 {
 "use strict";
 
-	var handler =
+	const handler =
 	{
 		get: function (target, key)
 		{
-			try
+			const value = target [key];
+
+			if (value !== undefined)
+				return value;
+
+			if (typeof key === "string")
 			{
-				var index = Number (key);
+				const index = key * 1;
 
 				if (Number .isInteger (index))
 				{
-					var
-						array      = target .getValue (),
+					const
 						components = target .getComponents (),
 						valueType  = target .getValueType ();
-	
+
+					let array = target .getValue ();
+
 					if (index >= target ._length)
 						array = target .resize (index + 1);
 
@@ -86,15 +92,15 @@ function (X3DArrayField,
 					else
 					{
 						// Return reference to index.
-	
-						var
+
+						const
 							value         = new (valueType) (),
 							internalValue = value .getValue (),
 							i             = index * components;
-	
-						value .addEvent = function () { return addEvent (target, i, internalValue, components); };
-						value .getValue = function () { return getValue (target, i, internalValue, components); };
-	
+
+						value .addEvent = addEvent .bind (target, i, internalValue, components);
+						value .getValue = getValue .bind (target, i, internalValue, components);
+
 						return value;
 					}
 				}
@@ -103,64 +109,82 @@ function (X3DArrayField,
 					return target [key];
 				}
 			}
-			catch (error)
+
+			if (key === Symbol .iterator)
 			{
-				// Don't know what to do with symbols, but it seem not to affect anything.
-				if ((typeof key) === "symbol")
-					return;
+				return function* ()
+				{
+					const
+						array      = target .getValue (),
+						components = target .getComponents (),
+						valueType  = target .getValueType ();
+
+					if (components === 1)
+					{
+						// Return native JavaScript value.
+
+						for (let index = 0; index < target ._length; ++ index)
+							yield valueType (array [index]);
+					}
+					else
+					{
+						// Return reference to index.
+
+						for (let index = 0; index < target ._length; ++ index)
+						{
+							const
+								value         = new (valueType) (),
+								internalValue = value .getValue (),
+								i             = index * components;
 
-				// if target not instance of X3DTypedArrayField, then the constuctor is called as function.
-				console .log (target, typeof key, key, error);
+							value .addEvent = addEvent .bind (target, i, internalValue, components);
+							value .getValue = getValue .bind (target, i, internalValue, components);
+
+							yield value;
+						}
+					}
+			  	};
 			}
 		},
 		set: function (target, key, value)
 		{
-			try
+			if (key in target)
 			{
-				if (key in target)
-				{
-					target [key] = value;
-					return true;
-				}
-
-				var
-					index      = parseInt (key),
-					array      = target .getValue (),
-					components = target .getComponents ();
-
-				if (index >= target ._length)
-					array = target .resize (index + 1);
+				target [key] = value;
+				return true;
+			}
 
-				if (components === 1)
-				{
-					array [index] = value;
-				}
-				else
-				{
-					index *= components;
+			const components = target .getComponents ();
 
-					for (var c = 0; c < components; ++ c, ++ index)
-						array [index] = value [c];
-				}
+			let
+				index = key * 1,
+				array = target .getValue ();
 
-				target .addEvent ();
+			if (index >= target ._length)
+				array = target .resize (index + 1);
 
-				return true;
+			if (components === 1)
+			{
+				array [index] = value;
 			}
-			catch (error)
+			else
 			{
-				// if target not instance of X3DTypedArrayField, then the constuctor is called as function.
-				console .log (target, key, error);
-				return false;
+				index *= components;
+
+				for (let c = 0; c < components; ++ c, ++ index)
+					array [index] = value [c];
 			}
+
+			target .addEvent ();
+
+			return true;
 		},
 		has: function (target, key)
 		{
-			return key in target .getValue ();
-		},
-		enumerate: function (target)
-		{
-			return Object .keys (target .getValue ()) [Symbol.iterator] ();
+			if (Number .isInteger (+key))
+				return key < target ._length;
+
+			return key in target;
 		},
 	};
 
@@ -189,7 +213,7 @@ function (X3DArrayField,
 		},
 		copy: function ()
 		{
-			var
+			const
 				target     = this ._target,
 				array      = target .getValue (),
 				copy       = new (target .constructor) (),
@@ -199,6 +223,8 @@ function (X3DArrayField,
 
 			X3DArrayField .prototype .set .call (copy, copyArray, target ._length);
 
+			copy .setModificationTime (0);
+
 			return copy;
 		},
 		equals: function (other)
@@ -206,18 +232,18 @@ function (X3DArrayField,
 			if (this === other)
 				return true;
 
-			var
+			const
 				target = this ._target,
 				length = target ._length;
 
 			if (length !== other ._length)
 				return false;
 
-			var
+			const
 				a = target  .getValue (),
 				b = other .getValue ();
 
-			for (var i = 0, l = length * target .getComponents (); i < l; ++ i)
+			for (let i = 0, l = length * target .getComponents (); i < l; ++ i)
 			{
 				if (a [i] !== b [i])
 					return false;
@@ -227,20 +253,24 @@ function (X3DArrayField,
 		},
 		assign: function (value)
 		{
-			var target = this ._target;
+			const target = this ._target;
 
 			target .set (value .getValue (), value .length);
 			target .addEvent ();
 		},
 		set: function (otherArray /* value of field */, l /* length of field */)
 		{
-			var
+			const
 				target      = this ._target,
 				components  = target .getComponents (),
+				length      = target ._length;
+
+			let
 				array       = target .getValue (),
-				length      = target ._length,
-				otherLength = l !== undefined ? l * components : otherArray .length,
-				rest        = otherLength % components;
+				otherLength = l !== undefined ? l * components : otherArray .length;
+
+			const
+				rest = otherLength % components;
 
 			if (rest)
 			{
@@ -254,6 +284,7 @@ function (X3DArrayField,
 			if (array .length < otherArray .length)
 			{
 				array = target .grow (otherArray .length);
+
 				array .set (otherArray);
 
 				if (rest)
@@ -275,7 +306,7 @@ function (X3DArrayField,
 		},
 		setValue: function (value)
 		{
-			var target = this ._target;
+			const target = this ._target;
 
 			if (value instanceof target .constructor)
 			{
@@ -289,13 +320,12 @@ function (X3DArrayField,
 		},
 		unshift: function (value)
 		{
-			var
+			const
 				target          = this ._target,
 				components      = target .getComponents (),
 				length          = target ._length,
-				argumentsLength = arguments .length;
-
-			var array = target .grow ((length + argumentsLength) * components);
+				argumentsLength = arguments .length,
+				array           = target .grow ((length + argumentsLength) * components);
 
 			array .copyWithin (argumentsLength * components, 0, length * components);
 
@@ -305,11 +335,11 @@ function (X3DArrayField,
 			}
 			else
 			{
-				for (var i = 0, a = 0; a < argumentsLength; ++ a)
+				for (let i = 0, a = 0; a < argumentsLength; ++ a)
 				{
-					var argument = arguments [a];
+					const argument = arguments [a];
 
-					for (var c = 0; c < components; ++ c, ++ i)
+					for (let c = 0; c < components; ++ c, ++ i)
 					{
 						array [i] = argument [c];
 					}
@@ -324,16 +354,16 @@ function (X3DArrayField,
 		},
 		shift: function ()
 		{
-			var
+			const
 				target = this ._target,
-				array  = target .getValue ();
+				length = target ._length;
 
-			if (array .length)
+			if (length)
 			{
-				var
+				const
+					array      = target .getValue (),
 					components = target .getComponents (),
 					valueType  = target .getValueType (),
-					length     = target ._length,
 					newLength  = length - 1;
 
 				if (components === 1)
@@ -342,9 +372,9 @@ function (X3DArrayField,
 				}
 				else
 				{
-					var tmp = target ._tmp;
+					const tmp = target ._tmp;
 
-					for (var c = 0; c < components; ++ c)
+					for (let c = 0; c < components; ++ c)
 						tmp [c] = array [c];
 
 					var value = Object .create (valueType .prototype);
@@ -363,13 +393,12 @@ function (X3DArrayField,
 		},
 		push: function (value)
 		{
-			var
+			const
 				target          = this ._target,
 				components      = target .getComponents (),
 				length          = target ._length,
-				argumentsLength = arguments .length;
-
-			var array = target .grow ((length + argumentsLength) * components);
+				argumentsLength = arguments .length,
+				array           = target .grow ((length + argumentsLength) * components);
 
 			if (components === 1)
 			{
@@ -377,11 +406,11 @@ function (X3DArrayField,
 			}
 			else
 			{
-				for (var i = length * components, a = 0; a < argumentsLength; ++ a)
+				for (let i = length * components, a = 0; a < argumentsLength; ++ a)
 				{
-					var argument = arguments [a];
+					const argument = arguments [a];
 
-					for (var c = 0; c < components; ++ c,  ++ i)
+					for (let c = 0; c < components; ++ c,  ++ i)
 					{
 						array [i] = argument [c];
 					}
@@ -396,27 +425,27 @@ function (X3DArrayField,
 		},
 		pop: function ()
 		{
-			var
+			const
 				target = this ._target,
-				array  = target .getValue ();
+				length = target ._length;
 
-			if (array .length)
+			if (length)
 			{
-				var
+				const
+					array      = target .getValue (),
 					components = target .getComponents (),
 					valueType  = target .getValueType (),
-					length     = target ._length,
 					newLength  = length - 1;
 
 				if (components === 1)
 				{
-					var value = valueType (array [length - 1]);
+					var value = valueType (array [length - 1]); // Don't use at(-1).
 				}
 				else
 				{
-					var tmp = target ._tmp;
+					const tmp = target ._tmp;
 
-					for (var c = 0, a = newLength * components; c < components; ++ c, ++ a)
+					for (let c = 0, a = newLength * components; c < components; ++ c, ++ a)
 						tmp [c] = array [a];
 
 					var value = Object .create (valueType .prototype);
@@ -435,7 +464,7 @@ function (X3DArrayField,
 		},
 		splice: function (index, deleteCount)
 		{
-			var
+			const
 				target = this ._target,
 				length = target ._length;
 
@@ -445,7 +474,7 @@ function (X3DArrayField,
 			if (index + deleteCount > length)
 				deleteCount = length - index;
 
-			var result = target .erase (index, index + deleteCount);
+			const result = target .erase (index, index + deleteCount);
 
 			if (arguments .length > 2)
 				target .spliceInsert (index, Array .prototype .splice .call (arguments, 2));
@@ -456,16 +485,15 @@ function (X3DArrayField,
 		},
 		spliceInsert: function (index, other)
 		{
-			var
+			const
 				target      = this ._target,
 				components  = target .getComponents (),
 				length      = target ._length,
-				otherLength = other .length;
+				otherLength = other .length,
+				array       = target .grow ((length + otherLength) * components);
 
 			index *= components;
 
-			var array = target .grow ((length + otherLength) * components);
-
 			array .copyWithin (index + otherLength * components, index, length * components);
 
 			if (components === 1)
@@ -474,11 +502,11 @@ function (X3DArrayField,
 			}
 			else
 			{
-				for (var i = 0, a = index; i < otherLength; ++ i)
+				for (let i = 0, a = index; i < otherLength; ++ i)
 				{
-					var value = other [i];
+					const value = other [i];
 
-					for (var c = 0; c < components; ++ c, ++ a)
+					for (let c = 0; c < components; ++ c, ++ a)
 						array [a] = value [c];
 				}
 			}
@@ -487,19 +515,18 @@ function (X3DArrayField,
 		},
 		insert: function (index, other, first, last)
 		{
-			var
+			const
 				target     = this ._target,
 				length     = target ._length,
 				otherArray = other .getValue (),
 				components = target .getComponents (),
-				difference = last - first;
+				difference = last - first,
+				array      = target .grow ((length + difference) * components);
 
 			index *= components;
 			first *= components;
 			last  *= components;
 
-			var array = target .grow ((length + difference) * components);
-
 			array .copyWithin (index + difference * components, index, length * components);
 
 			for (; first < last; ++ index, ++ first)
@@ -511,21 +538,20 @@ function (X3DArrayField,
 		},
 		erase: function (first, last)
 		{
-			var
-				target     = this ._target,
-				array      = target .getValue (),
-				components = target .getComponents (),
-				difference = last - first,
-				length     = target ._length,
-				newLength  = length - difference,
-				values     = new (target .constructor) ();
+			const
+				target      = this ._target,
+				array       = target .getValue (),
+				components  = target .getComponents (),
+				difference  = last - first,
+				length      = target ._length,
+				newLength   = length - difference,
+				values      = new (target .constructor) (),
+				valuesArray = values .grow (difference * components);
 
 			first *= components;
 			last  *= components;
 
-			var valuesArray = values .grow (difference * components);
-
-			for (var v = 0, f = first; f < last; ++ v, ++ f)
+			for (let v = 0, f = first; f < last; ++ v, ++ f)
 				valuesArray [v] = array [f];
 
 			array .copyWithin (first, last, length * components);
@@ -540,12 +566,13 @@ function (X3DArrayField,
 		},
 		resize: function (newLength, value, silent)
 		{
-			var
+			const
 				target     = this ._target,
 				length     = target ._length,
-				array      = target .getValue (),
 				components = target .getComponents ();
 
+			let array = target .getValue ();
+
 			if (newLength < length)
 			{
 				array .fill (0, newLength * components, length * components);
@@ -565,16 +592,16 @@ function (X3DArrayField,
 					}
 					else
 					{
-						for (var i = length * components, il = newLength * components; i < il; )
+						for (let i = length * components, il = newLength * components; i < il; )
 						{
-							for (var c = 0; c < components; ++ c, ++ i)
+							for (let c = 0; c < components; ++ c, ++ i)
 							{
 								array [i] = value [c];
 							}
 						}
 					}
 				}
-	
+
 				if (! silent)
 					target .addEvent ();
 			}
@@ -585,14 +612,14 @@ function (X3DArrayField,
 		},
 		grow: function (length)
 		{
-			var
+			const
 				target = this ._target,
 				array  = target .getValue ();
 
 			if (length < array .length)
 				return array;
 
-			var
+			const
 				maxLength = Algorithm .nextPowerOfTwo (length),
 				newArray  = new (target .getArrayType ()) (maxLength);
 
@@ -604,7 +631,7 @@ function (X3DArrayField,
 		},
 		shrinkToFit: function ()
 		{
-			var
+			const
 				target = this ._target,
 				array  = target .getValue (),
 				length = target ._length * target .getComponents ();
@@ -612,7 +639,7 @@ function (X3DArrayField,
 			if (array .length == length)
 				return array;
 
-			var newArray = array .subarray (0, length);
+			const newArray = array .subarray (0, length);
 
 			X3DArrayField .prototype .set .call (target, newArray);
 
@@ -620,7 +647,7 @@ function (X3DArrayField,
 		},
 		toStream: function (stream)
 		{
-			var
+			const
 				target     = this ._target,
 				generator  = Generator .Get (stream),
 				array      = target .getValue (),
@@ -647,8 +674,8 @@ function (X3DArrayField,
 					}
 					else
 					{
-						for (var c = 0, first = 0; c < components; ++ c, ++ first)
-							value [c] = array [first]; 
+						for (let c = 0, first = 0; c < components; ++ c, ++ first)
+							value [c] = array [first];
 
 						value .toStream (stream);
 					}
@@ -665,41 +692,41 @@ function (X3DArrayField,
 
 					if (components === 1)
 					{
-						for (var i = 0, n = length - 1; i < n; ++ i)
+						for (let i = 0, n = length - 1; i < n; ++ i)
 						{
 							stream .string += generator .Indent ();
 
 							value .set (array [i * components]);
 							value .toStream (stream);
-	
+
 							stream .string += ",\n";
 						}
-	
+
 						stream .string += generator .Indent ();
-						value .set (array [n * components]);
+						value .set (array [(length - 1) * components]);
 						value .toStream (stream);
 
 						stream .string += "\n";
 					}
 					else
 					{
-						for (var i = 0, n = length - 1; i < n; ++ i)
+						for (let i = 0, n = length - 1; i < n; ++ i)
 						{
 							stream .string += generator .Indent ();
 
-							for (var c = 0, first = i * components; c < components; ++ c, ++ first)
-								value [c] = array [first]; 
-		
+							for (let c = 0, first = i * components; c < components; ++ c, ++ first)
+								value [c] = array [first];
+
 							value .toStream (stream);
-		
+
 							stream .string += ",\n";
 						}
 
 						stream .string += generator .Indent ();
 
-						for (var c = 0, first = n * components; c < components; ++ c, ++ first)
-							value [c] = array [first]; 
-		
+						for (let c = 0, first = (length - 1) * components; c < components; ++ c, ++ first)
+							value [c] = array [first];
+
 						value .toStream (stream);
 						stream .string += "\n";
 					}
@@ -713,25 +740,29 @@ function (X3DArrayField,
 				}
 			}
 		},
+		toVRMLStream: function (stream)
+		{
+			this .toStream (stream);
+		},
 		toXMLStream: function (stream)
 		{
-			var
+			const
 				target = this ._target,
 				length = target ._length;
 
 			if (length)
 			{
-				var
+				const
 					generator  = Generator .Get (stream),
 					array      = target .getValue (),
 					components = target .getComponents (),
 					value      = new (target .getSingleType ()) ();
-	
+
 				generator .PushUnitCategory (target .getUnit ());
 
 				if (components === 1)
 				{
-					for (var i = 0, n = length - 1; i < n; ++ i)
+					for (let i = 0, n = length - 1; i < n; ++ i)
 					{
 						value .set (array [i * components]);
 						value .toXMLStream (stream);
@@ -739,25 +770,25 @@ function (X3DArrayField,
 						stream .string += ", ";
 					}
 
-					value .set (array [n * components]);
+					value .set (array [(length - 1) * components]);
 
 					value .toXMLStream (stream);
 				}
 				else
 				{
-					for (var i = 0, n = length - 1; i < n; ++ i)
+					for (let i = 0, n = length - 1; i < n; ++ i)
 					{
-						for (var c = 0, first = i * components; c < components; ++ c, ++ first)
-							value [c] = array [first]; 
-	
+						for (let c = 0, first = i * components; c < components; ++ c, ++ first)
+							value [c] = array [first];
+
 						value .toXMLStream (stream);
-	
+
 						stream .string += ", ";
 					}
 
-					for (var c = 0, first = n * components; c < components; ++ c, ++ first)
-						value [c] = array [first]; 
-	
+					for (let c = 0, first = (length - 1) * components; c < components; ++ c, ++ first)
+						value [c] = array [first];
+
 					value .toXMLStream (stream);
 				}
 
@@ -780,13 +811,13 @@ function (X3DArrayField,
 
 	// Getter/Setter functions to reference a value for a given index.
 
-	function getValue (target, index, value, components)
+	function getValue (index, value, components)
 	{
-		var
-			array = target .getValue (),
-			tmp   = target ._tmp;
+		const
+			array = this .getValue (),
+			tmp   = this ._tmp;
 
-		for (var c = 0; c < components; ++ c, ++ index)
+		for (let c = 0; c < components; ++ c, ++ index)
 			tmp [c] = array [index];
 
 		value .set .apply (value, tmp);
@@ -794,14 +825,14 @@ function (X3DArrayField,
 		return value;
 	}
 
-	function addEvent (target, index, value, components)
+	function addEvent (index, value, components)
 	{
-		var array = target .getValue ();
+		const array = this .getValue ();
 
-		for (var c = 0; c < components; ++ c, ++ index)
+		for (let c = 0; c < components; ++ c, ++ index)
 			array [index] = value [c];
 
-		target .addEvent ();
+		this .addEvent ();
 	}
 
 	return X3DTypedArrayField;