x_ite 4.0.5 → 4.7.5

package/src/x_ite/Components/Core/X3DPrototypeInstance.js

@@ -48,19 +48,13 @@
 
 
 define ([
-	"jquery",
-	"x_ite/Basic/FieldDefinitionArray",
-	"x_ite/Fields",
 	"x_ite/Base/X3DChildObject",
 	"x_ite/Components/Core/X3DNode",
 	"x_ite/Execution/X3DExecutionContext",
 	"x_ite/Bits/X3DConstants",
 	"x_ite/InputOutput/Generator",
 ],
-function ($,
-          FieldDefinitionArray,
-          Fields,
-          X3DChildObject,
+function (X3DChildObject,
           X3DNode,
           X3DExecutionContext,
           X3DConstants,
@@ -71,25 +65,22 @@ function ($,
 	function X3DPrototypeInstance (executionContext, protoNode)
 	{
 		this .protoNode        = protoNode;
-		this .fieldDefinitions = new FieldDefinitionArray (protoNode .getFieldDefinitions () .getValue () .slice ());
+		this .fieldDefinitions = protoNode .getFieldDefinitions ();
 
-		X3DNode             .call (this, executionContext);
-		X3DExecutionContext .call (this, executionContext);
+		X3DNode .call (this, executionContext);
 
 		this .addType (X3DConstants .X3DPrototypeInstance);
-		this .getRootNodes () .setAccessType (X3DConstants .initializeOnly);
 
-		this .getScene () .addInitLoadCount (this);
+		if (executionContext .getPrototype ())
+			return;
 
-		if (protoNode .isExternProto)
-			protoNode .requestAsyncLoad (this .construct .bind (this));
+		if (! protoNode .isExternProto)
+			return;
 
-		else
-			this .construct ();
+		protoNode .requestImmediateLoad (this .construct .bind (this));
 	}
 
-	X3DPrototypeInstance .prototype = $.extend (Object .create (X3DExecutionContext .prototype),
-		X3DNode .prototype,
+	X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .prototype),
 	{
 		constructor: X3DPrototypeInstance,
 		create: function (executionContext)
@@ -110,98 +101,92 @@ function ($,
 		},
 		construct: function ()
 		{
-			this .getScene () .removeInitLoadCount (this);
+			const proto = this .protoNode .getProtoDeclaration ();
 
-			var proto = this .protoNode .getProtoDeclaration ();
-
-			if (proto)
+			if (!proto)
 			{
-				// If there is a proto the externproto is completely loaded.
-			
-				if (! this .metadata_ .getSet ())
-					this .metadata_ = proto .metadata_;
+				this .body = new X3DExecutionContext (this .getExecutionContext ());
+				this .body .addParent (this);
+				this .body .setup ();
 
-				if (this .protoNode .isExternProto)
-				{
-					var fieldDefinitions = proto .getFieldDefinitions ();
+				if (this .isInitialized ())
+					X3DChildObject .prototype .addEvent .call (this);
+
+				return;
+			}
+
+			// If there is a proto the externproto is completely loaded.
 
-					for (var i = 0, length = fieldDefinitions .length; i < length; ++ i)
+			if (this .protoNode .isExternProto)
+			{
+				for (const fieldDefinition of proto .getFieldDefinitions ())
+				{
+					try
 					{
-						try
-						{
-							var
-								fieldDefinition = fieldDefinitions [i],
-                        field           = this .getField (fieldDefinition .name),
-								protoField      = proto .getField (fieldDefinition .name);
+						const
+							field      = this .getField (fieldDefinition .name),
+							protoField = proto .getField (fieldDefinition .name);
 
-							// Continue if something is wrong.
-							if (field .getAccessType () !== protoField .getAccessType ())
-								continue;
+						// Continue if something is wrong.
+						if (field .getAccessType () !== protoField .getAccessType ())
+							continue;
 
-							// Continue if something is wrong.
-							if (field .getType () !== protoField .getType ())
-								continue;
+						// Continue if something is wrong.
+						if (field .getType () !== protoField .getType ())
+							continue;
 
-							// Continue if field is eventIn or eventOut.
-							if (! (field .getAccessType () & X3DConstants .initializeOnly))
-								continue;
+						// Continue if field is eventIn or eventOut.
+						if (! (field .getAccessType () & X3DConstants .initializeOnly))
+							continue;
 
-							// Is set during parse.	
-							if (field .getSet ())
-								continue;
+						// Is set during parse.
+						if (field .getModificationTime ())
+							continue;
 
-							// Has IS references.
-							if (field .hasReferences ())
-								continue;
+						// Has IS references.
+						if (field .hasReferences ())
+							continue;
 
-							field .setValue (protoField .getValue ());
-						}
-						catch (error)
-						{
-							// Definition exists in proto but does not exist in extern proto.
-							this .addField (fieldDefinition);
-						}
+						if (field .equals (protoField))
+							continue;
+
+						// If default value of protoField is different from field update default value for field.
+						field .setValue (protoField);
+					}
+					catch (error)
+					{
+						// Definition exists in proto but does not exist in extern proto.
+						this .addField (fieldDefinition);
 					}
 				}
+			}
 
-				// Assign metadata.
+			// Create execution context.
 
-				this .setURL (proto .getURL ());
+			this .body = new X3DExecutionContext (proto .getExecutionContext ());
+			this .body .addParent (this);
 
-				this .importExternProtos (proto .externprotos);
-				this .importProtos       (proto .protos);
-				this .copyRootNodes      (proto .rootNodes);
+			// Copy proto.
 
-				if (this .isInitialized ())
-				{
-					this .setup ();
-					X3DChildObject .prototype .addEvent .call (this);
-				}
-			}
-		},
-		setup: function ()
-		{
-			X3DNode             .prototype .setup .call (this);
-			X3DExecutionContext .prototype .setup .call (this);
+			this .importExternProtos (proto .getBody () .externprotos);
+			this .importProtos       (proto .getBody () .protos);
+			this .copyRootNodes      (proto .getBody () .rootNodes);
+			this .copyImportedNodes  (proto .getBody (), proto .getBody () .getImportedNodes ());
+			this .copyRoutes         (proto .getBody (), proto .getBody () .routes);
+
+			this .body .setup ();
+
+			if (this .isInitialized ())
+				X3DChildObject .prototype .addEvent .call (this);
 		},
 		initialize: function ()
 		{
 			try
 			{
-				var proto = this .protoNode .getProtoDeclaration ();
+				X3DNode .prototype .initialize .call (this);
 
-				if (proto)
-				{
-					//this .copyImportedNodes (proto);
-					this .copyRoutes (proto .routes);
-				}
-
-				// TODO: connect getRootNodes () to X3DChildObject .prototype .addEvent .call (this);
-
-				// Now initialize bases.
-	
-				X3DNode             .prototype .initialize .call (this);
-				X3DExecutionContext .prototype .initialize .call (this);
+				if (! this .protoNode .isExternProto)
+					this .construct ();
 			}
 			catch (error)
 			{
@@ -212,56 +197,75 @@ function ($,
 		{
 			return false;
 		},
+		getBody: function ()
+		{
+			return this .body;
+		},
 		getInnerNode: function ()
 		{
-			var rootNodes = this .getRootNodes () .getValue ();
-			
+			const rootNodes = this .body .getRootNodes () .getValue ();
+
 			if (rootNodes .length)
 			{
-				var rootNode = rootNodes [0];
-				
+				const rootNode = rootNodes [0];
+
 				if (rootNode)
 					return rootNode .getValue () .getInnerNode ();
 			}
 
 			throw new Error ("Root node not available.");
 		},
-		importExternProtos: function (externprotos)
+		importExternProtos: function (externprotos1)
 		{
-			for (var i = 0, length = externprotos .length; i < length; ++ i)
-				this .externprotos .add (externprotos [i] .getName (), externprotos [i]);
+			const externprotos2 = this .body .externprotos;
+
+			for (const externproto of externprotos1)
+				externprotos2 .add (externproto .getName (), externproto);
 		},
-		importProtos: function (protos)
+		importProtos: function (protos1)
 		{
-			for (var i = 0, length = protos .length; i < length; ++ i)
-				this .protos .add (protos [i] .getName (), protos [i]);
+			const protos2 = this .body .protos;
+
+			for (const proto of protos1)
+				protos2 .add (proto .getName (), proto);
 		},
-		copyRootNodes: function (rootNodes)
+		copyRootNodes: function (rootNodes1)
 		{
-			var
-				rootNodes1 = rootNodes .getValue (),
-				rootNodes2 = this  .getRootNodes () .getValue ();
+			const rootNodes2 = this .body .getRootNodes ();
 
-			for (var i = 0, length = rootNodes1 .length; i < length; ++ i)
+			for (const node of rootNodes1)
+				rootNodes2 .push (node .copy (this));
+		},
+		copyImportedNodes: function (executionContext, importedNodes)
+		{
+			importedNodes .forEach (function (importedNode, importedName)
 			{
-				var value = rootNodes1 [i] .copy (this);
-				value .addParent (this .getRootNodes ());
-				rootNodes2 .push (value);
-			}
+				try
+				{
+					const
+						inlineNode   = this .body .getNamedNode (importedNode .getInlineNode () .getName ()),
+						exportedName = importedNode .getExportedName ();
+
+					this .body .addImportedNode (inlineNode, exportedName, importedName);
+				}
+				catch (error)
+				{
+					console .error ("Bad IMPORT specification in copy: ", error);
+				}
+			},
+			this);
 		},
-		copyRoutes: function (routes)
+		copyRoutes: function (executionContext, routes)
 		{
-			for (var i = 0, length = routes .length; i < length; ++ i)
+			for (const route of routes)
 			{
 				try
 				{
-					var route = routes [i];
+					const
+						sourceNode      = this .body .getLocalNode (executionContext .getLocalName (route .sourceNode)),
+						destinationNode = this .body .getLocalNode (executionContext .getLocalName (route .destinationNode));
 
-					// new Route ... addUninitializedNode ...
-					this .addRoute (this .getNamedNode (route .sourceNode .getNodeName ()),
-					                route .sourceField,
-					                this .getNamedNode (route .destinationNode .getNodeName ()),
-					                route .destinationField);
+					this .body .addRoute (sourceNode, route .sourceField, destinationNode, route .destinationField);
 				}
 				catch (error)
 				{
@@ -271,33 +275,35 @@ function ($,
 		},
 		toXMLStream: function (stream)
 		{
-			if (Generator .IsSharedNode (this))
+			const generator = Generator .Get (stream);
+
+			if (generator .IsSharedNode (this))
 			{
-				stream .string += Generator .Indent ();
-				stream .string += "<!-- NULL -->";		
+				stream .string += generator .Indent ();
+				stream .string += "<!-- NULL -->";
 				return;
 			}
 
-			Generator .EnterScope ();
+			generator .EnterScope ();
 
-			var name = Generator .Name (this);
+			const name = generator .Name (this);
 
 			if (name .length)
 			{
-				if (Generator .ExistsNode (this))
+				if (generator .ExistsNode (this))
 				{
-					stream .string += Generator .Indent ();
+					stream .string += generator .Indent ();
 					stream .string += "<ProtoInstance";
 					stream .string += " ";
 					stream .string += "name='";
-					stream .string += Generator .XMLEncode (this .getTypeName ());
+					stream .string += generator .XMLEncode (this .getTypeName ());
 					stream .string += "'";
 					stream .string += " ";
 					stream .string += "USE='";
-					stream .string += Generator .XMLEncode (name);
+					stream .string += generator .XMLEncode (name);
 					stream .string += "'";
 
-					var containerField = Generator .ContainerField ();
+					const containerField = generator .ContainerField ();
 
 					if (containerField)
 					{
@@ -305,36 +311,36 @@ function ($,
 						{
 							stream .string += " ";
 							stream .string += "containerField='";
-							stream .string += Generator .XMLEncode (containerField .getName ());
+							stream .string += generator .XMLEncode (containerField .getName ());
 							stream .string += "'";
 						}
 					}
 
 					stream .string += "/>";
 
-					Generator .LeaveScope ();
+					generator .LeaveScope ();
 					return;
 				}
 			}
 
-			stream .string += Generator .Indent ();
+			stream .string += generator .Indent ();
 			stream .string += "<ProtoInstance";
 			stream .string += " ";
 			stream .string += "name='";
-			stream .string += Generator .XMLEncode (this .getTypeName ());
+			stream .string += generator .XMLEncode (this .getTypeName ());
 			stream .string += "'";
 
 			if (name .length)
 			{
-				Generator .AddNode (this);
+				generator .AddNode (this);
 
 				stream .string += " ";
 				stream .string += "DEF='";
-				stream .string += Generator .XMLEncode (name);
+				stream .string += generator .XMLEncode (name);
 				stream .string += "'";
 			}
 
-			var containerField = Generator .ContainerField ();
+			const containerField = generator .ContainerField ();
 
 			if (containerField)
 			{
@@ -342,28 +348,14 @@ function ($,
 				{
 					stream .string += " ";
 					stream .string += "containerField='";
-					stream .string += Generator .XMLEncode (containerField .getName ());
+					stream .string += generator .XMLEncode (containerField .getName ());
 					stream .string += "'";
 				}
 			}
-		
-			var
-				fields   = this .getChangedFields (),
-				metadata = this .metadata_;
 
-			try
-			{
-				metadata = this .getField ("metadata");
-			}
-			catch (error)
-			{ }
+			const fields = this .getChangedFields ();
 
-			if (metadata === this .metadata_)
-			{
-				fields = fields .filter (function (value) { return value !== this .metadata_; } .bind (this));
-			}
-
-			if (fields .length === 0 && (metadata === this .metadata_ ? true || ! metadata .getValue () : true))
+			if (fields .length === 0)
 			{
 				stream .string += "/>";
 			}
@@ -371,41 +363,37 @@ function ($,
 			{
 				stream .string += ">\n";
 
-				Generator .IncIndent ();
+				generator .IncIndent ();
 
-				var references = [ ];
+				const references = [ ];
 
-				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 (generator .ExecutionContext ())
 					{
-						if (field .getAccessType () === X3DConstants .inputOutput && ! $.isEmptyObject (field .getReferences ()))
+						if (field .getAccessType () === X3DConstants .inputOutput && field .getReferences () .size !== 0)
 						{
-							var
-								initializableReference = false,
-								fieldReferences        = field .getReferences ();
+							let initializableReference = false;
 
-							for (var id in fieldReferences)
+							field .getReferences () .forEach (function (fieldReference)
 							{
-								initializableReference |= fieldReferences [id] .isInitializable ();
-							}
+								initializableReference = initializableReference || fieldReference .isInitializable ();
+							});
 
 							if (! initializableReference)
-								mustOutputValue = true;
+								mustOutputValue = ! this .isDefaultValue (field);
 						}
 					}
 
 					// If we have no execution context we are not in a proto and must not generate IS references the same is true
 					// if the node is a shared node as the node does not belong to the execution context.
 
-					if ($.isEmptyObject (field .getReferences ()) || ! Generator .ExecutionContext () || mustOutputValue)
+					if (field .getReferences () .size === 0 || ! generator .ExecutionContext () || mustOutputValue)
 					{
 						if (mustOutputValue)
 							references .push (field);
@@ -414,11 +402,11 @@ function ($,
 						{
 							case X3DConstants .MFNode:
 							{
-								stream .string += Generator .Indent ();
+								stream .string += generator .Indent ();
 								stream .string += "<fieldValue";
 								stream .string += " ";
 								stream .string += "name='";
-								stream .string += Generator .XMLEncode (field .getName ());
+								stream .string += generator .XMLEncode (field .getName ());
 								stream .string += "'";
 
 								if (field .length === 0)
@@ -427,18 +415,22 @@ function ($,
 								}
 								else
 								{
+									generator .PushContainerField (field);
+
 									stream .string += ">\n";
 
-									Generator .IncIndent ();
+									generator .IncIndent ();
 
 									field .toXMLStream (stream);
 
 									stream .string += "\n";
 
-									Generator .DecIndent ();
+									generator .DecIndent ();
 
-									stream .string += Generator .Indent ();
+									stream .string += generator .Indent ();
 									stream .string += "</fieldValue>\n";
+
+									generator .PopContainerField ();
 								}
 
 								break;
@@ -447,36 +439,40 @@ function ($,
 							{
 								if (field .getValue () !== null)
 								{
-									stream .string += Generator .Indent ();
+									generator .PushContainerField (field);
+
+									stream .string += generator .Indent ();
 									stream .string += "<fieldValue";
 									stream .string += " ";
 									stream .string += "name='";
-									stream .string += Generator .XMLEncode (field .getName ())
+									stream .string += generator .XMLEncode (field .getName ());
 									stream .string += "'";
 									stream .string += ">\n";
-									
-									Generator .IncIndent ();
+
+									generator .IncIndent ();
 
 									field .toXMLStream (stream);
 
 									stream .string += "\n";
 
-									Generator .DecIndent ();
+									generator .DecIndent ();
 
-									stream .string += Generator .Indent ();
-									stream .string += "</fieldValue>\n";		
+									stream .string += generator .Indent ();
+									stream .string += "</fieldValue>\n";
+
+									generator .PopContainerField ();
 									break;
 								}
-		
+
 								// Proceed with next case.
 							}
 							default:
 							{
-								stream .string += Generator .Indent ();
+								stream .string += generator .Indent ();
 								stream .string += "<fieldValue";
 								stream .string += " ";
 								stream .string += "name='";
-								stream .string += Generator .XMLEncode (field .getName ())
+								stream .string += generator .XMLEncode (field .getName ());
 								stream .string += "'";
 								stream .string += " ";
 								stream .string += "value='";
@@ -497,63 +493,47 @@ function ($,
 
 				if (references .length)
 				{
-					stream .string += Generator .Indent ();
+					stream .string += generator .Indent ();
 					stream .string += "<IS>";
 					stream .string += "\n";
 
-					Generator .IncIndent ();
-		
-					for (var i = 0, length = references .length; i < length; ++ i)
+					generator .IncIndent ();
+
+					for (const field of references)
 					{
-						var
-							field       = references [i],
-							protoFields = field .getReferences ()
+						const protoFields = field .getReferences ();
 
-						for (var id in protoFields)
+						protoFields .forEach (function (protoField)
 						{
-							var protoField = protoFields [id];
-
-							stream .string += Generator .Indent ();
+							stream .string += generator .Indent ();
 							stream .string += "<connect";
 							stream .string += " ";
 							stream .string += "nodeField='";
-							stream .string += Generator .XMLEncode (field .getName ());
+							stream .string += generator .XMLEncode (field .getName ());
 							stream .string += "'";
 							stream .string += " ";
 							stream .string += "protoField='";
-							stream .string += Generator .XMLEncode (protoField .getName ());
+							stream .string += generator .XMLEncode (protoField .getName ());
 							stream .string += "'";
 							stream .string += "/>\n";
-						}
+						});
 					}
 
-					Generator .DecIndent ();
+					generator .DecIndent ();
 
-					stream .string += Generator .Indent ();
+					stream .string += generator .Indent ();
 					stream .string += "</IS>\n";
 				}
 
-				if (metadata === this .metadata_)
-				{
-					if (metadata .getValue ())
-					{
-						metadata .toXMLStream (stream);
+				generator .DecIndent ();
 
-						stream .string += "\n";
-					}
-				}
-
-				Generator .DecIndent ();
-
-				stream .string += Generator .Indent ();
+				stream .string += generator .Indent ();
 				stream .string += "</ProtoInstance>";
 			}
 
-			Generator .LeaveScope ();
+			generator .LeaveScope ();
 		},
 	});
 
 	return X3DPrototypeInstance;
 });
-
-

package/src/x_ite/Components/Core/X3DSensorNode.js

@@ -48,12 +48,10 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Components/Core/X3DChildNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          X3DChildNode, 
+function (X3DChildNode, 
           X3DConstants)
 {
 "use strict";
@@ -65,7 +63,7 @@ function ($,
 		this .addType (X3DConstants .X3DSensorNode);
 	}
 
-	X3DSensorNode .prototype = $.extend (Object .create (X3DChildNode .prototype),
+	X3DSensorNode .prototype = Object .assign (Object .create (X3DChildNode .prototype),
 	{
 		constructor: X3DSensorNode,
 	});