x_ite 4.2.17 → 4.7.7

package/src/x_ite/Basic/X3DField.js

@@ -52,18 +52,20 @@ define ([
 	"x_ite/Base/X3DChildObject",
 	"x_ite/Bits/X3DConstants",
 	"x_ite/Base/Events",
+	"standard/Utility/MapUtilities",
 ],
 function ($,
 	       X3DChildObject,
 	       X3DConstants,
-	       Events)
+			 Events,
+			 MapUtilities)
 {
 "use strict";
 
 	function X3DField (value)
 	{
 		X3DChildObject .call (this);
-	
+
 		this ._value = value;
 
 		return this;
@@ -75,7 +77,6 @@ function ($,
 		_value: null,
 		_accessType: X3DConstants .initializeOnly,
 		_unit: null,
-		_set: false,
 		_uniformLocation: null,
 		_references: new Map (),
 		_fieldInterests: new Map (),
@@ -142,21 +143,12 @@ function ($,
 		},
 		setUnit: function (value)
 		{
-			return this ._unit = value;
+			this ._unit = value;
 		},
 		getUnit: function ()
 		{
 			return this ._unit;
 		},
-		setSet: function (value)
-		{
-			// Boolean indication whether the value is set during parse, or undefined.
-			return this ._set = value;
-		},
-		getSet: function ()
-		{
-			return this ._set;
-		},
 		hasReferences: function ()
 		{
 			if (this .hasOwnProperty ("_references"))
@@ -170,7 +162,7 @@ function ($,
 		},
 		addReference: function (reference)
 		{
-			var references = this .getReferences ();
+			const references = this .getReferences ();
 
 			if (references .has (reference .getId ()))
 				return; // throw ???
@@ -205,25 +197,6 @@ function ($,
 
 			return this ._references;
 		},
-		updateReferences: function ()
-		{
-			if (this .hasOwnProperty ("_references"))
-			{
-				for (var reference of this ._references .values ())
-				{
-					switch (this .getAccessType () & reference .getAccessType ())
-					{
-						case X3DConstants .inputOnly:
-						case X3DConstants .outputOnly:
-							continue;
-						case X3DConstants .initializeOnly:
-						case X3DConstants .inputOutput:
-							this .set (reference .getValue (), reference .length);
-							continue;
-					}
-				}
-			}
-		},
 		addFieldInterest: function (field)
 		{
 			if (! this .hasOwnProperty ("_fieldInterests"))
@@ -311,71 +284,77 @@ function ($,
 		{
 			if (this ._routeCallbacks .size)
 			{
-				(new Map (this ._routeCallbacks)) .forEach (function (routeCallback)
+				this ._routeCallbacks .forEach (function (routeCallback)
 				{
 					routeCallback ();
 				});
 			}
 		},
-		processEvent: function (event)
+		processEvent: (function ()
 		{
-			if (event .has (this .getId ()))
-				return;
-
-			event .add (this .getId ());
+			const fieldCallbacks = new Map ();
 
-			this .setTainted (false);
+			function processEvent (fieldCallback)
+			{
+				fieldCallback (this .valueOf ());
+			}
 
-			var field = event .field;
+			return function (event)
+			{
+				if (event .has (this .getId ()))
+					return;
 
-			if (field !== this)
-				this .set (field .getValue (), field .length);
+				event .add (this .getId ());
 
-			// Process interests
+				this .setTainted (false);
 
-			this .processInterests ();
+				const field = event .field;
 
-			// Process routes
+				if (field !== this)
+					this .set (field .getValue (), field .length);
 
-			var first = true;
+				// Process interests
 
-			this ._fieldInterests .forEach (function (fieldInterest)
-			{
-				if (first)
-				{
-					first = false;
-					fieldInterest .addEventObject (this, event);
-				}
-				else
-					fieldInterest .addEventObject (this, Events .copy (event));
-			},
-			this);
+				this .processInterests ();
 
-			if (first)
-			   Events .push (event);
+				// Process routes
 
-			// Process field callbacks
+				let first = true;
 
-			if (this ._fieldCallbacks .size)
-			{
-				(new Map (this ._fieldCallbacks)) .forEach (function (fieldCallback)
+				this ._fieldInterests .forEach (function (fieldInterest)
 				{
-					fieldCallback (this .valueOf ());
+					if (first)
+					{
+						first = false;
+						fieldInterest .addEventObject (this, event);
+					}
+					else
+						fieldInterest .addEventObject (this, Events .copy (event));
 				},
 				this);
-			}
-		},
+
+				if (first)
+					Events .push (event);
+
+				// Process field callbacks
+
+				if (this ._fieldCallbacks .size)
+				{
+					MapUtilities .assign (fieldCallbacks, this ._fieldCallbacks) .forEach (processEvent, this);
+				}
+			};
+		})(),
 		valueOf: function ()
 		{
 			return this;
 		},
 		fromString: function (string, scene)
 		{
-			var
+			const
 				Parser = require ("x_ite/Parser/Parser"),
 				parser = new Parser (scene);
 
-			parser .setUnits (Boolean (scene));
+			parser .setUnits (!! scene);
 			parser .setInput (string);
 			parser .fieldValue (this);
 			this .addEvent ();

package/src/x_ite/Basic/X3DFieldDefinition.js

@@ -57,10 +57,6 @@ define (function ()
 		this .dataType    = value .getType ();
 		this .name        = name;
 		this .value       = value;
-
-		Object .preventExtensions (this);
-		Object .freeze (this);
-		Object .seal (this);
 	}
 
 	X3DFieldDefinition .prototype .constructor = X3DFieldDefinition;

package/src/x_ite/Basic/X3DObjectArrayField.js

@@ -57,26 +57,31 @@ define ([
 function ($,
           X3DField,
           X3DArrayField,
-          X3DConstants, 
+          X3DConstants,
           Generator)
 {
 "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
+					array = target .getValue (),
+					index = key * 1;
 
 				if (Number .isInteger (index))
 				{
-					var array = target .getValue ();
-	
 					if (index >= array .length)
 						target .resize (index + 1);
-	
+
 					return array [index] .valueOf ();
 				}
 				else
@@ -84,57 +89,44 @@ function ($,
 					return target [key];
 				}
 			}
-			catch (error)
-			{
-				// Don't know what to do with symbols, but it seem not to affect anything.
-				if ((typeof key) === "symbol")
-					return;
 
-				// if target not instance of X3DObjectArrayField, then the constuctor is called as function.
-				console .log (target, typeof key, key, error);
-			}
+			const array = target .getValue ();
+
+			if (key === Symbol .iterator)
+				return array [key];
 		},
 		set: function (target, key, value)
 		{
-			try
+			if (key in target)
 			{
-				if (key in target)
-				{
-					target [key] = value;
-					return true;
-				}
+				target [key] = value;
+				return true;
+			}
 
-				var
-					array = target .getValue (),
-					index = parseInt (key);
+			const
+				array = target .getValue (),
+				index = key * 1;
 
-				if (index >= array .length)
-					target .resize (index + 1);
+			if (index >= array .length)
+				target .resize (index + 1);
 
-				array [index] .setValue (value);
-				return true;
-			}
-			catch (error)
-			{
-				// if target not instance of X3DObjectArrayField, then the constuctor is called as function.
-				console .log (target, key, error);
-				return false;
-			}
+			array [index] .setValue (value);
+
+			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 .getValue () .length;
+
+			return key in target;
 		},
 	};
 
 	function X3DObjectArrayField (value)
 	{
 		X3DArrayField .call (this, [ ]);
-		
+
 		this ._target = this;
 
 		if (value [0] instanceof Array)
@@ -154,18 +146,20 @@ function ($,
 		},
 		copy: function ()
 		{
-			var
+			const
 				target = this ._target,
 				copy   = new (target .constructor) (),
 				array  = target .getValue ();
 
 			X3DObjectArrayField .prototype .push .apply (copy, array);
 
+			copy .setModificationTime (0);
+
 			return copy;
 		},
 		equals: function (array)
 		{
-			var
+			const
 				target = this ._target,
 				a      = target .getValue (),
 				b      = array .getValue (),
@@ -177,7 +171,7 @@ function ($,
 			if (length !== b .length)
 				return false;
 
-			for (var i = 0; i < length; ++ i)
+			for (let i = 0; i < length; ++ i)
 			{
 				if (! a [i] .equals (b [i]))
 					return false;
@@ -187,13 +181,13 @@ function ($,
 		},
 		set: function (value)
 		{
-			var target = this ._target;
+			const target = this ._target;
 
 			target .resize (value .length, undefined, true);
 
-			var array = target .getValue ();
+			const array = target .getValue ();
 
-			for (var i = 0, length = value .length; i < length; ++ i)
+			for (let i = 0, length = value .length; i < length; ++ i)
 				array [i] .set (value [i] instanceof X3DField ? value [i] .getValue () : value [i]);
 		},
 		isDefaultValue: function ()
@@ -202,20 +196,20 @@ function ($,
 		},
 		setValue: function (value)
 		{
-			var target = this ._target;
+			const target = this ._target;
 
 			target .set (value instanceof X3DObjectArrayField ? value .getValue () : value);
 			target .addEvent ();
 		},
 		unshift: function (value)
 		{
-			var
+			const
 				target = this ._target,
 				array  = target .getValue ();
 
-			for (var i = arguments .length - 1; i >= 0; -- i)
+			for (let i = arguments .length - 1; i >= 0; -- i)
 			{
-				var field = new (target .getSingleType ()) ();
+				const field = new (target .getSingleType ()) ();
 
 				field .setValue (arguments [i]);
 				target .addChildObject (field);
@@ -228,13 +222,13 @@ function ($,
 		},
 		shift: function ()
 		{
-			var
+			const
 				target = this ._target,
 				array  = target .getValue ();
 
 			if (array .length)
 			{
-				var field = array .shift ();
+				const field = array .shift ();
 				target .removeChildObject (field);
 				target .addEvent ();
 				return field .valueOf ();
@@ -242,15 +236,15 @@ function ($,
 		},
 		push: function (value)
 		{
-			var
+			const
 				target = this ._target,
 				array  = target .getValue ();
 
-			for (var i = 0, length = arguments .length; i < length; ++ i)
+			for (const argument of arguments)
 			{
-				var field = new (target .getSingleType ()) ();
+				const field = new (target .getSingleType ()) ();
 
-				field .setValue (arguments [i]);
+				field .setValue (argument);
 				target .addChildObject (field);
 				array .push (field);
 			}
@@ -261,13 +255,13 @@ function ($,
 		},
 		pop: function ()
 		{
-			var
+			const
 				target = this ._target,
 				array  = target .getValue ();
 
 			if (array .length)
 			{
-				var field = array .pop ();
+				const field = array .pop ();
 				target .removeChildObject (field);
 				target .addEvent ();
 				return field .valueOf ();
@@ -275,7 +269,7 @@ function ($,
 		},
 		splice: function (index, deleteCount)
 		{
-			var
+			const
 				target = this ._target,
 				array  = target .getValue ();
 
@@ -285,7 +279,7 @@ function ($,
 			if (index + deleteCount > array .length)
 				deleteCount = array .length - index;
 
-			var result = target .erase (index, index + deleteCount);
+			const result = target .erase (index, index + deleteCount);
 
 			if (arguments .length > 2)
 				target .insert (index, arguments, 2, arguments .length);
@@ -294,13 +288,13 @@ function ($,
 		},
 		insert: function (index, array, first, last)
 		{
-			var
+			const
 				target = this ._target,
 				args   = [index, 0];
 
-			for (var i = first; i < last; ++ i)
+			for (let i = first; i < last; ++ i)
 			{
-				var field = new (target .getSingleType ()) ();
+				const field = new (target .getSingleType ()) ();
 
 				field .setValue (array [i]);
 				target .addChildObject (field);
@@ -313,24 +307,22 @@ function ($,
 		},
 		find: function (first, last, value)
 		{
-			var target = this ._target;
+			const
+				target = this ._target,
+				values = target .getValue ();;
 
 			if ($.isFunction (value))
 			{
-				var values = target .getValue ();
-	
-				for (var i = first; i < last; ++ i)
+				for (let i = first; i < last; ++ i)
 				{
 					if (value (values [i] .valueOf ()))
 						return i;
 				}
-	
+
 				return last;
 			}
 
-			var values = target .getValue ();
-
-			for (var i = first; i < last; ++ i)
+			for (let i = first; i < last; ++ i)
 			{
 				if (values [i] .equals (value))
 					return i;
@@ -340,49 +332,47 @@ function ($,
 		},
 		remove: function (first, last, value)
 		{
-			var target = this ._target;
+			const
+				target = this ._target,
+				values = target .getValue ();
 
 			if ($.isFunction (value))
 			{
-				var values = target .getValue ();
-	
 				first = target .find (first, last, value);
-	
+
 				if (first !== last)
 				{
-					for (var i = first; ++ i < last; )
+					for (let i = first; ++ i < last; )
 					{
-						var current = values [i];
+						const current = values [i];
 
 						if (! value (current .valueOf ()))
 						{
-							var tmp = values [first];
-	
+							const tmp = values [first];
+
 							values [first ++] = current;
 							values [i]        = tmp;
 						}
 					}
 				}
-		
+
 				if (first !== last)
 					target .addEvent ();
 
 				return first;
 			}
 
-			var values = target .getValue ();
-
 			first = target .find (first, last, value);
 
 			if (first !== last)
 			{
-				for (var i = first; ++ i < last; )
+				for (let i = first; ++ i < last; )
 				{
-					var current = values [i];
+					const current = values [i];
 
 					if (! current .equals (value))
 					{
-						var tmp = values [first];
+						const tmp = values [first];
 
 						values [first ++] = current;
 						values [i]        = tmp;
@@ -397,26 +387,26 @@ function ($,
 		},
 		erase: function (first, last)
 		{
-			var
+			const
 				target = this ._target,
 				values = target .getValue () .splice (first, last - first);
-				
-			for (var i = 0, length = values .length; i < length; ++ i)
-				target .removeChildObject (values [i]);
-			
+
+			for (const value of values)
+				target .removeChildObject (value);
+
 			target .addEvent ();
 
 			return new (target .constructor) (values);
 		},
 		resize: function (size, value, silent)
 		{
-			var
+			const
 				target = this ._target,
 				array  = target .getValue ();
-		
+
 			if (size < array .length)
 			{
-				for (var i = size, length = array .length; i < length; ++ i)
+				for (let i = size, length = array .length; i < length; ++ i)
 					target .removeChildObject (array [i]);
 
 				array .length = size;
@@ -426,9 +416,9 @@ function ($,
 			}
 			else if (size > array .length)
 			{
-				for (var i = array .length; i < size; ++ i)
+				for (let i = array .length; i < size; ++ i)
 				{
-					var field = new (target .getSingleType ()) ();
+					const field = new (target .getSingleType ()) ();
 
 					if (value !== undefined)
 						field .setValue (value);
@@ -451,7 +441,7 @@ function ($,
 		},
 		toStream: function (stream)
 		{
-			var
+			const
 				target    = this ._target,
 				array     = target .getValue (),
 				generator = Generator .Get (stream);
@@ -478,8 +468,8 @@ function ($,
 
 					stream .string += "[\n";
 					generator .IncIndent ();
-				
-					for (var i = 0, length = array .length - 1; i < length; ++ i)
+
+					for (let i = 0, length = array .length - 1; i < length; ++ i)
 					{
 						stream .string += generator .Indent ();
 						array [i] .toStream (stream);
@@ -487,7 +477,7 @@ function ($,
 					}
 
 					stream .string += generator .Indent ();
-					array [length] .toStream (stream);
+					array .at (-1) .toStream (stream);
 					stream .string += "\n";
 
 					generator .DecIndent ();
@@ -499,39 +489,43 @@ function ($,
 				}
 			}
 		},
+		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 ();
 
 				generator .PushUnitCategory (target .getUnit ());
 
-				for (var i = 0, n = length - 1; i < n; ++ i)
+				for (const element of array)
 				{
-					array [i] .toXMLStream (stream);
+					element .toXMLStream (stream);
 					stream .string += ", ";
 				}
 
-				array [n] .toXMLStream (stream);
+				array .at (-1) .toXMLStream (stream);
 
 				generator .PopUnitCategory ();
 			}
 		},
 		dispose: function ()
 		{
-			var
+			const
 				target = this ._target,
 				array  = target .getValue ();
 
-			for (var i = 0, length = target .length; i < length; ++ i)
-				target .removeChildObject (array [i]);
+			for (const value of array)
+				target .removeChildObject (value);
 
 			array .length = 0;