x_ite 4.2.17 → 4.7.7

package/src/x_ite/Execution/X3DScene.js

@@ -50,19 +50,23 @@
 define ([
 	"x_ite/Fields",
 	"x_ite/Execution/X3DExecutionContext",
+	"x_ite/Configuration/ComponentInfoArray",
 	"x_ite/Configuration/UnitInfo",
 	"x_ite/Configuration/UnitInfoArray",
 	"x_ite/Execution/ExportedNode",
 	"x_ite/Bits/X3DConstants",
 	"x_ite/InputOutput/Generator",
+	"x_ite/Fields/SFNodeCache",
 ],
 function (Fields,
           X3DExecutionContext,
+          ComponentInfoArray,
           UnitInfo,
           UnitInfoArray,
           ExportedNode,
           X3DConstants,
-          Generator)
+          Generator,
+          SFNodeCache)
 {
 "use strict";
 
@@ -72,15 +76,22 @@ function (Fields,
 
 		this .getRootNodes () .setAccessType (X3DConstants .inputOutput);
 
-		this .unitArray = new UnitInfoArray ();
+		this ._specificationVersion = "3.3";
+		this ._encoding             = "SCRIPTED";
+		this ._profile              = null;
+		this ._components           = new ComponentInfoArray ([ ]);
+		this ._worldURL             = location .toString ();
+		this ._units                = new UnitInfoArray ();
 
-		this .unitArray .add ("angle",  new UnitInfo ("angle",  "radian",   1));
-		this .unitArray .add ("force",  new UnitInfo ("force",  "newton",   1));
-		this .unitArray .add ("length", new UnitInfo ("length", "metre",    1));
-		this .unitArray .add ("mass",   new UnitInfo ("mass",   "kilogram", 1));
+		this ._units .add ("angle",  new UnitInfo ("angle",  "radian",   1));
+		this ._units .add ("force",  new UnitInfo ("force",  "newton",   1));
+		this ._units .add ("length", new UnitInfo ("length", "metre",    1));
+		this ._units .add ("mass",   new UnitInfo ("mass",   "kilogram", 1));
 
-		this .metadata      = { };
-		this .exportedNodes = { };
+		this ._metadata      = new Map ();
+		this ._exportedNodes = new Map ();
+
+		this .rootNodes_ .setAccessType (X3DConstants .inputOutput);
 
 		this .setLive (false);
 	}
@@ -88,7 +99,7 @@ function (Fields,
 	X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .prototype),
 	{
 		constructor: X3DScene,
-		isMasterContext: function ()
+		isMainContext: function ()
 		{
 			return this === this .getExecutionContext ();
 		},
@@ -98,16 +109,56 @@ function (Fields,
 		},
 		getScene: function ()
 		{
-			if (this .isMasterContext ())
+			if (this .isMainContext ())
 				return this;
 
 			return this .getExecutionContext () .getScene ();
 		},
+		setSpecificationVersion: function (specificationVersion)
+		{
+			this ._specificationVersion = specificationVersion;
+		},
+		getSpecificationVersion: function ()
+		{
+			return this ._specificationVersion;
+		},
+		setEncoding: function (encoding)
+		{
+			this ._encoding = encoding;
+		},
+		getEncoding: function ()
+		{
+			return this ._encoding;
+		},
+		setWorldURL: function (url)
+		{
+			this ._worldURL = url;
+		},
+		getWorldURL: function ()
+		{
+			return this ._worldURL;
+		},
+		setProfile: function (profile)
+		{
+			this ._profile = profile;
+		},
+		getProfile: function ()
+		{
+			return this ._profile;
+		},
+		addComponent: function (component)
+		{
+			this ._components .add (component .name, component);
+		},
+		getComponents: function ()
+		{
+			return this ._components;
+		},
 		updateUnit: function (category, name, conversionFactor)
 		{
 			// Private function.
 
-			var unit = this .unitArray .get (category);
+			const unit = this ._units .get (category);
 
 			if (! unit)
 				return;
@@ -117,7 +168,7 @@ function (Fields,
 		},
 		getUnits: function ()
 		{
-			return this .unitArray;
+			return this ._units;
 		},
 		fromUnit: function (category, value)
 		{
@@ -158,7 +209,7 @@ function (Fields,
 			   case "length":
 			   case "mass":
 					return value / this .getUnits () .get (category) .conversionFactor;
-			
+
 				// Derived units
 
 				case "acceleration:":
@@ -180,23 +231,23 @@ function (Fields,
 			if (! name .length)
 				return;
 
-			this .metadata [name] = String (value);
+			this ._metadata .set (name, String (value));
 		},
 		removeMetaData: function (name)
 		{
-			delete this .metadata [name];
+			this ._metadata .delete (name);
 		},
 		getMetaData: function (name)
 		{
-			return this .metadata [name];
+			return this ._metadata .get (name);
 		},
-		getMetadata: function ()
+		getMetaDatas: function ()
 		{
-			return Object .assign ({ }, this .metadata);
+			return this ._metadata;
 		},
 		addExportedNode: function (exportedName, node)
 		{
-			if (this .exportedNodes [exportedName])
+			if (this ._exportedNodes .has (exportedName))
 				throw new Error ("Couldn't add exported node: exported name '" + exportedName + "' already in use.");
 
 			this .updateExportedNode (exportedName, node);
@@ -217,24 +268,26 @@ function (Fields,
 			//if (node .getValue () .getExecutionContext () !== this)
 			//	throw new Error ("Couldn't update exported node: node does not belong to this execution context.");
 
-			this .exportedNodes [exportedName] = new ExportedNode (exportedName, node .getValue ());
+			const exportedNode = new ExportedNode (exportedName, node .getValue ());
+
+			this ._exportedNodes .set (exportedName, exportedNode);
 		},
 		removeExportedNode: function (exportedName)
 		{
-			delete this .exportedNodes [exportedName];
+			this ._exportedNodes .delete (exportedName);
 		},
 		getExportedNode: function (exportedName)
 		{
-			var exportedNode = this .exportedNodes [exportedName];
+			const exportedNode = this ._exportedNodes .get (exportedName);
 
 			if (exportedNode)
-				return exportedNode .getLocalNode ();	
+				return SFNodeCache .get (exportedNode .getLocalNode ());
 
 			throw new Error ("Exported node '" + exportedName + "' not found.");
 		},
 		getExportedNodes: function ()
 		{
-			return this .exportedNodes;
+			return this ._exportedNodes;
 		},
 		addRootNode: function (node)
 		{
@@ -244,9 +297,9 @@ function (Fields,
 			if (! (node instanceof Fields .SFNode))
 				throw new Error ("Couldn't add root node: node must be of type SFNode.");
 
-			var rootNodes = this .getRootNodes ();
+			const rootNodes = this .getRootNodes ();
 
-			for (var i = 0, length = rootNodes .length; i < length; ++ i)
+			for (let i = 0, length = rootNodes .length; i < length; ++ i)
 			{
 				if (rootNodes [i] .equals (node))
 					return;
@@ -262,7 +315,7 @@ function (Fields,
 			if (! (node instanceof Fields .SFNode))
 				throw new Error ("Couldn't remove root node: node must be of type SFNode.");
 
-			var
+			const
 				rootNodes = this .getRootNodes (),
 				length    = rootNodes .length;
 
@@ -272,22 +325,133 @@ function (Fields,
 		{
 			this .getRootNodes () .setValue (value);
 		},
+		toStream: function (stream)
+		{
+			stream .string += Object .prototype .toString .call (this);
+		},
+		toVRMLStream: function (stream)
+		{
+			const generator = Generator .Get (stream);
+
+			let specificationVersion = this .getSpecificationVersion ();
+
+			if (specificationVersion === "2.0")
+				specificationVersion = "3.3";
+
+			stream .string += "#X3D V";
+			stream .string += specificationVersion;
+			stream .string += " ";
+			stream .string += "utf8";
+			stream .string += " ";
+			stream .string += this .getBrowser () .name;
+			stream .string += " ";
+			stream .string += "V";
+			stream .string += this .getBrowser () .version;
+			stream .string += "\n";
+			stream .string += "\n";
+
+			const profile = this .getProfile ();
+
+			if (profile)
+			{
+				profile .toVRMLStream (stream);
+
+				stream .string += "\n";
+				stream .string += "\n";
+			}
+
+			const components = this .getComponents ();
+
+			if (components .length)
+			{
+				components .toVRMLStream (stream);
+
+				stream .string += "\n";
+			}
+
+			// Units
+			{
+				let empty = true;
+
+				for (const unit of this .getUnits ())
+				{
+					if (unit .conversionFactor !== 1)
+					{
+						empty = false;
+
+						unit .toVRMLStream (stream);
+
+						stream .string += "\n";
+					}
+				}
+
+				if (! empty)
+					stream .string += "\n";
+			}
+
+			const metadata = this .getMetaDatas ();
+
+			if (metadata .size)
+			{
+				metadata .forEach (function (value, key)
+				{
+					stream .string += "META";
+					stream .string += " ";
+					stream .string += new Fields .SFString (key) .toString ();
+					stream .string += " ";
+					stream .string += new Fields .SFString (value) .toString ();
+					stream .string += "\n";
+				});
+
+				stream .string += "\n";
+			}
+
+			const exportedNodes = this .getExportedNodes ();
+
+			generator .PushExecutionContext (this);
+			generator .EnterScope ();
+			generator .ExportedNodes (exportedNodes);
+
+			X3DExecutionContext .prototype .toVRMLStream .call (this, stream);
+
+			if (exportedNodes .size)
+			{
+				stream .string += "\n";
+
+				exportedNodes .forEach (function (exportedNode)
+				{
+					try
+					{
+						exportedNode .toVRMLStream (stream);
+
+						stream .string += "\n";
+					}
+					catch (error)
+					{
+						console .log (error);
+					}
+				});
+			}
+
+			generator .LeaveScope ();
+			generator .PopExecutionContext ();
+		},
 		toXMLStream: function (stream)
 		{
-			var
-				generator            = Generator .Get (stream),
-				specificationVersion = this .getSpecificationVersion ();
+			const generator = Generator .Get (stream);
+
+			let specificationVersion = this .getSpecificationVersion ();
 
 			if (specificationVersion === "2.0")
 				specificationVersion = "3.3";
-		
+
 			stream .string += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 			stream .string += "<!DOCTYPE X3D PUBLIC \"ISO//Web3D//DTD X3D ";
 			stream .string += specificationVersion;
 			stream .string += "//EN\" \"http://www.web3d.org/specifications/x3d-";
 			stream .string += specificationVersion;
 			stream .string += ".dtd\">\n";
-		
+
 			stream .string += "<X3D";
 			stream .string += " ";
 			stream .string += "profile='";
@@ -310,17 +474,13 @@ function (Fields,
 			stream .string += "<head>\n";
 
 			generator .IncIndent ();
-		
+
 			// <head>
 
 			this .getComponents () .toXMLStream (stream);
 
-			var units = this .getUnits ();
-
-			for (var i = 0, length = units .length; i < length; ++ i)
+			for (const unit of this .getUnits ())
 			{
-				var unit = units [i];
-
 				if (unit .conversionFactor !== 1)
 				{
 					unit .toXMLStream (stream);
@@ -328,10 +488,8 @@ function (Fields,
 					stream .string += "\n";
 				}
 			}
-		
-			var metaDatas = this .metadata;
 
-			for (var key in metaDatas)
+			this .getMetaDatas () .forEach (function (value, key)
 			{
 				stream .string += generator .Indent ();
 				stream .string += "<meta";
@@ -341,11 +499,11 @@ function (Fields,
 				stream .string += "'";
 				stream .string += " ";
 				stream .string += "content='";
-				stream .string += generator .XMLEncode (metaDatas [key]);
+				stream .string += generator .XMLEncode (value);
 				stream .string += "'";
 				stream .string += "/>\n";
-			}
-		
+			});
+
 			// </head>
 
 			generator .DecIndent ();
@@ -356,28 +514,30 @@ function (Fields,
 			stream .string += "<Scene>\n";
 
 			generator .IncIndent ();
-		
+
 			// <Scene>
 
-			var exportedNodes = this .getExportedNodes ();
+			const exportedNodes = this .getExportedNodes ();
 
 			generator .PushExecutionContext (this);
 			generator .EnterScope ();
 			generator .ExportedNodes (exportedNodes);
 
 			X3DExecutionContext .prototype .toXMLStream .call (this, stream);
-		
-			for (var exportedName in exportedNodes)
+
+			exportedNodes .forEach (function (exportedNode)
 			{
-				//try
+				try
 				{
-					exportedNodes [exportedName] .toXMLStream (stream);
+					exportedNode .toXMLStream (stream);
 
 					stream .string += "\n";
 				}
-				//catch (const X3DError &)
-				{ }
-			}
+				catch (error)
+				{
+					console .log (error);
+				}
+			});
 
 			generator .LeaveScope ();
 			generator .PopExecutionContext ();

package/src/x_ite/{Error.js → Fallback.js}

@@ -56,42 +56,39 @@ function ($)
 
 	// Everything went wrong when the Error function is called.
 
-	function Error (error, fallbacks)
+	const Fallback =
 	{
-		$(function ()
+		error: function (error, fallbacks)
 		{
-		   var elements = $("X3DCanvas");
-
-			Error .fallback (elements, error);
-
-			for (var i = 0; i < fallbacks .length; ++ i)
+			$(function ()
 			{
-			   var fallback = fallbacks [i];
-
-				if (typeof fallback === "function")
-				   fallback (elements, error);
-			}
-		});
-	}
+				const elements = $("X3DCanvas");
 
-	// In some browser went something wrong when the fallback function is called.
+				this .show (elements, error);
 
-	function fallback (elements, error)
-	{
-		console .log (error);
-
-		var consoleElement = $(".x_ite-console");
+				for (const fallback of fallbacks)
+				{
+					if (typeof fallback === "function")
+						fallback (elements, error);
+				}
+			}
+			.bind (this));
+		},
+		show: function (elements, error)
+		{
+			console .log (error);
 
-		if (consoleElement .length)
-			consoleElement .append (document .createTextNode (error));
+			const consoleElement = $(".x_ite-console");
 
-		elements .addClass ("x_ite-browser-fallback");
-		elements .children (".x_ite-private-browser") .hide ();
-		elements .children (":not(.x_ite-private-browser)") .addClass ("x_ite-fallback");
-		elements .children (":not(.x_ite-private-browser)") .show ();
-	}
+			if (consoleElement .length)
+				consoleElement .append (document .createTextNode (error));
 
-	Error .fallback = fallback;
+			elements .addClass ("x_ite-browser-fallback");
+			elements .children (".x_ite-private-browser") .hide ();
+			elements .children (":not(.x_ite-private-browser)") .addClass ("x_ite-fallback");
+			elements .children (":not(.x_ite-private-browser)") .show ();
+		},
+	};
 
-	return Error;
+	return Fallback;
 });