x_ite 4.2.17 → 4.7.7

package/src/x_ite/Basic/X3DBaseNode.js

@@ -66,11 +66,6 @@ function (X3DEventObject,
 {
 "use strict";
 
-	function isLive ()
-	{
-	   return this .isLive_;
-	}
-
 	function X3DBaseNode (executionContext)
 	{
 		if (this .hasOwnProperty ("_executionContext"))
@@ -82,6 +77,7 @@ function (X3DEventObject,
 		this ._type              = [ X3DConstants .X3DBaseNode ];
 		this ._fields            = new Map ();
 		this ._predefinedFields  = new Map ();
+		this ._aliases           = new Map ();
 		this ._userDefinedFields = new Map ();
 		this ._cloneCount        = 0;
 
@@ -90,10 +86,8 @@ function (X3DEventObject,
 		if (this .hasUserDefinedFields ())
 			this .fieldDefinitions = new FieldDefinitionArray (this .fieldDefinitions .getValue () .slice ());
 
-		var fieldDefinitions = this .fieldDefinitions .getValue ();
-
-		for (var i = 0, length = fieldDefinitions .length; i < length; ++ i)
-			this .addField (fieldDefinitions [i]);
+		for (const fieldDefinition of this .fieldDefinitions)
+			this .addField (fieldDefinition);
 	}
 
 	X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototype),
@@ -105,7 +99,7 @@ function (X3DEventObject,
 		_initialized: false,
 		setExecutionContext: function (value)
 		{
-			// Currently only usefull for Sene.
+			// Currently only useful for Sene.
 
 			this ._executionContext = value;
 		},
@@ -115,18 +109,18 @@ function (X3DEventObject,
 		},
 		getScene: function ()
 		{
-			var executionContext = this ._executionContext;
+			let executionContext = this ._executionContext;
 
 			while (! executionContext .isRootContext ())
 				executionContext = executionContext .getExecutionContext ();
 
 			return executionContext;
 		},
-		getMasterScene: function ()
+		getMainScene: function ()
 		{
-			var scene = this ._executionContext .getScene ();
+			let scene = this ._executionContext .getScene ();
 
-			while (! scene .isMasterContext ())
+			while (! scene .isMainContext ())
 				scene = scene .getScene ();
 
 			return scene;
@@ -141,11 +135,9 @@ function (X3DEventObject,
 		},
 		isType: function (types)
 		{
-			var type = this ._type;
-
-			for (var i = type .length - 1; i >= 0; -- i)
+			for (const type of this ._type)
 			{
-				if (types .has (type [i]))
+				if (types .has (type))
 					return true;
 			}
 
@@ -155,30 +147,38 @@ function (X3DEventObject,
 		{
 			return this;
 		},
-		isLive: function ()
+		isLive: (function ()
 		{
-			///  Returns the live event of this node.
+			function isLive ()
+			{
+			   return this .isLive_;
+			}
+
+			return function ()
+			{
+				///  Returns the live event of this node.
 
-			// Change function.
+				// Change function.
 
-			this .isLive = isLive;
+				this .isLive = isLive;
 
-			// Add isLive event.
+				// Add isLive event.
 
-			this .addChildObjects ("isLive", new Fields .SFBool (this .getLiveState ()));
+				this .addChildObjects ("isLive", new Fields .SFBool (this .getLiveState ()));
 
-			// Event processing is done manually and immediately, so:
-			this .isLive_ .removeParent (this);
+				// Event processing is done manually and immediately, so:
+				this .isLive_ .removeParent (this);
 
-			// Connect to execution context.
+				// Connect to execution context.
 
-			if (this ._executionContext !== this)
-				this ._executionContext .isLive () .addInterest ("_set_live__", this);
+				if (this ._executionContext !== this)
+					this ._executionContext .isLive () .addInterest ("_set_live__", this);
 
-			// Return field
+				// Return field
 
-			return this .isLive ();
-		},
+				return this .isLive ();
+			};
+		})(),
 		setLive: function (value)
 		{
 			///  Sets the own live state of this node.  Setting the live state to false
@@ -205,7 +205,7 @@ function (X3DEventObject,
 		},
 		_set_live__: function ()
 		{
-			var
+			const
 				live   = this .getLiveState (),
 				isLive = this .isLive ();
 
@@ -241,14 +241,7 @@ function (X3DEventObject,
 
 			this ._initialized = true;
 
-			var fieldDefinitions = this .fieldDefinitions .getValue ();
-
-			for (var i = 0, length = fieldDefinitions .length; i < length; ++ i)
-			{
-				var field = this ._fields .get (fieldDefinitions [i] .name);
-				field .updateReferences ();
-				field .setTainted (false);
-			}
+			this ._fields .forEach (field => field .setTainted (false));
 
 			this .initialize ();
 		},
@@ -257,76 +250,52 @@ function (X3DEventObject,
 		{
 			return new (this .constructor) (executionContext);
 		},
-		copy: function (executionContext)
+		copy: function (instance)
 		{
-			// First try to get a named node with the node's name.
+			const executionContext = instance .getBody ();
 
-			function needsName (baseNode)
-			{
-				if (baseNode .getCloneCount () > 1)
-					return true;
-
-				if (baseNode .hasRoutes ())
-					return true;
+			// First try to get a named node with the node's name.
 
-				return false;
-			}
+			const name = this .getName ();
 
-			var name = this .getName ();
-		
 			if (name .length)
 			{
-				try
-				{
-					return executionContext .getNamedNode (name) .getValue ();
-				}
-				catch (error)
-				{ }
-			}
-			else
-			{
-				if (needsName (this))
-					this .getExecutionContext () .updateNamedNode (this .getExecutionContext () .getUniqueName (name), this);
+				const namedNode = executionContext .getNamedNodes () .get (name);
+
+				if (namedNode)
+					return namedNode;
 			}
 
 			// Create copy.
 
-			var copy = this .create (executionContext);
+			const copy = this .create (executionContext);
 
 			if (name .length)
 				executionContext .updateNamedNode (name, copy);
 
 			// Default fields
 
-			var predefinedFields = this .getPredefinedFields ();
-
-			for (var sourceField of predefinedFields .values ())
+			this .getPredefinedFields () .forEach (function (sourceField)
 			{
 				try
 				{
-					var destfield = copy .getField (sourceField .getName ());
-
-					destfield .setSet (sourceField .getSet ());
-
-					//if (sourceField .getAccessType () === destfield .getAccessType () and sourceField .getType () === destfield .getType ())
-					//{
+					const destinationField = copy .getField (sourceField .getName ());
 
 					if (sourceField .hasReferences ())
 					{
-						var references = sourceField .getReferences ();
-
 						// IS relationship
-						for (var originalReference of references .values ())
+
+						sourceField .getReferences () .forEach (function (originalReference)
 						{
 							try
 							{
-								destfield .addReference (executionContext .getField (originalReference .getName ()));
+								destinationField .addReference (instance .getField (originalReference .getName ()));
 							}
 							catch (error)
 							{
 								console .error (error .message);
 							}
-						}
+						});
 					}
 					else
 					{
@@ -336,70 +305,66 @@ function (X3DEventObject,
 							{
 								case X3DConstants .SFNode:
 								case X3DConstants .MFNode:
-									destfield .setValue (sourceField .copy (executionContext));
+									destinationField .set (sourceField .copy (instance) .getValue ());
 									break;
 								default:
-									destfield .setValue (sourceField);
+									destinationField .set (sourceField .getValue (), sourceField .length);
 									break;
 							}
 						}
 					}
+
+					destinationField .setModificationTime (sourceField .getModificationTime ());
 				}
 				catch (error)
 				{
 					console .log (error .message);
 				}
-			}
+			},
+			this);
 
 			// User-defined fields
 
-			var userDefinedFields = this .getUserDefinedFields ();
-
-			for (var sourceField of userDefinedFields .values ())
+			this .getUserDefinedFields () .forEach (function (sourceField)
 			{
-				var destfield = sourceField .copy (executionContext);
+				const destinationField = sourceField .copy (instance);
 
 				copy .addUserDefinedField (sourceField .getAccessType (),
-				                           sourceField .getName (),
-				                           destfield);
-
-				destfield .setSet (sourceField .getSet ());
+													sourceField .getName (),
+													destinationField);
 
 				if (sourceField .hasReferences ())
 				{
 					// IS relationship
 
-					var references = sourceField .getReferences ();
-
-					for (var originalReference of references .values ())
+					sourceField .getReferences () .forEach (function (originalReference)
 					{
 						try
 						{
-							destfield .addReference (executionContext .getField (originalReference .getName ()));
+							destinationField .addReference (instance .getField (originalReference .getName ()));
 						}
 						catch (error)
 						{
-							console .error ("No reference '" + originalReference .getName () + "' inside execution context " + executionContext .getTypeName () + " '" + executionContext .getName () + "'.");
+							console .error ("No reference '" + originalReference .getName () + "' inside execution context " + instance .getTypeName () + " '" + instance .getName () + "'.");
 						}
-					}
+					});
 				}
-			}
 
-			executionContext .addUninitializedNode (copy);
+				destinationField .setModificationTime (sourceField .getModificationTime ());
+			});
+
+			copy .setup ();
+
 			return copy;
 		},
 		flatCopy: function (executionContext)
 		{
-			var
-				copy             = this .create (executionContext || this .getExecutionContext ()),
-				fieldDefinitions = this .fieldDefinitions .getValue ();
+			const copy = this .create (executionContext || this .getExecutionContext ());
 
-			for (var i = 0, length = fieldDefinitions .length; i < length; ++ i)
+			this ._fields .forEach (function (field)
 			{
-				var field = this ._fields .get (fieldDefinitions [i] .name);
-
-				copy ._fields .get (fieldDefinitions [i] .name) .assign (field);
-			}
+				copy ._fields .get (field .getName ()) .assign (field);
+			});
 
 			copy .setup ();
 
@@ -407,7 +372,7 @@ function (X3DEventObject,
 		},
 		addChildObjects: function (name, field)
 		{
-			for (var i = 0, length = arguments .length; i < length; i += 2)
+			for (let i = 0, length = arguments .length; i < length; i += 2)
 				this .addChildObject (arguments [i], arguments [i + 1]);
 		},
 		addChildObject: function (name, field)
@@ -425,7 +390,7 @@ function (X3DEventObject,
 		},
 		addField: function (fieldDefinition)
 		{
-			var
+			const
 				accessType = fieldDefinition .accessType,
 				name       = fieldDefinition .name,
 				field      = fieldDefinition .value .clone ();
@@ -442,36 +407,37 @@ function (X3DEventObject,
 			this ._fields .set (name, field);
 
 			if (! this .getPrivate ())
-				field .addClones (1);
+				field .addCloneCount (1);
 
 			if (userDefined)
 			{
 				this ._userDefinedFields .set (name, field);
-				return;
 			}
-
-			this ._predefinedFields .set (name, field);
-
-			Object .defineProperty (this, name + "_",
+			else
 			{
-				get: function () { return field; },
-				set: function (value) { field .setValue (value); },
-				enumerable: true,
-				configurable: true, // false : non deleteable
-			});
+				this ._predefinedFields .set (name, field);
+
+				Object .defineProperty (this, name + "_",
+				{
+					get: function () { return field; },
+					set: function (value) { field .setValue (value); },
+					enumerable: true,
+					configurable: true, // false : non deletable
+				});
+			}
 		},
 		removeField: function (name)
 		{
-			var field = this ._fields .get (name);
+			const field = this ._fields .get (name);
 
 			if (field)
 			{
 				this ._fields            .delete (name);
 				this ._userDefinedFields .delete (name);
-	
-				var fieldDefinitions = this .fieldDefinitions .getValue ();
-	
-				for (var i = 0, length = fieldDefinitions .length; i < length; ++ i)
+
+				const fieldDefinitions = this .fieldDefinitions .getValue ();
+
+				for (let i = 0, length = fieldDefinitions .length; i < length; ++ i)
 				{
 					if (fieldDefinitions [i] .name === name)
 					{
@@ -481,45 +447,51 @@ function (X3DEventObject,
 				}
 
 				if (! this .getPrivate ())
-					field .removeClones (1);
+					field .removeCloneCount (1);
 			}
 		},
 		getField: (function ()
 		{
-			var
-				set_re     = /^set_(.*?)$/,
-				changed_re = /^(.*?)_changed$/;
+			const
+				set_field     = /^set_(.*?)$/,
+				field_changed = /^(.*?)_changed$/;
 
 			return function (name)
 			{
-				var field = this ._fields .get (name);
+				const field = this ._fields .get (name) || this ._aliases .get (name);
 
 				if (field)
 					return field;
 
-				var match = name .match (set_re);
+				const match = name .match (set_field);
 
 				if (match)
 				{
-					field = this ._fields .get (match [1]);
-	
+					const field = this ._fields .get (match [1]) || this ._aliases .get (match [1]);
+
 					if (field && field .getAccessType () === X3DConstants .inputOutput)
 						return field;
 				}
-
-				var match = name .match (changed_re);
-
-				if (match)
+				else
 				{
-					field = this ._fields .get (match [1]);
+					const match = name .match (field_changed);
 
-					if (field && field .getAccessType () === X3DConstants .inputOutput)
-						return field;	
+					if (match)
+					{
+						const field = this ._fields .get (match [1]) || this ._aliases .get (match [1]);
+
+						if (field && field .getAccessType () === X3DConstants .inputOutput)
+							return field;
+					}
 				}
 
-				throw new Error ("Unkown field '" + name + "' in node class " + this .getTypeName () + ".");
+				throw new Error ("Unknown field '" + name + "' in node class " + this .getTypeName () + ".");
 			};
 		})(),
+		addAlias: function (alias, field)
+		{
+			this ._aliases .set (alias, field);
+		},
 		getFieldDefinitions: function ()
 		{
 			return this .fieldDefinitions;
@@ -550,68 +522,62 @@ function (X3DEventObject,
 		{
 			return this ._predefinedFields;
 		},
-		getChangedFields: function (extented)
+		getChangedFields: function (extended)
 		{
-			/* param routes: also returen fields with routes */
+			/* param routes: also return fields with routes */
 
-			var
+			const
 				changedFields    = [ ],
 				predefinedFields = this .getPredefinedFields ();
 
-			if (extented)
+			if (extended)
 			{
-				var userDefinedFields = this .getUserDefinedFields ();
+				const userDefinedFields = this .getUserDefinedFields ();
 
-				for (var field of userDefinedFields .values ())
+				userDefinedFields .forEach (function (field)
+				{
 					changedFields .push (field);
+				});
 			}
 
-			for (var field of predefinedFields .values ())
+			predefinedFields .forEach (function (field)
 			{
-				if (extented)
+				if (extended)
 				{
 					if (field .getInputRoutes () .size || field .getOutputRoutes () .size)
 					{
 						changedFields .push (field);
-						continue;
+						return;
 					}
 				}
 
 				if (field .getReferences () .size === 0)
 				{
 					if (! field .isInitializable ())
-						continue;
+						return;
 
 					if (this .isDefaultValue (field))
-						continue;
+						return;
 				}
 
 				changedFields .push (field);
-			}
+			},
+			this);
 
 			return changedFields;
 		},
 		isDefaultValue: function (field)
 		{
-			var fieldDefinition = this .getFieldDefinitions () .get (field .getName ());
+			const fieldDefinition = this .getFieldDefinitions () .get (field .getName ());
 
 			if (fieldDefinition)
 				return fieldDefinition .value .equals (field);
 
-			return ! field .getSet ();
+			return ! field .getModificationTime ();
 		},
 		getFields: function ()
 		{
-			var
-				fields           = [ ],
-				fieldDefinitions = this .getFieldDefinitions ();
-
-			for (var i = 0, length = fieldDefinitions .length; i < length; ++ i)
-			{
-				fields .push (this .getField (fieldDefinitions [i] .name));
-			}
-
-			return fields;
+			return this ._fields;
 		},
 		getSourceText: function ()
 		{
@@ -621,18 +587,15 @@ function (X3DEventObject,
 		{
 			///  Returns true if there are any routes from or to fields of this node otherwise false.
 
-			var fieldDefinitions = this .getFieldDefinitions ();
-
-			for (var i = 0, length = fieldDefinitions .length; i < length; ++ i)
+			for (const field of this ._fields .values ())
 			{
-				var field = this .getField (fieldDefinitions [i] .name);
-
-				if (field .getInputRoutes () .size === 0 && field .getOutputRoutes () .size === 0)
-					continue;
+				if (field .getInputRoutes () .size)
+					return true;
 
-				return true;
+				if (field .getOutputRoutes () .size)
+					return true;
 			}
-		
+
 			return false;
 		},
 		getPrivate: function ()
@@ -645,35 +608,35 @@ function (X3DEventObject,
 
 			if (value)
 			{
-				var fieldDefinitions = this .getFieldDefinitions ();
-
-				for (var i = 0, length = fieldDefinitions .length; i < length; ++ i)
-					this .getField (fieldDefinitions [i] .name) .removeClones (1);
+				this ._fields .forEach (function (field)
+				{
+					field .removeCloneCount (1);
+				});
 			}
 			else
 			{
-				var fieldDefinitions = this .getFieldDefinitions ();
-
-				for (var i = 0, length = fieldDefinitions .length; i < length; ++ i)
-					this .getField (fieldDefinitions [i] .name) .addClones (1);
+				this ._fields .forEach (function (field)
+				{
+					field .addCloneCount (1);
+				});
 			}
 		},
 		getCloneCount: function ()
 		{
 			return this ._cloneCount;
 		},
-		addClones: function (count)
+		addCloneCount: function (count)
 		{
 			if (count === 0)
 				return;
-		
+
 			this ._cloneCount += count;
 		},
-		removeClones: function (count)
+		removeCloneCount: function (count)
 		{
 			if (count === 0)
 				return;
-		
+
 			this ._cloneCount -= count;
 		},
 		traverse: function () { },
@@ -681,20 +644,248 @@ function (X3DEventObject,
 		{
 			stream .string += this .getTypeName () + " { }";
 		},
+		toVRMLStream: function (stream)
+		{
+			const generator = Generator .Get (stream);
+
+			if (generator .IsSharedNode (this))
+			{
+				stream .string += "NULL";
+				return;
+			}
+
+			generator .EnterScope ();
+
+			const name = generator .Name (this);
+
+			if (name .length)
+			{
+				if (generator .ExistsNode (this))
+				{
+					stream .string += "USE";
+					stream .string += " ";
+					stream .string += name;
+
+					generator .LeaveScope ();
+					return;
+				}
+			}
+
+			if (name .length)
+			{
+				generator .AddNode (this);
+
+				stream .string += "DEF";
+				stream .string += " ";
+				stream .string += name;
+				stream .string += " ";
+			}
+
+			stream .string += this .getTypeName ();
+			stream .string += " ";
+			stream .string += "{";
+
+			const
+				fields            = this .getChangedFields (),
+				userDefinedFields = this .getUserDefinedFields ();
+
+			let
+				fieldTypeLength  = 0,
+				accessTypeLength = 0;
+
+			if (this .hasUserDefinedFields ())
+			{
+				userDefinedFields .forEach (function (field)
+				{
+					fieldTypeLength  = Math .max (fieldTypeLength, field .getTypeName () .length);
+					accessTypeLength = Math .max (accessTypeLength, generator .AccessType (field .getAccessType ()) .length);
+				});
+
+				if (userDefinedFields .size)
+				{
+					stream .string += "\n";
+					generator .IncIndent ();
+
+					userDefinedFields .forEach (function (field)
+					{
+						this .toVRMLStreamUserDefinedField (stream, field, fieldTypeLength, accessTypeLength);
+
+						stream .string += "\n";
+					},
+					this);
+
+					generator .DecIndent ();
+
+					if (fields .length !== 0)
+						stream .string += "\n";
+				}
+			}
+
+			if (fields .length === 0)
+			{
+				if (userDefinedFields .size)
+					stream .string += generator .Indent ();
+				else
+					stream .string += " ";
+			}
+			else
+			{
+				if (userDefinedFields .size === 0)
+					stream .string += "\n";
+
+				generator .IncIndent ();
+
+				fields .forEach (function (field)
+				{
+					this .toVRMLStreamField (stream, field, fieldTypeLength, accessTypeLength);
+
+					stream .string += "\n";
+				},
+				this);
+
+				generator .DecIndent ();
+				stream .string += generator .Indent ();
+			}
+
+			stream .string += "}";
+
+			generator .LeaveScope ();
+		},
+		toVRMLStreamField: function (stream, field, fieldTypeLength, accessTypeLength)
+		{
+			const generator = Generator .Get (stream);
+
+			if (field .getReferences () .size === 0 || ! generator .ExecutionContext ())
+			{
+				if (field .isInitializable ())
+				{
+					stream .string += generator .Indent ();
+					stream .string += field .getName ();
+					stream .string += " ";
+
+					field .toVRMLStream (stream);
+				}
+			}
+			else
+			{
+				let
+					index                  = 0,
+					initializableReference = false;
+
+				field .getReferences () .forEach (function (reference)
+				{
+					initializableReference = initializableReference || reference .isInitializable ();
+
+					// Output build in reference field
+
+					stream .string += generator .Indent ();
+					stream .string += field .getName ();
+					stream .string += " ";
+					stream .string += "IS";
+					stream .string += " ";
+					stream .string += reference .getName ();
+
+					++ index;
+
+					if (index !== field .getReferences () .size)
+						stream .string += "\n";
+				});
+
+				if (field .getAccessType () === X3DConstants .inputOutput && ! initializableReference && ! this .isDefaultValue (field))
+				{
+					// Output build in field
+
+					stream .string += "\n";
+					stream .string += generator .Indent ();
+					stream .string += field .getName ();
+					stream .string += " ";
+
+					field .toVRMLStream (stream);
+				}
+			}
+		},
+		toVRMLStreamUserDefinedField: function (stream, field, fieldTypeLength, accessTypeLength)
+		{
+			const generator = Generator .Get (stream);
+
+			if (field .getReferences () .size === 0 || ! generator .ExecutionContext ())
+			{
+				stream .string += generator .Indent ();
+				stream .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+				stream .string += " ";
+				stream .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+				stream .string += " ";
+				stream .string += field .getName ();
+
+				if (field .isInitializable ())
+				{
+					stream .string += " ";
+
+					field .toVRMLStream (stream);
+				}
+			}
+			else
+			{
+				let
+					index                  = 0,
+					initializableReference = false;
+
+				field .getReferences () .forEach (function (reference)
+				{
+					initializableReference = initializableReference || reference .isInitializable ();
+
+					// Output user defined reference field
+
+					stream .string += generator .Indent ();
+					stream .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+					stream .string += " ";
+					stream .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+					stream .string += " ";
+					stream .string += field .getName ();
+					stream .string += " ";
+					stream .string += "IS";
+					stream .string += " ";
+					stream .string += reference .getName ();
+
+					++ index;
+
+					if (index !== field .getReferences () .size)
+						stream .string += "\n";
+				});
+
+				if (field .getAccessType () === X3DConstants .inputOutput && ! initializableReference && ! field .isDefaultValue ())
+				{
+					stream .string += "\n";
+					stream .string += generator .Indent ();
+					stream .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+					stream .string += " ";
+					stream .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+					stream .string += " ";
+					stream .string += field .getName ();
+
+					if (field .isInitializable ())
+					{
+						stream .string += " ";
+
+						field .toVRMLStream (stream);
+					}
+				}
+			}
+		},
 		toXMLStream: function (stream)
 		{
-			var generator = Generator .Get (stream);
+			const generator = Generator .Get (stream);
 
 			if (generator .IsSharedNode (this))
 			{
 				stream .string += generator .Indent ();
-				stream .string += "<!-- NULL -->";		
+				stream .string += "<!-- NULL -->";
 				return;
 			}
 
 			generator .EnterScope ();
 
-			var name = generator .Name (this);
+			const name = generator .Name (this);
 
 			if (name .length)
 			{
@@ -708,7 +899,7 @@ function (X3DEventObject,
 					stream .string += generator .XMLEncode (name);
 					stream .string += "'";
 
-					var containerField = generator .ContainerField ();
+					const containerField = generator .ContainerField ();
 
 					if (containerField)
 					{
@@ -727,7 +918,7 @@ function (X3DEventObject,
 					return;
 				}
 			}
-		
+
 			stream .string += generator .Indent ();
 			stream .string += "<";
 			stream .string += this .getTypeName ();
@@ -742,7 +933,7 @@ function (X3DEventObject,
 				stream .string += "'";
 			}
 
-			var containerField = generator .ContainerField ();
+			const containerField = generator .ContainerField ();
 
 			if (containerField)
 			{
@@ -755,15 +946,15 @@ function (X3DEventObject,
 				}
 			}
 
-			var
+			const
 				fields            = this .getChangedFields (),
 				userDefinedFields = this .getUserDefinedFields ();
 
-			var
+			const
 				references = [ ],
 				childNodes = [ ];
 
-			var cdata = this .getSourceText ();
+			const cdata = this .getSourceText ();
 
 			if (cdata && cdata .length === 0)
 				cdata = null;
@@ -771,30 +962,26 @@ function (X3DEventObject,
 			generator .IncIndent ();
 			generator .IncIndent ();
 
-			for (var i = 0, length = fields .length; i < length; ++ i)
+			for (const field of fields)
 			{
-				var field = fields [i];
-
 				// If the field is a inputOutput and we have as reference only inputOnly or outputOnly we must output the value
 				// for this field.
 
-				var mustOutputValue = false;
+				let mustOutputValue = false;
 
 				if (generator .ExecutionContext ())
 				{
 					if (field .getAccessType () === X3DConstants .inputOutput && field .getReferences () .size !== 0)
 					{
-						var
-							initializableReference = false,
-							fieldReferences        = field .getReferences ();
-		
-						for (var fieldReference of fieldReferences .values ())
+						let initializableReference = false;
+
+						field .getReferences () .forEach (function (fieldReference)
 						{
-							initializableReference |= fieldReference .isInitializable ();
-						}
+							initializableReference = initializableReference || fieldReference .isInitializable ();
+						});
 
 						if (! initializableReference)
-							mustOutputValue = true;
+							mustOutputValue = ! this .isDefaultValue (field);
 					}
 				}
 
@@ -828,7 +1015,7 @@ function (X3DEventObject,
 
 								field .toXMLStream (stream);
 
-								stream .string += "'";			
+								stream .string += "'";
 								break;
 							}
 						}
@@ -842,7 +1029,7 @@ function (X3DEventObject,
 
 			generator .DecIndent ();
 			generator .DecIndent ();
-	
+
 			if ((! this .hasUserDefinedFields () || userDefinedFields .size === 0) && references .length === 0 && childNodes .length === 0 && ! cdata)
 			{
 				stream .string += "/>";
@@ -855,7 +1042,7 @@ function (X3DEventObject,
 
 				if (this .hasUserDefinedFields ())
 				{
-					for (var field of userDefinedFields .values ())
+					userDefinedFields .forEach (function (field)
 					{
 						stream .string += generator .Indent ();
 						stream .string += "<field";
@@ -875,18 +1062,16 @@ function (X3DEventObject,
 						// If the field is a inputOutput and we have as reference only inputOnly or outputOnly we must output the value
 						// for this field.
 
-						var mustOutputValue = false;
+						let mustOutputValue = false;
 
 						if (field .getAccessType () === X3DConstants .inputOutput && field .getReferences () .size !== 0)
 						{
-							var
-								initializableReference = false,
-								fieldReferences        = field .getReferences ();
+							let initializableReference = false;
 
-							for (var fieldReference of fieldReferences .values ())
+							field .getReferences () .forEach (function (fieldReference)
 							{
-								initializableReference |= fieldReference .isInitializable ();
-							}
+								initializableReference = initializableReference || fieldReference .isInitializable ();
+							});
 
 							if (! initializableReference)
 								mustOutputValue = true;
@@ -896,7 +1081,7 @@ function (X3DEventObject,
 						{
 							if (mustOutputValue && generator .ExecutionContext ())
 								references .push (field);
-		
+
 							if (! field .isInitializable () || field .isDefaultValue ())
 							{
 								stream .string += "/>\n";
@@ -949,9 +1134,9 @@ function (X3DEventObject,
 
 							stream .string += "/>\n";
 						}
-					}
+					});
 				}
-		
+
 				if (references .length)
 				{
 					stream .string += generator .Indent ();
@@ -959,14 +1144,12 @@ function (X3DEventObject,
 					stream .string += "\n";
 
 					generator .IncIndent ();
-		
-					for (var i = 0, length = references .length; i < length; ++ i)
+
+					for (const field of references)
 					{
-						var
-							field       = references [i],
-							protoFields = field .getReferences ();
+						const protoFields = field .getReferences ();
 
-						for (var protoField of protoFields .values ())
+						protoFields .forEach (function (protoField)
 						{
 							stream .string += generator .Indent ();
 							stream .string += "<connect";
@@ -979,7 +1162,7 @@ function (X3DEventObject,
 							stream .string += generator .XMLEncode (protoField .getName ());
 							stream .string += "'";
 							stream .string += "/>\n";
-						}
+						});
 					}
 
 					generator .DecIndent ();
@@ -988,10 +1171,8 @@ function (X3DEventObject,
 					stream .string += "</IS>\n";
 				}
 
-				for (var i = 0, length = childNodes .length; i < length; ++ i)
+				for (const field of childNodes)
 				{
-					var field = childNodes [i];
-
 					generator .PushContainerField (field);
 
 					field .toXMLStream (stream);
@@ -1003,10 +1184,8 @@ function (X3DEventObject,
 
 				if (cdata)
 				{
-					for (var i = 0, length = cdata .length; i < length; ++ i)
+					for (const value of cdata)
 					{
-						var value = cdata [i];
-
 						stream .string += "<![CDATA[";
 						stream .string += generator .escapeCDATA (value);
 						stream .string += "]]>\n";
@@ -1026,47 +1205,49 @@ function (X3DEventObject,
 		dispose: function ()
 		{
 			// TODO: remove named node if any. (do this in NamedNode)
-			// TODO: remove improted node if any. (do this in ImportedNode)
+			// TODO: remove imported node if any. (do this in ImportedNode)
 			// TODO: remove exported node if any. (do this in ExportedNode)
 			// TODO: remove routes from and to node if any. (do this in Route)
 
-			var
+			const
 				predefinedFields  = this .getPredefinedFields (),
 				userDefinedFields = this .getUserDefinedFields ();
 
-			for (var predefinedField of predefinedFields .values ())
+			predefinedFields .forEach (function (predefinedField)
+			{
 				predefinedField .dispose ();
+			});
 
-			for (var userDefinedField of userDefinedFields .values ())
+			userDefinedFields .forEach (function (userDefinedField)
+			{
 				userDefinedField .dispose ();
+			});
 
 			// Remove node from entire scene graph.
 
-			var firstParents = this .getParents ();
+			const firstParents = new Set (this .getParents ());
 
-			for (var firstParent of firstParents .values ())
+			firstParents .forEach (function (firstParent)
 			{
 				if (firstParent instanceof Fields .SFNode)
 				{
-					var secondParents = firstParent .getParents ();
+					const secondParents = new Set (firstParent .getParents ());
 
-					for (var secondParent of secondParents .values ())
+					secondParents .forEach (function (secondParent)
 					{
 						if (secondParent instanceof Fields .MFNode)
 						{
-							var length = secondParent .length;
+							const length = secondParent .length;
 
 							secondParent .erase (secondParent .remove (0, length, firstParent), length);
 						}
-					}
+					});
 
 					firstParent .setValue (null);
 				}
-			}
+			});
 		},
 	});
 
-	X3DBaseNode .prototype .addAlias = X3DBaseNode .prototype .setField;
-
 	return X3DBaseNode;
 });