x_ite 4.2.17 → 4.7.7

package/src/x_ite/Configuration/UnitInfo.js

@@ -68,9 +68,19 @@ function (Generator)
 	Object .assign (UnitInfo .prototype,
 	{
 		constructor: UnitInfo,
+		toVRMLStream: function (stream)
+		{
+			stream .string += "UNIT";
+			stream .string += " ";
+			stream .string += this .category;
+			stream .string += " ";
+			stream .string += this .name;
+			stream .string += " ";
+			stream .string += this .conversionFactor;
+		},
 		toXMLStream: function (stream)
 		{
-			var generator = Generator .Get (stream);
+			const generator = Generator .Get (stream);
 
 			stream .string += generator .Indent ();
 			stream .string += "<unit";
@@ -98,4 +108,4 @@ function (Generator)
 	});
 
 	return UnitInfo;
-});
+});

package/src/x_ite/Configuration/X3DInfoArray.js

@@ -51,11 +51,11 @@ define (function ()
 {
 "use strict";
 
-	var handler =
+	const handler =
 	{
 		get: function (target, key)
 		{
-			var value = target [key];
+			let value = target [key];
 
 			if (value !== undefined)
 				return value;
@@ -65,7 +65,7 @@ define (function ()
 			if (value !== undefined)
 				return value;
 
-			return target .index [key];
+			return target .index .get (key);
 		},
 		set: function (target, key, value)
 		{
@@ -73,18 +73,17 @@ define (function ()
 		},
 		has: function (target, key)
 		{
-			return key in target .array || key in target .index;
-		},
-		enumerate: function (target)
-		{
-			return Object .keys (target .array) [Symbol.iterator] ();
+			if (Number .isInteger (+key))
+				return key < target .array .length;
+
+			return key in target;
 		},
 	};
 
 	function X3DInfoArray ()
 	{
 		this .array = [ ];
-		this .index = { };
+		this .index = new Map ();
 
 		return new Proxy (this, handler);
 	}
@@ -95,31 +94,51 @@ define (function ()
 		add: function (key, value)
 		{
 			this .array .push (value);
-			this .index [key] = value;
+			this .index .set (key, value);
+		},
+		addAlias: function (key, value)
+		{
+			this .index .set (key, this .index .get (value));
 		},
 		get: function (key)
 		{
-			return this .index [key];
+			return this .index .get (key);
 		},
 		getValue: function ()
 		{
 			return this .array;
 		},
-		toXMLStream: function (stream)
+		toVRMLStream: function (stream)
 		{
-			var array = this .array;
+			this .array .forEach (function (value)
+			{
+				try
+				{
+					value .toVRMLStream (stream);
 
-			for (var i = 0, length = array .length; i < length; ++ i)
+					stream .string += "\n";
+				}
+				catch (error)
+				{
+					console .log (error);
+				}
+			});
+		},
+		toXMLStream: function (stream)
+		{
+			this .array .forEach (function (value)
 			{
 				try
 				{
-					array [i] .toXMLStream (stream);
-	
+					value .toXMLStream (stream);
+
 					stream .string += "\n";
 				}
 				catch (error)
-				{ }
-			}
+				{
+					console .log (error);
+				}
+			});
 		},
 	});
 

package/src/x_ite/Execution/BindableList.js

@@ -54,27 +54,14 @@ function (X3DBaseNode)
 {
 "use strict";
 
-	function equals (lhs, rhs)
-	{
-		if (lhs .length !== rhs .length)
-			return false;
-
-		for (var i = 0; i < lhs .length; ++ i)
-		{
-			if (lhs [i] !== rhs [i])
-				return false
-		}
-
-		return true;
-	}
-
-	function BindableList (executionContext, layer, defaultNode)
+	function BindableList (executionContext, defaultNode)
 	{
 		X3DBaseNode .call (this, executionContext);
 
-		this .layer     = layer;
-		this .collected = [ defaultNode ];
-		this .array     = [ defaultNode ];
+		this .collected    = [ defaultNode ];
+		this .array        = [ defaultNode ];
+		this .updateTime   = 0;
+		this .removedNodes = [ ];
 	}
 
 	BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
@@ -100,19 +87,22 @@ function (X3DBaseNode)
 		{
 			if (this .array .length > 1)
 			{
-				var
+				const
 					enableInlineBindables = false,
-					masterScene           = this .getMasterScene ();
+					mainScene             = this .getMainScene ();
 
 				if (name && name .length)
 				{
 					// Return first viewpoint with @name.
 
-					for (var i = 1, length = this .array .length; i < length; ++ i)
+					for (let i = 1, length = this .array .length; i < length; ++ i)
 					{
-						var node = this .array [i];
+						const
+							node     = this .array [i],
+							instance = node .getExecutionContext () .getInstance (),
+							scene    = instance ?  instance .getScene () : node .getScene ();
 
-						if (! enableInlineBindables && node .getScene () !== masterScene)
+						if (! enableInlineBindables && scene !== mainScene)
 							continue;
 
 						if (node .getName () == name)
@@ -122,11 +112,14 @@ function (X3DBaseNode)
 
 				// Return first bound viewpoint in scene.
 
-				for (var i = 1, length = this .array .length; i < length; ++ i)
+				for (let i = 1, length = this .array .length; i < length; ++ i)
 				{
-					var node = this .array [i];
+					const
+						node     = this .array [i],
+						instance = node .getExecutionContext () .getInstance (),
+						scene    = instance ?  instance .getScene () : node .getScene ();
 
-					if (! enableInlineBindables && node .getScene () !== masterScene)
+					if (! enableInlineBindables && scene !== mainScene)
 						continue;
 
 					if (node .isBound_ .getValue ())
@@ -134,12 +127,15 @@ function (X3DBaseNode)
 				}
 
 				// Return first viewpoint in scene.
-	
-				for (var i = 1, length = this .array .length; i < length; ++ i)
+
+				for (let i = 1, length = this .array .length; i < length; ++ i)
 				{
-					var node = this .array [i];
+					const
+						node     = this .array [i],
+						instance = node .getExecutionContext () .getInstance (),
+						scene    = instance ?  instance .getScene () : node .getScene ();
 
-					if (! enableInlineBindables && node .getScene () !== masterScene)
+					if (! enableInlineBindables && scene !== mainScene)
 						continue;
 
 					return node;
@@ -154,34 +150,63 @@ function (X3DBaseNode)
 		{
 			return this .collected .push (node);
 		},
-		update: function ()
+		update: function (layerNode, stack)
 		{
+			const
+				changedNodes = this .collected .filter (node => node .set_bind_ .getModificationTime () > this .updateTime),
+				removedNodes = this .removedNodes;
+
 			if (! equals (this .collected, this .array))
 			{
 				// Unbind nodes not in current list (collected);
 
-				for (var i = 0, length = this .array .length; i < length; ++ i)
+				for (const node of this .array)
 				{
-					var node = this .array [i];
-
-					if (this .collected .indexOf (node) < 0)
+					if (this .collected .indexOf (node) === -1)
 					{
-						if (node .isBound_ .getValue ())
-							node .set_bind_ = false;							
+						removedNodes .push (node);
 					}
 				}
 
 				// Swap arrays.
 
-				var tmp = this .array;
+				const tmp = this .array;
 
 				this .array     = this .collected;
 				this .collected = tmp;
 			}
 
+			// Clear collected array.
+
 			this .collected .length = 1;
+
+			// Update stack.
+
+			stack .update (layerNode, removedNodes, changedNodes)
+
+			removedNodes .length = 0;
+
+			// Advance updateTime time.
+
+			this .updateTime = performance .now ();
 		},
 	});
 
+	// Compares two arrays.
+
+	function equals (lhs, rhs)
+	{
+		if (lhs .length !== rhs .length)
+			return false;
+
+		for (let i = 0; i < lhs .length; ++ i)
+		{
+			if (lhs [i] !== rhs [i])
+				return false
+		}
+
+		return true;
+	}
+
 	return BindableList;
 });

package/src/x_ite/Execution/BindableStack.js

@@ -54,12 +54,12 @@ function (X3DBaseNode)
 {
 "use strict";
 
-	function BindableStack (executionContext, layer, defaultNode)
+	function BindableStack (executionContext, defaultNode)
 	{
 		X3DBaseNode .call (this, executionContext);
 
-		this .layer = layer;
-		this .array = [ defaultNode ];
+		this .array          = [ defaultNode ];
+		this .transitionNode = defaultNode .create (executionContext);
 	}
 
 	BindableStack .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
@@ -83,106 +83,98 @@ function (X3DBaseNode)
 		},
 		top: function ()
 		{
-			return this .array [this .array .length - 1];
+			return this .transitionNode .transitionActive_ .getValue () ? this .transitionNode : this .array .at (-1);
 		},
-		forcePush: function (node)
+		pushOnTop: function (node)
 		{
+			if (node !== this .array [0])
+			{
+				this .array .at (-1) .isBound_ = false;
+				this .array .push (node);
+			}
+
+			// Don't do set_bind.
 			node .isBound_  = true;
 			node .bindTime_ = this .getBrowser () .getCurrentTime ();
 
-			this .push (node);
+			this .addNodeEvent ();
 		},
-		push: function (node)
+		update: function (layerNode, removedNodes, changedNodes)
 		{
-			if (this .array .length === 0)
+			if (removedNodes .length === 0 && changedNodes .length === 0)
 				return;
 
-			if (node === this .array [0])
-				return;
+			// Save top node for later use.
+
+			const
+				fromNode  = this .top (),
+				boundNode = this .array .at (-1);
 
-			var top = this .top ();
+			// Remove invisible nodes and unbind them if needed.
 
-			if (node !== top)
+			for (const removedNode of removedNodes)
 			{
-				this .pushOnTop (node);
+				const index = this .array .indexOf (removedNode);
 
-				if (top .isBound_ .getValue ())
-				{
-					top .set_bind_ = false;
-					top .isBound_  = false;
-				}
+				if (index > 0)
+					this .array .splice (index, 1);
+			}
+
+			// Unbind nodes with set_bind false and pop top node.
 
-				if (! node .isBound_ .getValue ())
+			if (boundNode !== this .array [0])
+			{
+				if (changedNodes .some (node => ! node .set_bind_ .getValue () && node === boundNode))
 				{
-					node .isBound_  = true;
-					node .bindTime_ = this .getBrowser () .getCurrentTime ();
-					node .transitionStart (top);
+					this .array .pop ();
 				}
-
-				this .pushOnTop (node);
-
-				this .addNodeEvent ();
 			}
-		},
-		pushOnTop: function (node)
-		{
-			var index = this .array .indexOf (node);
 
-			if (index > -1)
-				this .array .splice (index, 1);
+			// Push nodes with set_bind true to top of stack.
 
-			this .array .push (node);
-		},
-		remove: function (node)
-		{
-			if (node === this .array [0])
-				return;
-
-			// If on top, pop node.
+			for (const bindNode of changedNodes)
+			{
+				if (bindNode .set_bind_ .getValue ())
+				{
+					const index = this .array .indexOf (bindNode);
 
-			var top = this .top ();
+					if (index > -1)
+					{
+						this .array .splice (index, 1);
+					}
 
-			if (node === top)
-				return this .pop (node);
+					this .array .push (bindNode);
+				}
+			}
 
-			// Simply remove.
+			// Bind top node if not bound.
 
-			var index = this .array .indexOf (node);
+			const top = this .array .at (-1);
 
-			if (index > -1)
-				this .array .splice (index, 1);
-		},
-		pop: function (node)
-		{
-			if (node === this .array [0])
+			if (top === boundNode)
 				return;
 
-			var top = this .top ();
-			
-			if (node === top)
-			{
-				if (node .isBound_ .getValue ())
-					node .isBound_ = false;
+			// First unbind last bound node.
 
-				if (this .array .length === 0)
-					return;
+			boundNode .set_bind_ = false;
+			boundNode .isBound_  = false;
 
-				this .array .pop ();
+			// Now bind new top node.
 
-				top = this .top ();
+			top .set_bind_  = true;
+			top .isBound_   = true;
+			top .bindTime_  = this .getBrowser () .getCurrentTime ();
 
-				if (! top .isBound_ .getValue ())
-				{
-					top .set_bind_ = true;
-					top .isBound_  = true;
-					top .bindTime_ = this .getBrowser () .getCurrentTime ();
-					top .transitionStart (node);
-				}
+			// Do transition.
 
-				this .addNodeEvent ();
-			}
+			this .transitionNode = top .create (this .getExecutionContext ());
+
+			this .transitionNode .setup ();
+			this .transitionNode .transitionStart (layerNode, fromNode, top);
+
+			this .addNodeEvent ();
 		},
 	});
 
 	return BindableStack;
-});
+});

package/src/x_ite/Execution/ExportedNode.js

@@ -69,17 +69,40 @@ function (Fields,
 	ExportedNode .prototype = Object .assign (Object .create (X3DObject .prototype),
 	{
 		constructor: ExportedNode,
+		getTypeName: function ()
+		{
+			return "ExportedNode";
+		},
 		getExportedName: function ()
 		{
 			return this .exportedName;
 		},
 		getLocalNode: function ()
 		{
-			return new Fields .SFNode (this .localNode);
+			return this .localNode;
+		},
+		toVRMLStream: function (stream)
+		{
+			const
+				generator = Generator .Get (stream),
+				localName = generator .LocalName (this .localNode);
+
+			stream .string += generator .Indent ();
+			stream .string += "EXPORT";
+			stream .string += " ";
+			stream .string += localName;
+
+			if (this .exportedName !== localName)
+			{
+				stream .string += " ";
+				stream .string += "AS";
+				stream .string += " ";
+				stream .string += this .exportedName;
+			}
 		},
 		toXMLStream: function (stream)
 		{
-			var
+			const
 				generator = Generator .Get (stream),
 				localName = generator .LocalName (this .localNode);