x_ite 4.2.17 → 4.7.7

package/src/x_ite/Routing/RouteArray.js

@@ -51,12 +51,12 @@ define (function ()
 {
 "use strict";
 
-	var handler =
+	const handler =
 	{
 		get: function (target, key)
 		{
-			var value = target [key];
-	
+			const value = target [key];
+
 			if (value !== undefined)
 				return value;
 
@@ -66,12 +66,19 @@ define (function ()
 		{
 			return false;
 		},
+		has: function (target, key)
+		{
+			if (Number .isInteger (+key))
+				return key < target .array .length;
+
+			return key in target;
+		},
 	};
 
 	function RouteArray ()
 	{
 		this .array = [ ];
-		
+
 		return new Proxy (this, handler);
 	}
 
@@ -82,21 +89,37 @@ define (function ()
 		{
 			return this .array;
 		},
-		toXMLStream: function (stream)
+		toVRMLStream: function (stream)
 		{
-			var array = this .array;
+			this .array .forEach (function (route)
+			{
+				try
+				{
+					route .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 (route)
 			{
 				try
 				{
-					array [i] .toXMLStream (stream);
-	
+					route .toXMLStream (stream);
+
 					stream .string += "\n";
 				}
 				catch (error)
-				{ }
-			}
+				{
+					console .log (error);
+				}
+			});
 		},
 	});
 

package/src/x_ite/Routing/X3DRoute.js

@@ -49,12 +49,12 @@
 
 define ([
 	"x_ite/Fields",
-	"x_ite/Basic/X3DBaseNode",
+	"x_ite/Base/X3DObject",
 	"x_ite/Bits/X3DConstants",
 	"x_ite/InputOutput/Generator",
 ],
 function (Fields,
-          X3DBaseNode,
+          X3DObject,
           X3DConstants,
           Generator)
 {
@@ -62,70 +62,36 @@ function (Fields,
 
 	function X3DRoute (executionContext, sourceNode, sourceField, destinationNode, destinationField)
 	{
-		X3DBaseNode .call (this, executionContext);
-
-		this .addChildObjects ("sourceNode",      new Fields .SFNode (sourceNode),
-		                       "destinationNode", new Fields .SFNode (destinationNode));
+		X3DObject .call (this, executionContext);
 
+		this ._executionContext = executionContext;
+		this ._sourceNode       = new Fields .SFNode (sourceNode);
 		this ._sourceField      = sourceField;
+		this ._destinationNode  = new Fields .SFNode (destinationNode);
 		this ._destinationField = destinationField;
 
-		//if (! (this .getExecutionContext () instanceof X3DProtoDeclaration))
-		{
-			sourceField .addFieldInterest (destinationField);
+		// Must connect in every context, to make X3DBaseNode.hasRoutes work.
 
-			sourceField      .addOutputRoute (this);
-			destinationField .addInputRoute (this);
-		}
+		sourceField .addFieldInterest (destinationField);
+
+		sourceField      .addOutputRoute (this);
+		destinationField .addInputRoute (this);
 	}
 
-	X3DRoute .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
+	X3DRoute .prototype = Object .assign (Object .create (X3DObject .prototype),
 	{
 		getTypeName: function ()
 		{
 			return "X3DRoute";
 		},
-		getComponentName: function ()
-		{
-			return "X_ITE";
-		},
-		getContainerField: function ()
-		{
-			return "routes";
-		},
-		initialize: function ()
-		{
-			X3DBaseNode .prototype .initialize .call (this);
-
-			this .sourceNode_      .addInterest ("set_node", this);
-			this .destinationNode_ .addInterest ("set_node", this);
-
-//			Object .preventExtensions (this);
-//			Object .freeze (this);
-//			Object .seal (this);
-		},
-		set_node: function ()
+		getExecutionContext: function ()
 		{
-			if (! this .sourceNode_ .getValue () || ! this .destinationNode_ .getValue ())
-				this .dispose ();
-		},
-		disconnect: function ()
-		{
-			this ._sourceField .removeFieldInterest (this ._destinationField);
-
-			this ._sourceField      .removeOutputRoute (this);
-			this ._destinationField .removeInputRoute (this);
-
-			if (this .sourceNode_ .getValue ())
-				this .sourceNode_ .removeInterest ("set_node", this);
-
-			if (this .destinationNode_ .getValue ())
-				this .destinationNode_ .removeInterest ("set_node", this);
+			return this ._executionContext;
 		},
 		getSourceNode: function ()
 		{
 			///  SAI
-			return this .sourceNode_ .getValue ();
+			return this ._sourceNode .valueOf ();
 		},
 		getSourceField: function ()
 		{
@@ -135,23 +101,58 @@ function (Fields,
 		getDestinationNode: function ()
 		{
 			///  SAI
-			return this .destinationNode_ .getValue ();
+			return this ._destinationNode .valueOf ();
 		},
 		getDestinationField: function ()
 		{
 			///  SAI
 			return this ._destinationField .getName ();
 		},
-		toString: function ()
+		disconnect: function ()
 		{
-			return Object .prototype .toString (this);
+			this ._sourceField .removeFieldInterest (this ._destinationField);
+
+			this ._sourceField      .removeOutputRoute (this);
+			this ._destinationField .removeInputRoute (this);
+		},
+		toStream: function (stream)
+		{
+			stream .string += Object .prototype .toString .call (this);
+		},
+		toVRMLStream: function (stream)
+		{
+			const
+				generator           = Generator .Get (stream),
+				sourceNodeName      = generator .LocalName (this ._sourceNode .getValue ()),
+				destinationNodeName = generator .LocalName (this ._destinationNode .getValue ());
+
+			stream .string += generator .Indent ();
+			stream .string += "ROUTE";
+			stream .string += " ";
+			stream .string += sourceNodeName;
+			stream .string += ".";
+			stream .string += this ._sourceField .getName ();
+
+			if (this ._sourceField .getAccessType () === X3DConstants .inputOutput)
+				stream .string += "_changed";
+
+			stream .string += " ";
+			stream .string += "TO";
+			stream .string += " ";
+			stream .string += destinationNodeName;
+			stream .string += ".";
+
+			if (this ._destinationField .getAccessType () === X3DConstants .inputOutput)
+				stream .string += "set_";
+
+			stream .string += this ._destinationField .getName ();
 		},
 		toXMLStream: function (stream)
 		{
-			var
+			const
 				generator           = Generator .Get (stream),
-				sourceNodeName      = generator .LocalName (this .getSourceNode ()),
-				destinationNodeName = generator .LocalName (this .getDestinationNode ());
+				sourceNodeName      = generator .LocalName (this ._sourceNode .getValue ()),
+				destinationNodeName = generator .LocalName (this ._destinationNode .getValue ());
 
 			stream .string += generator .Indent ();
 			stream .string += "<ROUTE";
@@ -185,9 +186,9 @@ function (Fields,
 		{
 			this .disconnect ();
 
-			this .getExecutionContext () .deleteRoute (this);
+			this ._executionContext .deleteRoute (this);
 
-			X3DBaseNode .prototype .dispose .call (this);
+			X3DObject .prototype .dispose .call (this);
 		}
 	});
 
@@ -195,7 +196,7 @@ function (Fields,
 	{
 		get: function ()
 		{
-			return this .sourceNode_ .clone ();
+			return this ._sourceNode .valueOf ();
 		},
 		enumerable: true,
 		configurable: false
@@ -215,7 +216,7 @@ function (Fields,
 	{
 		get: function ()
 		{
-			return this .destinationNode_ .clone ();
+			return this ._destinationNode .valueOf ();
 		},
 		enumerable: true,
 		configurable: false
@@ -233,4 +234,3 @@ function (Fields,
 
 	return X3DRoute;
 });
-

package/src/x_ite/Routing/X3DRoutingContext.js

@@ -80,13 +80,13 @@ function ()
 				// Process field events
 				do
 				{
-					var taintedFields = this .taintedFields;
+					const taintedFields = this .taintedFields;
 
 					// Swap tainted fields.
 					this .taintedFields         = this .taintedFieldsTemp;
 					this .taintedFields .length = 0;
 
-					for (var i = 0, length = taintedFields .length; i < length; i += 2)
+					for (let i = 0, length = taintedFields .length; i < length; i += 2)
 						taintedFields [i] .processEvent (taintedFields [i + 1]);
 
 					// Don't know why this must be done after the for loop, otherwise a fatal error could be thrown.
@@ -97,15 +97,15 @@ function ()
 				// Process node events
 				do
 				{
-					var taintedNodes = this .taintedNodes;
+					const taintedNodes = this .taintedNodes;
 
 					// Swap tainted nodes.
 					this .taintedNodes         = this .taintedNodesTemp;
 					this .taintedNodes .length = 0;
 
-					for (var i = 0, length = taintedNodes .length; i < length; ++ i)
-						taintedNodes [i] .processEvents ();
-					
+					for (const taintedNode of taintedNodes)
+						taintedNode .processEvents ();
+
 					// Don't know why this must be done after the for loop, otherwise a fatal error could be thrown.
 					this .taintedNodesTemp = taintedNodes;
 				}

package/src/x_ite/X3D.js

@@ -49,7 +49,6 @@
 
 define ([
 	"jquery",
-	"x_ite/Error",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Basic/X3DField",
@@ -71,9 +70,11 @@ define ([
 	"x_ite/Routing/RouteArray",
 	"x_ite/Routing/X3DRoute",
 	"x_ite/Bits/X3DConstants",
+	"x_ite/Browser/Networking/urls",
+	"x_ite/Fallback",
+	"standard/Time/MicroTime",
 ],
 function ($,
-          Error,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DField,
@@ -94,39 +95,28 @@ function ($,
           X3DProtoDeclaration,
           RouteArray,
           X3DRoute,
-          X3DConstants)
+          X3DConstants,
+          urls,
+          Fallback,
+			 microtime)
 {
 "use strict";
 
-	// Console fallback
-
-	if (! console)        console        = { };
-	if (! console .log)   console .log   = function () { };
-	if (! console .info)  console .info  = console .log;
-	if (! console .warn)  console .warn  = console .log;
-	if (! console .error) console .error = console .log;
-
-	// DEBUG
-	//	function print ()
-	//	{
-	//		var string = "";
-	//
-	//		for (var i = 0; i < arguments .length; ++ i)
-	//			string += arguments [i];
-	//
-	//		$(".x_ite-console") .append (string);
-	//	}
-	//
-	//	console .log   = print;
-	//	console .info  = print;
-	//	console .warn  = print;
-	//	console .error = print;
-
 	// X3D
 
+	function getComponentUrl (name)
+	{
+		const url = urls .getProviderUrl (name);
+
+		if (typeof globalRequire === "function")
+			 globalRequire (new URL (url) .pathname);
+
+		return url;
+	}
+
 	function createBrowser (url, parameter)
 	{
-		var element = $("<X3DCanvas></X3DCanvas>");
+		const element = $("<X3DCanvas></X3DCanvas>");
 
 		if (url instanceof Fields .MFString)
 			 element .attr ("url", url .toString ())
@@ -138,7 +128,7 @@ function ($,
 
 	function getBrowser (dom)
 	{
-		return $(dom) .data ("browser");
+		return $(dom || "X3DCanvas") .data ("browser");
 	}
 
 	function createBrowserFromElement (dom)
@@ -148,7 +138,7 @@ function ($,
 		if (dom .find (".x_ite-private-browser") .length)
 			return;
 
-		var browser = new X3DBrowser (dom);
+		const browser = new X3DBrowser (dom);
 
 		dom .data ("browser", browser);
 
@@ -157,10 +147,11 @@ function ($,
 		return browser;
 	}
 
-	var
-		initialized = false,
-		callbacks   = $.Deferred (),
-		fallbacks   = $.Deferred ();
+	const
+		callbacks = $.Deferred (),
+		fallbacks = $.Deferred ();
+
+	let initialized = false;
 
 	function X3D (callback, fallback)
 	{
@@ -177,7 +168,7 @@ function ($,
 
 		$(function ()
 		{
-			var elements = $("X3DCanvas");
+			const elements = $("X3DCanvas");
 
 			elements .children () .hide ();
 
@@ -188,12 +179,14 @@ function ($,
 			}
 			catch (error)
 			{
-				Error .fallback (elements, error);
+				Fallback .show (elements, error);
 				fallbacks .resolve (error);
 			}
 		});
 	}
 
+	require .getComponentUrl = getComponentUrl;
+
 	Object .assign (X3D,
 	{
 		require:                     require,
@@ -241,7 +234,7 @@ function ($,
 		SFVec4d:                     Fields .SFVec4d,
 		SFVec4f:                     Fields .SFVec4f,
 		VrmlMatrix:                  Fields .VrmlMatrix,
-							              
+
 		MFBool:                      Fields .MFBool,
 		MFColor:                     Fields .MFColor,
 		MFColorRGBA:                 Fields .MFColorRGBA,

package/src/x_ite.config.js

@@ -36,11 +36,6 @@ require .config ({
 			"location": "../node_modules/opentype.js",
 			"main": "dist/opentype.js"
 		},
-		{
-			"name": "bezier",
-			"location": "../node_modules/bezier-js",
-			"main": "bezier.js"
-		},
 		{
 			"name": "sprintf",
 			"location": "../node_modules/sprintf-js",
@@ -50,6 +45,46 @@ require .config ({
 			"name": "contextMenu",
 			"location": "../node_modules/jquery-contextmenu",
 			"main": "dist/jquery.contextMenu.js"
+		},
+		{
+			"name": "nurbs",
+			"location": "lib/nurbs",
+			"main": "nurbs.js"
+		},
+		{
+			"name": "ammojs",
+			"location": "../node_modules/ammojs",
+			"main": "ammo.js"
+		},
+		{
+			"name": "dicom-parser",
+			"location": "../node_modules/dicom-parser",
+			"main": "dist/dicomParser.js"
+		},
+		{
+			"name": "jpeg",
+			"location": "../node_modules/jpeg-js",
+			"main": "lib/decoder.js"
+		},
+		{
+			"name": "jpegLossless",
+			"location": "../node_modules/jpeg-lossless-decoder-js",
+			"main": "release/current/lossless.js"
+		},
+		{
+			"name": "CharLS",
+			"location": "../node_modules/CharLS.js",
+			"main": "build/charLS-FixedMemory-browser.js"
+		},
+		{
+			"name": "OpenJPEG",
+			"location": "../node_modules/OpenJPEG.js",
+			"main": "build/openJPEG-FixedMemory-browser.js"
+		},
+		{
+			"name": "zlib",
+			"location": "../src",
+			"main": "dummy.js"
 		}
 	],
 	"shim": { },