x_ite 4.2.17 → 4.7.7

package/src/x_ite/Parser/X3DParser.js

@@ -55,6 +55,7 @@ define (function ()
 	{
 		this .scene             = scene;
 		this .executionContexts = [ scene ];
+		this .prototypes        = [ ];
 		this .units             = true;
 	}
 
@@ -70,7 +71,7 @@ define (function ()
 		},
 		getExecutionContext: function ()
 		{
-			return this .executionContexts [this .executionContexts .length - 1];
+			return this .executionContexts .at (-1);
 		},
 		pushExecutionContext: function (executionContext)
 		{
@@ -80,59 +81,79 @@ define (function ()
 		{
 			this .executionContexts .pop ();
 		},
+		getPrototype: function ()
+		{
+			return this .prototypes .at (-1);
+		},
+		pushPrototype: function (prototype)
+		{
+			return this .prototypes .push (prototype);
+		},
+		popPrototype: function ()
+		{
+			this .prototypes .pop ();
+		},
 		isInsideProtoDefinition: function ()
 		{
-			return this .executionContexts .length > 1;
+			return Boolean (this .prototypes .length);
+		},
+		addRootNode: function (node)
+		{
+			this .getExecutionContext () .rootNodes .push (node);
 		},
 		getProviderUrls: (function ()
 		{
-			var componentsUrl = /\.js$/;
+			const componentsUrl = /\.js$/;
 
 			return function ()
 			{
-				var
-					profileComponents = this .getScene () .getProfile () .components,
-					components        = this .getScene () .getComponents (),
+				const
+					scene             = this .getScene (),
+					profile           = scene .getProfile () ? scene .getProfile () : scene .getBrowser () .getProfile ("Full"),
+					profileComponents = profile .components,
+					components        = scene .getComponents (),
 					providerUrls      = new Set ();
 
-				for (var i = 0, length = profileComponents .length; i < length; ++ i)
+				for (const component of profileComponents)
 				{
-					var providerUrl = profileComponents [i] .providerUrl;
-	
+					const providerUrl = component .providerUrl;
+
 					if (providerUrl .match (componentsUrl))
 						providerUrls .add (providerUrl);
 				}
 
-				for (var i = 0, length = components .length; i < length; ++ i)
+				for (const component of components)
 				{
-					var providerUrl = components [i] .providerUrl;
-	
+					const providerUrl = component .providerUrl;
+
 					if (providerUrl .match (componentsUrl))
 						providerUrls .add (providerUrl);
 				}
 
+				if (typeof globalRequire === "function")
+				{
+					for (const url of providerUrls)
+						globalRequire (new URL (url) .pathname);
+				}
+
 				return Array .from (providerUrls);
 			};
 		})(),
-		addRootNode: function (node)
-		{
-			this .getExecutionContext () .rootNodes .push (node);
-		},
 		setUnits: function (generator)
 		{
-			if ((typeof arguments [0]) == "boolean")
+			if (typeof arguments [0] == "boolean")
 			{
 				this .units = arguments [0];
 				return;
 			}
 
-			var
+			const
 				version = /Titania\s+V(\d+).*/,
 				match   = generator .match (version);
 
 			if (match)
 			{
-				var major = parseInt (match [1]);
+				const major = parseInt (match [1]);
 
 				// Before version 4 units are wrongly implemented.
 				if (major < 4)
@@ -141,7 +162,7 @@ define (function ()
 					return;
 				}
 			}
-		
+
 			this .units = true;
 		},
 		getUnits: function ()

package/src/x_ite/Parser/XMLParser.js

@@ -67,7 +67,7 @@ function ($,
           Fields,
           Parser,
           X3DParser,
-          HTMLSupport,   
+          HTMLSupport,
           X3DExternProtoDeclaration,
           X3DProtoDeclaration,
           X3DConstants)
@@ -105,8 +105,9 @@ function ($,
 		constructor: XMLParser,
 		parseIntoScene: function (xmlElement, success, error)
 		{
-			this .success = success;
-			this .error   = error;
+			this .scene .dom = xmlElement;
+			this .success    = success;
+			this .error      = error;
 
 			this .getScene () .setEncoding ("XML");
 			this .getScene () .setProfile (this .getBrowser () .getProfile ("Full"));
@@ -137,28 +138,119 @@ function ($,
 							this .x3dElement (X3D [i]);
 					}
 					else
-						this .childrenElements (xmlElement);
+					{
+						if (this .success)
+						{
+							require (this .getProviderUrls (),
+							function ()
+							{
+								try
+								{
+									this .childrenElements (xmlElement);
+									this .success (this .getScene ());
+								}
+								catch (error)
+								{
+									if (this .error)
+										this .error (error);
+								}
+							}
+							.bind (this),
+							function (error)
+							{
+								if (this .error)
+									this .error (error);
+							}
+							.bind (this));
+						}
+						else
+						{
+							this .childrenElements (xmlElement);
+						}
+					}
 
 					break;
 				}
 				case "X3D":
+				{
 					this .x3dElement (xmlElement);
 					break;
+				}
 				case "Scene":
 				case "SCENE":
-					this .sceneElement (xmlElement);
+				{
+					if (this .success)
+					{
+						require (this .getProviderUrls (),
+						function ()
+						{
+							try
+							{
+								this .sceneElement (xmlElement);
+								this .success (this .getScene ());
+							}
+							catch (error)
+							{
+								if (this .error)
+									this .error (error);
+							}
+						}
+						.bind (this),
+						function (error)
+						{
+							if (this .error)
+								this .error (error);
+						}
+						.bind (this));
+					}
+					else
+					{
+						this .sceneElement (xmlElement);
+					}
+
 					break;
+				}
 				default:
-					this .childElement (xmlElement);
+				{
+					if (this .success)
+					{
+						require (this .getProviderUrls (),
+						function ()
+						{
+							try
+							{
+								this .childrenElements (xmlElement);
+								this .success (this .getScene ());
+							}
+							catch (error)
+							{
+								if (this .error)
+									this .error (error);
+							}
+						}
+						.bind (this),
+						function (error)
+						{
+							if (this .error)
+								this .error (error);
+						}
+						.bind (this));
+					}
+					else
+					{
+						this .childrenElements (xmlElement);
+					}
+
 					break;
+				}
 			}
 		},
 		x3dElement: function (xmlElement)
 		{
-			// Profile
-
 			try
 			{
+				// Profile
+
 				var
 					profileNameId = xmlElement .getAttribute ("profile"),
 					profile       = this .getBrowser () .getProfile (profileNameId || "Full");
@@ -175,7 +267,7 @@ function ($,
 			var specificationVersion = xmlElement .getAttribute ("version");
 
 			if (specificationVersion)
-				this .getScene () .specificationVersion = specificationVersion;
+				this .getScene () .setSpecificationVersion (specificationVersion);
 
 			// Process child nodes
 
@@ -194,17 +286,19 @@ function ($,
 						for (var i = 0; i < childNodes .length; ++ i)
 							this .x3dElementChildScene (childNodes [i])
 
-						this .success ();
+						this .success (this .getScene ());
 					}
 					catch (error)
 					{
-						this .error (error);
+						if (this .error)
+							this .error (error);
 					}
 				}
 				.bind (this),
 				function (error)
 				{
-					this .error (error);
+					if (this .error)
+						this .error (error);
 				}
 				.bind (this));
 			}
@@ -237,7 +331,7 @@ function ($,
 		headElement: function (xmlElement)
 		{
 			var childNodes = xmlElement .childNodes;
-	
+
 			for (var i = 0; i < childNodes .length; ++ i)
 				this .headElementChild (childNodes [i]);
 
@@ -274,15 +368,15 @@ function ($,
 				var
 					componentNameIdCharacters = xmlElement .getAttribute ("name"),
 					componentSupportLevel = parseInt (xmlElement .getAttribute ("level"));
-	
+
 				if (componentNameIdCharacters === null)
 					return console .warn ("XML Parser Error: Bad component statement: Expected name attribute.");
-	
+
 				if (componentSupportLevel === null)
 					return console .warn ("XML Parser Error: Bad component statement: Expected level attribute.");
 
 				var component = this .getBrowser () .getComponent (componentNameIdCharacters, componentSupportLevel);
-	
+
 				this .getScene () .addComponent (component);
 			}
 			catch (error)
@@ -315,7 +409,7 @@ function ($,
 				metavalue = xmlElement .getAttribute ("content");
 
 			if (metakey === null)
-				return console .warn ("XML Parser Error: Bad meta statement: Expected name attribute.");	
+				return console .warn ("XML Parser Error: Bad meta statement: Expected name attribute.");
 
 			if (metavalue === null)
 				return console .warn ("XML Parser Error: Bad meta statement: Expected content attribute.");
@@ -344,7 +438,7 @@ function ($,
 				case "#cdata-section":
 					this .cdataNode (xmlElement);
 					return;
-				
+
 				case "ExternProtoDeclare":
 				case "EXTERNPROTODECLARE":
 					this .externProtoDeclareElement (xmlElement);
@@ -401,12 +495,12 @@ function ($,
 
 				if (url === null)
 					return console .warn ("XML Parser Error: Bad ExternProtoDeclare statement: Expected url attribute.");
-				
+
 				this .parser .setInput (url);
 				Parser .prototype .sfstringValues .call (this .parser, this .url);
 
 				var externproto = new X3DExternProtoDeclaration (this .getExecutionContext ());
-							
+
 				this .pushParent (externproto);
 				this .protoInterfaceElement (xmlElement); // parse fields
 				this .popParent ();
@@ -415,7 +509,7 @@ function ($,
 				externproto .url_ = this .url;
 				externproto .setup ();
 
-				this .getExecutionContext () .externprotos .add (name, externproto);	
+				this .getExecutionContext () .externprotos .add (name, externproto);
 			}
 		},
 		protoDeclareElement: function (xmlElement)
@@ -458,11 +552,13 @@ function ($,
 						case "ProtoBody":
 						case "PROTOBODY":
 						{
-							this .pushExecutionContext (proto);
+							this .pushPrototype (proto);
+							this .pushExecutionContext (proto .getBody ());
 							this .pushParent (proto);
 							this .protoBodyElement (child);
 							this .popParent ();
 							this .popExecutionContext ();
+							this .popPrototype ();
 							break;
 						}
 						default:
@@ -503,39 +599,39 @@ function ($,
 					return;
 
 				var node = this .getParent ();
-	
+
 				if (! (node instanceof X3DBaseNode))
 					return;
 
 				if (! node .hasUserDefinedFields ())
 					return;
-	
+
 				var accessType = AccessType [xmlElement .getAttribute ("accessType")];
-	
+
 				if (accessType === undefined)
 					accessType = X3DConstants .initializeOnly;
-	
+
 				var type = Fields [xmlElement .getAttribute ("type")];
-	
+
 				if (type === undefined)
 					return;
-	
+
 				var name = xmlElement .getAttribute ("name");
-	
+
 				if (! this .id (name))
 					return;
-	
+
 				var field = new type ();
-	
+
 				if (accessType & X3DConstants .initializeOnly)
 				{
 					this .fieldValue (field, xmlElement .getAttribute ("value"));
-	
+
 					this .pushParent (field);
 					this .childrenElements (xmlElement);
 					this .popParent ();
 				}
-	
+
 				node .addUserDefinedField (accessType, name, field);
 			}
 			catch (error)
@@ -549,7 +645,7 @@ function ($,
 		},
 		isElement: function (xmlElement)
 		{
-			if (this .getExecutionContext () instanceof X3DProtoDeclaration)
+			if (this .isInsideProtoDefinition ())
 			{
 				var childNodes = xmlElement .childNodes;
 
@@ -586,7 +682,7 @@ function ($,
 
 				var
 					node  = this .getParent (),
-					proto = this .getExecutionContext ();
+					proto = this .getPrototype ();
 
 				if (! (node instanceof X3DBaseNode))
 					return;
@@ -600,10 +696,10 @@ function ($,
 					if (protoField .isReference (nodeField .getAccessType ()))
 						nodeField .addReference (protoField);
 					else
-						throw new Error ("Field '" + nodeField .getName () + "' and '" + protoField .getName () + "' in PROTO " + this .getExecutionContext () . getName () + " are incompatible as an IS mapping.");
+						throw new Error ("Field '" + nodeField .getName () + "' and '" + protoField .getName () + "' in PROTO " + proto .getName () + " are incompatible as an IS mapping.");
 				}
 				else
-					throw new Error ("Field '" + nodeField .getName () + "' and '" + protoField .getName () + "' in PROTO " + this .getExecutionContext () .getName () + " have different types.");
+					throw new Error ("Field '" + nodeField .getName () + "' and '" + protoField .getName () + "' in PROTO " + this .proto .getName () + " have different types.");
 			}
 			catch (error)
 			{
@@ -623,6 +719,9 @@ function ($,
 				{
 					var node = this .getExecutionContext () .createProto (name, false);
 
+					if (! node)
+						throw new Error ("Unknown proto or externproto type '" + name + "'.");
+
 					//AP: attach node to DOM xmlElement for access from DOM.
 					xmlElement .x3d = node;
 
@@ -630,7 +729,10 @@ function ($,
 					this .addNode (xmlElement, node);
 					this .pushParent (node);
 					this .childrenElements (xmlElement);
-					this .getExecutionContext () .addUninitializedNode (node);
+
+					if (! this .isInsideProtoDefinition ())
+						node .setup ();
+
 					this .popParent ();
 				}
 			}
@@ -663,6 +765,11 @@ function ($,
 
 				if (accessType & X3DConstants .initializeOnly)
 				{
+					if (field .getType () === X3DConstants .MFNode)
+					{
+						field .length = 0
+					}
+
 					this .fieldValue (field, xmlElement .getAttribute ("value"));
 
 					this .pushParent (field);
@@ -684,6 +791,9 @@ function ($,
 
 				var node = this .getExecutionContext () .createNode (xmlElement .nodeName, false);
 
+				if (! node)
+					throw new Error ("Unknown node type '" + xmlElement .nodeName + "', you probably have insufficient component/profile statements.");
+
 				//AP: attach node to DOM xmlElement for access from DOM.
 				xmlElement .x3d = node;
 
@@ -692,11 +802,22 @@ function ($,
 				this .pushParent (node);
 				this .nodeAttributes (xmlElement, node);
 				this .childrenElements (xmlElement);
-				this .getExecutionContext () .addUninitializedNode (node);
+
+				if (! this .isInsideProtoDefinition ())
+					node .setup ();
+
 				this .popParent ();
 			}
 			catch (error)
 			{
+				// NULL
+
+				if (xmlElement .nodeName == "NULL")
+				{
+					this .addNode (xmlElement, null);
+					return;
+				}
+
 				//console .error (error);
 
 				console .error ("XML Parser Error: " + error .message);
@@ -734,6 +855,7 @@ function ($,
 			}
 			catch (error)
 			{
+				console .log (error);
 				console .warn ("XML Parser Error: " + error .message);
 			}
 		},
@@ -804,7 +926,6 @@ function ($,
 				if (field)
 				{
 					field .push (xmlElement .data);
-					field .setSet (true);
 				}
 			}
 		},
@@ -874,7 +995,7 @@ function ($,
 			}
 			catch (error)
 			{
-				//console .warn (error .message);
+				//console .warn (error);
 			}
 		},
 		fieldValue: function (field, value)
@@ -882,8 +1003,6 @@ function ($,
 			if (value === null)
 				return;
 
-			field .setSet (true);
-
 			this .parser .pushExecutionContext (this .getExecutionContext ());
 
 			this .parser .setInput (value);
@@ -907,39 +1026,40 @@ function ($,
 				{
 					case X3DConstants .SFNode:
 						parent .setValue (node);
-						parent .setSet (true);
 						return;
 
 					case X3DConstants .MFNode:
 						parent .push (node);
-						parent .setSet (true);
 						return;
 				}
-					
+
 				return;
 			}
-				
+
 			// parent is a node.
 
 			try
 			{
 				var containerField = xmlElement .getAttribute ("containerField");
-				
+
 				if (! containerField)
-					containerField = node .getContainerField ();
-				
+				{
+					if (node)
+						containerField = node .getContainerField ();
+					else
+						throw new Error ("NULL node must have a container field attribute.");
+				}
+
 				var field = parent .getField (containerField);
 
 				switch (field .getType ())
 				{
 					case X3DConstants .SFNode:
 						field .setValue (node);
-						field .setSet (true);
 						return;
 
 					case X3DConstants .MFNode:
 						field .push (node);
-						field .setSet (true);
 						return;
 				}
 			}
@@ -954,7 +1074,7 @@ function ($,
 		},
 		getParent: function ()
 		{
-			return this .parents [this .parents .length - 1];
+			return this .parents .at (-1);
 		},
 		pushParent: function (parent)
 		{
@@ -976,10 +1096,8 @@ function ($,
 		},
 		attributeToCamelCase: function (name)
 		{
-			if (name !== name .toLowerCase())
-				return name ;
-			
-			return HTMLSupport .attributeLowerCaseToCamelCase [name] ;
+			// Function also needed by X_ITE DOM.
+			return HTMLSupport .fields .get (name);
 		},
 	});
 
@@ -995,9 +1113,9 @@ function ($,
 	XMLParser .prototype .fieldTypes [X3DConstants .SFMatrix3d]  = Parser .prototype .sfmatrix3fValue;
 	XMLParser .prototype .fieldTypes [X3DConstants .SFMatrix4f]  = Parser .prototype .sfmatrix4dValue;
 	XMLParser .prototype .fieldTypes [X3DConstants .SFMatrix4d]  = Parser .prototype .sfmatrix4fValue;
-	XMLParser .prototype .fieldTypes [X3DConstants .SFNode]      = function (field) { field .set (null); };
+	XMLParser .prototype .fieldTypes [X3DConstants .SFNode]      = function (field) { field .setValue (null); };
 	XMLParser .prototype .fieldTypes [X3DConstants .SFRotation]  = Parser .prototype .sfrotationValue;
-	XMLParser .prototype .fieldTypes [X3DConstants .SFString]    = function (field) { field .set (this .input); };
+	XMLParser .prototype .fieldTypes [X3DConstants .SFString]    = function (field) { field .setValue (Fields .SFString .unescape (this .input)); };
 	XMLParser .prototype .fieldTypes [X3DConstants .SFTime]      = Parser .prototype .sftimeValue;
 	XMLParser .prototype .fieldTypes [X3DConstants .SFVec2d]     = Parser .prototype .sfvec2dValue;
 	XMLParser .prototype .fieldTypes [X3DConstants .SFVec2f]     = Parser .prototype .sfvec2fValue;
@@ -1017,7 +1135,7 @@ function ($,
 	XMLParser .prototype .fieldTypes [X3DConstants .MFMatrix3f]  = Parser .prototype .sfmatrix3fValues;
 	XMLParser .prototype .fieldTypes [X3DConstants .MFMatrix4d]  = Parser .prototype .sfmatrix4dValues;
 	XMLParser .prototype .fieldTypes [X3DConstants .MFMatrix4f]  = Parser .prototype .sfmatrix4fValues;
-	XMLParser .prototype .fieldTypes [X3DConstants .MFNode]      = function () { };
+	XMLParser .prototype .fieldTypes [X3DConstants .MFNode]      = function (field) { field .length = 0; };
 	XMLParser .prototype .fieldTypes [X3DConstants .MFRotation]  = Parser .prototype .sfrotationValues;
 	XMLParser .prototype .fieldTypes [X3DConstants .MFString]    = Parser .prototype .sfstringValues;
 	XMLParser .prototype .fieldTypes [X3DConstants .MFTime]      = Parser .prototype .sftimeValues;

package/src/x_ite/Prototype/ExternProtoDeclarationArray.js

@@ -62,6 +62,23 @@ function (X3DInfoArray)
 	ExternProtoDeclarationArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),
 	{
 		constructor: ExternProtoDeclarationArray,
+		toVRMLStream: function (stream)
+		{
+			this .array .forEach (function (value)
+			{
+				try
+				{
+					value .toVRMLStream (stream);
+	
+					stream .string += "\n";
+					stream .string += "\n";
+				}
+				catch (error)
+				{
+					console .log (error);
+				}
+			});
+		},
 	});
 
 	return ExternProtoDeclarationArray;

package/src/x_ite/Prototype/ProtoDeclarationArray.js

@@ -62,6 +62,23 @@ function (X3DInfoArray)
 	ProtoDeclarationArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),
 	{
 		constructor: ProtoDeclarationArray,
+		toVRMLStream: function (stream)
+		{
+			this .array .forEach (function (value)
+			{
+				try
+				{
+					value .toVRMLStream (stream);
+	
+					stream .string += "\n";
+					stream .string += "\n";
+				}
+				catch (error)
+				{
+					console .log (error);
+				}
+			});
+		},
 	});
 
 	return ProtoDeclarationArray;